Browser: update UI

* Res
   - Rename (#themersgottahate)
   - Vectors
   - Card-Tabs
   - CleanUp
* Interface
   - Longpress fab to open incognito tab
   - New icon
   - Better urlbar
   - Fix tab animations
   - Remap PieControl
* Features
  - Immersive mode (replace jb fullscreen)

Change-Id: I2fde4242f477359dc8af18d1b7752750058cd6e9
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

221 files changed, 560 insertions, 640 deletions

diff --git a/Android.mk b/Android.mk
index dff63a7..838d768 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,11 +3,15 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res) \
+    frameworks/support/v7/cardview/res
+
 LOCAL_STATIC_JAVA_LIBRARIES := \
         android-common \
         guava \
         android-support-v13 \
-        android-support-v4
+        android-support-v4 \
+        android-support-v7-cardview
 
 LOCAL_SRC_FILES := \
         $(call all-java-files-under, src) \
@@ -17,6 +21,10 @@ LOCAL_PACKAGE_NAME := Browser
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+LOCAL_AAPT_FLAGS := \
+    --auto-add-overlay \
+    --extra-packages android.support.v7.cardview
+
 LOCAL_EMMA_COVERAGE_FILTER := *,-com.android.common.*
 
 # We need the sound recorder for the Media Capture API.
