diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ddf551e540e..685040a16e5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -946,7 +946,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="1">
+            <intent-filter android:priority="-1">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
diff --git a/res/layout/condition_card.xml b/res/layout/condition_card.xml
index 482d5b62532..1106a11279d 100644
--- a/res/layout/condition_card.xml
+++ b/res/layout/condition_card.xml
@@ -19,7 +19,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingStart="16dp"
     android:background="?android:attr/colorAccent"
     android:elevation="3dp"
     android:clickable="true">
@@ -49,9 +49,9 @@
         <ImageView
             android:id="@+id/expand_indicator"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="16dp"
             android:tint="?android:attr/textColorPrimaryInverse"
-            android:padding="?android:attr/listPreferredItemPaddingEnd"
             android:clickable="true"
             android:background="?android:attr/selectableItemBackground" />
 
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index e79f8d512e0..d3f6b4fe85f 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -18,8 +18,6 @@
     android:id="@+id/category"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dashboard_category_height"
-    android:paddingStart="@dimen/dashboard_category_padding_start"
-    android:paddingEnd="@dimen/dashboard_category_padding_end"
     android:orientation="vertical"
     android:paddingBottom="8dip"
     android:background="@color/card_background" >
diff --git a/res/layout/settings_main_prefs.xml b/res/layout/settings_main_prefs.xml
index 4f08679c228..7d6ce08f0c7 100644
--- a/res/layout/settings_main_prefs.xml
+++ b/res/layout/settings_main_prefs.xml
@@ -39,6 +39,8 @@
                 android:id="@+id/main_content"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:paddingStart="@dimen/dashboard_padding_start"
+                android:paddingEnd="@dimen/dashboard_padding_end"
                 />
 
     </LinearLayout>
diff --git a/res/layout/suggestion_header.xml b/res/layout/suggestion_header.xml
index 512c53a7da2..a3a308ab01b 100644
--- a/res/layout/suggestion_header.xml
+++ b/res/layout/suggestion_header.xml
@@ -27,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginStart="@dimen/suggestion_arrow_margin"
+        android:paddingStart="16dp"
         android:singleLine="true"
         android:textAppearance="@style/TextAppearance.TileTitle"
         android:textColor="?android:attr/colorAccent"
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 7612c9720e7..f18b34b1305 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -28,23 +28,6 @@
     <!-- ActionBar height -->
     <dimen name="actionbar_size">46dip</dimen>
 
-    <!-- Dashboard margins between each tiles within the layout -->
-    <dimen name="dashboard_cell_gap_x">8dp</dimen>
-    <dimen name="dashboard_cell_gap_y">0dp</dimen>
-
-    <!-- Dashboard category padding start / end -->
-    <dimen name="dashboard_category_padding_start">4dp</dimen>
-    <dimen name="dashboard_category_padding_end">4dp</dimen>
-
-    <!-- Dashboard category title margin start -->
-    <dimen name="dashboard_category_title_margin_start">12dp</dimen>
-
-    <!-- Dashboard tile minimum height -->
-    <dimen name="dashboard_tile_minimum_height">64dp</dimen>
-
-    <!-- Dashboard tile image margin start / end -->
-    <dimen name="dashboard_tile_image_margin_start">12dp</dimen>
-
     <!-- Fingerprint -->
     <item name="fingerprint_illustration_aspect_ratio" format="float" type="dimen">0.0</item>
     <dimen name="fingerprint_decor_padding_top">24dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 03809c4ae82..14a52e476ed 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -39,21 +39,6 @@
     <dimen name="actionbar_contentInsetStart">24dp</dimen>
     <dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
 
-    <!-- Dashboard margins between each tiles within the layout -->
-    <dimen name="dashboard_cell_gap_x">16dp</dimen>
-    <dimen name="dashboard_cell_gap_y">0dp</dimen>
-
-    <!-- Dashboard category padding start / end -->
-    <dimen name="dashboard_category_padding_start">16dp</dimen>
-    <dimen name="dashboard_category_padding_end">24dp</dimen>
-
-    <!-- Dashboard category title margin start -->
-    <dimen name="dashboard_category_title_margin_start">8dp</dimen>
-
-    <!-- Dashboard tile image padding start / end -->
-    <dimen name="dashboard_tile_image_margin_start">8dp</dimen>
-    <dimen name="dashboard_tile_image_margin_end">32dp</dimen>
-
     <!-- CryptKeeper top margin for password/pin screen -->
     <dimen name="crypt_keeper_password_top_margin">256dip</dimen>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 12bdfaabf7e..7c8d2eeac94 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -86,10 +86,6 @@
     <dimen name="actionbar_contentInsetStart">16dp</dimen>
     <dimen name="actionbar_subsettings_contentInsetStart">72dp</dimen>
 
-    <!-- Dashboard margins between each tiles within the layout -->
-    <dimen name="dashboard_cell_gap_x">0dp</dimen>
-    <dimen name="dashboard_cell_gap_y">0dp</dimen>
-
     <!-- Dashboard padding in its container -->
     <dimen name="dashboard_padding_start">0dp</dimen>
     <dimen name="dashboard_padding_end">0dp</dimen>
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 38537fbbd8a..b6ac0c0da9a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -783,9 +783,6 @@ public class SettingsActivity extends SettingsDrawerActivity
             onQueryTextSubmit(mSearchQuery);
         }
         updateTilesList();
-        if (mIsShowingDashboard) {
-            showMenuIcon();
-        }
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index f40fa9cecd6..dd5ecf1e43e 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -79,6 +79,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         mSuggestionsChecks = new SuggestionsChecks(mContext);
 
         setHasStableIds(true);
+        setShowingAll(true);
     }
 
     public void setSuggestions(SuggestionParser suggestionParser) {
@@ -167,7 +168,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
                         tile.intent.getComponent().getClassName()), NS_ITEMS);
             }
         }
-        countItem(null, R.layout.see_all, true, NS_ITEMS);
         notifyDataSetChanged();
     }