diff --git a/demos/sink/pages/card.ts b/demos/sink/pages/card.ts
index df8adc5b17..0613bd82cf 100644
--- a/demos/sink/pages/card.ts
+++ b/demos/sink/pages/card.ts
@@ -24,10 +24,8 @@ import {SinkPage} from '../sink-page';
         Card Header
       </ion-card-header>
 
-      <div class="item">
-        <div class="item-media">
-          <img src="http://i.imgur.com/7BEPcGo.jpg">
-        </div>
+      <div>
+        <img src="http://i.imgur.com/7BEPcGo.jpg">
       </div>
 
     </ion-card>
diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts
index 0773423150..85fd212ce0 100644
--- a/ionic/components/checkbox/checkbox.ts
+++ b/ionic/components/checkbox/checkbox.ts
@@ -46,7 +46,7 @@ import {IonicComponent, IonicView} from '../../config/annotations';
 })
 @IonicView({
   template:
-  '<div item-left class="item-media media-checkbox">' +
+  '<div item-left class="media-checkbox">' +
     '<div class="checkbox-icon"></div>' +
   '</div>' +
   '<ion-item-content id="{{labelId}}">' +
diff --git a/ionic/components/item/item-media.scss b/ionic/components/item/item-media.scss
index 18a846f674..66fb649b98 100644
--- a/ionic/components/item/item-media.scss
+++ b/ionic/components/item/item-media.scss
@@ -26,14 +26,6 @@
   }
 }
 
-.item .item-media {
-  line-height: 1;
-
-  img {
-    display: block;
-  }
-}
-
 ion-avatar,
 ion-thumbnail {
   display: block;
diff --git a/ionic/components/item/test/media/main.html b/ionic/components/item/test/media/main.html
index cf271f8e74..b3e4dc3923 100644
--- a/ionic/components/item/test/media/main.html
+++ b/ionic/components/item/test/media/main.html
@@ -55,9 +55,9 @@
   </ion-item>
 
   <button ion-item>
-    <div class="item-media" item-left>
-      <img class="thumbnail" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
-    </div>
+    <ion-thumbnail item-left>
+      <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
+    </ion-thumbnail>
     <h3>H3 Title Text</h3>
     <p>Icon on right</p>
     <p>Vertically align top</p>
diff --git a/ionic/components/radio/radio.ts b/ionic/components/radio/radio.ts
index aa05720662..edda986e04 100644
--- a/ionic/components/radio/radio.ts
+++ b/ionic/components/radio/radio.ts
@@ -189,7 +189,7 @@ export class RadioGroup extends Ion {
   '<ion-item-content id="{{labelId}}">' +
     '<ng-content></ng-content>' +
   '</ion-item-content>' +
-  '<div item-right class="item-media media-radio">' +
+  '<div item-right class="media-radio">' +
     '<div class="radio-icon"></div>' +
   '</div>'
 })
diff --git a/ionic/components/switch/modes/ios.scss b/ionic/components/switch/modes/ios.scss
index 5781d9124a..687a7ba76f 100644
--- a/ionic/components/switch/modes/ios.scss
+++ b/ionic/components/switch/modes/ios.scss
@@ -24,7 +24,7 @@ $switch-ios-transition-duration:       300ms !default;
 
 ion-switch {
 
-  .item-media.media-switch {
+  [item-right].media-switch {
     margin: 0;
     padding: 6px ($item-ios-padding-right / 2) 6px ($item-ios-padding-left);
   }
diff --git a/ionic/components/switch/modes/md.scss b/ionic/components/switch/modes/md.scss
index 01e330d540..4f029a4f50 100644
--- a/ionic/components/switch/modes/md.scss
+++ b/ionic/components/switch/modes/md.scss
@@ -20,7 +20,7 @@ $switch-md-transition-duration:       300ms !default;
 
 ion-switch {
 
-  .item-media.media-switch {
+  [item-right].media-switch {
     margin: 0;
     padding: 6px ($item-md-padding-right / 2) 6px $item-md-padding-left;
   }
diff --git a/ionic/components/switch/switch.ts b/ionic/components/switch/switch.ts
index f58326bbeb..5d4e8a2140 100644
--- a/ionic/components/switch/switch.ts
+++ b/ionic/components/switch/switch.ts
@@ -107,7 +107,7 @@ class MediaSwitch {
   '<ion-item-content id="{{labelId}}">' +
     '<ng-content></ng-content>' +
   '</ion-item-content>' +
-  '<div item-right class="item-media media-switch">' +
+  '<div item-right class="media-switch">' +
     '<div class="switch-icon"></div>' +
   '</div>',
   directives: [MediaSwitch]