diff --git a/res/drawable-hdpi/apps_customize_bg.png b/res/drawable-hdpi/apps_customize_bg.png
index 81768d7..2847467 100644
--- a/res/drawable-hdpi/apps_customize_bg.png
+++ b/res/drawable-hdpi/apps_customize_bg.png
Binary files differ
diff --git a/res/drawable-hdpi/apps_hotseat_button.png b/res/drawable-hdpi/apps_hotseat_button.png
index c459ba8..15e66db 100644
--- a/res/drawable-hdpi/apps_hotseat_button.png
+++ b/res/drawable-hdpi/apps_hotseat_button.png
Binary files differ
diff --git a/res/drawable-hdpi/bg_appwidget_error.9.png b/res/drawable-hdpi/bg_appwidget_error.9.png
index 59d9822..4da3195 100644
--- a/res/drawable-hdpi/bg_appwidget_error.9.png
+++ b/res/drawable-hdpi/bg_appwidget_error.9.png
Binary files differ
diff --git a/res/drawable-hdpi/divider_launcher_holo.9.png b/res/drawable-hdpi/divider_launcher_holo.9.png
index 0a1bd2a..3b7f000 100644
--- a/res/drawable-hdpi/divider_launcher_holo.9.png
+++ b/res/drawable-hdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/focused_bg.9.png b/res/drawable-hdpi/focused_bg.9.png
index 1b0d3fa..b118be1 100644
--- a/res/drawable-hdpi/focused_bg.9.png
+++ b/res/drawable-hdpi/focused_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png
index 5f83592..d2d263c 100644
--- a/res/drawable-hdpi/gardening_crosshairs.png
+++ b/res/drawable-hdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/drawable-hdpi/home_press.9.png b/res/drawable-hdpi/home_press.9.png
index 743880b..ef07011 100644
--- a/res/drawable-hdpi/home_press.9.png
+++ b/res/drawable-hdpi/home_press.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
index ece2afd..2710696 100644
--- a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
+++ b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_green_normal_holo.9.png b/res/drawable-hdpi/homescreen_green_normal_holo.9.png
index 7332c3b..677250c 100644
--- a/res/drawable-hdpi/homescreen_green_normal_holo.9.png
+++ b/res/drawable-hdpi/homescreen_green_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_green_strong_holo.9.png b/res/drawable-hdpi/homescreen_green_strong_holo.9.png
index 190c6cc..74f4dad 100644
--- a/res/drawable-hdpi/homescreen_green_strong_holo.9.png
+++ b/res/drawable-hdpi/homescreen_green_strong_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_small_blue.9.png b/res/drawable-hdpi/homescreen_small_blue.9.png
index ddc458b..700fadc 100644
--- a/res/drawable-hdpi/homescreen_small_blue.9.png
+++ b/res/drawable-hdpi/homescreen_small_blue.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-hdpi/homescreen_small_blue_strong.9.png
index 8f5a74e..6eab8f2 100644
--- a/res/drawable-hdpi/homescreen_small_blue_strong.9.png
+++ b/res/drawable-hdpi/homescreen_small_blue_strong.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_small_green.9.png b/res/drawable-hdpi/homescreen_small_green.9.png
index 00baae9..6e7090b 100644
--- a/res/drawable-hdpi/homescreen_small_green.9.png
+++ b/res/drawable-hdpi/homescreen_small_green.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_small_green_strong.9.png b/res/drawable-hdpi/homescreen_small_green_strong.9.png
index 77baa52..db1027e 100644
--- a/res/drawable-hdpi/homescreen_small_green_strong.9.png
+++ b/res/drawable-hdpi/homescreen_small_green_strong.9.png
Binary files differ
diff --git a/res/drawable-hdpi/hotseat_track_holo.9.png b/res/drawable-hdpi/hotseat_track_holo.9.png
index f49344f..2ce4967 100644
--- a/res/drawable-hdpi/hotseat_track_holo.9.png
+++ b/res/drawable-hdpi/hotseat_track_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png
index 3c7930f..a0bfc0f 100644
--- a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png
+++ b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_application.png b/res/drawable-hdpi/ic_launcher_application.png
index 8074c4c..882eb14 100644
--- a/res/drawable-hdpi/ic_launcher_application.png
+++ b/res/drawable-hdpi/ic_launcher_application.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png
index 3dc8b20..13513e0 100644
--- a/res/drawable-hdpi/ic_launcher_appwidget.png
+++ b/res/drawable-hdpi/ic_launcher_appwidget.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/drawable-hdpi/ic_launcher_home.png
index 74f6bd7..8945ada 100644
--- a/res/drawable-hdpi/ic_launcher_home.png
+++ b/res/drawable-hdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_info_active_holo.png b/res/drawable-hdpi/ic_launcher_info_active_holo.png
index 83ca112..c534e56 100644
--- a/res/drawable-hdpi/ic_launcher_info_active_holo.png
+++ b/res/drawable-hdpi/ic_launcher_info_active_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_info_normal_holo.png b/res/drawable-hdpi/ic_launcher_info_normal_holo.png
index 25fb1ac..c9bcd7f 100644
--- a/res/drawable-hdpi/ic_launcher_info_normal_holo.png
+++ b/res/drawable-hdpi/ic_launcher_info_normal_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png
index 51f0298..82b1b59 100644
--- a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png
+++ b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png
index 27a4b5e..3fc2e83 100644
--- a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png
+++ b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_wallpaper.png b/res/drawable-hdpi/ic_launcher_wallpaper.png
index dcd8709..5c8ee24 100644
--- a/res/drawable-hdpi/ic_launcher_wallpaper.png
+++ b/res/drawable-hdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_normal_holo.png b/res/drawable-hdpi/ic_search_normal_holo.png
index 9935f48..d888214 100644
--- a/res/drawable-hdpi/ic_search_normal_holo.png
+++ b/res/drawable-hdpi/ic_search_normal_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_voice_search_holo.png b/res/drawable-hdpi/ic_voice_search_holo.png
index e0df1a2..d1ec7e3 100644
--- a/res/drawable-hdpi/ic_voice_search_holo.png
+++ b/res/drawable-hdpi/ic_voice_search_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/paged_view_indicator.9.png b/res/drawable-hdpi/paged_view_indicator.9.png
new file mode 100644
index 0000000..5b47f44
--- /dev/null
+++ b/res/drawable-hdpi/paged_view_indicator.9.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_inner_holo.png b/res/drawable-hdpi/portal_ring_inner_holo.png
index 7f48e73..49df9ec 100644
--- a/res/drawable-hdpi/portal_ring_inner_holo.png
+++ b/res/drawable-hdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_outer_holo.png b/res/drawable-hdpi/portal_ring_outer_holo.png
index 4ad47bf..282d0d7 100644
--- a/res/drawable-hdpi/portal_ring_outer_holo.png
+++ b/res/drawable-hdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png
index 291af02..3a59f25 100644
--- a/res/drawable-hdpi/pressed_application_background.9.png
+++ b/res/drawable-hdpi/pressed_application_background.9.png
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg.9.png b/res/drawable-hdpi/preview_bg.9.png
index 5647144..5fa2ed8 100644
--- a/res/drawable-hdpi/preview_bg.9.png
+++ b/res/drawable-hdpi/preview_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg_focus.9.png b/res/drawable-hdpi/preview_bg_focus.9.png
index 31200fd..bbf67f7 100644
--- a/res/drawable-hdpi/preview_bg_focus.9.png
+++ b/res/drawable-hdpi/preview_bg_focus.9.png
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg_press.9.png b/res/drawable-hdpi/preview_bg_press.9.png
index 9cb1266..6d0b022 100644
--- a/res/drawable-hdpi/preview_bg_press.9.png
+++ b/res/drawable-hdpi/preview_bg_press.9.png
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
index 2856da0..d761b4a 100644
--- a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
+++ b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_picker_preview.png b/res/drawable-hdpi/wallpaper_picker_preview.png
index 300ea4a..b48899a 100644
--- a/res/drawable-hdpi/wallpaper_picker_preview.png
+++ b/res/drawable-hdpi/wallpaper_picker_preview.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_info_bg.9.png b/res/drawable-hdpi/widget_info_bg.9.png
index 217b35c..df4cea9 100644
--- a/res/drawable-hdpi/widget_info_bg.9.png
+++ b/res/drawable-hdpi/widget_info_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_frame_holo.9.png b/res/drawable-hdpi/widget_resize_frame_holo.9.png
index 8da665b..c41fbca 100644
--- a/res/drawable-hdpi/widget_resize_frame_holo.9.png
+++ b/res/drawable-hdpi/widget_resize_frame_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_bottom.png b/res/drawable-hdpi/widget_resize_handle_bottom.png
index 495476b..e039165 100644
--- a/res/drawable-hdpi/widget_resize_handle_bottom.png
+++ b/res/drawable-hdpi/widget_resize_handle_bottom.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_left.png b/res/drawable-hdpi/widget_resize_handle_left.png
index c73cf0e..bfc2e30 100644
--- a/res/drawable-hdpi/widget_resize_handle_left.png
+++ b/res/drawable-hdpi/widget_resize_handle_left.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_right.png b/res/drawable-hdpi/widget_resize_handle_right.png
index 9532302..a7245b8 100644
--- a/res/drawable-hdpi/widget_resize_handle_right.png
+++ b/res/drawable-hdpi/widget_resize_handle_right.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_top.png b/res/drawable-hdpi/widget_resize_handle_top.png
index a3d2f7c..447f59a 100644
--- a/res/drawable-hdpi/widget_resize_handle_top.png
+++ b/res/drawable-hdpi/widget_resize_handle_top.png
Binary files differ
diff --git a/res/drawable-land-hdpi/divider_launcher_holo.9.png b/res/drawable-land-hdpi/divider_launcher_holo.9.png
index f07f6c4..23a0f97 100644
--- a/res/drawable-land-hdpi/divider_launcher_holo.9.png
+++ b/res/drawable-land-hdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-land-mdpi/divider_launcher_holo.9.png b/res/drawable-land-mdpi/divider_launcher_holo.9.png
index ae77340..7bdf323 100644
--- a/res/drawable-land-mdpi/divider_launcher_holo.9.png
+++ b/res/drawable-land-mdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/apps_customize_bg.png b/res/drawable-mdpi/apps_customize_bg.png
index 81768d7..2847467 100644
--- a/res/drawable-mdpi/apps_customize_bg.png
+++ b/res/drawable-mdpi/apps_customize_bg.png
Binary files differ
diff --git a/res/drawable-mdpi/apps_hotseat_button.png b/res/drawable-mdpi/apps_hotseat_button.png
index f9006a4..62f119d 100644
--- a/res/drawable-mdpi/apps_hotseat_button.png
+++ b/res/drawable-mdpi/apps_hotseat_button.png
Binary files differ
diff --git a/res/drawable-mdpi/bg_appwidget_error.9.png b/res/drawable-mdpi/bg_appwidget_error.9.png
index f222f94..493c0d4 100644
--- a/res/drawable-mdpi/bg_appwidget_error.9.png
+++ b/res/drawable-mdpi/bg_appwidget_error.9.png
Binary files differ
diff --git a/res/drawable-mdpi/divider_launcher_holo.9.png b/res/drawable-mdpi/divider_launcher_holo.9.png
index 6d101f4..7bdf323 100644
--- a/res/drawable-mdpi/divider_launcher_holo.9.png
+++ b/res/drawable-mdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/focused_bg.9.png b/res/drawable-mdpi/focused_bg.9.png
index 1b0d3fa..b118be1 100644
--- a/res/drawable-mdpi/focused_bg.9.png
+++ b/res/drawable-mdpi/focused_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png
index 2845fe4..9d9f3c1 100644
--- a/res/drawable-mdpi/gardening_crosshairs.png
+++ b/res/drawable-mdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/drawable-mdpi/home_press.9.png b/res/drawable-mdpi/home_press.9.png
index ff841c3..679a1f6 100644
--- a/res/drawable-mdpi/home_press.9.png
+++ b/res/drawable-mdpi/home_press.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
index fef82bb..efdc861 100644
--- a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
+++ b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_green_normal_holo.9.png b/res/drawable-mdpi/homescreen_green_normal_holo.9.png
index dad34d8..414a5c9 100644
--- a/res/drawable-mdpi/homescreen_green_normal_holo.9.png
+++ b/res/drawable-mdpi/homescreen_green_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_green_strong_holo.9.png b/res/drawable-mdpi/homescreen_green_strong_holo.9.png
index 901bf4c..15f334e 100644
--- a/res/drawable-mdpi/homescreen_green_strong_holo.9.png
+++ b/res/drawable-mdpi/homescreen_green_strong_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_small_blue.9.png b/res/drawable-mdpi/homescreen_small_blue.9.png
index 28bc33b..fb74449 100644
--- a/res/drawable-mdpi/homescreen_small_blue.9.png
+++ b/res/drawable-mdpi/homescreen_small_blue.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-mdpi/homescreen_small_blue_strong.9.png
index f286de9..79d84a4 100644
--- a/res/drawable-mdpi/homescreen_small_blue_strong.9.png
+++ b/res/drawable-mdpi/homescreen_small_blue_strong.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_small_green.9.png b/res/drawable-mdpi/homescreen_small_green.9.png
index 58698ea..a713f90 100644
--- a/res/drawable-mdpi/homescreen_small_green.9.png
+++ b/res/drawable-mdpi/homescreen_small_green.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_small_green_strong.9.png b/res/drawable-mdpi/homescreen_small_green_strong.9.png
index 9773085..9884bcd 100644
--- a/res/drawable-mdpi/homescreen_small_green_strong.9.png
+++ b/res/drawable-mdpi/homescreen_small_green_strong.9.png
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_track_holo.9.png b/res/drawable-mdpi/hotseat_track_holo.9.png
index 3dcab67..21f1ed1 100644
--- a/res/drawable-mdpi/hotseat_track_holo.9.png
+++ b/res/drawable-mdpi/hotseat_track_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png
index 04749e6..ffc3020 100644
--- a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png
+++ b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_application.png b/res/drawable-mdpi/ic_launcher_application.png
index 18ea7a5..d7ff417 100644
--- a/res/drawable-mdpi/ic_launcher_application.png
+++ b/res/drawable-mdpi/ic_launcher_application.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_appwidget.png b/res/drawable-mdpi/ic_launcher_appwidget.png
index f369ccd..72dbfdf 100644
--- a/res/drawable-mdpi/ic_launcher_appwidget.png
+++ b/res/drawable-mdpi/ic_launcher_appwidget.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_home.png b/res/drawable-mdpi/ic_launcher_home.png
index 893d7c7..72bd80a 100644
--- a/res/drawable-mdpi/ic_launcher_home.png
+++ b/res/drawable-mdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_info_active_holo.png b/res/drawable-mdpi/ic_launcher_info_active_holo.png
index d05de74..f84b4a6 100644
--- a/res/drawable-mdpi/ic_launcher_info_active_holo.png
+++ b/res/drawable-mdpi/ic_launcher_info_active_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_info_normal_holo.png b/res/drawable-mdpi/ic_launcher_info_normal_holo.png
index 6a07cc9..eac578f 100644
--- a/res/drawable-mdpi/ic_launcher_info_normal_holo.png
+++ b/res/drawable-mdpi/ic_launcher_info_normal_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png
index 244fe27..0350e55 100644
--- a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png
+++ b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png
index bd5db08..799b62f 100644
--- a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png
+++ b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_wallpaper.png b/res/drawable-mdpi/ic_launcher_wallpaper.png
index 7e7c6b8..d2803b1 100644
--- a/res/drawable-mdpi/ic_launcher_wallpaper.png
+++ b/res/drawable-mdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_normal_holo.png b/res/drawable-mdpi/ic_search_normal_holo.png
index 6acf24b..9eb214a 100644
--- a/res/drawable-mdpi/ic_search_normal_holo.png
+++ b/res/drawable-mdpi/ic_search_normal_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_voice_search_holo.png b/res/drawable-mdpi/ic_voice_search_holo.png
index 29533ba..34097b7 100644
--- a/res/drawable-mdpi/ic_voice_search_holo.png
+++ b/res/drawable-mdpi/ic_voice_search_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/paged_view_indicator.9.png b/res/drawable-mdpi/paged_view_indicator.9.png
index 9fd357a..647b60f 100644
--- a/res/drawable-mdpi/paged_view_indicator.9.png
+++ b/res/drawable-mdpi/paged_view_indicator.9.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png
index 4dbae06..369e64a 100644
--- a/res/drawable-mdpi/portal_ring_inner_holo.png
+++ b/res/drawable-mdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_outer_holo.png b/res/drawable-mdpi/portal_ring_outer_holo.png
index a70acf2..842e7bc 100644
--- a/res/drawable-mdpi/portal_ring_outer_holo.png
+++ b/res/drawable-mdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png
index b09f595..7d5da3d 100644
--- a/res/drawable-mdpi/pressed_application_background.9.png
+++ b/res/drawable-mdpi/pressed_application_background.9.png
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg.9.png b/res/drawable-mdpi/preview_bg.9.png
index 82c951d..d96e885 100644
--- a/res/drawable-mdpi/preview_bg.9.png
+++ b/res/drawable-mdpi/preview_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg_focus.9.png b/res/drawable-mdpi/preview_bg_focus.9.png
index f64f6a0..19e82a7 100644
--- a/res/drawable-mdpi/preview_bg_focus.9.png
+++ b/res/drawable-mdpi/preview_bg_focus.9.png
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg_press.9.png b/res/drawable-mdpi/preview_bg_press.9.png
index 151cab6..f938090 100644
--- a/res/drawable-mdpi/preview_bg_press.9.png
+++ b/res/drawable-mdpi/preview_bg_press.9.png
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
index 20c74a1..b5e8767 100644
--- a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
+++ b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_picker_preview.png b/res/drawable-mdpi/wallpaper_picker_preview.png
index 300ea4a..b48899a 100644
--- a/res/drawable-mdpi/wallpaper_picker_preview.png
+++ b/res/drawable-mdpi/wallpaper_picker_preview.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_info_bg.9.png b/res/drawable-mdpi/widget_info_bg.9.png
index 7fd1c20..c8c62b5 100644
--- a/res/drawable-mdpi/widget_info_bg.9.png
+++ b/res/drawable-mdpi/widget_info_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_frame_holo.9.png b/res/drawable-mdpi/widget_resize_frame_holo.9.png
index 0572f89..095919f 100644
--- a/res/drawable-mdpi/widget_resize_frame_holo.9.png
+++ b/res/drawable-mdpi/widget_resize_frame_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_bottom.png b/res/drawable-mdpi/widget_resize_handle_bottom.png
index 6c93973..873d1be 100644
--- a/res/drawable-mdpi/widget_resize_handle_bottom.png
+++ b/res/drawable-mdpi/widget_resize_handle_bottom.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_left.png b/res/drawable-mdpi/widget_resize_handle_left.png
index 7139415..99a88ac 100644
--- a/res/drawable-mdpi/widget_resize_handle_left.png
+++ b/res/drawable-mdpi/widget_resize_handle_left.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_right.png b/res/drawable-mdpi/widget_resize_handle_right.png
index 442224b..ed0a539 100644
--- a/res/drawable-mdpi/widget_resize_handle_right.png
+++ b/res/drawable-mdpi/widget_resize_handle_right.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_top.png b/res/drawable-mdpi/widget_resize_handle_top.png
index 2435884..f4159fe 100644
--- a/res/drawable-mdpi/widget_resize_handle_top.png
+++ b/res/drawable-mdpi/widget_resize_handle_top.png
Binary files differ
diff --git a/res/drawable-xhdpi/apps_customize_bg.png b/res/drawable-xhdpi/apps_customize_bg.png
new file mode 100644
index 0000000..a51cc11
--- /dev/null
+++ b/res/drawable-xhdpi/apps_customize_bg.png
Binary files differ
diff --git a/res/drawable-xhdpi/apps_hotseat_button.png b/res/drawable-xhdpi/apps_hotseat_button.png
new file mode 100644
index 0000000..932dac7
--- /dev/null
+++ b/res/drawable-xhdpi/apps_hotseat_button.png
Binary files differ
diff --git a/res/drawable-xhdpi/bg_appwidget_error.9.png b/res/drawable-xhdpi/bg_appwidget_error.9.png
new file mode 100644
index 0000000..b792cc8
--- /dev/null
+++ b/res/drawable-xhdpi/bg_appwidget_error.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/divider_launcher_holo.9.png b/res/drawable-xhdpi/divider_launcher_holo.9.png
new file mode 100644
index 0000000..e226ae7
--- /dev/null
+++ b/res/drawable-xhdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/focused_bg.9.png b/res/drawable-xhdpi/focused_bg.9.png
new file mode 100644
index 0000000..d445c59
--- /dev/null
+++ b/res/drawable-xhdpi/focused_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/gardening_crosshairs.png b/res/drawable-xhdpi/gardening_crosshairs.png
index 18c9fbe..3168463 100644
--- a/res/drawable-xhdpi/gardening_crosshairs.png
+++ b/res/drawable-xhdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/drawable-xhdpi/home_press.9.png b/res/drawable-xhdpi/home_press.9.png
new file mode 100644
index 0000000..d9abfd3
--- /dev/null
+++ b/res/drawable-xhdpi/home_press.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
index 966d0c1..3f8eaf5 100644
--- a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
+++ b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png b/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index 7e037ed..0000000
--- a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_green_normal_holo.9.png b/res/drawable-xhdpi/homescreen_green_normal_holo.9.png
index 219db3b..4b12213 100644
--- a/res/drawable-xhdpi/homescreen_green_normal_holo.9.png
+++ b/res/drawable-xhdpi/homescreen_green_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_green_strong_holo.9.png b/res/drawable-xhdpi/homescreen_green_strong_holo.9.png
index cc71519..4e41441 100644
--- a/res/drawable-xhdpi/homescreen_green_strong_holo.9.png
+++ b/res/drawable-xhdpi/homescreen_green_strong_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_small_blue.9.png b/res/drawable-xhdpi/homescreen_small_blue.9.png
new file mode 100644
index 0000000..e678927
--- /dev/null
+++ b/res/drawable-xhdpi/homescreen_small_blue.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_small_blue_strong.9.png b/res/drawable-xhdpi/homescreen_small_blue_strong.9.png
new file mode 100644
index 0000000..696d907
--- /dev/null
+++ b/res/drawable-xhdpi/homescreen_small_blue_strong.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_small_green.9.png b/res/drawable-xhdpi/homescreen_small_green.9.png
new file mode 100644
index 0000000..3c4532a
--- /dev/null
+++ b/res/drawable-xhdpi/homescreen_small_green.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_small_green_strong.9.png b/res/drawable-xhdpi/homescreen_small_green_strong.9.png
new file mode 100644
index 0000000..c1d4ded
--- /dev/null
+++ b/res/drawable-xhdpi/homescreen_small_green_strong.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/hotseat_track_holo.9.png b/res/drawable-xhdpi/hotseat_track_holo.9.png
index a362a98..04004b2 100644
--- a/res/drawable-xhdpi/hotseat_track_holo.9.png
+++ b/res/drawable-xhdpi/hotseat_track_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_google_logo_normal_holo.png b/res/drawable-xhdpi/ic_google_logo_normal_holo.png
deleted file mode 100644
index 925e0b9..0000000
--- a/res/drawable-xhdpi/ic_google_logo_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png
new file mode 100644
index 0000000..21a51ab
--- /dev/null
+++ b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_application.png b/res/drawable-xhdpi/ic_launcher_application.png
new file mode 100644
index 0000000..83acf89
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_application.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_appwidget.png b/res/drawable-xhdpi/ic_launcher_appwidget.png
new file mode 100644
index 0000000..997504a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_appwidget.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_home.png b/res/drawable-xhdpi/ic_launcher_home.png
new file mode 100644
index 0000000..7bef13c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_info_active_holo.png b/res/drawable-xhdpi/ic_launcher_info_active_holo.png
index 356c074..b8cdbc4 100644
--- a/res/drawable-xhdpi/ic_launcher_info_active_holo.png
+++ b/res/drawable-xhdpi/ic_launcher_info_active_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png
index 1f827fa..f503fb8 100644
--- a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png
+++ b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png
index 77cc3e4..c155274 100644
--- a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png
+++ b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png
index ce6aff0..2ec7ad9 100644
--- a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png
+++ b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_wallpaper.png b/res/drawable-xhdpi/ic_launcher_wallpaper.png
new file mode 100644
index 0000000..9b0b7b2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_normal_holo.png b/res/drawable-xhdpi/ic_search_normal_holo.png
index 3700a0c..0f4caad 100644
--- a/res/drawable-xhdpi/ic_search_normal_holo.png
+++ b/res/drawable-xhdpi/ic_search_normal_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_voice_search_holo.png b/res/drawable-xhdpi/ic_voice_search_holo.png
index bab4e49..a415218 100644
--- a/res/drawable-xhdpi/ic_voice_search_holo.png
+++ b/res/drawable-xhdpi/ic_voice_search_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/paged_view_indicator.9.png b/res/drawable-xhdpi/paged_view_indicator.9.png
new file mode 100644
index 0000000..fb8a228
--- /dev/null
+++ b/res/drawable-xhdpi/paged_view_indicator.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/portal_ring_inner_holo.png b/res/drawable-xhdpi/portal_ring_inner_holo.png
index fc3d3c0..66beb84 100644
--- a/res/drawable-xhdpi/portal_ring_inner_holo.png
+++ b/res/drawable-xhdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/portal_ring_outer_holo.png b/res/drawable-xhdpi/portal_ring_outer_holo.png
index 43579ec..34423fc 100644
--- a/res/drawable-xhdpi/portal_ring_outer_holo.png
+++ b/res/drawable-xhdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/pressed_application_background.9.png b/res/drawable-xhdpi/pressed_application_background.9.png
new file mode 100644
index 0000000..05e240a
--- /dev/null
+++ b/res/drawable-xhdpi/pressed_application_background.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/preview_bg.9.png b/res/drawable-xhdpi/preview_bg.9.png
new file mode 100644
index 0000000..11cbcb5
--- /dev/null
+++ b/res/drawable-xhdpi/preview_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/preview_bg_focus.9.png b/res/drawable-xhdpi/preview_bg_focus.9.png
new file mode 100644
index 0000000..698c465
--- /dev/null
+++ b/res/drawable-xhdpi/preview_bg_focus.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/preview_bg_press.9.png b/res/drawable-xhdpi/preview_bg_press.9.png
new file mode 100644
index 0000000..78e7510
--- /dev/null
+++ b/res/drawable-xhdpi/preview_bg_press.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png b/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png
new file mode 100644
index 0000000..d8124f8
--- /dev/null
+++ b/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png
Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_picker_preview.png b/res/drawable-xhdpi/wallpaper_picker_preview.png
new file mode 100644
index 0000000..4560455
--- /dev/null
+++ b/res/drawable-xhdpi/wallpaper_picker_preview.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_info_bg.9.png b/res/drawable-xhdpi/widget_info_bg.9.png
new file mode 100644
index 0000000..19eff05
--- /dev/null
+++ b/res/drawable-xhdpi/widget_info_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_frame_holo.9.png b/res/drawable-xhdpi/widget_resize_frame_holo.9.png
index 4988cad..d099206 100644
--- a/res/drawable-xhdpi/widget_resize_frame_holo.9.png
+++ b/res/drawable-xhdpi/widget_resize_frame_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_bottom.png b/res/drawable-xhdpi/widget_resize_handle_bottom.png
index 18b5a26..62882c8 100644
--- a/res/drawable-xhdpi/widget_resize_handle_bottom.png
+++ b/res/drawable-xhdpi/widget_resize_handle_bottom.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_left.png b/res/drawable-xhdpi/widget_resize_handle_left.png
index 40d4e0b..6f45c99 100644
--- a/res/drawable-xhdpi/widget_resize_handle_left.png
+++ b/res/drawable-xhdpi/widget_resize_handle_left.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_right.png b/res/drawable-xhdpi/widget_resize_handle_right.png
index 5ca6071..28437f1 100644
--- a/res/drawable-xhdpi/widget_resize_handle_right.png
+++ b/res/drawable-xhdpi/widget_resize_handle_right.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_top.png b/res/drawable-xhdpi/widget_resize_handle_top.png
index 329559c..0d187ad 100644
--- a/res/drawable-xhdpi/widget_resize_handle_top.png
+++ b/res/drawable-xhdpi/widget_resize_handle_top.png
Binary files differ
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index 9dbe234..f82d541 100644
--- a/res/layout-land/hotseat.xml
+++ b/res/layout-land/hotseat.xml
@@ -25,8 +25,8 @@
         android:layout_height="match_parent"
         android:paddingTop="@dimen/workspace_top_padding"
         android:paddingBottom="@dimen/workspace_bottom_padding"
