diff --git a/res/drawable-land-hdpi/delete_handle.png b/res/drawable-land-hdpi/delete_handle.png
deleted file mode 100644
index ba19671..0000000
--- a/res/drawable-land-hdpi/delete_handle.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-hdpi/delete_handle_normal.png b/res/drawable-land-hdpi/delete_handle_normal.png
deleted file mode 100644
index 7b26b5d..0000000
--- a/res/drawable-land-hdpi/delete_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-hdpi/ic_delete.png b/res/drawable-land-hdpi/ic_delete.png
deleted file mode 100644
index d7af3c1..0000000
--- a/res/drawable-land-hdpi/ic_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-hdpi/ic_tray_collapse.png b/res/drawable-land-hdpi/ic_tray_collapse.png
deleted file mode 100644
index 26b7753..0000000
--- a/res/drawable-land-hdpi/ic_tray_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-hdpi/ic_tray_expand.png b/res/drawable-land-hdpi/ic_tray_expand.png
deleted file mode 100644
index e04096e..0000000
--- a/res/drawable-land-hdpi/ic_tray_expand.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-hdpi/tray_handle_normal.png b/res/drawable-land-hdpi/tray_handle_normal.png
deleted file mode 100644
index 5395e18..0000000
--- a/res/drawable-land-hdpi/tray_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-hdpi/tray_handle_pressed.png b/res/drawable-land-hdpi/tray_handle_pressed.png
deleted file mode 100644
index 8f5d6c9..0000000
--- a/res/drawable-land-hdpi/tray_handle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-hdpi/tray_handle_selected.png b/res/drawable-land-hdpi/tray_handle_selected.png
deleted file mode 100644
index 7b2cf5c..0000000
--- a/res/drawable-land-hdpi/tray_handle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-mdpi/delete_handle.png b/res/drawable-land-mdpi/delete_handle.png
deleted file mode 100644
index 43a9081..0000000
--- a/res/drawable-land-mdpi/delete_handle.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-mdpi/delete_handle_normal.png b/res/drawable-land-mdpi/delete_handle_normal.png
deleted file mode 100644
index bc11ff8..0000000
--- a/res/drawable-land-mdpi/delete_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-mdpi/ic_delete.png b/res/drawable-land-mdpi/ic_delete.png
deleted file mode 100644
index 7b0f768..0000000
--- a/res/drawable-land-mdpi/ic_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-mdpi/ic_tray_collapse.png b/res/drawable-land-mdpi/ic_tray_collapse.png
deleted file mode 100644
index c11f8b3..0000000
--- a/res/drawable-land-mdpi/ic_tray_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-mdpi/ic_tray_expand.png b/res/drawable-land-mdpi/ic_tray_expand.png
deleted file mode 100644
index cd3e5a4..0000000
--- a/res/drawable-land-mdpi/ic_tray_expand.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-mdpi/tray_handle_normal.png b/res/drawable-land-mdpi/tray_handle_normal.png
deleted file mode 100644
index 0cd2146..0000000
--- a/res/drawable-land-mdpi/tray_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-mdpi/tray_handle_pressed.png b/res/drawable-land-mdpi/tray_handle_pressed.png
deleted file mode 100644
index c875617..0000000
--- a/res/drawable-land-mdpi/tray_handle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-land-mdpi/tray_handle_selected.png b/res/drawable-land-mdpi/tray_handle_selected.png
deleted file mode 100644
index 1dfdf1e..0000000
--- a/res/drawable-land-mdpi/tray_handle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bg_appwidget_error.9.png b/res/drawable-mdpi/bg_appwidget_error.9.png
deleted file mode 100644
index 5077424..0000000
--- a/res/drawable-mdpi/bg_appwidget_error.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/box_launcher_bottom.9.png b/res/drawable-mdpi/box_launcher_bottom.9.png
deleted file mode 100755
index 1c99c50..0000000
--- a/res/drawable-mdpi/box_launcher_bottom.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/box_launcher_top_normal.9.png b/res/drawable-mdpi/box_launcher_top_normal.9.png
deleted file mode 100644
index 30b17b2..0000000
--- a/res/drawable-mdpi/box_launcher_top_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/box_launcher_top_pressed.9.png b/res/drawable-mdpi/box_launcher_top_pressed.9.png
deleted file mode 100644
index 033cd48..0000000
--- a/res/drawable-mdpi/box_launcher_top_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/box_launcher_top_selected.9.png b/res/drawable-mdpi/box_launcher_top_selected.9.png
deleted file mode 100644
index 3ef394c..0000000
--- a/res/drawable-mdpi/box_launcher_top_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/focused_application_background.9.png b/res/drawable-mdpi/focused_application_background.9.png
deleted file mode 100644
index 9d09b41..0000000
--- a/res/drawable-mdpi/focused_application_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_application.png b/res/drawable-mdpi/ic_launcher_application.png
deleted file mode 100644
index 8be3b54..0000000
--- a/res/drawable-mdpi/ic_launcher_application.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_appwidget.png b/res/drawable-mdpi/ic_launcher_appwidget.png
deleted file mode 100644
index cb40a19..0000000
--- a/res/drawable-mdpi/ic_launcher_appwidget.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_folder.png b/res/drawable-mdpi/ic_launcher_folder.png
deleted file mode 100644
index ed31ba5..0000000
--- a/res/drawable-mdpi/ic_launcher_folder.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_folder_live.png b/res/drawable-mdpi/ic_launcher_folder_live.png
deleted file mode 100644
index 2145747..0000000
--- a/res/drawable-mdpi/ic_launcher_folder_live.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_folder_open.png b/res/drawable-mdpi/ic_launcher_folder_open.png
deleted file mode 100644
index 0723014..0000000
--- a/res/drawable-mdpi/ic_launcher_folder_open.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_home.png b/res/drawable-mdpi/ic_launcher_home.png
deleted file mode 100755
index 84af2a2..0000000
--- a/res/drawable-mdpi/ic_launcher_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_shortcut.png b/res/drawable-mdpi/ic_launcher_shortcut.png
deleted file mode 100644
index d6c0ef4..0000000
--- a/res/drawable-mdpi/ic_launcher_shortcut.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_widget.png b/res/drawable-mdpi/ic_search_widget.png
deleted file mode 100644
index 37bf77e..0000000
--- a/res/drawable-mdpi/ic_search_widget.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/livewallpaper_placeholder.png b/res/drawable-mdpi/livewallpaper_placeholder.png
deleted file mode 100644
index 4d3456c..0000000
--- a/res/drawable-mdpi/livewallpaper_placeholder.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/placeholder_google.png b/res/drawable-mdpi/placeholder_google.png
deleted file mode 100644
index 4af30aa..0000000
--- a/res/drawable-mdpi/placeholder_google.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/search_button_bg.9.png b/res/drawable-mdpi/search_button_bg.9.png
deleted file mode 100644
index b140b24..0000000
--- a/res/drawable-mdpi/search_button_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/search_button_voice.png b/res/drawable-mdpi/search_button_voice.png
deleted file mode 100644
index 4c3d683..0000000
--- a/res/drawable-mdpi/search_button_voice.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/search_floater.9.png b/res/drawable-mdpi/search_floater.9.png
deleted file mode 100644
index 6646ad3..0000000
--- a/res/drawable-mdpi/search_floater.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/textfield_searchwidget_default.9.png b/res/drawable-mdpi/textfield_searchwidget_default.9.png
deleted file mode 100644
index 247abca..0000000
--- a/res/drawable-mdpi/textfield_searchwidget_default.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/textfield_searchwidget_pressed.9.png b/res/drawable-mdpi/textfield_searchwidget_pressed.9.png
deleted file mode 100644
index d628cbc..0000000
--- a/res/drawable-mdpi/textfield_searchwidget_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/textfield_searchwidget_selected.9.png b/res/drawable-mdpi/textfield_searchwidget_selected.9.png
deleted file mode 100644
index 9e93527..0000000
--- a/res/drawable-mdpi/textfield_searchwidget_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_beach.jpg b/res/drawable-mdpi/wallpaper_beach.jpg
deleted file mode 100644
index b502092..0000000
--- a/res/drawable-mdpi/wallpaper_beach.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_beach_small.jpg b/res/drawable-mdpi/wallpaper_beach_small.jpg
deleted file mode 100644
index 46051cc..0000000
--- a/res/drawable-mdpi/wallpaper_beach_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_blue.jpg b/res/drawable-mdpi/wallpaper_blue.jpg
deleted file mode 100644
index 0edd6bd..0000000
--- a/res/drawable-mdpi/wallpaper_blue.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_blue_small.jpg b/res/drawable-mdpi/wallpaper_blue_small.jpg
deleted file mode 100644
index 5cf585a..0000000
--- a/res/drawable-mdpi/wallpaper_blue_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_green.jpg b/res/drawable-mdpi/wallpaper_green.jpg
deleted file mode 100644
index 36c9e08..0000000
--- a/res/drawable-mdpi/wallpaper_green.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_green_small.jpg b/res/drawable-mdpi/wallpaper_green_small.jpg
deleted file mode 100644
index d7c28ec..0000000
--- a/res/drawable-mdpi/wallpaper_green_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grey.jpg b/res/drawable-mdpi/wallpaper_grey.jpg
deleted file mode 100644
index ca48e6a..0000000
--- a/res/drawable-mdpi/wallpaper_grey.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_grey_small.jpg b/res/drawable-mdpi/wallpaper_grey_small.jpg
deleted file mode 100644
index 1734d2e..0000000
--- a/res/drawable-mdpi/wallpaper_grey_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_jellyfish.jpg b/res/drawable-mdpi/wallpaper_jellyfish.jpg
deleted file mode 100644
index 659228b..0000000
--- a/res/drawable-mdpi/wallpaper_jellyfish.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_jellyfish_small.jpg b/res/drawable-mdpi/wallpaper_jellyfish_small.jpg
deleted file mode 100644
index 4e5d134..0000000
--- a/res/drawable-mdpi/wallpaper_jellyfish_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_lake.jpg b/res/drawable-mdpi/wallpaper_lake.jpg
deleted file mode 100644
index 5ba522f..0000000
--- a/res/drawable-mdpi/wallpaper_lake.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_lake_small.jpg b/res/drawable-mdpi/wallpaper_lake_small.jpg
deleted file mode 100644
index 36d56cc..0000000
--- a/res/drawable-mdpi/wallpaper_lake_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_mountain.jpg b/res/drawable-mdpi/wallpaper_mountain.jpg
deleted file mode 100644
index 1376177..0000000
--- a/res/drawable-mdpi/wallpaper_mountain.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_mountain_small.jpg b/res/drawable-mdpi/wallpaper_mountain_small.jpg
deleted file mode 100644
index e2d5ac2..0000000
--- a/res/drawable-mdpi/wallpaper_mountain_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_path.jpg b/res/drawable-mdpi/wallpaper_path.jpg
deleted file mode 100644
index e1c98c0..0000000
--- a/res/drawable-mdpi/wallpaper_path.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_path_small.jpg b/res/drawable-mdpi/wallpaper_path_small.jpg
deleted file mode 100644
index f47d7a7..0000000
--- a/res/drawable-mdpi/wallpaper_path_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_pink.jpg b/res/drawable-mdpi/wallpaper_pink.jpg
deleted file mode 100644
index 74403e5..0000000
--- a/res/drawable-mdpi/wallpaper_pink.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_pink_small.jpg b/res/drawable-mdpi/wallpaper_pink_small.jpg
deleted file mode 100644
index 42b1770..0000000
--- a/res/drawable-mdpi/wallpaper_pink_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_road.jpg b/res/drawable-mdpi/wallpaper_road.jpg
deleted file mode 100644
index 3aaa639..0000000
--- a/res/drawable-mdpi/wallpaper_road.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_road_small.jpg b/res/drawable-mdpi/wallpaper_road_small.jpg
deleted file mode 100644
index 0b0c390..0000000
--- a/res/drawable-mdpi/wallpaper_road_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_snow_leopard.jpg b/res/drawable-mdpi/wallpaper_snow_leopard.jpg
deleted file mode 100644
index bcbc51e..0000000
--- a/res/drawable-mdpi/wallpaper_snow_leopard.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg b/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg
deleted file mode 100644
index 99db5c6..0000000
--- a/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunrise.jpg b/res/drawable-mdpi/wallpaper_sunrise.jpg
deleted file mode 100644
index 4ee8d5d..0000000
--- a/res/drawable-mdpi/wallpaper_sunrise.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunrise_small.jpg b/res/drawable-mdpi/wallpaper_sunrise_small.jpg
deleted file mode 100644
index 248b7e7..0000000
--- a/res/drawable-mdpi/wallpaper_sunrise_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunset.jpg b/res/drawable-mdpi/wallpaper_sunset.jpg
deleted file mode 100644
index bcfd8d4..0000000
--- a/res/drawable-mdpi/wallpaper_sunset.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_sunset_small.jpg b/res/drawable-mdpi/wallpaper_sunset_small.jpg
deleted file mode 100644
index d5e5add..0000000
--- a/res/drawable-mdpi/wallpaper_sunset_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_zanzibar.jpg b/res/drawable-mdpi/wallpaper_zanzibar.jpg
deleted file mode 100644
index fb13374..0000000
--- a/res/drawable-mdpi/wallpaper_zanzibar.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_zanzibar_small.jpg b/res/drawable-mdpi/wallpaper_zanzibar_small.jpg
deleted file mode 100644
index 700a7fe..0000000
--- a/res/drawable-mdpi/wallpaper_zanzibar_small.jpg
+++ /dev/null
Binary files differ
diff --git a/res/drawable-port/delete_handle.png b/res/drawable-port/delete_handle.png
deleted file mode 100644
index 94a5cd0..0000000
--- a/res/drawable-port/delete_handle.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-port/delete_handle_normal.png b/res/drawable-port/delete_handle_normal.png
deleted file mode 100644
index 95b3da7..0000000
--- a/res/drawable-port/delete_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-port/ic_delete.png b/res/drawable-port/ic_delete.png
deleted file mode 100644
index 382cba9..0000000
--- a/res/drawable-port/ic_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-port/ic_tray_collapse.png b/res/drawable-port/ic_tray_collapse.png
deleted file mode 100644
index 712d189..0000000
--- a/res/drawable-port/ic_tray_collapse.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-port/ic_tray_expand.png b/res/drawable-port/ic_tray_expand.png
deleted file mode 100644
index 753a4c9..0000000
--- a/res/drawable-port/ic_tray_expand.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-port/tray_handle_normal.png b/res/drawable-port/tray_handle_normal.png
deleted file mode 100644
index e989645..0000000
--- a/res/drawable-port/tray_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-port/tray_handle_pressed.png b/res/drawable-port/tray_handle_pressed.png
deleted file mode 100644
index bc6e03f..0000000
--- a/res/drawable-port/tray_handle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-port/tray_handle_selected.png b/res/drawable-port/tray_handle_selected.png
deleted file mode 100644
index b319c8d..0000000
--- a/res/drawable-port/tray_handle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/handle.xml b/res/drawable/handle.xml
deleted file mode 100644
index b184a56..0000000
--- a/res/drawable/handle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/tray_handle_normal" />
-    <item android:state_pressed="true" android:drawable="@drawable/tray_handle_pressed" />
-    <item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/tray_handle_selected" />
-    <item android:state_enabled="true" android:drawable="@drawable/tray_handle_normal" />
-    <item android:state_focused="true" android:drawable="@drawable/tray_handle_selected" />
-</selector>
diff --git a/res/drawable/handle_icon.xml b/res/drawable/handle_icon.xml
deleted file mode 100644
index 20e16b4..0000000
--- a/res/drawable/handle_icon.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_tray_expand"  />
-    <item android:drawable="@drawable/ic_tray_collapse"  />
-</transition>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index fd27bad..4f2709f 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -22,6 +22,18 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
+    <com.android.launcher2.AllAppsView
+        android:id="@+id/all_apps_view"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+
+        android:scrollbarStyle="outsideInset"
+        android:drawSelectorOnTop="false"
+        android:listSelector="@drawable/grid_selector"
+
+        android:verticalSpacing="10dip"
+        android:numColumns="4" />
+
     <!-- The workspace contains 3 screens of cells -->
     <com.android.launcher2.Workspace
         android:id="@+id/workspace"
