diff --git a/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png b/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png
deleted file mode 100644
index 6c94a31ed5..0000000000
Binary files a/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xlarge-mdpi/app_market_generic.png b/res/drawable-xlarge-mdpi/app_market_generic.png
index c093e2425e..355ea6a546 100644
Binary files a/res/drawable-xlarge-mdpi/app_market_generic.png and b/res/drawable-xlarge-mdpi/app_market_generic.png differ
diff --git a/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png
index d3ab3ad1a5..7f04589981 100644
Binary files a/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png and b/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png differ
diff --git a/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png
index 0261d0db80..04749e6f4c 100644
Binary files a/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png and b/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png differ
diff --git a/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png
deleted file mode 100644
index 8a992739d6..0000000000
Binary files a/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png and /dev/null differ
diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml
index fbe98b09e4..d03a571580 100644
--- a/res/layout-xlarge-land/all_apps_tabbed.xml
+++ b/res/layout-xlarge-land/all_apps_tabbed.xml
@@ -54,7 +54,7 @@
             <com.android.launcher2.DeleteZone
                 android:id="@+id/all_apps_delete_zone"
                 android:text="@string/delete_zone_label_all_apps"
-                android:drawablePadding="@dimen/all_apps_drawable_padding"
+                android:drawablePadding="@dimen/delete_zone_drawable_padding"
                 android:drawableLeft="@drawable/delete_zone_selector"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml
index c76516e156..957327ebfb 100644
--- a/res/layout-xlarge-land/launcher.xml
+++ b/res/layout-xlarge-land/launcher.xml
@@ -75,13 +75,13 @@
             android:id="@+id/search_divider"
             android:src="@drawable/divider_launcher_holo"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/toolbar_divider_height"
+            android:layout_height="match_parent"
             android:layout_toRightOf="@id/search_button"
             android:paddingTop="@dimen/toolbar_button_vertical_padding"
             android:paddingBottom="@dimen/toolbar_button_vertical_padding"
 
-            android:onClick="onClickAllAppsButton"
-            android:focusable="true"
+            android:onClick="onClickSearchButton"
+            android:focusable="false"
             android:clickable="true" />
 
         <!-- Voice search icon -->
@@ -120,26 +120,26 @@
             android:id="@+id/divider"
             android:src="@drawable/divider_launcher_holo"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/toolbar_divider_height"
+            android:layout_height="match_parent"
             android:layout_toLeftOf="@id/configure_button"
             android:paddingTop="@dimen/toolbar_button_vertical_padding"
             android:paddingBottom="@dimen/toolbar_button_vertical_padding"
 
             android:onClick="onClickAllAppsButton"
-            android:focusable="true"
+            android:focusable="false"
             android:clickable="true" />
         <TextView
             android:id="@+id/all_apps_button"
             android:text="@string/all_apps_button_label"
-            android:drawablePadding="@dimen/all_apps_drawable_padding"
+            android:drawablePadding="@dimen/all_apps_button_drawable_padding"
             android:drawableLeft="@drawable/ic_home_all_apps_holo_dark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@id/divider"
             android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
             android:paddingRight="@dimen/toolbar_button_horizontal_padding"
-            android:paddingTop="@dimen/toolbar_button_vertical_padding"
-            android:paddingBottom="@dimen/toolbar_button_vertical_padding"
+            android:paddingTop="@dimen/all_apps_button_vertical_padding"
+            android:paddingBottom="@dimen/all_apps_button_vertical_padding"
             android:background="@drawable/button_bg"
             
             android:gravity="center_horizontal|center_vertical"
@@ -158,7 +158,7 @@
             android:id="@+id/divider_during_drag"
             android:src="@drawable/divider_launcher_holo"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/toolbar_divider_height"
+            android:layout_height="match_parent"
             android:layout_toLeftOf="@id/configure_button"
             android:paddingTop="@dimen/toolbar_button_vertical_padding"
             android:paddingBottom="@dimen/toolbar_button_vertical_padding"
@@ -166,7 +166,7 @@
         <com.android.launcher2.DeleteZone
             android:id="@+id/delete_zone"
             android:text="@string/delete_zone_label_workspace"
-            android:drawablePadding="@dimen/all_apps_drawable_padding"
+            android:drawablePadding="@dimen/delete_zone_drawable_padding"
             android:drawableLeft="@drawable/delete_zone_selector"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml
index b90041c6b0..269fa12756 100644
--- a/res/layout-xlarge-port/all_apps_tabbed.xml
+++ b/res/layout-xlarge-port/all_apps_tabbed.xml
@@ -54,7 +54,7 @@
             <com.android.launcher2.DeleteZone
                 android:id="@+id/all_apps_delete_zone"
                 android:text="@string/delete_zone_label_all_apps"
-                android:drawablePadding="@dimen/all_apps_drawable_padding"
+                android:drawablePadding="@dimen/delete_zone_drawable_padding"
                 android:drawableLeft="@drawable/delete_zone_selector"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml
index 3b499d9a88..a8087f450a 100644
--- a/res/layout-xlarge-port/launcher.xml
+++ b/res/layout-xlarge-port/launcher.xml
@@ -46,7 +46,7 @@
         android:id="@+id/all_apps_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="top"/>
+        android:layout_gravity="top" />
 
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
@@ -75,13 +75,13 @@
             android:id="@+id/search_divider"
             android:src="@drawable/divider_launcher_holo"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/toolbar_divider_height"
+            android:layout_height="match_parent"
             android:layout_toRightOf="@id/search_button"
             android:paddingTop="@dimen/toolbar_button_vertical_padding"
             android:paddingBottom="@dimen/toolbar_button_vertical_padding"
 
-            android:onClick="onClickAllAppsButton"
-            android:focusable="true"
+            android:onClick="onClickSearchButton"
+            android:focusable="false"
             android:clickable="true" />
 
         <!-- Voice search icon -->
@@ -111,6 +111,7 @@
             android:paddingRight="@dimen/toolbar_button_horizontal_padding"
             android:paddingTop="@dimen/toolbar_button_vertical_padding"
             android:paddingBottom="@dimen/toolbar_button_vertical_padding"
+            android:background="@drawable/button_bg"
 
             android:onClick="onClickConfigureButton"
             android:focusable="true"
@@ -119,26 +120,27 @@
             android:id="@+id/divider"
             android:src="@drawable/divider_launcher_holo"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/toolbar_divider_height"
+            android:layout_height="match_parent"
             android:layout_toLeftOf="@id/configure_button"
             android:paddingTop="@dimen/toolbar_button_vertical_padding"
             android:paddingBottom="@dimen/toolbar_button_vertical_padding"
 
             android:onClick="onClickAllAppsButton"
-            android:focusable="true"
+            android:focusable="false"
             android:clickable="true" />
         <TextView
             android:id="@+id/all_apps_button"
             android:text="@string/all_apps_button_label"
-            android:drawablePadding="@dimen/all_apps_drawable_padding"
+            android:drawablePadding="@dimen/all_apps_button_drawable_padding"
             android:drawableLeft="@drawable/ic_home_all_apps_holo_dark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@id/divider"
             android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
             android:paddingRight="@dimen/toolbar_button_horizontal_padding"
-            android:paddingTop="@dimen/toolbar_button_vertical_padding"
-            android:paddingBottom="@dimen/toolbar_button_vertical_padding"
+            android:paddingTop="@dimen/all_apps_button_vertical_padding"
+            android:paddingBottom="@dimen/all_apps_button_vertical_padding"
+            android:background="@drawable/button_bg"
             
             android:gravity="center_horizontal|center_vertical"
             android:textColor="#CCFFFFFF"
@@ -156,7 +158,7 @@
             android:id="@+id/divider_during_drag"
             android:src="@drawable/divider_launcher_holo"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/toolbar_divider_height"
+            android:layout_height="match_parent"
             android:layout_toLeftOf="@id/configure_button"
             android:paddingTop="@dimen/toolbar_button_vertical_padding"
             android:paddingBottom="@dimen/toolbar_button_vertical_padding"
@@ -164,7 +166,7 @@
         <com.android.launcher2.DeleteZone
             android:id="@+id/delete_zone"
             android:text="@string/delete_zone_label_workspace"
-            android:drawablePadding="@dimen/all_apps_drawable_padding"
+            android:drawablePadding="@dimen/delete_zone_drawable_padding"
             android:drawableLeft="@drawable/delete_zone_selector"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -173,6 +175,7 @@
             android:paddingRight="@dimen/toolbar_button_horizontal_padding"
             android:paddingTop="@dimen/toolbar_button_vertical_padding"
             android:paddingBottom="@dimen/toolbar_button_vertical_padding"
+            android:background="@drawable/button_bg"
 
             android:gravity="center_horizontal|center_vertical"
             android:textColor="@color/workspace_all_apps_and_delete_zone_text_color"
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 22f4134c5e..c4988e42e8 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -42,10 +42,11 @@
     <dimen name="customizeSmallScreenVerticalMarginLandscape">90dip</dimen>
     <dimen name="customizeSmallScreenVerticalMarginPortrait">180dip</dimen>
 
-    <dimen name="all_apps_drawable_padding">8dip</dimen>
-    <!--  toolbar divider height is 32dip plus 2*8dip for padding on top and bottom -->
-    <dimen name="toolbar_divider_height">48dip</dimen>
-    <dimen name="toolbar_button_vertical_padding">8dip</dimen>
+    <dimen name="delete_zone_drawable_padding">8dip</dimen>
+    <dimen name="all_apps_button_drawable_padding">0dip</dimen>
+    <dimen name="all_apps_button_vertical_padding">4dip</dimen>
+
+    <dimen name="toolbar_button_vertical_padding">12dip</dimen>
     <dimen name="toolbar_button_horizontal_padding">16dip</dimen>
 
     <!-- height & width of the drop rectangle for the trash icon -->