-        launcher:cellWidth="@dimen/workspace_cell_width"
-        launcher:cellHeight="@dimen/workspace_cell_height"
+        launcher:cellWidth="@dimen/hotseat_cell_width"
+        launcher:cellHeight="@dimen/hotseat_cell_height"
         launcher:widthGap="-1dp"
         launcher:heightGap="-1dp"
         launcher:maxGap="@dimen/workspace_max_gap" />
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
index 0dbfd7b..452a80c 100644
--- a/res/layout-land/search_bar.xml
+++ b/res/layout-land/search_bar.xml
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_search_normal_holo"
         android:adjustViewBounds="true"
-        android:background="@drawable/button_bg"
+        android:background="?android:attr/selectableItemBackground"
         android:onClick="onClickSearchButton"
         android:focusable="true"
         android:clickable="true"
@@ -49,7 +49,7 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_voice_search_holo"
         android:adjustViewBounds="true"
-        android:background="@drawable/button_bg"
+        android:background="?android:attr/selectableItemBackground"
         android:onClick="onClickVoiceButton"
         android:focusable="true"
         android:clickable="true"
diff --git a/res/layout-large/search_bar.xml b/res/layout-large/search_bar.xml
index e26a96a..44ac14c 100644
--- a/res/layout-large/search_bar.xml
+++ b/res/layout-large/search_bar.xml
@@ -28,7 +28,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:src="@drawable/ic_search_normal_holo"
-        android:background="@drawable/button_bg"
+        android:background="?android:attr/selectableItemBackground"
         android:onClick="onClickSearchButton"
         android:focusable="true"
         android:clickable="true"
