diff --git a/browser/metro/base/content/browser.xul b/browser/metro/base/content/browser.xul
index f06d5f01427..ad3e852cfcb 100644
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -228,10 +228,7 @@
               <richgrid id="start-remotetabs-grid" set-name="remoteTabs" seltype="multiple" flex="1"/>
             </vbox>
 
-            <!-- Spacer to take extra space in snapped mode. -->
-            <spacer flex="999"/>
           </scrollbox>
-
         </hbox>
       </vbox> <!-- end tray -->
 
diff --git a/browser/metro/theme/browser.css b/browser/metro/theme/browser.css
index 74fb2efea2e..521d7cbbe62 100644
--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -234,17 +234,18 @@ documenttab[selected] .documenttab-selection {
 #start-autocomplete[viewstate="snapped"] .richgrid-item-content {
   -moz-box-orient: horizontal;
 }
+
 #start-container,
 #start-autocomplete {
   padding-left: 0;
   padding-right: 0;
 }
+
 #start-container[viewstate="snapped"] #start-scrollbox > .meta-section {
-  margin: 0;
+  margin: 0 @metro_spacing_xnormal@;
   min-width: @grid_double_column_width@;
-  -moz-box-flex: 1;
-  -moz-box-align: center;
 }
+
 #start-container[viewstate="snapped"] richgrid {
   visibility: collapse;
 }
diff --git a/browser/metro/theme/platform.css b/browser/metro/theme/platform.css
index 6d2104e14b0..660c6c55a51 100644
--- a/browser/metro/theme/platform.css
+++ b/browser/metro/theme/platform.css
@@ -581,6 +581,16 @@ arrowbox {
   cursor: default;
 }
 
+#start-container[viewstate="snapped"] {
+  padding-top: 0;
+}
+
+#start-container[viewstate="snapped"] .meta-section-title,
+#start-container[viewstate="snapped"] richgrid {
+  margin-top: @metro_spacing_xnormal@;
+  padding: 0;
+}
+
 #start-container[viewstate="snapped"] .meta-section-title.narrow-title,
 #start-container:not([viewstate="snapped"]) .meta-section-title.wide-title {
   display: block;
diff --git a/browser/metro/theme/tiles.css b/browser/metro/theme/tiles.css
index 6480b074de8..22e6b8f8bb6 100644
--- a/browser/metro/theme/tiles.css
+++ b/browser/metro/theme/tiles.css
@@ -282,4 +282,13 @@ richgriditem[bending] > .tile-content {
     background: #fff;
     opacity: 1.0;
   }
+
+  .tile-content {
+    left: 0;
+    right: 0;
+  }
+
+  richgriditem {
+    width: auto;
+  }
 }