@@ -38,32 +50,27 @@
 
     <com.android.launcher2.HandleView
         android:id="@+id/all_apps_button"
-        android:layout_width="56dip"
+        android:layout_width="@dimen/button_bar_height"
         android:layout_height="fill_parent"
-
-        android:background="@drawable/handle"
+        android:layout_gravity="right|center_vertical"
 
         android:focusable="true"
         android:clickable="true"
 
         android:scaleType="center"
-        android:src="@drawable/handle_icon"
-
-        launcher:direction="vertical" />
+        android:src="@drawable/all_apps_button"
+        launcher:direction="vertical"
+        />
 
     <com.android.launcher2.DeleteZone
         android:id="@+id/delete_zone"
         android:layout_width="49dip"
-        android:layout_height="wrap_content"
+        android:layout_height="fill_parent"
 
         android:scaleType="center"
-        android:src="@drawable/ic_delete"
-        android:background="@drawable/delete_zone_selector"
-
-        android:layout_marginBottom="-25dip"
-        android:layout_gravity="right|center_vertical"
+        android:src="@drawable/delete_zone_selector"
         android:visibility="invisible"
-
-        launcher:direction="vertical" />
+        launcher:direction="vertical"
+        />
 
 </com.android.launcher2.DragLayer>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 38b5c26..89b3b43 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -32,7 +32,8 @@
         android:listSelector="@drawable/grid_selector"
 
         android:verticalSpacing="10dip"
-        android:numColumns="4" />
+        android:numColumns="4"
+        />
 
     <!-- The workspace contains 3 screens of cells -->
     <com.android.launcher2.Workspace
@@ -50,7 +51,7 @@
 
     <com.android.launcher2.HandleView
         android:id="@+id/all_apps_button"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="@dimen/button_bar_height"
         android:layout_gravity="bottom|center_horizontal"
 
@@ -59,7 +60,8 @@
 
         android:scaleType="center"
         android:src="@drawable/all_apps_button"
-        launcher:direction="horizontal" />
+        launcher:direction="horizontal"
+        />
 
     <com.android.launcher2.DeleteZone
         android:id="@+id/delete_zone"
@@ -69,9 +71,8 @@
 
         android:scaleType="center"
         android:src="@drawable/delete_zone_selector"
-
         android:visibility="invisible"
-        
-        launcher:direction="horizontal" />
+        launcher:direction="horizontal"
+        />
 
 </com.android.launcher2.DragLayer>