@@ -51,7 +51,7 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/search_divider"
         android:src="@drawable/ic_voice_search_holo"
-        android:background="@drawable/button_bg"
+        android:background="?android:attr/selectableItemBackground"
         android:onClick="onClickVoiceButton"
         android:focusable="true"
         android:clickable="true"
@@ -71,7 +71,7 @@
         android:paddingRight="@dimen/toolbar_button_horizontal_padding"
         android:paddingTop="@dimen/all_apps_button_vertical_padding"
         android:paddingBottom="@dimen/all_apps_button_vertical_padding"
-        android:background="@drawable/button_bg"
+        android:background="?android:attr/selectableItemBackground"
 
         android:gravity="center"
         android:textColor="#CCFFFFFF"
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
index a122abb..53f3c20 100644
--- a/res/layout-port/hotseat.xml
+++ b/res/layout-port/hotseat.xml
@@ -26,9 +26,9 @@
         android:paddingTop="@dimen/button_bar_height_padding"
         android:paddingLeft="@dimen/workspace_left_padding"
         android:paddingRight="@dimen/workspace_right_padding"
-        launcher:cellWidth="@dimen/workspace_cell_width"
-        launcher:cellHeight="@dimen/workspace_cell_height"
+        launcher:cellWidth="@dimen/hotseat_cell_width"
+        launcher:cellHeight="@dimen/hotseat_cell_height"
         launcher:widthGap="-1dp"
         launcher:heightGap="-1dp"
         launcher:maxGap="@dimen/workspace_max_gap" />