diff --git a/res/drawable-hdpi/app_web_browser_sm.png b/res/drawable-hdpi/app_web_browser_sm.png
deleted file mode 100644
index 62d5cc3..0000000
--- a/res/drawable-hdpi/app_web_browser_sm.png
+++ /dev/null
diff --git a/res/drawable-hdpi/browsertab_add.png b/res/drawable-hdpi/browsertab_add.png
deleted file mode 100644
index 768ec1d..0000000
--- a/res/drawable-hdpi/browsertab_add.png
+++ /dev/null
diff --git a/res/drawable-hdpi/browsertab_add_focused.png b/res/drawable-hdpi/browsertab_add_focused.png
deleted file mode 100644
index 30c371b..0000000
--- a/res/drawable-hdpi/browsertab_add_focused.png
+++ /dev/null
diff --git a/res/drawable-hdpi/browsertab_inactive.png b/res/drawable-hdpi/browsertab_inactive.png
deleted file mode 100644
index 3ba90b1..0000000
--- a/res/drawable-hdpi/browsertab_inactive.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_back_hierarchy_dark.png b/res/drawable-hdpi/ic_back_hierarchy_dark.png
deleted file mode 100644
index 86fa337..0000000
--- a/res/drawable-hdpi/ic_back_hierarchy_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_bookmark_black.png b/res/drawable-hdpi/ic_bookmark.png
index 15aaccf..15aaccf 100644
--- a/res/drawable-hdpi/ic_bookmark_black.png
+++ b/res/drawable-hdpi/ic_bookmark.png
diff --git a/res/drawable-hdpi/ic_bookmark_off_dark.png b/res/drawable-hdpi/ic_bookmark_off.png
index 99dc3dc..99dc3dc 100644
--- a/res/drawable-hdpi/ic_bookmark_off_dark.png
+++ b/res/drawable-hdpi/ic_bookmark_off.png
diff --git a/res/drawable-hdpi/ic_bookmark_on_dark.png b/res/drawable-hdpi/ic_bookmark_on.png
index c31388b..c31388b 100644
--- a/res/drawable-hdpi/ic_bookmark_on_dark.png
+++ b/res/drawable-hdpi/ic_bookmark_on.png
diff --git a/res/drawable-hdpi/ic_bookmark_widget_bookmark_dark.png b/res/drawable-hdpi/ic_bookmark_widget_bookmark.png
index b29d9a2..b29d9a2 100644
--- a/res/drawable-hdpi/ic_bookmark_widget_bookmark_dark.png
+++ b/res/drawable-hdpi/ic_bookmark_widget_bookmark.png
diff --git a/res/drawable-hdpi/ic_delete_black.png b/res/drawable-hdpi/ic_delete.png
index 4e34e33..4e34e33 100644
--- a/res/drawable-hdpi/ic_delete_black.png
+++ b/res/drawable-hdpi/ic_delete.png
diff --git a/res/drawable-hdpi/ic_desktop_dark.png b/res/drawable-hdpi/ic_desktop.png
index 4bb18fa..4bb18fa 100644
--- a/res/drawable-hdpi/ic_desktop_dark.png
+++ b/res/drawable-hdpi/ic_desktop.png
diff --git a/res/drawable-hdpi/ic_folder_dark.png b/res/drawable-hdpi/ic_folder.png
index 139d79b..139d79b 100644
--- a/res/drawable-hdpi/ic_folder_dark.png
+++ b/res/drawable-hdpi/ic_folder.png
diff --git a/res/drawable-hdpi/ic_gps_denied_dark.png b/res/drawable-hdpi/ic_gps_denied.png
index 9ac0cd3..9ac0cd3 100644
--- a/res/drawable-hdpi/ic_gps_denied_dark.png
+++ b/res/drawable-hdpi/ic_gps_denied.png
diff --git a/res/drawable-hdpi/ic_gps_on_dark.png b/res/drawable-hdpi/ic_gps_on.png
index 65aa70b..65aa70b 100644
--- a/res/drawable-hdpi/ic_gps_on_dark.png
+++ b/res/drawable-hdpi/ic_gps_on.png
diff --git a/res/drawable-hdpi/ic_history_dark.png b/res/drawable-hdpi/ic_history.png
index b2b1332..b2b1332 100644
--- a/res/drawable-hdpi/ic_history_dark.png
+++ b/res/drawable-hdpi/ic_history.png
diff --git a/res/drawable-hdpi/ic_home_dark.png b/res/drawable-hdpi/ic_home_dark.png
deleted file mode 100644
index 24d2df3..0000000
--- a/res/drawable-hdpi/ic_home_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_home_info_dark.png b/res/drawable-hdpi/ic_home_info.png
index aa5817a..aa5817a 100644
--- a/res/drawable-hdpi/ic_home_info_dark.png
+++ b/res/drawable-hdpi/ic_home_info.png
diff --git a/res/drawable-hdpi/ic_incognito_dark.png b/res/drawable-hdpi/ic_incognito_dark.png
deleted file mode 100644
index 3e44913..0000000
--- a/res/drawable-hdpi/ic_incognito_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_new_incognito_dark.png b/res/drawable-hdpi/ic_new_incognito_dark.png
deleted file mode 100644
index 2d2f5bf..0000000
--- a/res/drawable-hdpi/ic_new_incognito_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_refresh_dark.png b/res/drawable-hdpi/ic_refresh_dark.png
deleted file mode 100644
index cd16fdd..0000000
--- a/res/drawable-hdpi/ic_refresh_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_search_dark.png b/res/drawable-hdpi/ic_search.png
index a2fc5b2..a2fc5b2 100644
--- a/res/drawable-hdpi/ic_search_dark.png
+++ b/res/drawable-hdpi/ic_search.png
diff --git a/res/drawable-hdpi/ic_secure_dark.png b/res/drawable-hdpi/ic_secure_dark.png
deleted file mode 100644
index 76348f7..0000000
--- a/res/drawable-hdpi/ic_secure_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_secure_partial_dark.png b/res/drawable-hdpi/ic_secure_partial_dark.png
deleted file mode 100644
index d7e3e5b..0000000
--- a/res/drawable-hdpi/ic_secure_partial_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_settings_dark.png b/res/drawable-hdpi/ic_settings_dark.png
deleted file mode 100644
index f9a8915..0000000
--- a/res/drawable-hdpi/ic_settings_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_share_dark.png b/res/drawable-hdpi/ic_share.png
index 2094394..2094394 100644
--- a/res/drawable-hdpi/ic_share_dark.png
+++ b/res/drawable-hdpi/ic_share.png
diff --git a/res/drawable-hdpi/ic_tab_close.png b/res/drawable-hdpi/ic_tab_close.png
deleted file mode 100644
index 794b7b7..0000000
--- a/res/drawable-hdpi/ic_tab_close.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_voice_search_dark.png b/res/drawable-hdpi/ic_voice_search.png
index e5c2e8a..e5c2e8a 100644
--- a/res/drawable-hdpi/ic_voice_search_dark.png
+++ b/res/drawable-hdpi/ic_voice_search.png
diff --git a/res/drawable-hdpi/ic_web_dark.png b/res/drawable-hdpi/ic_web.png
index 0e3e7a9..0e3e7a9 100644
--- a/res/drawable-hdpi/ic_web_dark.png
+++ b/res/drawable-hdpi/ic_web.png
diff --git a/res/drawable-hdpi/ic_windows_dark.png b/res/drawable-hdpi/ic_windows_dark.png
deleted file mode 100644
index 7eb5f5d..0000000
--- a/res/drawable-hdpi/ic_windows_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/nav_tab_bg.9.png b/res/drawable-hdpi/nav_tab_bg.9.png
deleted file mode 100644
index d7e8693..0000000
--- a/res/drawable-hdpi/nav_tab_bg.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/app_web_browser_sm.png b/res/drawable-mdpi/app_web_browser_sm.png
deleted file mode 100644
index 0bbc682..0000000
--- a/res/drawable-mdpi/app_web_browser_sm.png
+++ /dev/null
diff --git a/res/drawable-mdpi/browsertab_add.png b/res/drawable-mdpi/browsertab_add.png
deleted file mode 100644
index fbbe32b..0000000
--- a/res/drawable-mdpi/browsertab_add.png
+++ /dev/null
diff --git a/res/drawable-mdpi/browsertab_add_focused.png b/res/drawable-mdpi/browsertab_add_focused.png
deleted file mode 100644
index 6b6f538..0000000
--- a/res/drawable-mdpi/browsertab_add_focused.png
+++ /dev/null
diff --git a/res/drawable-mdpi/browsertab_inactive.png b/res/drawable-mdpi/browsertab_inactive.png
deleted file mode 100644
index aa50b1b..0000000
--- a/res/drawable-mdpi/browsertab_inactive.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_back_hierarchy_dark.png b/res/drawable-mdpi/ic_back_hierarchy_dark.png
deleted file mode 100644
index 5513b05..0000000
--- a/res/drawable-mdpi/ic_back_hierarchy_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_bookmark_black.png b/res/drawable-mdpi/ic_bookmark.png
index d7cd384..d7cd384 100644
--- a/res/drawable-mdpi/ic_bookmark_black.png
+++ b/res/drawable-mdpi/ic_bookmark.png
diff --git a/res/drawable-mdpi/ic_bookmark_off_dark.png b/res/drawable-mdpi/ic_bookmark_off.png
index 825970c..825970c 100644
--- a/res/drawable-mdpi/ic_bookmark_off_dark.png
+++ b/res/drawable-mdpi/ic_bookmark_off.png
diff --git a/res/drawable-mdpi/ic_bookmark_on_dark.png b/res/drawable-mdpi/ic_bookmark_on.png
index 82da4ea..82da4ea 100644
--- a/res/drawable-mdpi/ic_bookmark_on_dark.png
+++ b/res/drawable-mdpi/ic_bookmark_on.png
diff --git a/res/drawable-mdpi/ic_bookmark_widget_bookmark_dark.png b/res/drawable-mdpi/ic_bookmark_widget_bookmark.png
index ec69d41..ec69d41 100644
--- a/res/drawable-mdpi/ic_bookmark_widget_bookmark_dark.png
+++ b/res/drawable-mdpi/ic_bookmark_widget_bookmark.png
diff --git a/res/drawable-mdpi/ic_delete_black.png b/res/drawable-mdpi/ic_delete.png
index 213fe67..213fe67 100644
--- a/res/drawable-mdpi/ic_delete_black.png
+++ b/res/drawable-mdpi/ic_delete.png
diff --git a/res/drawable-mdpi/ic_desktop_dark.png b/res/drawable-mdpi/ic_desktop.png
index b74276c..b74276c 100644
--- a/res/drawable-mdpi/ic_desktop_dark.png
+++ b/res/drawable-mdpi/ic_desktop.png
diff --git a/res/drawable-mdpi/ic_folder_dark.png b/res/drawable-mdpi/ic_folder.png
index a9bebb9..a9bebb9 100644
--- a/res/drawable-mdpi/ic_folder_dark.png
+++ b/res/drawable-mdpi/ic_folder.png
diff --git a/res/drawable-mdpi/ic_gps_denied_dark.png b/res/drawable-mdpi/ic_gps_denied.png
index 61f8c9b..61f8c9b 100644
--- a/res/drawable-mdpi/ic_gps_denied_dark.png
+++ b/res/drawable-mdpi/ic_gps_denied.png
diff --git a/res/drawable-mdpi/ic_gps_on_dark.png b/res/drawable-mdpi/ic_gps_on.png
index a125035..a125035 100644
--- a/res/drawable-mdpi/ic_gps_on_dark.png
+++ b/res/drawable-mdpi/ic_gps_on.png
diff --git a/res/drawable-mdpi/ic_history_dark.png b/res/drawable-mdpi/ic_history.png
index b93da10..b93da10 100644
--- a/res/drawable-mdpi/ic_history_dark.png
+++ b/res/drawable-mdpi/ic_history.png
diff --git a/res/drawable-mdpi/ic_home_dark.png b/res/drawable-mdpi/ic_home_dark.png
deleted file mode 100644
index 80545ce..0000000
--- a/res/drawable-mdpi/ic_home_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_home_info_dark.png b/res/drawable-mdpi/ic_home_info.png
index 97f0e3b..97f0e3b 100644
--- a/res/drawable-mdpi/ic_home_info_dark.png
+++ b/res/drawable-mdpi/ic_home_info.png
diff --git a/res/drawable-mdpi/ic_incognito_dark.png b/res/drawable-mdpi/ic_incognito_dark.png
deleted file mode 100644
index 197599c..0000000
--- a/res/drawable-mdpi/ic_incognito_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_new_incognito_dark.png b/res/drawable-mdpi/ic_new_incognito_dark.png
deleted file mode 100644
index e8a7f49..0000000
--- a/res/drawable-mdpi/ic_new_incognito_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_refresh_dark.png b/res/drawable-mdpi/ic_refresh_dark.png
deleted file mode 100644
index 235c84f..0000000
--- a/res/drawable-mdpi/ic_refresh_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_search_dark.png b/res/drawable-mdpi/ic_search.png
index dff1e3a..dff1e3a 100644
--- a/res/drawable-mdpi/ic_search_dark.png
+++ b/res/drawable-mdpi/ic_search.png
diff --git a/res/drawable-mdpi/ic_secure_dark.png b/res/drawable-mdpi/ic_secure_dark.png
deleted file mode 100644
index 8568256..0000000
--- a/res/drawable-mdpi/ic_secure_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_secure_partial_dark.png b/res/drawable-mdpi/ic_secure_partial_dark.png
deleted file mode 100644
index cc8f039..0000000
--- a/res/drawable-mdpi/ic_secure_partial_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_settings_dark.png b/res/drawable-mdpi/ic_settings_dark.png
deleted file mode 100644
index fdcf657..0000000
--- a/res/drawable-mdpi/ic_settings_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_share_dark.png b/res/drawable-mdpi/ic_share.png
index d02cbad..d02cbad 100644
--- a/res/drawable-mdpi/ic_share_dark.png
+++ b/res/drawable-mdpi/ic_share.png
diff --git a/res/drawable-mdpi/ic_tab_close.png b/res/drawable-mdpi/ic_tab_close.png
deleted file mode 100644
index df332ef..0000000
--- a/res/drawable-mdpi/ic_tab_close.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_voice_search_dark.png b/res/drawable-mdpi/ic_voice_search.png
index 75730cd..75730cd 100644
--- a/res/drawable-mdpi/ic_voice_search_dark.png
+++ b/res/drawable-mdpi/ic_voice_search.png
diff --git a/res/drawable-mdpi/ic_web_dark.png b/res/drawable-mdpi/ic_web.png
index 9083c63..9083c63 100644
--- a/res/drawable-mdpi/ic_web_dark.png
+++ b/res/drawable-mdpi/ic_web.png
diff --git a/res/drawable-mdpi/ic_windows_dark.png b/res/drawable-mdpi/ic_windows_dark.png
deleted file mode 100644
index 2cd98cc..0000000
--- a/res/drawable-mdpi/ic_windows_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/nav_tab_bg.9.png b/res/drawable-mdpi/nav_tab_bg.9.png
deleted file mode 100644
index d30ba95..0000000
--- a/res/drawable-mdpi/nav_tab_bg.9.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png
deleted file mode 100644
index c11b709..0000000
--- a/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png
deleted file mode 100644
index a90425a..0000000
--- a/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png
deleted file mode 100644
index fac7629..0000000
--- a/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png
deleted file mode 100644
index a7b6cf9..0000000
--- a/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-nodpi/bg_urlbar.png b/res/drawable-sw600dp-nodpi/bg_urlbar.png
deleted file mode 100644
index 31c6443..0000000
--- a/res/drawable-sw600dp-nodpi/bg_urlbar.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png
deleted file mode 100644
index 1ce6c3f..0000000
--- a/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png
deleted file mode 100644
index 01feec8..0000000
--- a/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/app_web_browser_sm.png b/res/drawable-xhdpi/app_web_browser_sm.png
deleted file mode 100644
index 45a5f12..0000000
--- a/res/drawable-xhdpi/app_web_browser_sm.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/browsertab_add.png b/res/drawable-xhdpi/browsertab_add.png
deleted file mode 100644
index 84f1123..0000000
--- a/res/drawable-xhdpi/browsertab_add.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/browsertab_add_focused.png b/res/drawable-xhdpi/browsertab_add_focused.png
deleted file mode 100644
index 56ea166..0000000
--- a/res/drawable-xhdpi/browsertab_add_focused.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/browsertab_inactive.png b/res/drawable-xhdpi/browsertab_inactive.png
deleted file mode 100644
index a4e93df..0000000
--- a/res/drawable-xhdpi/browsertab_inactive.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_back_hierarchy_dark.png b/res/drawable-xhdpi/ic_back_hierarchy_dark.png
deleted file mode 100644
index 815b155..0000000
--- a/res/drawable-xhdpi/ic_back_hierarchy_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_bookmark_black.png b/res/drawable-xhdpi/ic_bookmark.png
index 9992141..9992141 100644
--- a/res/drawable-xhdpi/ic_bookmark_black.png
+++ b/res/drawable-xhdpi/ic_bookmark.png
diff --git a/res/drawable-xhdpi/ic_bookmark_off_dark.png b/res/drawable-xhdpi/ic_bookmark_off.png
index 1472f6a..1472f6a 100644
--- a/res/drawable-xhdpi/ic_bookmark_off_dark.png
+++ b/res/drawable-xhdpi/ic_bookmark_off.png
diff --git a/res/drawable-xhdpi/ic_bookmark_on_dark.png b/res/drawable-xhdpi/ic_bookmark_on.png
index 46de0e9..46de0e9 100644
--- a/res/drawable-xhdpi/ic_bookmark_on_dark.png
+++ b/res/drawable-xhdpi/ic_bookmark_on.png
diff --git a/res/drawable-xhdpi/ic_delete_black.png b/res/drawable-xhdpi/ic_delete.png
index e677071..e677071 100644
--- a/res/drawable-xhdpi/ic_delete_black.png
+++ b/res/drawable-xhdpi/ic_delete.png
diff --git a/res/drawable-xhdpi/ic_desktop_dark.png b/res/drawable-xhdpi/ic_desktop.png
index 92b187d..92b187d 100644
--- a/res/drawable-xhdpi/ic_desktop_dark.png
+++ b/res/drawable-xhdpi/ic_desktop.png
diff --git a/res/drawable-xhdpi/ic_folder_dark.png b/res/drawable-xhdpi/ic_folder.png
index 6bdb7d0..6bdb7d0 100644
--- a/res/drawable-xhdpi/ic_folder_dark.png
+++ b/res/drawable-xhdpi/ic_folder.png
diff --git a/res/drawable-xhdpi/ic_gps_denied_dark.png b/res/drawable-xhdpi/ic_gps_denied.png
index 1894424..1894424 100644
--- a/res/drawable-xhdpi/ic_gps_denied_dark.png
+++ b/res/drawable-xhdpi/ic_gps_denied.png
diff --git a/res/drawable-xhdpi/ic_gps_on_dark.png b/res/drawable-xhdpi/ic_gps_on.png
index a5683f9..a5683f9 100644
--- a/res/drawable-xhdpi/ic_gps_on_dark.png
+++ b/res/drawable-xhdpi/ic_gps_on.png
diff --git a/res/drawable-xhdpi/ic_history_dark.png b/res/drawable-xhdpi/ic_history.png
index 7681ac8..7681ac8 100644
--- a/res/drawable-xhdpi/ic_history_dark.png
+++ b/res/drawable-xhdpi/ic_history.png
diff --git a/res/drawable-xhdpi/ic_home_dark.png b/res/drawable-xhdpi/ic_home_dark.png
deleted file mode 100644
index d00f914..0000000
--- a/res/drawable-xhdpi/ic_home_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_home_info_dark.png b/res/drawable-xhdpi/ic_home_info.png
index 16e375d..16e375d 100644
--- a/res/drawable-xhdpi/ic_home_info_dark.png
+++ b/res/drawable-xhdpi/ic_home_info.png
diff --git a/res/drawable-xhdpi/ic_incognito_dark.png b/res/drawable-xhdpi/ic_incognito_dark.png
deleted file mode 100644
index 94bf80e..0000000
--- a/res/drawable-xhdpi/ic_incognito_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_new_incognito_dark.png b/res/drawable-xhdpi/ic_new_incognito_dark.png
deleted file mode 100644
index 2f21240..0000000
--- a/res/drawable-xhdpi/ic_new_incognito_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_refresh_dark.png b/res/drawable-xhdpi/ic_refresh_dark.png
deleted file mode 100644
index 5f89fc2..0000000
--- a/res/drawable-xhdpi/ic_refresh_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_search_dark.png b/res/drawable-xhdpi/ic_search.png
index 043759a..043759a 100644
--- a/res/drawable-xhdpi/ic_search_dark.png
+++ b/res/drawable-xhdpi/ic_search.png
diff --git a/res/drawable-xhdpi/ic_secure_dark.png b/res/drawable-xhdpi/ic_secure_dark.png
deleted file mode 100644
index 81a3542..0000000
--- a/res/drawable-xhdpi/ic_secure_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_secure_partial_dark.png b/res/drawable-xhdpi/ic_secure_partial_dark.png
deleted file mode 100644
index 1df4dd9..0000000
--- a/res/drawable-xhdpi/ic_secure_partial_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_settings_dark.png b/res/drawable-xhdpi/ic_settings_dark.png
deleted file mode 100644
index 12e5d10..0000000
--- a/res/drawable-xhdpi/ic_settings_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_share_dark.png b/res/drawable-xhdpi/ic_share.png
index 5c3047a..5c3047a 100644
--- a/res/drawable-xhdpi/ic_share_dark.png
+++ b/res/drawable-xhdpi/ic_share.png
diff --git a/res/drawable-xhdpi/ic_tab_close.png b/res/drawable-xhdpi/ic_tab_close.png
deleted file mode 100644
index e9e9c7a..0000000
--- a/res/drawable-xhdpi/ic_tab_close.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_voice_search_dark.png b/res/drawable-xhdpi/ic_voice_search.png
index a6f37ee..a6f37ee 100644
--- a/res/drawable-xhdpi/ic_voice_search_dark.png
+++ b/res/drawable-xhdpi/ic_voice_search.png
diff --git a/res/drawable-xhdpi/ic_web_dark.png b/res/drawable-xhdpi/ic_web.png
index bded242..bded242 100644
--- a/res/drawable-xhdpi/ic_web_dark.png
+++ b/res/drawable-xhdpi/ic_web.png
diff --git a/res/drawable-xhdpi/ic_windows_dark.png b/res/drawable-xhdpi/ic_windows_dark.png
deleted file mode 100644
index 5b07ad6..0000000
--- a/res/drawable-xhdpi/ic_windows_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/nav_tab_bg.9.png b/res/drawable-xhdpi/nav_tab_bg.9.png
deleted file mode 100644
index 9fa2234..0000000
--- a/res/drawable-xhdpi/nav_tab_bg.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/app_web_browser_sm.png b/res/drawable-xxhdpi/app_web_browser_sm.png
deleted file mode 100644
index 45a5f12..0000000
--- a/res/drawable-xxhdpi/app_web_browser_sm.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/browsertab_add.png b/res/drawable-xxhdpi/browsertab_add.png
deleted file mode 100644
index 60cc858..0000000
--- a/res/drawable-xxhdpi/browsertab_add.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/browsertab_add_focused.png b/res/drawable-xxhdpi/browsertab_add_focused.png
deleted file mode 100644
index 4ccee3d..0000000
--- a/res/drawable-xxhdpi/browsertab_add_focused.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/browsertab_inactive.png b/res/drawable-xxhdpi/browsertab_inactive.png
deleted file mode 100644
index 07d7e0e..0000000
--- a/res/drawable-xxhdpi/browsertab_inactive.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_back_hierarchy_dark.png b/res/drawable-xxhdpi/ic_back_hierarchy_dark.png
deleted file mode 100644
index 69ac65e..0000000
--- a/res/drawable-xxhdpi/ic_back_hierarchy_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_bookmark_black.png b/res/drawable-xxhdpi/ic_bookmark.png
index 1e4c01b..1e4c01b 100644
--- a/res/drawable-xxhdpi/ic_bookmark_black.png
+++ b/res/drawable-xxhdpi/ic_bookmark.png
diff --git a/res/drawable-xxhdpi/ic_bookmark_off_dark.png b/res/drawable-xxhdpi/ic_bookmark_off.png
index ba8eccb..ba8eccb 100644
--- a/res/drawable-xxhdpi/ic_bookmark_off_dark.png
+++ b/res/drawable-xxhdpi/ic_bookmark_off.png
diff --git a/res/drawable-xxhdpi/ic_bookmark_on_dark.png b/res/drawable-xxhdpi/ic_bookmark_on.png
index 33a28c0..33a28c0 100644
--- a/res/drawable-xxhdpi/ic_bookmark_on_dark.png
+++ b/res/drawable-xxhdpi/ic_bookmark_on.png
diff --git a/res/drawable-xxhdpi/ic_bookmark_widget_bookmark_dark.png b/res/drawable-xxhdpi/ic_bookmark_widget_bookmark.png
index 7267a25..7267a25 100644
--- a/res/drawable-xxhdpi/ic_bookmark_widget_bookmark_dark.png
+++ b/res/drawable-xxhdpi/ic_bookmark_widget_bookmark.png
diff --git a/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/res/drawable-xxhdpi/ic_cancel_white_24dp.png
deleted file mode 100644
index faa409f..0000000
--- a/res/drawable-xxhdpi/ic_cancel_white_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_delete_black.png b/res/drawable-xxhdpi/ic_delete.png
index 8d86e58..8d86e58 100644
--- a/res/drawable-xxhdpi/ic_delete_black.png
+++ b/res/drawable-xxhdpi/ic_delete.png
diff --git a/res/drawable-xxhdpi/ic_desktop_dark.png b/res/drawable-xxhdpi/ic_desktop.png
index b54a561..b54a561 100644
--- a/res/drawable-xxhdpi/ic_desktop_dark.png
+++ b/res/drawable-xxhdpi/ic_desktop.png
diff --git a/res/drawable-xxhdpi/ic_folder_dark.png b/res/drawable-xxhdpi/ic_folder.png
index 6bdb7d0..6bdb7d0 100644
--- a/res/drawable-xxhdpi/ic_folder_dark.png
+++ b/res/drawable-xxhdpi/ic_folder.png
diff --git a/res/drawable-xxhdpi/ic_gps_denied_dark.png b/res/drawable-xxhdpi/ic_gps_denied.png
index 0478775..0478775 100644
--- a/res/drawable-xxhdpi/ic_gps_denied_dark.png
+++ b/res/drawable-xxhdpi/ic_gps_denied.png
diff --git a/res/drawable-xxhdpi/ic_gps_on_dark.png b/res/drawable-xxhdpi/ic_gps_on.png
index 72f948e..72f948e 100644
--- a/res/drawable-xxhdpi/ic_gps_on_dark.png
+++ b/res/drawable-xxhdpi/ic_gps_on.png
diff --git a/res/drawable-xxhdpi/ic_history_dark.png b/res/drawable-xxhdpi/ic_history.png
index 3e438ec..3e438ec 100644
--- a/res/drawable-xxhdpi/ic_history_dark.png
+++ b/res/drawable-xxhdpi/ic_history.png
diff --git a/res/drawable-xxhdpi/ic_home_dark.png b/res/drawable-xxhdpi/ic_home_dark.png
deleted file mode 100644
index fd40ac3..0000000
--- a/res/drawable-xxhdpi/ic_home_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_home_info_dark.png b/res/drawable-xxhdpi/ic_home_info.png
index c67573f..c67573f 100644
--- a/res/drawable-xxhdpi/ic_home_info_dark.png
+++ b/res/drawable-xxhdpi/ic_home_info.png
diff --git a/res/drawable-xxhdpi/ic_incognito_dark.png b/res/drawable-xxhdpi/ic_incognito_dark.png
deleted file mode 100644
index 94bf80e..0000000
--- a/res/drawable-xxhdpi/ic_incognito_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_new_incognito_dark.png b/res/drawable-xxhdpi/ic_new_incognito_dark.png
deleted file mode 100644
index 2f21240..0000000
--- a/res/drawable-xxhdpi/ic_new_incognito_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_refresh_dark.png b/res/drawable-xxhdpi/ic_refresh_dark.png
deleted file mode 100644
index 72128fe..0000000
--- a/res/drawable-xxhdpi/ic_refresh_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_search_dark.png b/res/drawable-xxhdpi/ic_search.png
index 0bbeab1..0bbeab1 100644
--- a/res/drawable-xxhdpi/ic_search_dark.png
+++ b/res/drawable-xxhdpi/ic_search.png
diff --git a/res/drawable-xxhdpi/ic_secure_dark.png b/res/drawable-xxhdpi/ic_secure_dark.png
deleted file mode 100644
index 850e06e..0000000
--- a/res/drawable-xxhdpi/ic_secure_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_secure_partial_dark.png b/res/drawable-xxhdpi/ic_secure_partial_dark.png
deleted file mode 100644
index aa32a7e..0000000
--- a/res/drawable-xxhdpi/ic_secure_partial_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_settings_dark.png b/res/drawable-xxhdpi/ic_settings_dark.png
deleted file mode 100644
index 6bb8f6e..0000000
--- a/res/drawable-xxhdpi/ic_settings_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_share_dark.png b/res/drawable-xxhdpi/ic_share.png
index 9963c6a..9963c6a 100644
--- a/res/drawable-xxhdpi/ic_share_dark.png
+++ b/res/drawable-xxhdpi/ic_share.png
diff --git a/res/drawable-xxhdpi/ic_tab_close.png b/res/drawable-xxhdpi/ic_tab_close.png
deleted file mode 100644
index e9e9c7a..0000000
--- a/res/drawable-xxhdpi/ic_tab_close.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_voice_search_dark.png b/res/drawable-xxhdpi/ic_voice_search.png
index 077f8d8..077f8d8 100644
--- a/res/drawable-xxhdpi/ic_voice_search_dark.png
+++ b/res/drawable-xxhdpi/ic_voice_search.png
diff --git a/res/drawable-xxhdpi/ic_web_dark.png b/res/drawable-xxhdpi/ic_web.png
index 56e7246..56e7246 100644
--- a/res/drawable-xxhdpi/ic_web_dark.png
+++ b/res/drawable-xxhdpi/ic_web.png
diff --git a/res/drawable-xxhdpi/ic_windows_dark.png b/res/drawable-xxhdpi/ic_windows_dark.png
deleted file mode 100644
index 9ff2296..0000000
--- a/res/drawable-xxhdpi/ic_windows_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/nav_tab_bg.9.png b/res/drawable-xxhdpi/nav_tab_bg.9.png
deleted file mode 100644
index b980597..0000000
--- a/res/drawable-xxhdpi/nav_tab_bg.9.png
+++ /dev/null
diff --git a/res/drawable/add_tab_selector.xml b/res/drawable/add_tab_selector.xml
index 4898f8f..35a0404 100644
--- a/res/drawable/add_tab_selector.xml
+++ b/res/drawable/add_tab_selector.xml
@@ -18,7 +18,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_focused="false"
-        android:drawable="@drawable/browsertab_add" />
+        android:drawable="@color/primary" />
     <item android:state_focused="true"
