diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index 53f7554..28c9c60 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_holo_dark"
+            android:src="@drawable/ic_action_bookmark_checked"
             android:scaleType="fitCenter"
             />
     <LinearLayout
diff --git a/res/layout/bookmarks_drag_actionmode.xml b/res/layout/bookmarks_drag_actionmode.xml
index 64b1042..df64fb9 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_holo_dark" />
+        android:src="@drawable/ic_deco_favicon_normal" />
     <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_holo_dark" />
+        android:src="@drawable/ic_action_add_tab" />
     <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_holo_dark" />
+        android:src="@drawable/ic_deco_info_normal" />
 </LinearLayout>
diff --git a/res/layout/bookmarkthumbnailwidget_item.xml b/res/layout/bookmarkthumbnailwidget_item.xml
index 8bc1efb..99df109 100644
--- a/res/layout/bookmarkthumbnailwidget_item.xml
+++ b/res/layout/bookmarkthumbnailwidget_item.xml
@@ -37,7 +37,7 @@
         android:layout_marginBottom="2dip">
         <ImageView
             android:id="@+id/favicon"
-            android:src="@drawable/app_web_browser_sm"
+            android:src="@drawable/ic_deco_favicon_normal"
             android:layout_width="@dimen/favicon_size"
             android:layout_height="@dimen/favicon_size"
             android:layout_gravity="center_vertical"
diff --git a/res/layout/bookmarkthumbnailwidget_item_folder.xml b/res/layout/bookmarkthumbnailwidget_item_folder.xml
index 6044164..8722da6 100644
--- a/res/layout/bookmarkthumbnailwidget_item_folder.xml
+++ b/res/layout/bookmarkthumbnailwidget_item_folder.xml
@@ -37,7 +37,7 @@
         android:layout_marginBottom="2dip">
         <ImageView
             android:id="@+id/favicon"
-            android:src="@drawable/app_web_browser_sm"
+            android:src="@drawable/ic_deco_favicon_normal"
             android:layout_width="@dimen/favicon_size"
             android:layout_height="@dimen/favicon_size"
             android:layout_gravity="center_vertical"
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 58db8a5..8dfe1b4 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -37,7 +37,6 @@
             android:id="@+id/add_new_folder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_add_string"
             android:text="@string/new_folder"
             android:visibility="gone"
             android:focusable="true"
@@ -61,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:drawableLeft="@drawable/ic_bookmark_on_holo_dark"
+            android:drawableLeft="@drawable/ic_action_bookmark_checked"
             android:text="@string/bookmark_this_page"
             android:textAppearance="?android:attr/textAppearanceMedium" />
         <View android:id="@+id/remove_divider"
@@ -76,7 +75,7 @@
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
             android:text="@string/remove"
-            android:drawableLeft="@drawable/trashcan"
+            android:drawableLeft="@drawable/ic_action_trash_normal"
             android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
diff --git a/res/layout/download_settings.xml b/res/layout/download_settings.xml
index ad47363..47d8081 100644
--- a/res/layout/download_settings.xml
+++ b/res/layout/download_settings.xml
@@ -47,7 +47,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:drawableLeft="@drawable/ic_bookmark_on_holo_dark"
             android:text="@string/download_settings_title"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 46cda37..54de3cf 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_holo_dark" />
+        android:src="@drawable/ic_deco_folder_normal" />
     <TextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index ad07280..031958f 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -14,56 +14,59 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-        android:layout_width="match_parent" 
-        android:layout_height="wrap_content"
-        android:minHeight="?android:attr/listPreferredItemHeight"
-        android:orientation="horizontal"
-        android:paddingLeft="12dip"
-        android:paddingRight="8dip"
-        >
-    <ImageView android:id="@+id/favicon"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/favicon"
         android:layout_width="32dip"
         android:layout_height="32dip"
         android:layout_gravity="center_vertical"
-        android:scaleType="fitXY"
+        android:layout_marginLeft="12dip"
         android:background="@drawable/bookmark_list_favicon_bg"