-</com.android.launcher2.Hotseat>
\ No newline at end of file
+</com.android.launcher2.Hotseat>
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 0de290a..b65da0b 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -27,7 +27,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_toLeftOf="@+id/voice_button"
-        android:background="@drawable/button_bg"
+        android:background="?android:attr/selectableItemBackground"
         android:onClick="onClickSearchButton"
         android:focusable="true"
         android:clickable="true"
@@ -50,7 +50,7 @@
         android:layout_alignParentTop="true"
         android:src="@drawable/ic_voice_search_holo"
         android:adjustViewBounds="true"
-        android:background="@drawable/button_bg"
+        android:background="?android:attr/selectableItemBackground"
         android:onClick="onClickVoiceButton"
         android:focusable="true"
         android:clickable="true"
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index c277153..788d4c3 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -15,7 +15,8 @@
 -->
 <com.android.launcher2.AppsCustomizeTabHost
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    android:background="#FF000000">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index b413c53..85465b4 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -17,12 +17,16 @@
 <resources>
 <!-- QSB -->
     <dimen name="toolbar_button_vertical_padding">12dip</dimen>
-    <dimen name="toolbar_button_horizontal_padding">10dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">4dip</dimen>
 
 <!-- Workspace -->
+    <dimen name="workspace_cell_width">106dp</dimen>
+    <dimen name="workspace_cell_height">74dp</dimen>
+    <dimen name="hotseat_cell_width">68dp</dimen>
+    <dimen name="hotseat_cell_height">74dp</dimen>
     <!-- Block spacing on each side of the screen -->