-         android:drawable="@drawable/browsertab_add_focused" />
+         android:drawable="@color/primary" />
 </selector>
diff --git a/res/drawable/btn_checkbox_star.xml b/res/drawable/btn_checkbox_star.xml
index 6f2c75b..ddbcb53 100644
--- a/res/drawable/btn_checkbox_star.xml
+++ b/res/drawable/btn_checkbox_star.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true"
-          android:drawable="@drawable/ic_bookmark_on_dark" />
+          android:drawable="@drawable/ic_bookmark_on" />
     <item android:state_checked="false"
-          android:drawable="@drawable/ic_bookmark_off_dark" />
+          android:drawable="@drawable/ic_bookmark_off" />
 </selector>
diff --git a/res/drawable/btn_imageview_star.xml b/res/drawable/btn_imageview_star.xml
index 319c199..6de9801 100644
--- a/res/drawable/btn_imageview_star.xml
+++ b/res/drawable/btn_imageview_star.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_activated="true"
-          android:drawable="@drawable/ic_bookmark_on_dark" />
+          android:drawable="@drawable/ic_bookmark_on" />
     <item android:state_activated="false"
-          android:drawable="@drawable/ic_bookmark_off_dark" />
+          android:drawable="@drawable/ic_bookmark_off" />
 </selector>
diff --git a/res/drawable/card.xml b/res/drawable/card.xml
new file mode 100644
index 0000000..fbbf095
--- /dev/null
+++ b/res/drawable/card.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <padding android:top="10dp" android:right="10dp" android:bottom="5dp" android:left="10dp" />
+            <solid android:color="@color/trasparent" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <padding android:top="0dp" android:right="0dp" android:bottom="1dp" android:left="0dp" />
+            <solid android:color="@color/primary" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/res/drawable/ic_back_hierarchy_dark.xml b/res/drawable/ic_back.xml
index 07defc9..2f704c5 100644
--- a/res/drawable/ic_back_hierarchy_dark.xml
+++ b/res/drawable/ic_back.xml
@@ -5,11 +5,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
 
-    <group>
-        <path
-            android:fillColor="#fafafa"
-            android:pathData="M15.41 7.41l-1.41-1.41-6 6 6 6 1.41-1.41-4.58-4.59z" />
-        <path
-            android:pathData="M0 0h24v24h-24z" />
-    </group>
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" />
 </vector>
diff --git a/res/drawable/ic_back_dark.xml b/res/drawable/ic_back_disabled.xml
index f470923..f470923 100644
--- a/res/drawable/ic_back_dark.xml
+++ b/res/drawable/ic_back_disabled.xml
diff --git a/res/drawable/ic_back_hierarchy.xml b/res/drawable/ic_back_hierarchy.xml
new file mode 100644
index 0000000..2b1a1b9
--- /dev/null
+++ b/res/drawable/ic_back_hierarchy.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" />
+</vector>
diff --git a/res/drawable/ic_bookmarks_dark.xml b/res/drawable/ic_bookmarks.xml
index a7d7342..a7d7342 100644
--- a/res/drawable/ic_bookmarks_dark.xml
+++ b/res/drawable/ic_bookmarks.xml
diff --git a/res/drawable/ic_bookmarks_history_dark.xml b/res/drawable/ic_bookmarks_history.xml
index a7d7342..a7d7342 100644
--- a/res/drawable/ic_bookmarks_history_dark.xml
+++ b/res/drawable/ic_bookmarks_history.xml
diff --git a/res/drawable/ic_close_window_dark.xml b/res/drawable/ic_close_window.xml
index 5e49748..5e49748 100644
--- a/res/drawable/ic_close_window_dark.xml
+++ b/res/drawable/ic_close_window.xml
diff --git a/res/drawable/ic_forward.xml b/res/drawable/ic_forward.xml
new file mode 100644
index 0000000..1489d5e
--- /dev/null
+++ b/res/drawable/ic_forward.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z" />
+</vector>
diff --git a/res/drawable/ic_forward_dark.xml b/res/drawable/ic_forward_disabled.xml
index b75da6c..b75da6c 100644
--- a/res/drawable/ic_forward_dark.xml
+++ b/res/drawable/ic_forward_disabled.xml
diff --git a/res/drawable/ic_forward_disabled_dark.xml b/res/drawable/ic_forward_disabled_dark.xml
deleted file mode 100644
index b75da6c..0000000
--- a/res/drawable/ic_forward_disabled_dark.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <group>
-        <path
-            android:pathData="M0 0h24v24h-24z" />
-        <path
-            android:fillColor="#fafafa"
-            android:pathData="M12 4l-1.41 1.41 5.58 5.59h-12.17v2h12.17l-5.58 5.59 1.41 1.41 8-8z" />
-    </group>
-</vector>
diff --git a/res/drawable/ic_fullscreen.xml b/res/drawable/ic_fullscreen.xml
new file mode 100644
index 0000000..d955ed7
--- /dev/null
+++ b/res/drawable/ic_fullscreen.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M19 12h-2v3h-3v2h5v-5zM7 9h3V7H5v5h2V9zm14-6H3c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16.01H3V4.99h18v14.02z" />
+</vector>
diff --git a/res/drawable/ic_home.xml b/res/drawable/ic_home.xml
new file mode 100644
index 0000000..9b8ebbe
--- /dev/null
+++ b/res/drawable/ic_home.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
+</vector>
diff --git a/res/drawable/ic_incognito.xml b/res/drawable/ic_incognito.xml
new file mode 100644
index 0000000..e88d891
--- /dev/null
+++ b/res/drawable/ic_incognito.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89
+3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74 .25 -3.98 .7 l2.16 2.16C10.74 7.13
+11.35 7 12 7zM2 4.27l2.28 2.28 .46 .46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5
+11 7.5 1.55 0 3.03-.3 4.38-.84l.42 .42 L19.73 22 21 20.73 3.27 3 2 4.27zM7.53
+9.8l1.55 1.55c-.05 .21 -.08 .43 -.08 .65 0 1.66 1.34 3 3 3 .22 0 .44-.03 .65
+-.08l1.55 1.55c-.67 .33 -1.41 .53 -2.2 .53 -2.76 0-5-2.24-5-5 0-.79 .2 -1.53 .53
+-2.2zm4.31-.78l3.15 3.15 .02 -.16c0-1.66-1.34-3-3-3l-.17 .01 z" />
+</vector>
diff --git a/res/drawable/ic_menu.xml b/res/drawable/ic_menu.xml
new file mode 100644
index 0000000..8cf152f
--- /dev/null
+++ b/res/drawable/ic_menu.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
+2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
+</vector>
diff --git a/res/drawable/ic_back_disabled_dark.xml b/res/drawable/ic_menu_bookmark.xml
index f470923..2646064 100644
--- a/res/drawable/ic_back_disabled_dark.xml
+++ b/res/drawable/ic_menu_bookmark.xml
@@ -7,9 +7,10 @@
 
     <group>
         <path
-            android:pathData="M0 0h24v24h-24z" />
+            android:fillColor="#212121"
+            android:pathData="M17 3h-10c-1.1 0-1.99 .9 -1.99 2l-.01 16 7-3 7 3v-16c0-1.1-.9-2-2-2zm0
+15l-5-2.18-5 2.18v-13h10v13z" />
         <path
-            android:fillColor="#fafafa"
-            android:pathData="M20 11h-12.17l5.59-5.59-1.42-1.41-8 8 8 8 1.41-1.41-5.58-5.59h12.17v-2z" />
+            android:pathData="M0 0h24v24h-24z" />
     </group>
 </vector>
diff --git a/res/drawable/ic_menu_forward.xml b/res/drawable/ic_menu_forward.xml
new file mode 100644
index 0000000..cdf04d7
--- /dev/null
+++ b/res/drawable/ic_menu_forward.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#212121"
+        android:pathData="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z" />
+</vector>
diff --git a/res/drawable/ic_menu_stop.xml b/res/drawable/ic_menu_stop.xml
new file mode 100644
index 0000000..3189848
--- /dev/null
+++ b/res/drawable/ic_menu_stop.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#212121"
+            android:pathData="M19 6.41l-1.41-1.41-5.59 5.59-5.59-5.59-1.41 1.41 5.59 5.59-5.59 5.59 1.41 1.41
+5.59-5.59 5.59 5.59 1.41-1.41-5.59-5.59z" />
+        <path
+            android:pathData="M0 0h24v24h-24z" />
+    </group>
+</vector>
diff --git a/res/drawable/ic_new_window_dark.xml b/res/drawable/ic_new_window.xml
index 2339658..2339658 100644
--- a/res/drawable/ic_new_window_dark.xml
+++ b/res/drawable/ic_new_window.xml
diff --git a/res/drawable/ic_new_window_incognito.xml b/res/drawable/ic_new_window_incognito.xml
new file mode 100644
index 0000000..46a950e
--- /dev/null
+++ b/res/drawable/ic_new_window_incognito.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48
+10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" />
+</vector>
diff --git a/res/drawable/ic_refresh.xml b/res/drawable/ic_refresh.xml
new file mode 100644
index 0000000..4f870dc
--- /dev/null
+++ b/res/drawable/ic_refresh.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0
+6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66
+0 3.14 .69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
+</vector>
diff --git a/res/drawable/ic_refresh_dark.xml b/res/drawable/ic_refresh_dark.xml
deleted file mode 100644
index 674c8fd..0000000
--- a/res/drawable/ic_refresh_dark.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <group>
-        <path
-            android:fillColor="#fafafa"
-            android:pathData="M17.65 6.35c-1.45-1.45-3.44-2.35-5.65-2.35-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99
-8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6
-6-6c1.66 0 3.14 .69 4.22 1.78l-3.22 3.22h7v-7l-2.35 2.35z" />
-        <path
-            android:pathData="M0 0h24v24h-24z" />
-    </group>
-</vector>
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
new file mode 100644
index 0000000..1600440
--- /dev/null
+++ b/res/drawable/ic_settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M19.43 12.98c.04-.32 .07 -.64 .07 -.98s-.03-.66-.07-.98l2.11-1.65c.19-.15 .24
+-.42 .12 -.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49
+1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46 .18
+-.49 .42 l-.38 2.65c-.61 .25 -1.17 .59 -1.69 .98 l-2.49-1c-.23-.09-.49 0-.61 .22
+l-2 3.46c-.13 .22 -.07 .49 .12 .64 l2.11 1.65c-.04 .32 -.07 .65 -.07 .98 s.03
+.66 .07 .98 l-2.11 1.65c-.19 .15 -.24 .42 -.12 .64 l2 3.46c.12 .22 .39 .3 .61
+.22 l2.49-1c.52 .4 1.08 .73 1.69 .98 l.38 2.65c.03 .24 .24 .42 .49 .42 h4c.25 0
+.46-.18 .49 -.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23 .09 .49 0
+.61-.22l2-3.46c.12-.22 .07 -.49-.12-.64l-2.11-1.65zM12 15.5c-1.93
+0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z" />
+</vector>
diff --git a/res/drawable/ic_stop_dark.xml b/res/drawable/ic_stop.xml
index 5e49748..5e49748 100644
--- a/res/drawable/ic_stop_dark.xml
+++ b/res/drawable/ic_stop.xml
diff --git a/res/drawable/ic_windows.xml b/res/drawable/ic_windows.xml
new file mode 100644
index 0000000..64f4b3a
--- /dev/null
+++ b/res/drawable/ic_windows.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#fafafa"
+        android:pathData="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
+</vector>
diff --git a/res/drawable/url_background.xml b/res/drawable/url_background.xml
index f719c29..42d812c 100644
--- a/res/drawable/url_background.xml
+++ b/res/drawable/url_background.xml
@@ -18,8 +18,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_focused="true"
-        android:drawable="@drawable/textfield_active_holo_dark" />
+        android:drawable="@color/primary" />
     <item
         android:state_focused="false"
-        android:drawable="@drawable/textfield_default_holo_dark" />
-</selector>
\ No newline at end of file
+        android:drawable="@color/primary" />
+</selector>
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index dc95217..4091573 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -37,41 +37,43 @@
             android:id="@+id/gotohome"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_homescreen"
-            android:src="@drawable/ic_home_dark" />
+            android:visibility="gone"
+            android:src="@drawable/ic_home" />
         <ImageButton
             android:id="@+id/newincognitotab"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_newincognitotab"
-            android:src="@drawable/ic_new_incognito_dark" />
+            android:visibility="gone"
+            android:src="@drawable/ic_incognito" />
         <ImageButton
             android:id="@+id/newtab"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_newtab"
             android:visibility="gone"
-            android:src="@drawable/ic_new_window_dark" />
+            android:src="@drawable/ic_new_window" />
         <ImageButton
             android:id="@+id/bookmarks"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_bookmarks"
-            android:src="@drawable/ic_bookmarks_history_dark"
-            style="@style/HoloButton" />
+            android:src="@drawable/ic_bookmarks_history"
+            style="@style/BrowserButton" />
         <ImageButton
             android:id="@+id/more"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:paddingLeft="8dip"
             android:paddingRight="8dip"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_more"
             android:src="@drawable/ic_menu_overflow" />
@@ -90,6 +92,6 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:background="@drawable/floating_action_button"
-            android:src="@drawable/ic_new_window_dark"/>
+            android:src="@drawable/ic_new_window"/>
     </FrameLayout>
 </RelativeLayout>
diff --git a/res/layout-sw600dp/suggestion_item.xml b/res/layout-sw600dp/suggestion_item.xml
index b1a809b..b106ae6 100644
--- a/res/layout-sw600dp/suggestion_item.xml
+++ b/res/layout-sw600dp/suggestion_item.xml
@@ -68,17 +68,10 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:id="@+id/divider"
-        android:scaleType="center"
-        android:background="@*android:drawable/list_divider_holo_light"
-        />
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
         android:id="@+id/icon2"
         android:scaleType="center"
         android:src="@drawable/ic_querybuilder"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:paddingRight="@dimen/suggest_item_padding"
         android:paddingLeft="@dimen/suggest_item_padding"
         />
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index 62e0d78..444ea43 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -26,26 +26,26 @@
         android:orientation="horizontal">
         <ImageButton
             android:id="@+id/back"
-            android:src="@drawable/ic_back_dark"
+            android:src="@drawable/ic_back"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_back"
-            style="@style/HoloButton" />
+            style="@style/BrowserButton" />
         <ImageButton
             android:id="@+id/forward"
-            android:src="@drawable/ic_forward_dark"
+            android:src="@drawable/ic_forward"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_forward"
-            style="@style/HoloButton" />
+            style="@style/BrowserButton" />
         <ImageButton
             android:id="@+id/stop"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_stop"
-            android:src="@drawable/ic_stop_dark" />
+            android:src="@drawable/ic_stop" />
     </LinearLayout>
     <LinearLayout
         android:id="@+id/urlbar_focused"
@@ -53,21 +53,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1.0"
         android:orientation="horizontal"
-        android:background="@drawable/url_background">
-        <ImageView
-            android:id="@+id/url_icon"
-            android:layout_width="32dip"
-            android:layout_height="20dip"
-            android:src="@drawable/ic_web_dark"
-            android:layout_gravity="center" />
-        <ImageView
-            android:id="@+id/lock"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="0dip"
-            style="@style/HoloIcon"
-            android:visibility="gone" />
+        android:background="@color/primary">
         <com.android.browser.UrlInputView
             android:id="@+id/url"
             android:layout_width="0dip"
@@ -92,36 +78,36 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_addbookmark"
-            style="@style/HoloButton" />
+            style="@style/BrowserButton" />
         <ImageButton
             android:id="@+id/clear"