-        android:src="@drawable/app_web_browser_sm"
-        />
-    <LinearLayout android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="8dip"
-            android:paddingRight="8dip"
-            android:layout_gravity="center_vertical"
-            >
-        <TextView android:id="@+id/title"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:maxLines="1"
-                android:layout_width="wrap_content" 
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:ellipsize="end"
-                />
-        <TextView android:id="@+id/url" 
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:maxLines="1"
-                android:layout_width="wrap_content" 
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:ellipsize="middle"
-                />
-    </LinearLayout>
-    <CheckBox android:id="@+id/star"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_deco_favicon_normal" />
+
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingLeft="8dip"
+        android:paddingRight="8dip">
+
+        <TextView
+            android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingTop="16dip"
-            android:paddingBottom="16dip"
-            android:paddingRight="8dip"
-            android:paddingLeft="8dip"
-            android:focusable="false"
-            android:button="@drawable/btn_checkbox_star"
-            android:layout_gravity="center_vertical"
-            />
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/url"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+
+    <CheckBox
+        android:id="@+id/star"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:button="@drawable/ic_action_bookmark"
+        android:focusable="false"
+        android:paddingBottom="16dip"
+        android:paddingLeft="8dip"
+        android:paddingRight="8dip"
+        android:paddingTop="16dip" />
 </LinearLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index 36e2082..a126732 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -16,11 +16,11 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
+    android:id="@+id/nav_tab"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@drawable/nav_tab_title"
+    android:background="@drawable/nav_tab_title_normal"
     android:focusable="false">
     <LinearLayout
         android:id="@+id/titlebar"
@@ -49,7 +49,7 @@
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_closetab"
             android:paddingRight="16dip"
-            android:src="@drawable/ic_action_stop" />
+            android:src="@drawable/ic_action_close" />
     </LinearLayout>
 
     <!-- Preview Image -->
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index dc0fa39..bd34087 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_holo_dark" />
+        android:src="@drawable/ic_deco_folder_normal" />
   <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:src="@drawable/ic_tab_close"
+        android:src="@drawable/ic_action_close"
         android:contentDescription="@string/cancel"
         />
   </LinearLayout>
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index 1bc5455..d0075f6 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -73,7 +73,7 @@
         android:layout_height="match_parent"
         android:id="@+id/icon2"
         android:scaleType="center"
-        android:src="@drawable/ic_querybuilder"
+        android:src="@drawable/ic_action_querybuilder"
         android:background="?android:attr/selectableItemBackground"
         android:paddingRight="@dimen/suggest_item_padding"
         android:paddingLeft="@dimen/suggest_item_padding"
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index af78411..f248938 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -21,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:src="@drawable/ic_incognito_holo_dark"
+        android:src="@drawable/ic_deco_incognito_normal"
         android:contentDescription="@string/accessibility_state_incognito"
         android:visibility="gone" />
     <ImageView
@@ -62,5 +62,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/accessibility_button_closetab"
-        android:src="@drawable/ic_action_stop" />
+        android:src="@drawable/ic_action_close" />
 </merge>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index b9952f1..c412e11 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -29,15 +29,18 @@
 
         <ImageView
             android:id="@+id/incognito_icon"
-            android:layout_width="48dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:src="@drawable/ic_incognito_holo_dark"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:src="@drawable/ic_deco_incognito_normal"
             android:visibility="gone" />
 
         <com.android.browser.LocationButton
             android:id="@+id/location_button"
             style="@style/NavButton"
             android:layout_width="wrap_content"
+            android:paddingRight="2dp"
             android:visibility="gone" />
 
         <ImageView
@@ -61,7 +64,8 @@
                 android:layout_height="32dip"
                 android:layout_gravity="center"
                 android:paddingLeft="6dip"
-                android:paddingRight="6dip" />
+                android:paddingRight="6dip"
+                android:scaleType="fitCenter" />
 
             <ImageView
                 android:id="@+id/lock"
@@ -100,6 +104,7 @@
             android:paddingRight="6dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
+            android:fontFamily="sans-serif-condensed"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
@@ -108,7 +113,7 @@
             android:layout_width="wrap_content"
             android:contentDescription="@string/accessibility_button_voice"
             android:paddingRight="4dip"
-            android:src="@drawable/ic_voice_search_holo_dark"
+            android:src="@drawable/ic_action_microphone_normal"
             android:visibility="gone" />
 
         <ImageButton
@@ -136,11 +141,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:clickable="false"
             android:paddingBottom="3dp"
             android:paddingRight="2dp"
-            android:clickable="false"
-            android:text="0" >
-        </TextView>
+            android:textColor="#333"
+            android:textSize="13dp"
+            android:textStyle="bold" />
     </FrameLayout>
 
     <ImageButton