-    <dimen name="workspace_left_padding">12dp</dimen>
-    <dimen name="workspace_right_padding">12dp</dimen>
+    <dimen name="workspace_left_padding">0dp</dimen>
+    <dimen name="workspace_right_padding">0dp</dimen>
     <!-- We need top/bottom padding for portals to look right, but
          really only in spring loaded mode... -->
     <dimen name="workspace_top_padding">0dp</dimen>
@@ -33,6 +37,13 @@
     <dimen name="workspace_divider_padding_top">12dp</dimen>
     <dimen name="workspace_divider_padding_bottom">12dp</dimen>
 
+    <!-- height of the bottom row of controls -->
+    <dimen name="button_bar_height">68dip</dimen>
+    <!-- Because portal animations go beyond the bounds of an icon, we need
+         to make the dock layout slightly larger than the button_bar_height -->
+    <dimen name="button_bar_height_padding">8dp</dimen>
+    <dimen name="button_bar_height_plus_padding">76dp</dimen>
+
 <!-- AppsCustomize -->
     <dimen name="apps_customize_cell_width">80dp</dimen>
     <!-- The width can be 76dp because we don't have B padding -->
diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml
index ea1a8e6..41bd9cd 100644
--- a/res/values-large/styles.xml
+++ b/res/values-large/styles.xml
@@ -94,7 +94,7 @@
     </style>
     <style name="DropTargetButton">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:drawablePadding">7.5dp</item>
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
index 9add357..088d3fd 100644
--- a/res/values-port/dimens.xml
+++ b/res/values-port/dimens.xml
@@ -20,8 +20,8 @@
     <dimen name="workspace_right_padding">0dp</dimen>
     <!-- Block spacing on each side of the screen.  And also padding
          for the portals to look right. -->
-    <dimen name="workspace_top_padding">12dp</dimen>
-    <dimen name="workspace_bottom_padding">12dp</dimen>
+    <dimen name="workspace_top_padding">2dp</dimen>
+    <dimen name="workspace_bottom_padding">2dp</dimen>
     <dimen name="workspace_page_spacing">8dp</dimen>
 
     <integer name="apps_customize_cellCountX">4</integer>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 71f282c..1efeb9e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -27,13 +27,6 @@
 
     <color name="appwidget_error_color">#FCCC</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>
-    <color name="workspace_item_focused_outline_color">#6595f9</color>
-    <color name="workspace_item_focused_glow_color">#0997ff</color>
-
     <color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color>
     <color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cb354b4..5289ebd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,9 +16,11 @@
 
 <resources>
 <!-- Workspace -->
-    <dimen name="qsb_bar_height">48dp</dimen>
+    <dimen name="qsb_bar_height">40dp</dimen>
     <dimen name="workspace_cell_width">80dp</dimen>
-    <dimen name="workspace_cell_height">80dp</dimen>
+    <dimen name="workspace_cell_height">100dp</dimen>
+    <dimen name="hotseat_cell_width">80dp</dimen>
+    <dimen name="hotseat_cell_height">64dp</dimen>
     <dimen name="workspace_width_gap">-1dp</dimen>
     <dimen name="workspace_height_gap">-1dp</dimen>
     <dimen name="workspace_max_gap">16dp</dimen>
@@ -35,7 +37,7 @@
 
 <!-- AllApps/Customize/AppsCustomize -->
     <dimen name="apps_customize_tab_bar_height">56dp</dimen>
-    <dimen name="app_icon_size">56dp</dimen>
+    <dimen name="app_icon_size">48dp</dimen>
     <!-- The width can be 72dp because we don't have L/R padding -->
     <dimen name="apps_customize_cell_width">72dp</dimen>
     <dimen name="apps_customize_cell_height">80dp</dimen>
@@ -46,11 +48,11 @@
     <dimen name="title_texture_width">120px</dimen>
 
     <!-- height of the bottom row of controls -->
-    <dimen name="button_bar_height">80dip</dimen>
+    <dimen name="button_bar_height">64dip</dimen>
     <!-- Because portal animations go beyond the bounds of an icon, we need
          to make the dock layout slightly larger than the button_bar_height -->
     <dimen name="button_bar_height_padding">8dp</dimen>
-    <dimen name="button_bar_height_plus_padding">88dp</dimen>
+    <dimen name="button_bar_height_plus_padding">72dp</dimen>
 
     <!-- Drag padding to add to the drop targets -->
     <dimen name="drop_target_drag_padding">40dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e8c8d00..125520e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -45,8 +45,8 @@
     <string name="widgets_tab_label">Widgets</string>
 
     <!-- AppsCustomize pane -->