-            android:src="@drawable/ic_stop_dark"
+            android:src="@drawable/ic_stop"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_clear"
-            style="@style/HoloButton" />
+            style="@style/BrowserButton" />
         <ImageButton
             android:id="@+id/voice"
-            android:src="@drawable/ic_voice_search_dark"
+            android:src="@drawable/ic_voice_search"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_voice"
-            style="@style/HoloButton" />
+            style="@style/BrowserButton" />
         </LinearLayout>
     <ImageButton
         android:id="@+id/search"
-        android:src="@drawable/ic_search_dark"
+        android:src="@drawable/ic_search"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_search"
-        style="@style/HoloButton" />
+        style="@style/BrowserButton" />
     <ImageButton
         android:id="@+id/all_btn"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:scaleType="center"
-        style="@style/HoloButton"
+        style="@style/BrowserButton"
         android:contentDescription="@string/accessibility_button_bookmarks"
-        android:src="@drawable/ic_bookmarks_history_dark" />
+        android:src="@drawable/ic_bookmarks_history" />
 </com.android.browser.NavigationBarTablet>
diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml
index 2155e70..1669233 100644
--- a/res/layout-sw600dp/title_bar_snapshot.xml
+++ b/res/layout-sw600dp/title_bar_snapshot.xml
@@ -49,7 +49,7 @@
         android:layout_height="match_parent"
         android:scaleType="center"
         android:paddingRight="16dip"
-        style="@style/HoloButton"
-        android:src="@drawable/ic_bookmarks_history_dark"
+        style="@style/BrowserButton"
+        android:src="@drawable/ic_bookmarks_history"
         android:contentDescription="@string/accessibility_button_bookmarks" />
 </com.android.browser.SnapshotBar>
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index 730b74e..f00374d 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -31,7 +31,7 @@
             android:layout_marginLeft="5dip"
             android:layout_marginRight="11dip"
             android:focusable="false"
-            android:src="@drawable/ic_bookmark_on_dark"
+            android:src="@drawable/ic_bookmark_on"
             android:scaleType="fitCenter"
             />
     <LinearLayout
diff --git a/res/layout/anim_screen.xml b/res/layout/anim_screen.xml
index 0cdc931..4015ba1 100644
--- a/res/layout/anim_screen.xml
+++ b/res/layout/anim_screen.xml
@@ -23,10 +23,6 @@
     android:focusable="false"
     android:background="@drawable/browser_background_holo">
     <ImageView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_height" />
-    <ImageView
         android:id="@+id/content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index 09b442e..d19f778 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -4,9 +4,9 @@
      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.
diff --git a/res/layout/bookmarks_drag_actionmode.xml b/res/layout/bookmarks_drag_actionmode.xml
index 77e590f..17ae180 100644
--- a/res/layout/bookmarks_drag_actionmode.xml
+++ b/res/layout/bookmarks_drag_actionmode.xml
@@ -30,19 +30,19 @@
         android:layout_height="match_parent"
         android:paddingLeft="16dip"
         android:paddingRight="16dip"
-        android:src="@drawable/ic_web_dark" />
+        android:src="@drawable/ic_web" />
     <ImageView
         android:id="@+id/new_window_context_menu_id"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:paddingLeft="16dip"
         android:paddingRight="16dip"
-        android:src="@drawable/ic_new_window_dark" />
+        android:src="@drawable/ic_new_window" />
     <ImageView
         android:id="@+id/info"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:paddingLeft="16dip"
         android:paddingRight="16dip"
-        android:src="@drawable/ic_home_info_dark" />
+        android:src="@drawable/ic_home_info" />
 </LinearLayout>
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 6b4bad9..bf76592 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -61,7 +61,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:drawableLeft="@drawable/ic_bookmark_black"
+            android:drawableLeft="@drawable/ic_bookmark"
             android:text="@string/bookmark_this_page"
             android:textAppearance="?android:attr/textAppearanceMedium" />
         <View android:id="@+id/remove_divider"
@@ -76,7 +76,7 @@
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
             android:text="@string/remove"
-            android:drawableLeft="@drawable/ic_delete_black"
+            android:drawableLeft="@drawable/ic_delete"
             android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index e1f05d7..c206a2b 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -27,11 +27,11 @@
         android:layout_gravity="right"
         android:gravity="right" >
         <ImageButton android:id="@+id/subwindow_close"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:focusable="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_close_window_dark" />
+            android:src="@drawable/ic_close_window" />
     </LinearLayout>
     <LinearLayout
         android:id="@+id/inner_container"
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 374c10f..ce47ebe 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:minHeight="?android:attr/listPreferredItemHeight"
-        android:src="@drawable/ic_folder_dark" />
+        android:src="@drawable/ic_folder" />
     <TextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
diff --git a/res/layout/four_button_menu_item.xml b/res/layout/four_button_menu_item.xml
new file mode 100644
index 0000000..99c4996
--- /dev/null
+++ b/res/layout/four_button_menu_item.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:layout_gravity="top|start"
+    android:orientation="horizontal">
+
+    <ImageButton
+        android:id="@+id/button_one"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:paddingEnd="11dp"
+        android:layout_weight="24"
+        android:paddingStart="11dp"
+        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:scaleType="center" />
+
+    <ImageButton
+        android:id="@+id/button_two"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="24"
+        android:paddingStart="11dp"
+        android:paddingEnd="11dp"
+        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:scaleType="center" />
+
+    <ImageButton
+        android:id="@+id/button_three"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="24"
+        android:paddingStart="11dp"
+        android:paddingEnd="11dp"
+        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:scaleType="center" />
+
+    <ImageButton
+        android:id="@+id/button_four"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="24"
+        android:paddingStart="11dp"
+        android:paddingEnd="11dp"
+        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:scaleType="center" />
+</LinearLayout>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 46a86cf..d028ea1 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -19,7 +19,7 @@
     android:id="@+id/nav_screen"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/browser_background_holo">
+    android:background="@color/white">
     <com.android.browser.NavTabScroller
         android:id="@+id/scroller"
         android:layout_width="match_parent"
@@ -35,44 +35,37 @@
         android:background="@color/primary"
         android:elevation="8dp">
         <ImageButton
-            android:id="@+id/gotohome"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            style="@style/HoloButton"
-            android:gravity="center_vertical"
-            android:contentDescription="@string/accessibility_button_homescreen"
-            android:src="@drawable/ic_home_dark" />
-        <ImageButton
             android:id="@+id/newincognitotab"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_newincognitotab"
-            android:src="@drawable/ic_new_incognito_dark" />
+            android:visibility="gone"
+            android:src="@drawable/ic_incognito" />
         <ImageButton
             android:id="@+id/newtab"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_newtab"
             android:visibility="gone"
-            android:src="@drawable/ic_new_window_dark" />
+            android:src="@drawable/ic_new_window" />
         <ImageButton
             android:id="@+id/bookmarks"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_bookmarks"
-            android:src="@drawable/ic_bookmarks_history_dark"
-            style="@style/HoloButton" />
+            android:src="@drawable/ic_bookmarks_history"
+            style="@style/BrowserButton" />
         <ImageButton
             android:id="@+id/more"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:paddingLeft="8dip"
             android:paddingRight="8dip"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_more"
             android:src="@drawable/ic_menu_overflow" />
@@ -91,6 +84,6 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:background="@drawable/floating_action_button"
-            android:src="@drawable/ic_new_window_dark"/>
+            android:src="@drawable/ic_new_window"/>
     </FrameLayout>
 </RelativeLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index 5b1b55c..4f9c70f 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -12,52 +12,46 @@
      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.
+     android:background="@drawable/card"
 -->
 
-<LinearLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@drawable/nav_tab_bg"
     android:focusable="false"
-    android:elevation="6dp">
+    android:elevation="6dp"
+    card_view:cardCornerRadius="2dp"
+    card_view:cardElevation="4dp"
+    card_view:cardBackgroundColor="@color/primary"
+    card_view:contentPaddingLeft="8dp"
+    card_view:contentPaddingRight="8dp"
+    card_view:contentPaddingTop="8dp"
+    card_view:contentPaddingBottom="4dp"
+    card_view:cardUseCompatPadding="true">
     <LinearLayout
         android:id="@+id/titlebar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/nav_tab_titleheight"
-        android:layout_gravity="center_horizontal"
-        android:paddingLeft="8dip" >
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal">
+        <ImageView
+            android:id="@+id/tab_view"
+            android:src="@drawable/ic_stop"
+            android:layout_width="@dimen/nav_tab_width"
+            android:layout_height="@dimen/nav_tab_height"
+            android:focusable="false" />
         <TextView
             android:id="@+id/title"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1.0"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/nav_tab_titleheight"
+            android:layout_marginTop="4dp"
             android:gravity="center_vertical"
             android:singleLine="true"
             android:ellipsize="end"
-            android:lines="1"
-            android:textAppearance="?android:attr/textAppearanceSmallInverse"
-            android:scrollHorizontally="true"
-            android:drawablePadding="8dip" />
-        <ImageView
-            android:id="@+id/closetab"
-            android:src="@drawable/ic_tab_close"
-            android:layout_gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingRight="16dip"
-            android:contentDescription="@string/accessibility_button_closetab"
-            style="@style/HoloButton" />
+            android:textAppearance="?android:attr/textAppearanceSmallInverse" />
     </LinearLayout>
-    <ImageView
-        android:id="@+id/tab_view"
-        android:src="@drawable/ic_stop_dark"
-        android:layout_width="@dimen/nav_tab_width"
-        android:layout_height="@dimen/nav_tab_height"
-        android:paddingLeft="2dip"
-        android:paddingRight="2dip"
-        android:focusable="false" />
-</LinearLayout>
+</android.support.v7.widget.CardView>
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index 76cc2f2..d2ebdb4 100644
--- a/res/layout/new_folder_layout.xml
+++ b/res/layout/new_folder_layout.xml
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:minHeight="?android:attr/listPreferredItemHeight"
-        android:src="@drawable/ic_folder_dark" />
+        android:src="@drawable/ic_folder" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index 9a08517..acfa4f4 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -64,17 +64,10 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:id="@+id/divider"
-        android:scaleType="center"
-        android:background="@*android:drawable/list_divider_holo_light"
-        />
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
         android:id="@+id/icon2"
         android:scaleType="center"
         android:src="@drawable/ic_querybuilder"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:paddingRight="@dimen/suggest_item_padding"
         android:paddingLeft="@dimen/suggest_item_padding"
         />
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index 7d32a8c..144222c 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -28,6 +28,6 @@
         android:src="@drawable/ic_menu_new_window"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        style="@style/HoloButton"
+        style="@style/BrowserButton"
         android:background="@drawable/add_tab_selector" />
 </merge>
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 954ffa3..226e18d 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:src="@drawable/ic_incognito_dark"
+        android:src="@drawable/ic_incognito"
         android:contentDescription="@string/accessibility_state_incognito"
         android:visibility="gone" />
     <ImageView
@@ -59,7 +59,7 @@
         android:singleLine="true" />
     <ImageButton
         android:id="@+id/close"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/accessibility_button_closetab"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 5052757..ef1d7e4 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -35,34 +35,7 @@
             android:paddingLeft="4dip"
             android:paddingRight="8dip"
             android:visibility="gone"
-            android:src="@drawable/ic_search_dark" />
-        <ImageView
-            android:id="@+id/incognito_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="4dip"
-            android:visibility="gone"
-            android:src="@drawable/ic_incognito_dark" />
-        <FrameLayout
-            android:id="@+id/iconcombo"
-            android:layout_width="44dip"
-            android:layout_height="match_parent"
-            android:contentDescription="@string/page_info"
-            style="@style/HoloButton">
-            <ImageView
-                android:id="@+id/favicon"
-                android:layout_width="32dip"
-                android:layout_height="32dip"
-                android:paddingLeft="4dip"
-                android:paddingRight="8dip"
-                android:layout_gravity="center" />
-            <ImageView
-                android:id="@+id/lock"
-                android:layout_width="32dip"
-                android:layout_height="32dip"
-                android:layout_gravity="center"
-                android:visibility="gone" />
-        </FrameLayout>
+            android:src="@drawable/ic_search" />
         <ImageView
             android:id="@+id/stop"
             android:layout_width="wrap_content"
@@ -70,8 +43,8 @@
             android:layout_gravity="center_vertical"
             android:paddingLeft="4dip"
             android:contentDescription="@string/accessibility_button_stop"
-            android:src="@drawable/ic_stop_dark"
-            style="@style/HoloButton" />
+            android:src="@drawable/ic_stop"
+            style="@style/BrowserButton" />
         <com.android.browser.UrlInputView
             android:id="@+id/url"
             android:focusable="true"
@@ -92,36 +65,34 @@
             android:theme="@style/Widget.UrlInputView"
             android:background="@null" />
         <ImageView
-            android:id="@+id/voice"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingRight="4dip"
-            android:contentDescription="@string/accessibility_button_voice"
-            android:src="@drawable/ic_voice_search_dark"
-            style="@style/HoloButton"
-            android:visibility="gone" />
-        <ImageView
             android:id="@+id/clear"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:paddingRight="4dip"
             android:contentDescription="@string/accessibility_button_clear"
-            android:src="@drawable/ic_close_window_dark"
-            style="@style/HoloButton"
+            android:src="@drawable/ic_close_window"
+            style="@style/BrowserButton"
             android:visibility="gone" />
+        <ImageView
+            android:id="@+id/incognito_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="4dip"
+            android:visibility="gone"
+            android:src="@drawable/ic_incognito" />
     </LinearLayout>
     <ImageButton
         android:id="@+id/tab_switcher"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_navscreen"
-        android:src="@drawable/ic_windows_dark"
-        style="@style/HoloButton" />
+        android:src="@drawable/ic_windows"
+        style="@style/BrowserButton" />
     <ImageButton
         android:id="@+id/more"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        style="@style/HoloButton"
+        style="@style/BrowserButton"
         android:gravity="center_vertical"
         android:contentDescription="@string/accessibility_button_more"
         android:src="@drawable/ic_menu_overflow" />
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index c203a80..4dbc4e3 100644
--- a/res/layout/title_bar_snapshot.xml
+++ b/res/layout/title_bar_snapshot.xml
@@ -57,14 +57,14 @@
         android:id="@+id/tab_switcher"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:src="@drawable/ic_windows_dark"
+        android:src="@drawable/ic_windows"
         android:contentDescription="@string/accessibility_button_navscreen"
-        style="@style/HoloButton" />
+        style="@style/BrowserButton" />
     <ImageButton
         android:id="@+id/more"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        style="@style/HoloButton"
+        style="@style/BrowserButton"
         android:gravity="center_vertical"
         android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark"
         android:contentDescription="@string/accessibility_button_more" />
diff --git a/res/layout/widget_account_selection.xml b/res/layout/widget_account_selection.xml
index 5dcd210..a66d7b8 100644
--- a/res/layout/widget_account_selection.xml
+++ b/res/layout/widget_account_selection.xml
@@ -54,4 +54,3 @@
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
-
diff --git a/res/menu-sw600dp/combined.xml b/res/menu-sw600dp/combined.xml
index 3c02d03..96ab79a 100644
--- a/res/menu-sw600dp/combined.xml
+++ b/res/menu-sw600dp/combined.xml
@@ -18,7 +18,7 @@
     <item
         android:id="@+id/preferences_menu_id"
         android:title="@string/menu_preferences"
-        android:icon="@drawable/ic_settings_dark"
+        android:icon="@drawable/ic_settings"
         android:alphabeticShortcut="p"
         android:showAsAction="ifRoom"
         android:orderInCategory="1000" />
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 73f988c..afd9565 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -1,12 +1,9 @@
 <?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.
@@ -31,30 +28,30 @@
         <item
             android:id="@+id/new_tab_menu_id"
             android:title="@string/new_tab"
-            android:icon="@drawable/ic_new_window_dark"
+            android:icon="@drawable/ic_new_window"
             android:showAsAction="never"
             android:alphabeticShortcut="n" />
         <item
             android:id="@+id/bookmarks_menu_id"
             android:title="@string/bookmarks"
