diff --git a/scss/_items.scss b/scss/_items.scss
index 24ddd8c34f7..ae69322cde6 100644
--- a/scss/_items.scss
+++ b/scss/_items.scss
@@ -474,6 +474,7 @@ button.item.item-button-right {
     max-width: $item-avatar-width;
     max-height: $item-avatar-height;
     width: 100%;
+    height: 100%;
     border-radius: $item-avatar-border-radius;
   }
 }
@@ -491,6 +492,7 @@ button.item.item-button-right {
     max-width: $item-avatar-width;
     max-height: $item-avatar-height;
     width: 100%;
+    height: 100%;
     border-radius: $item-avatar-border-radius;
   }
 }
@@ -513,6 +515,7 @@ button.item.item-button-right {
     max-width: $item-thumbnail-width;
     max-height: $item-thumbnail-height;
     width: 100%;
+    height: 100%;
   }
 }
 .item-avatar.item-complex,
@@ -536,6 +539,7 @@ button.item.item-button-right {
     max-width: $item-thumbnail-width;
     max-height: $item-thumbnail-height;
     width: 100%;
+    height: 100%;
   }
 }
 .item-avatar-right.item-complex,
diff --git a/scss/_platform.scss b/scss/_platform.scss
index aaf5e68b53e..75747cd445a 100644
--- a/scss/_platform.scss
+++ b/scss/_platform.scss
@@ -33,7 +33,7 @@
     .has-subheader {
       top: $bar-height + $bar-subheader-height + $ios-statusbar-height;
     }
-    .has-tabs-top {
+    .has-header.has-tabs-top {
       top: $bar-height + $tabs-height + $ios-statusbar-height;
     }
     .has-header.has-subheader.has-tabs-top {