-    <!-- Message to tell the user to long-press on a widget to add it [CHAR_LIMIT=50] -->
-    <string name="long_press_widget_to_add">Long-press to pick up a widget</string>
+    <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
+    <string name="long_press_widget_to_add">Touch &amp; hold to pick up a widget</string>
     <!-- Market button text.  The market button text is removed in Launcher.java 
          in the Phone UI. [CHAR LIMIT=32] -->
     <string name="market">Shop</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b356a42..be9b0fd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,18 +39,18 @@
     </style>
 
     <style name="WorkspaceIcon.Portrait">
-        <item name="android:drawablePadding">4dp</item>
+        <item name="android:drawablePadding">8dp</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:paddingRight">4dp</item>
-        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingTop">8dp</item>
         <item name="android:paddingBottom">4dp</item>
     </style>
 
     <style name="WorkspaceIcon.Landscape">
-        <item name="android:drawablePadding">0dp</item>
+        <item name="android:drawablePadding">4dp</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:paddingRight">4dp</item>
-        <item name="android:paddingTop">2dp</item>
+        <item name="android:paddingTop">6dp</item>
         <item name="android:paddingBottom">4dp</item>
     </style>
 
@@ -66,18 +66,18 @@
 
     <style name="WorkspaceIcon.Portrait.AppsCustomize">
         <item name="android:background">@null</item>
-        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingTop">4dp</item>
         <item name="android:paddingBottom">0dp</item>
         <item name="android:paddingLeft">0dp</item>
         <item name="android:paddingRight">0dp</item>
-        <item name="android:drawablePadding">4dp</item>
+        <item name="android:drawablePadding">8dp</item>
         <item name="android:includeFontPadding">false</item>
     </style>
     <style name="WorkspaceIcon.Landscape.AppsCustomize">
         <item name="android:background">@null</item>
-        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingTop">4dp</item>
         <item name="android:paddingBottom">0dp</item>
-        <item name="android:drawablePadding">2dp</item>
+        <item name="android:drawablePadding">6dp</item>
         <item name="android:includeFontPadding">false</item>
     </style>
 
@@ -104,7 +104,7 @@
     </style>
     <style name="DropTargetButton">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:drawablePadding">7.5dp</item>
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index e5fe7bd..53d154f 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -228,6 +228,7 @@
         // (top + bottom)
         mWidgetPreviewIconPaddedDimension =
             (int) (mAppIconSize * (1 + (2 * sWidgetPreviewIconPaddingPercentage)));
+        mFadeInAdjacentScreens = LauncherApplication.isScreenLarge();
     }
 
     @Override
@@ -567,7 +568,9 @@
         layout.allowHardwareLayerCreation();
         layout.createHardwareLayers();
 
-        prepareGenerateHoloOutlinesTask(page, items, images);
+        if (mFadeInAdjacentScreens) {
+            prepareGenerateHoloOutlinesTask(page, items, images);
+        }
     }
 
     /**
@@ -929,7 +932,10 @@
 
         invalidate();
         forceUpdateAdjacentPagesAlpha();
-        prepareGenerateHoloOutlinesTask(data.page, data.items, data.generatedImages);
+
+        if (mFadeInAdjacentScreens) {
+            prepareGenerateHoloOutlinesTask(data.page, data.items, data.generatedImages);
+        }
     }
     private void onHolographicPageItemsLoaded(AsyncTaskPageData data) {
         // Invalidate early to short-circuit children invalidates
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java
index bd3a4bd..08f337e 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher2/BubbleTextView.java
@@ -93,10 +93,10 @@
         mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mPaint.setColor(bubbleColor);
         mBubbleColorAlpha = Color.alpha(bubbleColor) / 255.0f;
-        mFocusedOutlineColor = res.getColor(R.color.workspace_item_focused_outline_color);
-        mFocusedGlowColor = res.getColor(R.color.workspace_item_focused_glow_color);
-        mPressedOutlineColor = res.getColor(R.color.workspace_item_pressed_outline_color);
-        mPressedGlowColor = res.getColor(R.color.workspace_item_pressed_glow_color);
+        mFocusedOutlineColor = res.getColor(android.R.color.holo_blue_light);
+        mFocusedGlowColor = res.getColor(android.R.color.holo_blue_light);
+        mPressedOutlineColor = res.getColor(android.R.color.holo_blue_light);
+        mPressedGlowColor = res.getColor(android.R.color.holo_blue_light);
 
         setShadowLayer(SHADOW_LARGE_RADIUS, 0.0f, SHADOW_Y_OFFSET, SHADOW_LARGE_COLOUR);
     }
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 0a3c96d..d9d0487 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -1528,8 +1528,8 @@
         int smallerSize = Math.min(actualWidth, actualHeight);
 
         // Always round up to next largest cell
-        int spanX = (width + smallerSize) / smallerSize;
-        int spanY = (height + smallerSize) / smallerSize;
+        int spanX = (int) Math.ceil(width / (float) smallerSize);
+        int spanY = (int) Math.ceil(height / (float) smallerSize);
 
         if (result == null) {
             return new int[] { spanX, spanY };
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index 7fbde54..d0d4bad 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -375,6 +375,11 @@
             toY -= (dragView.getHeight() - (int) Math.round(scale * d.getIntrinsicHeight())) / 2;
             // Center in the x coordinate about the target's drawable
             toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2;
+        } else if (child instanceof FolderIcon) {
+            // Account for holographic blur padding on the drag view
+            toY -= HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS / 2;
+            // Center in the x coordinate about the target's drawable
+            toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2;
         } else {
             toY -= (Math.round(scale * (dragView.getHeight() - child.getMeasuredHeight()))) / 2;
             toX -= (Math.round(scale * (dragView.getMeasuredWidth()
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index b132870..1af3f71 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -436,6 +436,7 @@
      * a configuration step, this allows the proper animations to run after other transitions.
      */
     private boolean completeAdd(PendingAddArguments args) {
+        boolean result = false;
         switch (args.requestCode) {
             case REQUEST_PICK_APPLICATION:
                 completeAddApplication(args.intent, args.container, args.screen, args.cellX,
@@ -447,19 +448,24 @@
             case REQUEST_CREATE_SHORTCUT:
                 completeAddShortcut(args.intent, args.container, args.screen, args.cellX,
                         args.cellY);
-                return true;
+                result = true;
+                break;
             case REQUEST_PICK_APPWIDGET:
                 addAppWidgetFromPick(args.intent);
                 break;
             case REQUEST_CREATE_APPWIDGET:
                 int appWidgetId = args.intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
                 completeAddAppWidget(appWidgetId, args.container, args.screen);
-                return true;
+                result = true;
+                break;
             case REQUEST_PICK_WALLPAPER:
                 // We just wanted the activity result here so we can clear mWaitingForResult
                 break;
         }
-        return false;
+        // In any situation where we have a multi-step drop, we should reset the add info only after
+        // we complete the drop
+        resetAddInfo();
+        return result;
     }
 
     @Override
@@ -629,7 +635,6 @@
         }
 
         State state = intToState(savedState.getInt(RUNTIME_STATE, State.WORKSPACE.ordinal()));
-
         if (state == State.APPS_CUSTOMIZE) {
             showAllApps(false);
         }
@@ -910,8 +915,9 @@
                 mDragLayer.clearAllResizeFrames();
                 updateRunning();
 