-            android:icon="@drawable/ic_bookmarks_dark"
+            android:icon="@drawable/ic_bookmarks"
             android:showAsAction="never" />
         <item
             android:id="@+id/add_bookmark_menu_id"
             android:title="@string/save_to_bookmarks"
-            android:icon="@drawable/ic_bookmark_on_dark"
+            android:icon="@drawable/ic_bookmark_on"
             android:alphabeticShortcut="d"
             android:visible="@bool/menu_show_bookmarks" />
-        <item
+        <!--item
             android:id="@+id/fullscreen_menu_id"
             android:checkable="true"
-            android:title="@string/pref_lab_fullscreen" />
+            android:title="@string/pref_lab_fullscreen" /-->
         <group
             android:id="@+id/LIVE_MENU">
             <item
                 android:id="@+id/share_page_menu_id"
                 android:title="@string/share_page"
-                android:icon="@drawable/ic_share_dark"
+                android:icon="@drawable/ic_share"
                 android:alphabeticShortcut="s" />
             <item
                 android:id="@+id/find_menu_id"
@@ -89,7 +86,7 @@
         <item
             android:id="@+id/preferences_menu_id"
             android:title="@string/menu_preferences"
-            android:icon="@drawable/ic_settings_dark"
+            android:icon="@drawable/ic_settings"
             android:alphabeticShortcut="p" />
         <!-- followings are debug only -->
         <item
diff --git a/res/menu/url_selection.xml b/res/menu/url_selection.xml
index 33e9ae0..8c505a9 100644
--- a/res/menu/url_selection.xml
+++ b/res/menu/url_selection.xml
@@ -16,7 +16,7 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/share"
-        android:icon="@drawable/ic_share_dark"
+        android:icon="@drawable/ic_share"
         android:title="@string/menu_share_url"
         android:showAsAction="always|withText"
         />
diff --git a/res/mipmap-hdpi/ic_launcher_browser.png b/res/mipmap-hdpi/ic_launcher_browser.png
index a346c60..8c877ea 100644
--- a/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/res/mipmap-hdpi/ic_launcher_browser.png
diff --git a/res/mipmap-mdpi/ic_launcher_browser.png b/res/mipmap-mdpi/ic_launcher_browser.png
index 5f41c8e..9def2da 100644
--- a/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/res/mipmap-mdpi/ic_launcher_browser.png
diff --git a/res/mipmap-xhdpi/ic_launcher_browser.png b/res/mipmap-xhdpi/ic_launcher_browser.png
index 4e1f08e..aee578b 100644
--- a/res/mipmap-xhdpi/ic_launcher_browser.png
+++ b/res/mipmap-xhdpi/ic_launcher_browser.png
diff --git a/res/mipmap-xxhdpi/ic_launcher_browser.png b/res/mipmap-xxhdpi/ic_launcher_browser.png
index 3c99526..1cc15be 100644
--- a/res/mipmap-xxhdpi/ic_launcher_browser.png
+++ b/res/mipmap-xxhdpi/ic_launcher_browser.png
diff --git a/res/mipmap-xxxhdpi/ic_launcher_browser.png b/res/mipmap-xxxhdpi/ic_launcher_browser.png
index 531d05b..852323f 100644
--- a/res/mipmap-xxxhdpi/ic_launcher_browser.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_browser.png
diff --git a/res/xml/lab_preferences.xml b/res/values/cm_colors.xml
index a7151e0..c9dd6af 100644
--- a/res/xml/lab_preferences.xml
+++ b/res/values/cm_colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android" >
-    <CheckBoxPreference
-        android:key="enable_quick_controls"
-        android:defaultValue="false"
-        android:title="@string/pref_lab_quick_controls"
-        android:summary="@string/pref_lab_quick_controls_summary" />
-</PreferenceScreen>
+<resources>
+    <color name="white">#fafafa</color>
+    <color name="black">#212121</color>
+    <color name="primary">#4caf50</color>
+    <color name="primary_dark">#388e3c</color>
+    <color name="accent">#1b5e20</color>
+    <color name="floating_action_button_touch_tint">#388e3c</color>
+    <color name="trasparent">#00000000</color>
+</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index ebcc697..e5f22ac 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -27,4 +27,16 @@
 
     <!-- User agent label -->
     <string name="pref_content_ua">User agent</string>
+
+    <!-- Interface preferences -->
+    <string name="pref_interface_title">Interface</string>
+
+    <!-- FullScreen -->
+    <string name="full_screen_title">Fullscreen</string>
+    <string name="full_screen_summary">Enable immersive navigation</string>
+
+    <!-- OneHand -->
+    <string name="onehand_title">OneHand Navigation</string>
+    <string name="onehand_summary">Easier web navigation with swipes and quick actions</string>
+
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3b362aa..706180d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,12 +20,6 @@
 <!-- FIXME: Change the name of this file!  It is now being used generically
     for the browser -->
 <resources>
-    <color name="white">#fafafa</color>
-    <color name="black">#212121</color>
-    <color name="primary">#4caf50</color>
-    <color name="primary_dark">#388e3c</color>
-    <color name="accent">#1b5e20</color>
-    <color name="floating_action_button_touch_tint">#388e3c</color>
     <color name="bookmarkWidgetHeader">#383847</color>
     <color name="bookmarkWidgetDivider">#383847</color>
     <color name="bookmarkWidgetItemBackground">#2b2b3c</color>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index b285344..59e235e 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -69,7 +69,7 @@
     <dimen name="tab_thumbnail_height">160dip</dimen>
     <dimen name="nav_tab_width">240dip</dimen>
     <dimen name="nav_tab_height">160dip</dimen>
-    <dimen name="nav_tab_titleheight">32dip</dimen>
+    <dimen name="nav_tab_titleheight">24dip</dimen>
     <dimen name="nav_tab_text_normal">18sp</dimen>
     <dimen name="nav_tab_text_small">14sp</dimen>
     <dimen name="suggest_item_padding">8dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0ad7ffe..6541904 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -62,7 +62,7 @@
         <item name="android:textColorHint">?android:attr/textColorHintInverse</item>
     </style>
     <style name="Widget.UrlInputView" parent="BrowserTheme">
-        <item name="android:colorAccent">@color/accent</item>
+        <!--item name="android:colorAccent">@color/accent</item-->
     </style>
     <style name="SuggestionLineMedium"
             parent="@android:style/TextAppearance.Material.Medium">
@@ -84,8 +84,8 @@
     <style name="HoloIcon">
         <item name="android:layout_marginLeft">16dip</item>
     </style>
-    <style name="HoloButton">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+    <style name="BrowserButton">
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
         <item name="android:paddingLeft">8dip</item>
         <item name="android:paddingRight">8dip</item>
     </style>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index d2b9c51..b12df57 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -22,13 +22,10 @@
         android:entryValues="@array/pref_homepage_values"
         android:title="@string/pref_content_homepage" />
 
-    <PreferenceCategory android:title="@string/pref_general_autofill_title">
-        <CheckBoxPreference android:key="autofill_enabled"
-            android:title="@string/pref_autofill_enabled"
-            android:summary="@string/pref_autofill_enabled_summary"
-            android:defaultValue="true"
+    <CheckBoxPreference android:key="autofill_enabled"
+        android:title="@string/pref_autofill_enabled"
+        android:summary="@string/pref_autofill_enabled_summary"
+        android:defaultValue="true"
         />
 
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml-sw600dp/lab_preferences.xml b/res/xml/interface_preferences.xml
index a7151e0..f4fbc71 100644
--- a/res/xml-sw600dp/lab_preferences.xml
+++ b/res/xml/interface_preferences.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2015 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,8 +17,13 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android" >
     <CheckBoxPreference
+        android:key="fullscreen"
+        android:defaultValue="false"
+        android:title="@string/pref_lab_fullscreen"
+        android:summary="@string/pref_lab_fullscreen_summary" />
+    <CheckBoxPreference
         android:key="enable_quick_controls"
         android:defaultValue="false"
-        android:title="@string/pref_lab_quick_controls"
-        android:summary="@string/pref_lab_quick_controls_summary" />
+        android:title="@string/onehand_title"
+        android:summary="@string/onehand_summary" />
 </PreferenceScreen>
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
index 2c80835..9265a2c 100644
--- a/res/xml/preference_headers.xml
+++ b/res/xml/preference_headers.xml
@@ -36,8 +36,8 @@
         android:title="@string/pref_data_title"
     />
 
-    <header android:fragment="com.android.browser.preferences.LabPreferencesFragment"
-        android:title="@string/pref_lab_title"
+    <header android:fragment="com.android.browser.preferences.InterfacePreferencesFragment"
+        android:title="@string/pref_interface_title"
     />
 
 </preference-headers>
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 6f3779a..c4365e4 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -669,7 +669,7 @@ public class AddBookmarkPage extends Activity
         mCrumbs = (BreadCrumbView) findViewById(R.id.crumbs);
         mCrumbs.setUseBackButton(true);
         mCrumbs.setController(this);
-        mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder_dark);
+        mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder);
         mCrumbHolder = findViewById(R.id.crumb_holder);
         mCrumbs.setMaxVisible(MAX_CRUMBS_SHOWN);
 
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 939874f..cdfc5a2 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -34,6 +34,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
+import android.view.GestureDetector;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -87,16 +88,13 @@ public abstract class BaseUi implements UI {
     protected Tab mActiveTab;
     private InputMethodManager mInputManager;
 
-    private Drawable mLockIconSecure;
-    private Drawable mLockIconMixed;
-    protected Drawable mGenericFavicon;
-
     protected FrameLayout mContentView;
     protected FrameLayout mCustomViewContainer;
     protected FrameLayout mFullscreenContainer;
     private FrameLayout mFixedTitlebarContainer;
 
     private View mCustomView;
+    private View mDecorView;
     private WebChromeClient.CustomViewCallback mCustomViewCallback;
     private int mOriginalOrientation;
 
@@ -125,8 +123,6 @@ public abstract class BaseUi implements UI {
         Resources res = mActivity.getResources();
         mInputManager = (InputMethodManager)
                 browser.getSystemService(Activity.INPUT_METHOD_SERVICE);
-        mLockIconSecure = res.getDrawable(R.drawable.ic_secure_dark);
-        mLockIconMixed = res.getDrawable(R.drawable.ic_secure_partial_dark);
         FrameLayout frameLayout = (FrameLayout) mActivity.getWindow()
                 .getDecorView().findViewById(android.R.id.content);
         LayoutInflater.from(mActivity)
@@ -139,9 +135,7 @@ public abstract class BaseUi implements UI {
                 R.id.fullscreen_custom_content);
         mErrorConsoleContainer = (LinearLayout) frameLayout
                 .findViewById(R.id.error_console);
-        setFullscreen(false);
-        mGenericFavicon = res.getDrawable(
-                R.drawable.app_web_browser_sm);
+        setImmersiveFullscreen(BrowserSettings.getInstance().useFullscreen());
         mTitleBar = new TitleBar(mActivity, mUiController, this,
                 mContentView);
         mTitleBar.setProgress(100);
@@ -149,6 +143,8 @@ public abstract class BaseUi implements UI {
         mUrlBarAutoShowManager = new UrlBarAutoShowManager(this);
     }
 
+
+
     private void cancelStopToast() {
         if (mStopToast != null) {
             mStopToast.cancel();
@@ -223,8 +219,6 @@ public abstract class BaseUi implements UI {
     @Override
     public void onTabDataChanged(Tab tab) {
         setUrlTitle(tab);
-        setFavicon(tab);
-        updateLockIconToLatest(tab);
         updateNavigationState(tab);
         mTitleBar.onTabDataChanged(tab);
         mNavigationBar.onTabDataChanged(tab);
@@ -603,31 +597,6 @@ public abstract class BaseUi implements UI {
         mTitleBar.updateAutoLogin(tab, animate);
     }
 
-    /**
-     * Update the lock icon to correspond to our latest state.
-     */
-    protected void updateLockIconToLatest(Tab t) {
-        if (t != null && t.inForeground()) {
-            updateLockIconImage(t.getSecurityState());
-        }
-    }
-
-    /**
-     * Updates the lock-icon image in the title-bar.
-     */
-    private void updateLockIconImage(SecurityState securityState) {
-        Drawable d = null;
-        if (securityState == SecurityState.SECURITY_STATE_SECURE) {
-            d = mLockIconSecure;
-        } else if (securityState == SecurityState.SECURITY_STATE_MIXED
-                || securityState == SecurityState.SECURITY_STATE_BAD_CERTIFICATE) {
-            // TODO: It would be good to have different icons for insecure vs mixed content.
-            // See http://b/5403800
-            d = mLockIconMixed;
-        }
-        mNavigationBar.setLock(d);
-    }
-
     protected void setUrlTitle(Tab tab) {
         String url = tab.getUrl();
         String title = tab.getTitle();
@@ -639,14 +608,6 @@ public abstract class BaseUi implements UI {
         }
     }
 
-    // Set the favicon in the title bar.
-    protected void setFavicon(Tab tab) {
-        if (tab.inForeground()) {
-            Bitmap icon = tab.getFavicon();
-            mNavigationBar.setFavicon(icon);
-        }
-    }
-
     @Override
     public void onActionModeFinished(boolean inLoad) {
     }
@@ -775,27 +736,19 @@ public abstract class BaseUi implements UI {
     }
 
     public void setFullscreen(boolean enabled) {
-        Window win = mActivity.getWindow();
-        WindowManager.LayoutParams winParams = win.getAttributes();
-        final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN;
+        FrameLayout decor = (FrameLayout) mActivity.getWindow().getDecorView();
+        int systemUiVisibility = decor.getSystemUiVisibility();
+        final int bits = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+            | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+            | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+            | View.SYSTEM_UI_FLAG_FULLSCREEN
+            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
         if (enabled) {
-            winParams.flags |=  bits;
+            systemUiVisibility |= bits;
         } else {
-            winParams.flags &= ~bits;
-            if (mCustomView != null) {
-                mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-            } else {
-                mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-            }
+            systemUiVisibility &= ~bits;
         }
-        win.setAttributes(winParams);
-    }
-
-    public boolean isFullscreen() {
-        Window win = mActivity.getWindow();
-        WindowManager.LayoutParams winParams = win.getAttributes();
-        final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN;
-        return (winParams.flags & bits) == bits;
+        decor.setSystemUiVisibility(systemUiVisibility);
     }
 
     protected void setImmersiveFullscreen (boolean enabled) {
@@ -814,22 +767,6 @@ public abstract class BaseUi implements UI {
         decor.setSystemUiVisibility(systemUiVisibility);
     }
 
-    public Drawable getFaviconDrawable(Bitmap icon) {
-        Drawable[] array = new Drawable[3];
-        array[0] = new PaintDrawable(Color.BLACK);
-        PaintDrawable p = new PaintDrawable(Color.WHITE);
-        array[1] = p;
-        if (icon == null) {
-            array[2] = mGenericFavicon;
-        } else {
-            array[2] = new BitmapDrawable(icon);
-        }
-        LayerDrawable d = new LayerDrawable(array);
-        d.setLayerInset(1, 1, 1, 1, 1);
-        d.setLayerInset(2, 2, 2, 2, 2);
-        return d;
-    }
-
     public boolean isLoading() {
         return mActiveTab != null ? mActiveTab.inPageLoad() : false;
     }
diff --git a/src/com/android/browser/BreadCrumbView.java b/src/com/android/browser/BreadCrumbView.java
index c8d0f2b..b6810d9 100644
--- a/src/com/android/browser/BreadCrumbView.java
+++ b/src/com/android/browser/BreadCrumbView.java
@@ -169,10 +169,10 @@ public class BreadCrumbView extends LinearLayout implements OnClickListener {
 
     private void addBackButton() {
         mBackButton = new ImageButton(mContext);
-        mBackButton.setImageResource(R.drawable.ic_back_hierarchy_dark);
+        mBackButton.setImageResource(R.drawable.ic_back_hierarchy);
         TypedValue outValue = new TypedValue();
         getContext().getTheme().resolveAttribute(
-                android.R.attr.selectableItemBackground, outValue, true);
+                android.R.attr.selectableItemBackgroundBorderless, outValue, true);
         int resid = outValue.resourceId;
         mBackButton.setBackgroundResource(resid);
         mBackButton.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 3a0c65a..a83c00b 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -309,7 +309,7 @@ public class BrowserBookmarksPage extends Fragment implements View.OnCreateConte
         if (isFolder) {
             item.setUrl(null);
             Bitmap bitmap =
-                BitmapFactory.decodeResource(getResources(), R.drawable.ic_folder_dark);
+                BitmapFactory.decodeResource(getResources(), R.drawable.ic_folder);
             item.setFavicon(bitmap);
             new LookupBookmarkCount(getActivity(), item)
                     .execute(cursor.getLong(BookmarksLoader.COLUMN_INDEX_ID));
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 323b9b8..75cee06 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -27,7 +27,7 @@ import com.android.browser.preferences.AdvancedPreferencesFragment;
 import com.android.browser.preferences.BandwidthPreferencesFragment;
 import com.android.browser.preferences.DebugPreferencesFragment;
 import com.android.browser.preferences.GeneralPreferencesFragment;
-import com.android.browser.preferences.LabPreferencesFragment;
+import com.android.browser.preferences.InterfacePreferencesFragment;
 import com.android.browser.preferences.PrivacySecurityPreferencesFragment;
 import com.android.browser.preferences.WebsiteSettingsFragment;
 
@@ -111,7 +111,7 @@ public class BrowserPreferencesPage extends PreferenceActivity {
                 BandwidthPreferencesFragment.class.getName().equals(fragmentName) ||
                 DebugPreferencesFragment.class.getName().equals(fragmentName) ||
                 GeneralPreferencesFragment.class.getName().equals(fragmentName) ||
-                LabPreferencesFragment.class.getName().equals(fragmentName) ||
+                InterfacePreferencesFragment.class.getName().equals(fragmentName) ||
                 PrivacySecurityPreferencesFragment.class.getName().equals(fragmentName) ||
                 WebsiteSettingsFragment.class.getName().equals(fragmentName);
 
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 95b7706..e76fa5d 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -340,6 +340,10 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
         syncManagedSettings();
         if (PREF_SEARCH_ENGINE.equals(key)) {
             updateSearchEngine(false);
+        } else if (PREF_FULLSCREEN.equals(key)) {
+            if (mController != null && mController.getUi() != null) {
+                mController.getUi().setFullscreen(useFullscreen());
+            }
         } else if (PREF_ENABLE_QUICK_CONTROLS.equals(key)) {
             if (mController != null && mController.getUi() != null) {
                 mController.getUi().setUseQuickControls(sharedPreferences.getBoolean(key, false));
@@ -762,7 +766,7 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
     }
 
     // -----------------------------
-    // getter/setters for lab_preferences.xml
+    // getter/setters for interface.xml
     // -----------------------------
 
     public boolean useQuickControls() {
@@ -773,6 +777,10 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
         return HomeProvider.MOST_VISITED.equals(getHomePage());
     }
 
+    public boolean useFullscreen() {
+        return mPrefs.getBoolean(PREF_FULLSCREEN, false);
+    }
+
     public boolean useInvertedRendering() {
         return mPrefs.getBoolean(PREF_INVERTED, false);
     }
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 8c77270..f006986 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -79,6 +79,8 @@ import android.webkit.WebChromeClient.FileChooserParams;
 import android.webkit.WebIconDatabase;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.Toast;
 
 import com.android.browser.IntentHandler.UrlData;
@@ -365,6 +367,7 @@ public class Controller
                 && BrowserActivity.ACTION_SHOW_BOOKMARKS.equals(intent.getAction())) {
             bookmarksOrHistoryPicker(ComboViews.Bookmarks);
         }
+
     }
 
     private static class PruneThumbnails implements Runnable {
@@ -396,7 +399,6 @@ public class Controller
                 cr.delete(Thumbnails.CONTENT_URI, where.toString(), null);
             }
         }
-
     }
 
     @Override
@@ -1586,9 +1588,6 @@ public class Controller
         final MenuItem uaSwitcher = menu.findItem(R.id.ua_desktop_menu_id);
         uaSwitcher.setChecked(isDesktopUa);
 
-        final MenuItem fullscreen = menu.findItem(R.id.fullscreen_menu_id);
-        fullscreen.setChecked(mUi.isFullscreen());
-
         menu.setGroupVisible(R.id.LIVE_MENU, isLive);
         menu.setGroupVisible(R.id.SNAPSHOT_MENU, !isLive);
         menu.setGroupVisible(R.id.COMBO_MENU, false);
@@ -1652,7 +1651,7 @@ public class Controller
 
             case R.id.back_menu_id:
                 getCurrentTab().goBack();
-                break;
+                 break;
 
             case R.id.forward_menu_id:
                 getCurrentTab().goForward();
@@ -1716,9 +1715,6 @@ public class Controller
                 toggleUserAgent();
                 break;
 
-            case R.id.fullscreen_menu_id:
-                toggleFullscreen();
-
             case R.id.window_one_menu_id:
             case R.id.window_two_menu_id:
             case R.id.window_three_menu_id:
@@ -1756,11 +1752,6 @@ public class Controller
     }
 
     @Override
-    public void toggleFullscreen() {
-        mUi.setFullscreen(!mUi.isFullscreen());
-    }
-
-    @Override
     public void findOnPage() {
         getCurrentTopWebView().showFindDialog(null, true);
     }
diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index f7b73df..887ffca 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -65,7 +65,6 @@ public class NavScreen extends RelativeLayout
     FrameLayout mHolder;
 
     TextView mTitle;
-    ImageView mFavicon;
     ImageButton mCloseTab;
     ImageView mNewTabFab;
 
@@ -128,7 +127,6 @@ public class NavScreen extends RelativeLayout
         mNewTab = (ImageButton) findViewById(R.id.newtab);
         mMore = (ImageButton) findViewById(R.id.more);
         mBookmarks.setOnClickListener(this);
-        mHomeTab.setOnClickListener(this);
         mNewIncognitoTab.setOnClickListener(this);
         mNewTab.setOnClickListener(this);
         mMore.setOnClickListener(this);
@@ -148,13 +146,19 @@ public class NavScreen extends RelativeLayout
             }
         });
         mNewTabFab = (ImageView) findViewById(R.id.floating_action_button);
-        mNewTabFab.setOnClickListener(
-        new View.OnClickListener() {
+        mNewTabFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 openNewTab(false);
             }
         });
+        mNewTabFab.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                openNewTab(true);
+                return true;
+            }
+        });
     }
 
     @Override
