diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png
index fca6036..409bb5d 100644
--- a/res/drawable-hdpi/gardening_crosshairs.png
+++ b/res/drawable-hdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png
index d473044..338c832 100644
--- a/res/drawable-mdpi/gardening_crosshairs.png
+++ b/res/drawable-mdpi/gardening_crosshairs.png
Binary files differ
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 6c94a31..0000000
--- a/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/app_market_generic.png b/res/drawable-xlarge-mdpi/app_market_generic.png
index c093e24..355ea6a 100644
--- a/res/drawable-xlarge-mdpi/app_market_generic.png
+++ b/res/drawable-xlarge-mdpi/app_market_generic.png
Binary files 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 d3ab3ad..7f04589 100644
--- a/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png
+++ b/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png
Binary files 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 0261d0d..04749e6 100644
--- a/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png
+++ b/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png
Binary files 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 8a99273..0000000
--- a/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml
index fbe98b0..d03a571 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 c76516e..957327e 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 b90041c..269fa12 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 3b499d9..a8087f4 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/layout-xlarge-port/tab_widget_indicator.xml b/res/layout-xlarge-port/tab_widget_indicator.xml
new file mode 100644
index 0000000..b113b7b
--- /dev/null
+++ b/res/layout-xlarge-port/tab_widget_indicator.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/TabIndicator.Portrait" />
diff --git a/res/layout-xlarge/tab_widget_indicator.xml b/res/layout-xlarge/tab_widget_indicator.xml
index 1b3f1c0..7794e29 100644
--- a/res/layout-xlarge/tab_widget_indicator.xml
+++ b/res/layout-xlarge/tab_widget_indicator.xml
@@ -16,20 +16,4 @@
 
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-
-    android:id="@+id/title"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:paddingLeft="40dp"
-    android:paddingRight="40dp"
-    android:paddingTop="15dp"
-    android:paddingBottom="20dp"
-
-    android:textColor="@color/tab_widget_indicator_color"
-    android:background="@drawable/tab_widget_indicator_selector"
-    android:textSize="20sp"
-    android:shadowColor="#393939"
-    android:shadowDx="0.0"
-    android:shadowDy="1.0"
-    android:shadowRadius="1.0" />
+    style="@style/TabIndicator" />
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 22f4134..c4988e4 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 -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 91fe2c9..6c372e3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,7 @@
     <color name="app_info_filter">#A50000FE</color>
     <color name="dimmed_view_color">#FF7F7F7F</color>
 
-    <color name="drag_outline_color">#9DBE12</color>
+    <color name="drag_outline_color">#6595f9</color>
 
     <color name="workspace_item_pressed_outline_color">#6595f9</color>
     <color name="workspace_item_pressed_glow_color">#0997ff</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c4aa26..6dcaa57 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -54,7 +54,7 @@
     <!--  Title of tab for configuring wallpapers -->
     <string name="wallpapers_tab_label">Wallpapers</string>
     <!--  Title of tab for configuring applications -->
-    <string name="applications_tab_label">App Shortcuts</string>
+    <string name="applications_tab_label">App shortcuts</string>
     <!--  Placeholder text, will be removed -->
     <string name="wallpapers_temp_tab_text">This will be the wallpapers tab</string>
     <!--  Labels for the tabs in All Apps -->
@@ -65,7 +65,7 @@
     <!--  Title of the tab for applications labeled as games [CHAR_LIMIT=24] -->
     <string name="all_apps_tab_games">Games</string>
     <!--  Tile of the tab for applications that were downloaded from market [CHAR_LIMIT=24] -->
-    <string name="all_apps_tab_downloaded">My Apps</string>
+    <string name="all_apps_tab_downloaded">My apps</string>
 
     <!-- All Apps pane -->
     <!-- Message to show when there are no games [CHAR_LIMIT=25] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7592a15..0c74a6a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -68,6 +68,28 @@
         <item name="android:layout_marginRight">10dip</item>
     </style>
 
+    <style name="TabIndicator">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingLeft">40dp</item>
+        <item name="android:paddingRight">40dp</item>
+        <item name="android:paddingTop">15dp</item>
+        <item name="android:paddingBottom">20dp</item>
+        <item name="android:textColor">@color/tab_widget_indicator_color</item>
+        <item name="android:background">@drawable/tab_widget_indicator_selector</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:shadowColor">#393939</item>
+        <item name="android:shadowDx">0.0</item>
+        <item name="android:shadowDy">1.0</item>
+        <item name="android:shadowRadius">1.0</item>
+    </style>
+
+    <style name="TabIndicator.Portrait">
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingRight">20dp</item>
+    </style>
+
     <style name="SearchButton" parent="@android:style/Widget.Button.Small">
         <item name="android:paddingTop">7dip</item>
         <item name="android:paddingBottom">9dip</item>
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 966f2e7..8614865 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2598,42 +2598,26 @@
      * @param hideSeq AnimatorSet in which to put "hide" animations, or null.
      */
     private void hideAndShowToolbarButtons(State newState, AnimatorSet showSeq, AnimatorSet hideSeq) {
-        final View searchButton = findViewById(R.id.search_button);
-        final View searchDivider = findViewById(R.id.search_divider);
-        final View voiceSearchButton = findViewById(R.id.voice_button);
+        final View buttonCluster = findViewById(R.id.all_apps_button_cluster);
+
         final View allAppsButton = findViewById(R.id.all_apps_button);
         final View divider = findViewById(R.id.divider);
         final View configureButton = findViewById(R.id.configure_button);
 
         switch (newState) {
         case WORKSPACE:
-            hideOrShowToolbarButton(true, searchButton, showSeq);
-            hideOrShowToolbarButton(true, searchDivider, showSeq);
-            hideOrShowToolbarButton(true, voiceSearchButton, showSeq);
-            hideOrShowToolbarButton(true, allAppsButton, showSeq);
-            hideOrShowToolbarButton(true, divider, showSeq);
-            hideOrShowToolbarButton(true, configureButton, showSeq);
+            hideOrShowToolbarButton(true, buttonCluster, showSeq);
             mDeleteZone.setOverlappingViews(new View[] { allAppsButton, divider, configureButton });
             mDeleteZone.setDragAndDropEnabled(true);
             mDeleteZone.setText(getResources().getString(R.string.delete_zone_label_workspace));
             break;
         case ALL_APPS:
-            hideOrShowToolbarButton(false, configureButton, hideSeq);
-            hideOrShowToolbarButton(false, searchDivider, hideSeq);
-            hideOrShowToolbarButton(false, searchButton, hideSeq);
-            hideOrShowToolbarButton(false, voiceSearchButton, hideSeq);
-            hideOrShowToolbarButton(false, divider, hideSeq);
-            hideOrShowToolbarButton(false, allAppsButton, hideSeq);
+            hideOrShowToolbarButton(false, buttonCluster, hideSeq);
             mDeleteZone.setDragAndDropEnabled(false);
             mDeleteZone.setText(getResources().getString(R.string.delete_zone_label_all_apps));
             break;
         case CUSTOMIZE:
-            hideOrShowToolbarButton(false, allAppsButton, hideSeq);
-            hideOrShowToolbarButton(false, searchDivider, hideSeq);
-            hideOrShowToolbarButton(false, searchButton, hideSeq);
-            hideOrShowToolbarButton(false, voiceSearchButton, hideSeq);
-            hideOrShowToolbarButton(false, divider, hideSeq);
-            hideOrShowToolbarButton(false, configureButton, hideSeq);
+            hideOrShowToolbarButton(false, buttonCluster, hideSeq);
             mDeleteZone.setDragAndDropEnabled(false);
             break;
         }