-                // Reset AllApps to it's initial state
-                if (mAppsCustomizeContent != null) {
+                // Reset AllApps to it's initial state only if we are not in the middle of
+                // processing a multi-step drop
+                if (mAppsCustomizeContent != null && mPendingAddInfo.container == ItemInfo.NO_ID) {
                     mAppsCustomizeContent.reset();
                 }
             } else if (Intent.ACTION_USER_PRESENT.equals(action)) {
@@ -1195,43 +1201,6 @@
             appSearchData, globalSearch);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-
-        startWallpaper();
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_ADD:
-                addItems();
-                return true;
-            case MENU_MANAGE_APPS:
-                manageApps();
-                return true;
-            case MENU_WALLPAPER_SETTINGS:
-                startWallpaper();
-                return true;
-            case MENU_SEARCH:
-                onSearchRequested();
-                return true;
-            case MENU_NOTIFICATIONS:
-                showNotifications();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
     /**
      * Indicates that we want global search for this activity by setting the globalSearch
      * argument for {@link #startSearch} to true.
@@ -2214,7 +2183,12 @@
             @Override
             public void run() {
                 exitSpringLoadedDragMode();
+
                 if (successfulDrop) {
+                    // Before we show workspace, hide all apps again because
+                    // exitSpringLoadedDragMode made it visible. This is a bit hacky; we should
+                    // clean up our state transition functions
+                    mAppsCustomizeTabHost.setVisibility(View.GONE);
                     showWorkspace(true);
                 }
             }
@@ -2581,20 +2555,12 @@
     }
 
     /**
-     * Receives notifications when applications are added/removed.
+     * Receives notifications when system dialogs are to be closed.
      */
     private class CloseSystemDialogsIntentReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             closeSystemDialogs();
-            String reason = intent.getStringExtra("reason");
-            if (!"homekey".equals(reason)) {
-                boolean animate = true;
-                if (mPaused || "lock".equals(reason)) {
-                    animate = false;
-                }
-                showWorkspace(animate);
-            }
         }
     }
 
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 6658f07..1573483 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -382,8 +382,7 @@
         final ContentResolver cr = context.getContentResolver();
         item.onAddToDatabase(values);
 
-        Launcher l = (Launcher) context;
-        LauncherApplication app = (LauncherApplication) l.getApplication();
+        LauncherApplication app = (LauncherApplication) context.getApplicationContext();
         item.id = app.getLauncherProvider().generateNewId();
         values.put(LauncherSettings.Favorites._ID, item.id);
         item.updateValuesWithCoordinates(values, item.cellX, item.cellY);
@@ -1512,7 +1511,7 @@
         // the db
         if (icon == null) {
             if (c != null) {
-                icon = getIconFromCursor(c, iconIndex);
+                icon = getIconFromCursor(c, iconIndex, context);
             }
         }
         // the fallback icon
@@ -1582,7 +1581,7 @@
             }
             // the db
             if (icon == null) {
-                icon = getIconFromCursor(c, iconIndex);
+                icon = getIconFromCursor(c, iconIndex, context);
             }
             // the fallback icon
             if (icon == null) {
@@ -1591,7 +1590,7 @@
             }
             break;
         case LauncherSettings.Favorites.ICON_TYPE_BITMAP:
-            icon = getIconFromCursor(c, iconIndex);
+            icon = getIconFromCursor(c, iconIndex, context);
             if (icon == null) {
                 icon = getFallbackIcon();
                 info.customIcon = false;
@@ -1610,14 +1609,15 @@
         return info;
     }
 
-    Bitmap getIconFromCursor(Cursor c, int iconIndex) {
+    Bitmap getIconFromCursor(Cursor c, int iconIndex, Context context) {
         if (false) {
             Log.d(TAG, "getIconFromCursor app="
                     + c.getString(c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE)));
         }
         byte[] data = c.getBlob(iconIndex);
         try {
-            return BitmapFactory.decodeByteArray(data, 0, data.length);
+            return Utilities.createIconBitmap(
+                    BitmapFactory.decodeByteArray(data, 0, data.length), context);
         } catch (Exception e) {
             return null;
         }
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 48360fe..24feb41 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -432,6 +432,7 @@
         int maxChildHeight = 0;
 
         final int verticalPadding = mPaddingTop + mPaddingBottom;
+        final int horizontalPadding = mPaddingLeft + mPaddingRight;
 
 
         // The children are given the same width and height as the workspace
@@ -458,7 +459,7 @@
             }
 
             final int childWidthMeasureSpec =
-                MeasureSpec.makeMeasureSpec(widthSize, childWidthMode);
+                MeasureSpec.makeMeasureSpec(widthSize - horizontalPadding, childWidthMode);
             final int childHeightMeasureSpec =
                 MeasureSpec.makeMeasureSpec(heightSize - verticalPadding, childHeightMode);
 
diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher2/Utilities.java
index c63c822..b537f7a 100644
--- a/src/com/android/launcher2/Utilities.java
+++ b/src/com/android/launcher2/Utilities.java
@@ -76,8 +76,32 @@
     }
 
     /**
-     * Returns a bitmap suitable for the all apps view.  The bitmap will be a power
-     * of two sized ARGB_8888 bitmap that can be used as a gl texture.
+     * Returns a bitmap suitable for the all apps view. Used to convert pre-ICS
+     * icon bitmaps that are stored in the database (which were 74x74 pixels at hdpi size)
+     * to the proper size (48dp)
+     */
+    static Bitmap createIconBitmap(Bitmap icon, Context context) {
+        int textureWidth = sIconTextureWidth;
+        int textureHeight = sIconTextureHeight;
+        int sourceWidth = icon.getWidth();
+        int sourceHeight = icon.getHeight();
+        if (sourceWidth > textureWidth && sourceHeight > textureHeight) {
+            // Icon is bigger than it should be; clip it (solves the GB->ICS migration case)
+            return Bitmap.createBitmap(icon,
+                    (sourceWidth - textureWidth) / 2,
+                    (sourceHeight - textureHeight) / 2,
+                    textureWidth, textureHeight);
+        } else if (sourceWidth == textureWidth && sourceHeight == textureHeight) {
+            // Icon is the right size, no need to change it
+            return icon;
+        } else {
+            // Icon is too small, render to a larger bitmap
+            return createIconBitmap(new BitmapDrawable(icon), context);
+        }
+    }
+
+    /**
+     * Returns a bitmap suitable for the all apps view.
      */
     static Bitmap createIconBitmap(Drawable icon, Context context) {
         synchronized (sCanvas) { // we share the statics :-(
@@ -103,7 +127,7 @@
             int sourceWidth = icon.getIntrinsicWidth();
             int sourceHeight = icon.getIntrinsicHeight();
 
-            if (sourceWidth > 0 && sourceWidth > 0) {
+            if (sourceWidth > 0 && sourceHeight > 0) {
                 // There are intrinsic sizes.
                 if (width < sourceWidth || height < sourceHeight) {
                     // It's too big, scale it down.
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 26c00ad..ce3aad4 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1000,37 +1000,7 @@
         mDrawBackground = true;
     }
 
-    private void showBackgroundGradientForAllApps(boolean animated) {
-        showBackgroundGradient(animated);
-    }
-
-    private void showBackgroundGradient(boolean animated) {
-        if (mBackground == null) return;
-        if (mBackgroundFadeOutAnimation != null) {
-            mBackgroundFadeOutAnimation.cancel();
-            mBackgroundFadeOutAnimation = null;
-        }
-        if (mBackgroundFadeInAnimation != null) {
-            mBackgroundFadeInAnimation.cancel();
-            mBackgroundFadeInAnimation = null;
-        }
-        final float finalAlpha = 1f;
-        if (animated) {
-            mBackgroundFadeInAnimation = ValueAnimator.ofFloat(getBackgroundAlpha(), finalAlpha);
-            mBackgroundFadeInAnimation.addUpdateListener(new AnimatorUpdateListener() {
-                public void onAnimationUpdate(ValueAnimator animation) {
-                    setBackgroundAlpha(((Float) animation.getAnimatedValue()).floatValue());
-                }
-            });
-            mBackgroundFadeInAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
-            mBackgroundFadeInAnimation.setDuration(BACKGROUND_FADE_IN_DURATION);
-            mBackgroundFadeInAnimation.start();
-        } else {
-            setBackgroundAlpha(finalAlpha);
-        }
-    }
-
-    private void hideBackgroundGradient(float finalAlpha, boolean animated) {
+    private void animateBackgroundGradient(float finalAlpha, boolean animated) {
         if (mBackground == null) return;
         if (mBackgroundFadeInAnimation != null) {
             mBackgroundFadeInAnimation.cancel();
@@ -1040,18 +1010,21 @@
             mBackgroundFadeOutAnimation.cancel();
             mBackgroundFadeOutAnimation = null;
         }
-        if (animated) {
-            mBackgroundFadeOutAnimation = ValueAnimator.ofFloat(getBackgroundAlpha(), finalAlpha);
-            mBackgroundFadeOutAnimation.addUpdateListener(new AnimatorUpdateListener() {
-                public void onAnimationUpdate(ValueAnimator animation) {
-                    setBackgroundAlpha(((Float) animation.getAnimatedValue()).floatValue());
-                }
-            });
-            mBackgroundFadeOutAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
-            mBackgroundFadeOutAnimation.setDuration(BACKGROUND_FADE_OUT_DURATION);
-            mBackgroundFadeOutAnimation.start();
-        } else {
-            setBackgroundAlpha(finalAlpha);
+        float startAlpha = getBackgroundAlpha();
+        if (finalAlpha != startAlpha) {
+            if (animated) {
+                mBackgroundFadeOutAnimation = ValueAnimator.ofFloat(startAlpha, finalAlpha);
+                mBackgroundFadeOutAnimation.addUpdateListener(new AnimatorUpdateListener() {
+                    public void onAnimationUpdate(ValueAnimator animation) {
+                        setBackgroundAlpha(((Float) animation.getAnimatedValue()).floatValue());
+                    }
+                });
+                mBackgroundFadeOutAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
+                mBackgroundFadeOutAnimation.setDuration(BACKGROUND_FADE_OUT_DURATION);
+                mBackgroundFadeOutAnimation.start();
+            } else {
+                setBackgroundAlpha(finalAlpha);
+            }
         }
     }
 
@@ -1552,8 +1525,6 @@
             updateWallpaperOffsetImmediately();
         }
         setChildrenDrawnWithCacheEnabled(true);
-
-        showBackgroundGradientForAllApps(animated);
     }
 
     @Override
@@ -1925,8 +1896,16 @@
             }
         }
 
-        hideBackgroundGradient(springLoaded ? getResources().getInteger(
-                R.integer.config_appsCustomizeSpringLoadedBgAlpha) / 100f : 0f, animated);
+        if (springLoaded) {
+            // Right now we're covered by Apps Customize
+            // Show the background gradient immediately, so the gradient will
+            // be showing once AppsCustomize disappears
+            animateBackgroundGradient(getResources().getInteger(
+                    R.integer.config_appsCustomizeSpringLoadedBgAlpha) / 100f, false);
+        } else {
+            // Fade the background gradient away
+            animateBackgroundGradient(0f, true);
+        }
     }
 
     /**
@@ -1970,7 +1949,7 @@
      * Responsibility for the bitmap is transferred to the caller.
      */
     public Bitmap createDragBitmap(View v, Canvas canvas, int padding) {
-        final int outlineColor = getResources().getColor(R.color.drag_outline_color);
+        final int outlineColor = getResources().getColor(android.R.color.holo_blue_light);
         Bitmap b;
 
         if (v instanceof TextView) {
@@ -1995,7 +1974,7 @@
      * Responsibility for the bitmap is transferred to the caller.
      */
     private Bitmap createDragOutline(View v, Canvas canvas, int padding) {
-        final int outlineColor = getResources().getColor(R.color.drag_outline_color);
+        final int outlineColor = getResources().getColor(android.R.color.holo_blue_light);
         final Bitmap b = Bitmap.createBitmap(
                 v.getWidth() + padding, v.getHeight() + padding, Bitmap.Config.ARGB_8888);
 
@@ -2011,7 +1990,7 @@
      * Responsibility for the bitmap is transferred to the caller.
      */
     private Bitmap createDragOutline(Bitmap orig, Canvas canvas, int padding, int w, int h) {
-        final int outlineColor = getResources().getColor(R.color.drag_outline_color);
+        final int outlineColor = getResources().getColor(android.R.color.holo_blue_light);
         final Bitmap b = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
         canvas.setBitmap(b);
 
@@ -2041,7 +2020,7 @@
      */
     private Bitmap createExternalDragOutline(Canvas canvas, int padding) {
         Resources r = getResources();
-        final int outlineColor = r.getColor(R.color.drag_outline_color);
+        final int outlineColor = r.getColor(android.R.color.holo_blue_light);
         final int iconWidth = r.getDimensionPixelSize(R.dimen.workspace_cell_width);
         final int iconHeight = r.getDimensionPixelSize(R.dimen.workspace_cell_height);
         final int rectRadius = r.getDimensionPixelSize(R.dimen.external_drop_icon_rect_radius);
@@ -2295,17 +2274,7 @@
         } else if (mDragInfo != null) {
             final View cell = mDragInfo.cell;
 
-            boolean continueDrop = true;
-            if (mLauncher.isHotseatLayout(mDragTargetLayout) && d.dragInfo instanceof ItemInfo) {
-                ItemInfo info = (ItemInfo) d.dragInfo;
-                if (info.spanX > 1 || info.spanY > 1) {
-                    continueDrop = false;
-                    Toast.makeText(getContext(), R.string.invalid_hotseat_item,
-                            Toast.LENGTH_SHORT).show();
-                }
-            }
-
-            if (continueDrop && dropTargetLayout != null) {
+            if (dropTargetLayout != null) {
                 // Move internally
                 boolean hasMovedLayouts = (getParentCellLayoutForView(cell) != dropTargetLayout);
                 boolean hasMovedIntoHotseat = mLauncher.isHotseatLayout(dropTargetLayout);
@@ -2809,6 +2778,14 @@
         return res;
     }
 
+    private boolean isDragWidget(DragObject d) {
+        return (d.dragInfo instanceof LauncherAppWidgetInfo ||
+                d.dragInfo instanceof PendingAddWidgetInfo);
+    }
+    private boolean isExternalDragWidget(DragObject d) {
+        return d.dragSource != this && isDragWidget(d);
+    }
+
     public void onDragOver(DragObject d) {
         // Skip drag over events while we are dragging over side pages
         if (mInScrollArea) return;
@@ -2825,7 +2802,7 @@
 
         // Identify whether we have dragged over a side page
         if (isSmall()) {
-            if (mLauncher.getHotseat() != null) {
+            if (mLauncher.getHotseat() != null && !isExternalDragWidget(d)) {
                 mLauncher.getHotseat().getHitRect(r);
                 if (r.contains(d.x, d.y)) {
                     layout = mLauncher.getHotseat().getLayout();
@@ -2862,7 +2839,7 @@
             }
         } else {
             // Test to see if we are over the hotseat otherwise just use the current page
-            if (mLauncher.getHotseat() != null) {
+            if (mLauncher.getHotseat() != null && !isDragWidget(d)) {
                 mLauncher.getHotseat().getHitRect(r);
                 if (r.contains(d.x, d.y)) {
                     layout = mLauncher.getHotseat().getLayout();