diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index d11a68a..53f7554 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_list_bookmark"
+            android:src="@drawable/ic_bookmark_on_holo_dark"
             android:scaleType="fitCenter"
             />
     <LinearLayout
diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index df46be5..f5c09a9 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -69,7 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:drawableLeft="@drawable/ic_list_bookmark"
+            android:drawableLeft="@drawable/ic_bookmark_on_holo_dark"
             android:text="@string/bookmark_this_page"
             android:textAppearance="?android:attr/textAppearanceMedium" />
         <ImageView android:id="@+id/remove_divider"
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 5d77fd9..46cda37 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_bookmark_widget_holo_dark" />
+        android:src="@drawable/ic_folder_holo_dark" />
     <TextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index ecc730f..230dd3d 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_bookmark_widget_holo_dark" />
+        android:src="@drawable/ic_folder_holo_dark" />
   <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 d3a2404..b85911f 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -63,10 +63,10 @@
     </LinearLayout>
     <ImageView
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:id="@+id/divider"
         android:scaleType="center"
-        android:src="@drawable/divider_vert"
+        android:background="@*android:drawable/list_divider_holo_light"
         />
     <ImageView
         android:layout_width="wrap_content"
@@ -74,7 +74,7 @@
         android:id="@+id/icon2"
         android:scaleType="center"
         android:src="@drawable/ic_add_string"
-        android:background="@drawable/browserbarbutton"
+        android:background="?android:attr/activatedBackgroundIndicator"
         style="@style/HoloButton"
         android:layout_marginRight="16dip"
          />
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index ce3f987..164e9b6 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -59,7 +59,7 @@
         android:singleLine="true" />
     <ImageButton
         android:id="@+id/close"
-        android:background="@drawable/browserbarbutton"
+        android:background="?android:attr/selectableItemBackground"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="16dip"
diff --git a/res/layout/tab_view_add_incognito_tab.xml b/res/layout/tab_view_add_incognito_tab.xml
index d07b4f5..43fcb43 100644
--- a/res/layout/tab_view_add_incognito_tab.xml
+++ b/res/layout/tab_view_add_incognito_tab.xml
@@ -26,7 +26,7 @@
         android:layout_height="40dip"
         android:layout_marginLeft="8dip"
         android:layout_marginRight="8dip"
-        android:src="@drawable/ic_list_new_window"/>
+        android:src="@drawable/ic_new_window_holo_dark"/>
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/tab_view_add_tab.xml b/res/layout/tab_view_add_tab.xml
index f69865e..f4e0f02 100644
--- a/res/layout/tab_view_add_tab.xml
+++ b/res/layout/tab_view_add_tab.xml
@@ -26,7 +26,7 @@
         android:layout_height="40dip"
         android:layout_marginLeft="8dip"
         android:layout_marginRight="8dip"
-        android:src="@drawable/ic_list_new_window"/>
+        android:src="@drawable/ic_new_window_holo_dark"/>
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index a7e50b7..9bfba35 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -88,7 +88,7 @@
             android:layout_marginRight="-5dip"
             android:scaleType="center"
             android:background="@drawable/btn_bookmark"
-            android:src="@drawable/ic_list_bookmark"
+            android:src="@drawable/ic_bookmark_on_holo_dark"
         />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index c619e64..5a6a4d3 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -24,13 +24,13 @@
         android:background="@drawable/bg_urlbar">
         <ImageButton
             android:id="@+id/back"
-            android:src="@drawable/ic_back_normal"
+            android:src="@drawable/ic_back_holo_dark"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             style="@style/HoloButton" />
         <ImageButton
             android:id="@+id/forward"
-            android:src="@drawable/ic_forward_normal"
+            android:src="@drawable/ic_forward_holo_dark"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             style="@style/HoloButton" />
@@ -40,7 +40,7 @@
             android:layout_height="match_parent"
             style="@style/HoloButton"
             android:gravity="center_vertical"
-            android:src="@drawable/ic_stop_normal" />
+            android:src="@drawable/ic_stop_holo_dark" />
         <LinearLayout
             android:id="@+id/urlbar_focused"
             android:layout_width="0dip"
@@ -53,7 +53,7 @@
                 android:id="@+id/voice_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_search_light"
+                android:src="@drawable/ic_search_holo_dark"
                 style="@style/HoloIcon"
                 android:visibility="gone" />
             <ImageView
@@ -89,14 +89,14 @@
                 style="@style/HoloButton" />
             <ImageView
                 android:id="@+id/clear"
-                android:src="@drawable/ic_clear_search_light"
+                android:src="@drawable/ic_stop_holo_dark"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 style="@style/HoloButton" />
         </LinearLayout>
         <ImageButton
             android:id="@+id/go"
-            android:src="@drawable/ic_go_normal_white"
+            android:src="@drawable/ic_go_holo_dark"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:visibility="gone"
@@ -104,13 +104,13 @@
             style="@style/HoloButton" />
         <ImageView
             android:id="@+id/voicesearch"
-            android:src="@drawable/ic_voice_search"
+            android:src="@drawable/ic_voice_search_holo_dark"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             style="@style/HoloButton" />
         <ImageButton
             android:id="@+id/search"
-            android:src="@drawable/ic_search_normal"
+            android:src="@drawable/ic_search_holo_dark"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
@@ -122,7 +122,7 @@
             android:layout_marginRight="4dip"
             android:scaleType="center"
             style="@style/HoloButton"
-            android:src="@drawable/ic_bookmarks_history_normal" />
+            android:src="@drawable/ic_bookmarks_history_holo_dark" />
     </LinearLayout>
     <com.android.browser.PageProgressView
         android:id="@+id/progress"