@@ -223,14 +227,14 @@ public class NavScreen extends RelativeLayout
         }
     }
 
-    private Tab findCenteredTab(){
+    private Tab findCenteredTab() {
         View v = mScroller.findViewAt(mScroller.getWidth() / 2, mScroller.getHeight() / 2);
-        if( v != null && v instanceof NavTabView ){
-            Long tabId = ((NavTabView)v).getWebViewId();
-            if( tabId != null ){
+        if (v != null && v instanceof NavTabView) {
+            long tabId = ((NavTabView)v).getWebViewId();
+            if (tabId != -1) {
                 List<Tab> tabs = mUiController.getTabs();
-                for( int i=0; i<tabs.size(); i++ ){
-                    if( tabs.get(i).getId() == tabId.longValue() ) {
+                for (int i = 0; i < tabs.size(); i++) {
+                    if (tabs.get(i).getId() == tabId) {
                         return tabs.get(i);
                     }
                 }
@@ -290,10 +294,7 @@ public class NavScreen extends RelativeLayout
             tabview.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (tabview.isClose(v)) {
-                        mScroller.animateOut(tabview);
-                        mTabViews.remove(tab);
-                    } else if (tabview.isTitle(v)) {
+                    if (tabview.isTitle(v)) {
                         switchToTab(tab);
                         mUi.getTitleBar().setSkipTitleBarAnimations(true);
                         close(position, false);
diff --git a/src/com/android/browser/NavTabView.java b/src/com/android/browser/NavTabView.java
index de50317..17b0425 100644
--- a/src/com/android/browser/NavTabView.java
+++ b/src/com/android/browser/NavTabView.java
@@ -31,7 +31,6 @@ public class NavTabView extends LinearLayout {
 
     private ViewGroup mContent;
     private Tab mTab;
-    private ImageView mClose;
     private TextView mTitle;
     private View mTitleBar;
     ImageView mImage;
@@ -56,16 +55,11 @@ public class NavTabView extends LinearLayout {
     private void init() {
         LayoutInflater.from(mContext).inflate(R.layout.nav_tab_view, this);
         mContent = (ViewGroup) findViewById(R.id.main);
-        mClose = (ImageView) findViewById(R.id.closetab);
-        mTitle = (TextView) findViewById(R.id.title);
         mTitleBar = findViewById(R.id.titlebar);
+        mTitle = (TextView) findViewById(R.id.title);
         mImage = (ImageView) findViewById(R.id.tab_view);
     }
 
-    protected boolean isClose(View v) {
-        return v == mClose;
-    }
-
     protected boolean isTitle(View v) {
         return v == mTitleBar;
     }
@@ -85,31 +79,30 @@ public class NavTabView extends LinearLayout {
             }
             mTitle.setText(txt);
         }
-        if (mTab.isSnapshot()) {
-            setTitleIcon(R.drawable.ic_history_dark);
-        } else if (mTab.isPrivateBrowsingEnabled()) {
-            setTitleIcon(R.drawable.ic_incognito_dark);
-        } else {
-            setTitleIcon(0);
+        if (!mTab.isSnapshot()) {
+            setTitleIcon();
         }
     }
 
-    private void setTitleIcon(int id) {
-        if (id == 0) {
-            mTitle.setPadding(mTitle.getCompoundDrawablePadding(), 0, 0, 0);
-        } else {
-            mTitle.setPadding(0, 0, 0, 0);
-        }
-        mTitle.setCompoundDrawablesWithIntrinsicBounds(id, 0, 0, 0);
-    }
+    private void setTitleIcon() {
+        mTitle.setPadding(mTitle.getCompoundDrawablePadding(), 0, 0, 0);
+        mTitle.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+     }
 
     protected boolean isHighlighted() {
         return mHighlighted;
     }
 
-    protected Long getWebViewId(){
-        if(mTab == null) return null;
-        return new Long(mTab.getId());
+    protected long getWebViewId() {
+        return mTab != null ? mTab.getId() : -1;
+    }
+
+    protected int getContentLeft() {
+        return getLeft() + mTitleBar.getLeft() + mImage.getLeft();
+    }
+
+    protected int getContentTop() {
+        return getTop() + mTitleBar.getTop() + mImage.getTop();
     }
 
     protected void setWebView(Tab tab) {
@@ -128,7 +121,6 @@ public class NavTabView extends LinearLayout {
     public void setOnClickListener(OnClickListener listener) {
         mClickListener = listener;
         mTitleBar.setOnClickListener(mClickListener);
-        mClose.setOnClickListener(mClickListener);
         if (mImage != null) {
             mImage.setOnClickListener(mClickListener);
         }
diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index 7f100ff..00702e6 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -87,11 +87,6 @@ public class NavigationBarBase extends LinearLayout implements
         }
     }
 
-    public void setFavicon(Bitmap icon) {
-        if (mFavicon == null) return;
-        mFavicon.setImageDrawable(mBaseUi.getFaviconDrawable(icon));
-    }
-
     @Override
     public void onClick(View v) {
     }
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index cdf73c7..d1920e8 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -38,13 +38,11 @@ public class NavigationBarPhone extends NavigationBarBase implements
     private ImageView mStopButton;
     private ImageView mMagnify;
     private ImageView mClearButton;
-    private ImageView mVoiceButton;
     private Drawable mStopDrawable;
     private Drawable mRefreshDrawable;
     private String mStopDescription;
     private String mRefreshDescription;
     private View mTabSwitcher;
-    private View mComboIcon;
     private View mTitleContainer;
     private View mMore;
     private Drawable mTextfieldBgDrawable;
@@ -71,20 +69,16 @@ public class NavigationBarPhone extends NavigationBarBase implements
         mStopButton.setOnClickListener(this);
         mClearButton = (ImageView) findViewById(R.id.clear);
         mClearButton.setOnClickListener(this);
-        mVoiceButton = (ImageView) findViewById(R.id.voice);
-        mVoiceButton.setOnClickListener(this);
         mMagnify = (ImageView) findViewById(R.id.magnify);
         mTabSwitcher = findViewById(R.id.tab_switcher);
         mTabSwitcher.setOnClickListener(this);
         mMore = findViewById(R.id.more);
         mMore.setOnClickListener(this);
-        mComboIcon = findViewById(R.id.iconcombo);
-        mComboIcon.setOnClickListener(this);
         mTitleContainer = findViewById(R.id.title_bg);
         setFocusState(false);
         Resources res = getContext().getResources();
-        mStopDrawable = res.getDrawable(R.drawable.ic_stop_dark);
-        mRefreshDrawable = res.getDrawable(R.drawable.ic_refresh_dark);
+        mStopDrawable = res.getDrawable(R.drawable.ic_stop);
+        mRefreshDrawable = res.getDrawable(R.drawable.ic_refresh);
         mStopDescription = res.getString(R.string.accessibility_button_stop);
         mRefreshDescription = res.getString(R.string.accessibility_button_refresh);
         mTextfieldBgDrawable = res.getDrawable(R.drawable.textfield_active_holo_dark);
@@ -100,7 +94,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
             mStopButton.setImageDrawable(mStopDrawable);
             mStopButton.setContentDescription(mStopDescription);
             if (mStopButton.getVisibility() != View.VISIBLE) {
-                mComboIcon.setVisibility(View.GONE);
                 mStopButton.setVisibility(View.VISIBLE);
             }
         }
@@ -111,9 +104,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
         super.onProgressStopped();
         mStopButton.setImageDrawable(mRefreshDrawable);
         mStopButton.setContentDescription(mRefreshDescription);
-        if (!isEditingUrl()) {
-            mComboIcon.setVisibility(View.VISIBLE);
-        }
         onStateChanged(mUrlInput.getState());
     }
 
@@ -153,10 +143,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
             showMenu(mMore);
         } else if (mClearButton == v) {
             mUrlInput.setText("");
-        } else if (mComboIcon == v) {
-            mUiController.showPageInfo();
-        } else if (mVoiceButton == v) {
-            mUiController.startVoiceRecognizer();
         } else {
             super.onClick(v);
         }
@@ -213,10 +199,8 @@ public class NavigationBarPhone extends NavigationBarBase implements
 
     @Override
     public void onStateChanged(int state) {
-        mVoiceButton.setVisibility(View.GONE);
         switch(state) {
         case StateListener.STATE_NORMAL:
-            mComboIcon.setVisibility(View.VISIBLE);
             mStopButton.setVisibility(View.GONE);
             mClearButton.setVisibility(View.GONE);
             mMagnify.setVisibility(View.GONE);
@@ -225,19 +209,14 @@ public class NavigationBarPhone extends NavigationBarBase implements
             mMore.setVisibility(View.VISIBLE);
             break;
         case StateListener.STATE_HIGHLIGHTED:
-            mComboIcon.setVisibility(View.GONE);
             mStopButton.setVisibility(View.VISIBLE);
             mClearButton.setVisibility(View.GONE);
-            if ((mUiController != null) && mUiController.supportsVoice()) {
-                mVoiceButton.setVisibility(View.VISIBLE);
-            }
             mMagnify.setVisibility(View.GONE);
             mTabSwitcher.setVisibility(View.GONE);
             mMore.setVisibility(View.GONE);
             mTitleContainer.setBackgroundDrawable(mTextfieldBgDrawable);
             break;
         case StateListener.STATE_EDITED:
-            mComboIcon.setVisibility(View.GONE);
             mStopButton.setVisibility(View.GONE);
             mClearButton.setVisibility(View.VISIBLE);
             mMagnify.setVisibility(View.VISIBLE);
diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java
index d66553f..5fce727 100644
--- a/src/com/android/browser/NavigationBarTablet.java
+++ b/src/com/android/browser/NavigationBarTablet.java
@@ -45,7 +45,6 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe
     private ImageButton mBackButton;
     private ImageButton mForwardButton;
     private ImageView mStar;
-    private ImageView mUrlIcon;
     private ImageView mSearchButton;
     private ImageView mStopButton;
     private View mAllButton;
@@ -55,7 +54,6 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe
     private Drawable mFocusDrawable;
     private Drawable mUnfocusDrawable;
     private boolean mHideNavButtons;
-    private Drawable mFaviconDrawable;
 
     public NavigationBarTablet(Context context) {
         super(context);
@@ -74,8 +72,8 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe
 
     private void init(Context context) {
         Resources resources = context.getResources();
-        mStopDrawable = resources.getDrawable(R.drawable.ic_stop_dark);
-        mReloadDrawable = resources.getDrawable(R.drawable.ic_refresh_dark);
+        mStopDrawable = resources.getDrawable(R.drawable.ic_stop);
+        mReloadDrawable = resources.getDrawable(R.drawable.ic_refresh);
         mStopDescription = resources.getString(R.string.accessibility_button_stop);
         mRefreshDescription = resources.getString(R.string.accessibility_button_refresh);
         mFocusDrawable = resources.getDrawable(
@@ -94,7 +92,6 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe
         mNavButtons = findViewById(R.id.navbuttons);
         mBackButton = (ImageButton) findViewById(R.id.back);
         mForwardButton = (ImageButton) findViewById(R.id.forward);
-        mUrlIcon = (ImageView) findViewById(R.id.url_icon);
         mStar = (ImageView) findViewById(R.id.star);
         mStopButton = (ImageView) findViewById(R.id.stop);
         mSearchButton = (ImageView) findViewById(R.id.search);
@@ -140,13 +137,12 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe
     void updateNavigationState(Tab tab) {
         if (tab != null) {
             mBackButton.setImageResource(tab.canGoBack()
-                    ? R.drawable.ic_back_dark
-                    : R.drawable.ic_back_disabled_dark);
+                    ? R.drawable.ic_back
+                    : R.drawable.ic_back_disabled);
             mForwardButton.setImageResource(tab.canGoForward()
-                    ? R.drawable.ic_forward_dark
-                    : R.drawable.ic_forward_disabled_dark);
+                    ? R.drawable.ic_forward
+                    : R.drawable.ic_forward_disabled);
         }
-        updateUrlIcon();
     }
 
     @Override
@@ -197,23 +193,6 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe
     }
 
     @Override
-    public void setFavicon(Bitmap icon) {
-        mFaviconDrawable = mBaseUi.getFaviconDrawable(icon);
-        updateUrlIcon();
-    }
-
-    void updateUrlIcon() {
-        if (mUrlInput.hasFocus()) {
-            mUrlIcon.setImageResource(R.drawable.ic_search_dark);
-        } else {
-            if (mFaviconDrawable == null) {
-                mFaviconDrawable = mBaseUi.getFaviconDrawable(null);
-            }
-            mUrlIcon.setImageDrawable(mFaviconDrawable);
-        }
-    }
-
-    @Override
     protected void setFocusState(boolean focus) {
         super.setFocusState(focus);
         if (focus) {
@@ -222,7 +201,6 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe
             }
             mSearchButton.setVisibility(View.GONE);
             mStar.setVisibility(View.GONE);
-            mUrlIcon.setImageResource(R.drawable.ic_search_dark);
         } else {
             if (mHideNavButtons) {
                 showNavButtons();
@@ -233,7 +211,6 @@ public class NavigationBarTablet extends NavigationBarBase implements StateListe
             } else {
                 mSearchButton.setVisibility(View.VISIBLE);
             }
-            updateUrlIcon();
         }
         mUrlContainer.setBackgroundDrawable(focus
                 ? mFocusDrawable : mUnfocusDrawable);
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 32bbc6b..6707134 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -25,6 +25,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Message;
 import android.util.Log;
@@ -124,8 +125,8 @@ public class PhoneUi extends BaseUi {
             }
             if (mAnimScreen == null) {
                 mAnimScreen = new AnimScreen(mActivity);
-                // initialize bitmaps
-                mAnimScreen.set(getTitleBar(), getWebView());
+                // initialize bitmap
+                mAnimScreen.set(getWebView());
             }
         }
     }
@@ -158,7 +159,6 @@ public class PhoneUi extends BaseUi {
         }
         // update nav bar state
         mNavigationBar.onStateChanged(StateListener.STATE_NORMAL);
-        updateLockIconToLatest(tab);
         mTitleBar.setSkipTitleBarAnimations(false);
     }
 
@@ -184,10 +184,10 @@ public class PhoneUi extends BaseUi {
         if (info != null) {
             info.setVisible(false);
         }
-        MenuItem newtab = menu.findItem(R.id.new_tab_menu_id);
+         MenuItem newtab = menu.findItem(R.id.new_tab_menu_id);
         if (newtab != null && !mUseQuickControls) {
             newtab.setVisible(false);
-        }
+         }
         MenuItem closeOthers = menu.findItem(R.id.close_other_tabs_id);
         if (closeOthers != null) {
             boolean isLastTab = true;
@@ -196,10 +196,6 @@ public class PhoneUi extends BaseUi {
             }
             closeOthers.setEnabled(!isLastTab);
         }
-        MenuItem fullscreen = menu.findItem(R.id.fullscreen_menu_id);
-        if (fullscreen != null) {
-            fullscreen.setVisible(!showingNavScreen());
-        }
         if (showingNavScreen()) {
             menu.setGroupVisible(R.id.LIVE_MENU, false);
             menu.setGroupVisible(R.id.SNAPSHOT_MENU, false);
@@ -279,10 +275,9 @@ public class PhoneUi extends BaseUi {
             mAnimScreen = new AnimScreen(mActivity);
         } else {
             mAnimScreen.mMain.setAlpha(1f);
-            mAnimScreen.mTitle.setAlpha(1f);
             mAnimScreen.setScaleFactor(1f);
         }
-        mAnimScreen.set(getTitleBar(), getWebView());
+        mAnimScreen.set(getWebView());
         if (mAnimScreen.mMain.getParent() == null) {
             mCustomViewContainer.addView(mAnimScreen.mMain, COVER_SCREEN_PARAMS);
         }
@@ -291,14 +286,14 @@ public class PhoneUi extends BaseUi {
         mAnimScreen.mMain.layout(0, 0, mContentView.getWidth(),
                 mContentView.getHeight());
         int fromLeft = 0;
-        int fromTop = getTitleBar().getHeight();
+        int fromTop = 0;
         int fromRight = mContentView.getWidth();
         int fromBottom = mContentView.getHeight();
         int width = mActivity.getResources().getDimensionPixelSize(R.dimen.nav_tab_width);
         int height = mActivity.getResources().getDimensionPixelSize(R.dimen.nav_tab_height);
         int ntth = mActivity.getResources().getDimensionPixelSize(R.dimen.nav_tab_titleheight);
         int toLeft = (mContentView.getWidth() - width) / 2;
-        int toTop = ((fromBottom - (ntth + height)) / 2 + ntth);
+        int toTop = ((fromBottom - (ntth + height)) / 2);
         int toRight = toLeft + width;
         int toBottom = toTop + height;
         float scaleFactor = width / (float) mContentView.getWidth();
@@ -314,15 +309,13 @@ public class PhoneUi extends BaseUi {
                 fromRight, toRight);
         ObjectAnimator tb = ObjectAnimator.ofInt(mAnimScreen.mContent, "bottom",
                 fromBottom, toBottom);
-        ObjectAnimator title = ObjectAnimator.ofFloat(mAnimScreen.mTitle, "alpha",
-                1f, 0f);
         ObjectAnimator sx = ObjectAnimator.ofFloat(mAnimScreen, "scaleFactor",
                 1f, scaleFactor);
         ObjectAnimator blend1 = ObjectAnimator.ofFloat(mAnimScreen.mMain,
                 "alpha", 1f, 0f);
         blend1.setDuration(100);
 
-        inanim.playTogether(tx, ty, tr, tb, sx, title);
+        inanim.playTogether(tx, ty, tr, tb, sx);
         inanim.setDuration(200);
         set1.addListener(new AnimatorListenerAdapter() {
             @Override
@@ -382,14 +375,14 @@ public class PhoneUi extends BaseUi {
         mAnimScreen.mMain.layout(0, 0, mContentView.getWidth(),
                 mContentView.getHeight());
         mNavScreen.mScroller.finishScroller();
-        ImageView target = tabview.mImage;
+        Drawable contentDrawable = tabview.mImage.getDrawable();
         int toLeft = 0;
         int toTop = (tab.getWebView() != null) ? tab.getWebView().getVisibleTitleHeight() : 0;
         int toRight = mContentView.getWidth();
-        int width = target.getDrawable().getIntrinsicWidth();
-        int height = target.getDrawable().getIntrinsicHeight();
-        int fromLeft = tabview.getLeft() + target.getLeft() - mNavScreen.mScroller.getScrollX();
-        int fromTop = tabview.getTop() + target.getTop() - mNavScreen.mScroller.getScrollY();
+        int width = contentDrawable.getIntrinsicWidth();
+        int height = contentDrawable.getIntrinsicHeight();
+        int fromLeft = tabview.getContentLeft() - mNavScreen.mScroller.getScrollX();
+        int fromTop = tabview.getContentTop() - mNavScreen.mScroller.getScrollY();
         int fromRight = fromLeft + width;
         int fromBottom = fromTop + height;
         float scaleFactor = mContentView.getWidth() / (float) width;
@@ -460,16 +453,13 @@ public class PhoneUi extends BaseUi {
     static class AnimScreen {
 
         private View mMain;
-        private ImageView mTitle;
         private ImageView mContent;
         private float mScale;
-        private Bitmap mTitleBarBitmap;
         private Bitmap mContentBitmap;
 
         public AnimScreen(Context ctx) {
             mMain = LayoutInflater.from(ctx).inflate(R.layout.anim_screen,
                     null);
-            mTitle = (ImageView) mMain.findViewById(R.id.title);
             mContent = (ImageView) mMain.findViewById(R.id.content);
             mContent.setScaleType(ImageView.ScaleType.MATRIX);
             mContent.setImageMatrix(new Matrix());
@@ -477,28 +467,11 @@ public class PhoneUi extends BaseUi {
             setScaleFactor(getScaleFactor());
         }
 
-        public void set(TitleBar tbar, WebView web) {
-            if (tbar == null || web == null) {
+        public void set(WebView web) {
+            if (web == null) {
                 return;
             }
-            if (tbar.getWidth() > 0 && tbar.getEmbeddedHeight() > 0) {
-                if (mTitleBarBitmap == null
-                        || mTitleBarBitmap.getWidth() != tbar.getWidth()
-                        || mTitleBarBitmap.getHeight() != tbar.getEmbeddedHeight()) {
-                    mTitleBarBitmap = safeCreateBitmap(tbar.getWidth(),
-                            tbar.getEmbeddedHeight());
-                }
-                if (mTitleBarBitmap != null) {
-                    Canvas c = new Canvas(mTitleBarBitmap);
-                    tbar.draw(c);
-                    c.setBitmap(null);
-                }
-            } else {
-                mTitleBarBitmap = null;
-            }
-            mTitle.setImageBitmap(mTitleBarBitmap);
-            mTitle.setVisibility(View.VISIBLE);
-            int h = web.getHeight() - tbar.getEmbeddedHeight();
+            int h = web.getHeight();
             if (mContentBitmap == null
                     || mContentBitmap.getWidth() != web.getWidth()
                     || mContentBitmap.getHeight() != h) {
@@ -506,9 +479,7 @@ public class PhoneUi extends BaseUi {
             }
             if (mContentBitmap != null) {
                 Canvas c = new Canvas(mContentBitmap);
-                int tx = web.getScrollX();
-                int ty = web.getScrollY();
-                c.translate(-tx, -ty - tbar.getEmbeddedHeight());
+                c.translate(-web.getScrollX(), -web.getScrollY());
                 web.draw(c);
                 c.setBitmap(null);
             }
@@ -525,7 +496,6 @@ public class PhoneUi extends BaseUi {
         }
 
         public void set(Bitmap image) {
-            mTitle.setVisibility(View.GONE);
             mContent.setImageBitmap(image);
         }
 
diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index 18c348e..c7cfa29 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -43,7 +43,24 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Controller for Quick Controls pie menu
+ * Controller for OneHand pie menu
+ *
+ * "Swype" actions:
+ * (0~45)°   = Opened tabs (swype up)
+ * (45~90)°  = Open Tab (swype middle-up)
+ * (90~135)° = Back (swype middle-down)
+ * (135-180)°= URLBar (swype down)
+ *
+ * |-Switch - OpenedTabs
+ * |-AddTab - Incognito
+ * |        - Close
+ * |        - Reload
+ * |-Back   - Forward
+ * |        - Home
+ * |        - Share
+ * |-Url    - History
+ * |        - Desktop/Mobile
+ * |        - Bookmarks
  */
 public class PieControl implements PieMenu.PieController, OnClickListener {
 
@@ -65,8 +82,6 @@ public class PieControl implements PieMenu.PieController, OnClickListener {
     private PieItem mIncognito;
     private PieItem mClose;
     private PieItem mShowTabs;
-    private PieItem mInfo;
-    private PieItem mFind;
     private PieItem mShare;
     private PieItem mRDS;
     private TabAdapter mTabAdapter;
@@ -125,30 +140,28 @@ public class PieControl implements PieMenu.PieController, OnClickListener {
             if (mUiController.getSettings().hasDesktopUseragent(view)) {
                 icon.setImageResource(R.drawable.ic_mobile);
             } else {
-                icon.setImageResource(R.drawable.ic_desktop_dark);
+                icon.setImageResource(R.drawable.ic_desktop);
             }
         }
         return true;
     }
 
     protected void populateMenu() {
-        mBack = makeItem(R.drawable.ic_back_dark, 1);
-        mUrl = makeItem(R.drawable.ic_web_dark, 1);
-        mBookmarks = makeItem(R.drawable.ic_bookmarks_dark, 1);
-        mHistory = makeItem(R.drawable.ic_history_dark, 1);
-        mAddBookmark = makeItem(R.drawable.ic_bookmark_on_dark, 1);
-        mRefresh = makeItem(R.drawable.ic_refresh_dark, 1);
-        mForward = makeItem(R.drawable.ic_forward_dark, 1);
-        mNewTab = makeItem(R.drawable.ic_new_window_dark, 1);
-        mIncognito = makeItem(R.drawable.ic_new_incognito_dark, 1);
-        mClose = makeItem(R.drawable.ic_close_window_dark, 1);
-        mInfo = makeItem(android.R.drawable.ic_menu_info_details, 1);
-        mFind = makeItem(R.drawable.ic_search_dark, 1);
-        mShare = makeItem(R.drawable.ic_share_dark, 1);
+        mBack = makeItem(R.drawable.ic_back, 1);
+        mUrl = makeItem(R.drawable.ic_web, 1);
+        mBookmarks = makeItem(R.drawable.ic_bookmarks, 1);
+        mHistory = makeItem(R.drawable.ic_history, 1);
+        mAddBookmark = makeItem(R.drawable.ic_bookmark_on, 1);
+        mRefresh = makeItem(R.drawable.ic_refresh, 1);
+        mForward = makeItem(R.drawable.ic_forward, 1);
+        mNewTab = makeItem(R.drawable.ic_new_window, 1);
+        mIncognito = makeItem(R.drawable.ic_incognito, 1);
+        mClose = makeItem(R.drawable.ic_close_window, 1);
+        mShare = makeItem(R.drawable.ic_share, 1);
         View tabs = makeTabsView();
         mShowTabs = new PieItem(tabs, 1);
-        mOptions = makeItem(R.drawable.ic_settings_dark, 1);
-        mRDS = makeItem(R.drawable.ic_desktop_dark, 1);
+        mOptions = makeItem(R.drawable.ic_settings, 1);
+        mRDS = makeItem(R.drawable.ic_desktop, 1);
         mTabAdapter = new TabAdapter(mActivity, mUiController);
         PieStackView stack = new PieStackView(mActivity);
         stack.setLayoutListener(new OnLayoutListener() {
@@ -160,43 +173,30 @@ public class PieControl implements PieMenu.PieController, OnClickListener {
         stack.setOnCurrentListener(mTabAdapter);
         stack.setAdapter(mTabAdapter);
         mShowTabs.setPieView(stack);
-        setClickListener(this, mBack, mRefresh, mForward, mUrl, mFind, mInfo,
+        setClickListener(this, mBack, mRefresh, mForward, mUrl,
                 mShare, mBookmarks, mNewTab, mIncognito, mClose, mHistory,
                 mAddBookmark, mOptions, mRDS);
         if (!BrowserActivity.isTablet(mActivity)) {
             mShowTabs.getView().setOnClickListener(this);
         }
-        // level 1
-        mPie.addItem(mOptions);
-        mOptions.addItem(mRDS);
-        mOptions.addItem(makeFiller());
-        mOptions.addItem(makeFiller());
-        mOptions.addItem(makeFiller());
+        // 0-45: up
+        mPie.addItem(mShowTabs);
+        // 45-90: middle-up
+        mPie.addItem(mNewTab);
+        mNewTab.addItem(mIncognito);
+        mNewTab.addItem(mClose);
+        mNewTab.addItem(mRefresh);
+        // 90-135: middle-down
         mPie.addItem(mBack);
-        mBack.addItem(mRefresh);
-        mBack.addItem(mForward);
-        mBack.addItem(makeFiller());
         mBack.addItem(makeFiller());
+        mBack.addItem(mForward);
+        mBack.addItem(mShare);
+        // 135-180: down
         mPie.addItem(mUrl);
-        mUrl.addItem(mFind);
-        mUrl.addItem(mShare);
-        mUrl.addItem(makeFiller());
-        mUrl.addItem(makeFiller());
-        mPie.addItem(mShowTabs);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            mShowTabs.addItem(makeFiller());
-            mShowTabs.addItem(mClose);
-        } else {
-            mShowTabs.addItem(mClose);
-            mShowTabs.addItem(mIncognito);
-        }
-        mShowTabs.addItem(mNewTab);
-        mShowTabs.addItem(makeFiller());
-        mPie.addItem(mBookmarks);
-        mBookmarks.addItem(makeFiller());
-        mBookmarks.addItem(makeFiller());
-        mBookmarks.addItem(mAddBookmark);
-        mBookmarks.addItem(mHistory);
+        mUrl.addItem(mOptions);
+        mUrl.addItem(mRDS);
+        mUrl.addItem(mBookmarks);
+        mUrl.addItem(mHistory);
     }
 
     @Override
@@ -233,10 +233,6 @@ public class PieControl implements PieMenu.PieController, OnClickListener {
             mUiController.openPreferences();
         } else if (mShare.getView() == v) {
             mUiController.shareCurrentPage();
-        } else if (mInfo.getView() == v) {
-            mUiController.showPageInfo();
-        } else if (mFind.getView() == v) {
-            mUiController.findOnPage();
         } else if (mRDS.getView() == v) {
             mUiController.toggleUserAgent();
         } else if (mShowTabs.getView() == v) {
@@ -267,12 +263,13 @@ public class PieControl implements PieMenu.PieController, OnClickListener {
         return new PieItem(null, 1);
     }
 
+
     protected View makeTabsView() {
         View v = mActivity.getLayoutInflater().inflate(R.layout.qc_tabs_view, null);
         mTabsCount = (TextView) v.findViewById(R.id.label);
         mTabsCount.setText("1");
         ImageView image = (ImageView) v.findViewById(R.id.icon);
-        image.setImageResource(R.drawable.ic_windows_dark);
+        image.setImageResource(R.drawable.ic_windows);
         image.setScaleType(ScaleType.CENTER);
         LayoutParams lp = new LayoutParams(mItemSize, mItemSize);
         v.setLayoutParams(lp);
diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java
index 1828032..3bb2438 100644
--- a/src/com/android/browser/PreferenceKeys.java
+++ b/src/com/android/browser/PreferenceKeys.java
@@ -62,6 +62,7 @@ public interface PreferenceKeys {
     static final String PREF_AUTOFILL_PROFILE = "autofill_profile";
     static final String PREF_HOMEPAGE = "homepage";
     static final String PREF_SYNC_WITH_CHROME = "sync_with_chrome";
+    static final String PREF_FULL_SCREEN = "full_screen";
 
     // ----------------------
     // Keys for hidden_debug_preferences.xml
diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index 9f66e3c..62fa0bc 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -161,7 +161,6 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable,
         TextView tv2 = (TextView) view.findViewById(android.R.id.text2);
         ImageView ic1 = (ImageView) view.findViewById(R.id.icon1);
         View ic2 = view.findViewById(R.id.icon2);
-        View div = view.findViewById(R.id.divider);
         tv1.setText(Html.fromHtml(item.title));
         if (TextUtils.isEmpty(item.url)) {
             tv2.setVisibility(View.GONE);
@@ -195,7 +194,6 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable,
         ic2.setVisibility(((TYPE_SUGGEST == item.type)
                 || (TYPE_SEARCH == item.type))
                 ? View.VISIBLE : View.GONE);
-        div.setVisibility(ic2.getVisibility());
         ic2.setOnClickListener(this);
         view.findViewById(R.id.suggestion).setOnClickListener(this);
     }
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index d6c02f9..c8e068a 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -95,7 +95,7 @@ public class TabBar extends LinearLayout implements OnClickListener {
         Resources res = activity.getResources();
         mTabWidth = (int) res.getDimension(R.dimen.tab_width);
         mActiveDrawable = res.getDrawable(R.drawable.bg_urlbar);
-        mInactiveDrawable = res.getDrawable(R.drawable.browsertab_inactive);
+        mInactiveDrawable = res.getDrawable(R.color.primary);
 
         mTabMap = new HashMap<Tab, TabView>();
         LayoutInflater factory = LayoutInflater.from(activity);
@@ -244,7 +244,6 @@ public class TabBar extends LinearLayout implements OnClickListener {
         Tab mTab;
         View mTabContent;
         TextView mTitle;
-        View mIncognito;
         View mSnapshot;
         ImageView mIconView;
         ImageView mLock;
@@ -274,7 +273,6 @@ public class TabBar extends LinearLayout implements OnClickListener {
             mLock = (ImageView) mTabContent.findViewById(R.id.lock);
             mClose = (ImageView) mTabContent.findViewById(R.id.close);
             mClose.setOnClickListener(this);
-            mIncognito = mTabContent.findViewById(R.id.incognito);
             mSnapshot = mTabContent.findViewById(R.id.snapshot);
             mSelected = false;
             // update the status
@@ -294,16 +292,10 @@ public class TabBar extends LinearLayout implements OnClickListener {
                 displayTitle = mTab.getUrl();
             }
             setDisplayTitle(displayTitle);
-            if (mTab.getFavicon() != null) {
-                setFavicon(mUi.getFaviconDrawable(mTab.getFavicon()));
-            }
             updateTabIcons();
         }
 
         private void updateTabIcons() {
-            mIncognito.setVisibility(
-                    mTab.isPrivateBrowsingEnabled() ?
-                    View.VISIBLE : View.GONE);
             mSnapshot.setVisibility(mTab.isSnapshot()
                     ? View.VISIBLE : View.GONE);
         }
@@ -333,10 +325,6 @@ public class TabBar extends LinearLayout implements OnClickListener {
             mTitle.setText(title);
         }
 
-        void setFavicon(Drawable d) {
-            mIconView.setImageDrawable(d);
-        }
-
         void setLock(Drawable d) {
             if (null == d) {
                 mLock.setVisibility(View.GONE);
@@ -491,13 +479,6 @@ public class TabBar extends LinearLayout implements OnClickListener {
         mTabs.setSelectedTab(mTabControl.getTabPosition(tab));
     }
 
-    public void onFavicon(Tab tab, Bitmap favicon) {
-        TabView tv = mTabMap.get(tab);
-        if (tv != null) {
-            tv.setFavicon(mUi.getFaviconDrawable(favicon));
-        }
-    }
-
     public void onNewTab(Tab tab) {
         TabView tv = buildTabView(tab);
         animateTabIn(tab, tv);
diff --git a/src/com/android/browser/UI.java b/src/com/android/browser/UI.java
index d9bb3bc..677c3d3 100644
--- a/src/com/android/browser/UI.java
+++ b/src/com/android/browser/UI.java
@@ -142,8 +142,6 @@ public interface UI {
 
     void setFullscreen(boolean enabled);
 
-    boolean isFullscreen();
-
     void setUseQuickControls(boolean enabled);
 
     public boolean shouldCaptureThumbnails();
diff --git a/src/com/android/browser/UiController.java b/src/com/android/browser/UiController.java
index 643fb40..f00f1a2 100644
--- a/src/com/android/browser/UiController.java
+++ b/src/com/android/browser/UiController.java
@@ -105,8 +105,6 @@ public interface UiController {
 
     void toggleUserAgent();
 
-    void toggleFullscreen();
-
     BrowserSettings getSettings();
 
     boolean supportsVoice();
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 0d9b00e..f031c8c 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -152,7 +152,6 @@ public class XLargeUi extends BaseUi {
             return;
         }
         mTabBar.onSetActiveTab(tab);
-        updateLockIconToLatest(tab);
         mTitleBar.setSkipTitleBarAnimations(false);
     }
 
@@ -224,13 +223,6 @@ public class XLargeUi extends BaseUi {
         mTabBar.onUrlAndTitle(tab, tab.getUrl(), tab.getTitle());
     }
 
-    // Set the favicon in the title bar.
-    @Override
-    public void setFavicon(Tab tab) {
-        super.setFavicon(tab);
-        mTabBar.onFavicon(tab, tab.getFavicon());
-    }
-
     @Override
     public void onHideCustomView() {
         super.onHideCustomView();
@@ -274,30 +266,4 @@ public class XLargeUi extends BaseUi {
         return mUseQuickControls;
     }
 
-    private Drawable getFaviconBackground() {
-        if (mFaviconBackground == null) {
-            mFaviconBackground = new PaintDrawable();
-            Resources res = mActivity.getResources();
-            mFaviconBackground.getPaint().setColor(
-                    res.getColor(R.color.tabFaviconBackground));
-            mFaviconBackground.setCornerRadius(
-                    res.getDimension(R.dimen.tab_favicon_corner_radius));
-        }
-        return mFaviconBackground;
-    }
-
-    @Override
-    public Drawable getFaviconDrawable(Bitmap icon) {
-        Drawable[] array = new Drawable[2];
-        array[0] = getFaviconBackground();
-        if (icon == null) {
-            array[1] = mGenericFavicon;
-        } else {
-            array[1] = new BitmapDrawable(mActivity.getResources(), icon);
-        }
-        LayerDrawable d = new LayerDrawable(array);
-        d.setLayerInset(1, 2, 2, 2, 2);
-        return d;
-    }
-
 }
diff --git a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
index 1cad1dd..4ae417b 100644
--- a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
+++ b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
@@ -69,17 +69,17 @@ public class FolderSpinnerAdapter extends BaseAdapter {
         switch (position) {
             case HOME_SCREEN:
                 labelResource = R.string.add_to_homescreen_menu_option;
-                drawableResource = R.drawable.ic_home_dark;
+                drawableResource = R.drawable.ic_home;
                 break;
             case ROOT_FOLDER:
                 labelResource = R.string.add_to_bookmarks_menu_option;
-                drawableResource = R.drawable.ic_bookmarks_dark;
+                drawableResource = R.drawable.ic_bookmarks;
                 break;
             case RECENT_FOLDER:
                 // Fall through and use the same icon resource
             case OTHER_FOLDER:
                 labelResource = R.string.add_to_other_folder_menu_option;
-                drawableResource = R.drawable.ic_folder_dark;
+                drawableResource = R.drawable.ic_folder;
                 break;
             default:
                 labelResource = 0;
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
index 26fb05f..2e1fdb4 100644
--- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java
+++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
@@ -17,6 +17,8 @@
 package com.android.browser.preferences;
 
 import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.res.Resources;
diff --git a/src/com/android/browser/preferences/LabPreferencesFragment.java b/src/com/android/browser/preferences/InterfacePreferencesFragment.java
index 222b5fa..474f03a 100644
--- a/src/com/android/browser/preferences/LabPreferencesFragment.java
+++ b/src/com/android/browser/preferences/InterfacePreferencesFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 The Android Open Source Project
+ * Copyright (C) 2015 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@ import com.android.browser.PreferenceKeys;
 import com.android.browser.R;
 import com.android.browser.search.SearchEngine;
 
-public class LabPreferencesFragment extends PreferenceFragment {
+public class InterfacePreferencesFragment extends PreferenceFragment {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // Load the XML preferences file
-        addPreferencesFromResource(R.xml.lab_preferences);
+        addPreferencesFromResource(R.xml.interface_preferences);
     }
 }
diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
index be38f3e..d1a3cc8 100644
--- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java
+++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
@@ -219,9 +219,9 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList
             mUsageHighIcon = BitmapFactory.decodeResource(getResources(),
                     R.drawable.ic_list_data_large);
             mLocationAllowedIcon = BitmapFactory.decodeResource(getResources(),
-                    R.drawable.ic_gps_on_dark);
+                    R.drawable.ic_gps_on);
             mLocationDisallowedIcon = BitmapFactory.decodeResource(getResources(),
-                    R.drawable.ic_gps_denied_dark);
+                    R.drawable.ic_gps_denied);
             mCurrentSite = site;
             if (mCurrentSite == null) {
                 askForOrigins();
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index e791a98..44fd8e9 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -129,8 +129,8 @@ public class BrowserProvider2 extends SQLiteContentProvider {
             qualifyColumn(TABLE_HISTORY, History.URL),
             bookmarkOrHistoryColumn(Combined.TITLE),
             bookmarkOrHistoryLiteral(Combined.URL,
-                    Integer.toString(R.drawable.ic_bookmark_off_dark),
-                    Integer.toString(R.drawable.ic_history_dark)),
+                    Integer.toString(R.drawable.ic_bookmark_off),
+                    Integer.toString(R.drawable.ic_history)),
             qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED)};
 
     private static final String SUGGEST_SELECTION =
diff --git a/src/com/android/browser/view/PieMenu.java b/src/com/android/browser/view/PieMenu.java
index 1699c27..cb8f9da 100644
--- a/src/com/android/browser/view/PieMenu.java
+++ b/src/com/android/browser/view/PieMenu.java
@@ -45,7 +45,7 @@ import java.util.List;
 public class PieMenu extends FrameLayout {
 
     private static final int MAX_LEVELS = 5;
-    private static final long ANIMATION = 80;
+    private static final long ANIMATION = 40;
 
     public interface PieController {
         /**
diff --git a/src/com/android/browser/view/StopProgressView.java b/src/com/android/browser/view/StopProgressView.java
index 5da3e15..05d86b4 100644
--- a/src/com/android/browser/view/StopProgressView.java
+++ b/src/com/android/browser/view/StopProgressView.java
@@ -58,7 +58,7 @@ public class StopProgressView extends ProgressBar {
     private void init(AttributeSet attrs) {
         mProgressDrawable = getIndeterminateDrawable();
         setImageDrawable(mContext.getResources()
-                .getDrawable(R.drawable.ic_stop_dark));
+                .getDrawable(R.drawable.ic_stop));
     }
 
     public void hideProgress() {
diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
index 3c40645..8168c3b 100644
--- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
+++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
@@ -246,8 +246,6 @@ public class BookmarkThumbnailWidgetService extends RemoteViewsService {
                 } else {
                     views.setImageViewResource(R.id.thumb, R.drawable.thumb_bookmark_widget_folder_holo);
                 }
-                views.setImageViewResource(R.id.favicon, R.drawable.ic_bookmark_widget_bookmark_dark);
-                views.setDrawableParameters(R.id.thumb, true, 0, -1, null, -1);
             } else {
                 // RemoteViews require a valid bitmap config
                 Options options = new Options();