diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index ae0db1b..c655727 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -32,7 +32,7 @@
         android:layout_height="@dimen/toolbar_height"
         android:layout_gravity="top"
         android:gravity="right"
-        android:background="#C0404040">
+        android:background="#CC0d0d0d">
         <ImageButton
             android:id="@+id/newtab"
             android:layout_width="wrap_content"
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index cdfcda7..82541a4 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -26,7 +26,7 @@
         android:id="@+id/titlebar"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="48dip"
+        android:layout_height="32dip"
         android:layout_gravity="center_horizontal"
         android:paddingLeft="8dip" >
         <TextView
@@ -43,7 +43,7 @@
             android:drawablePadding="8dip" />
         <ImageView
             android:id="@+id/closetab"
-            android:src="@drawable/ic_stop_holo_dark"
+            android:src="@drawable/ic_tab_close"
             android:layout_gravity="center_vertical"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 8ed6331..15568c3 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -24,12 +24,14 @@
         android:layout_weight="1.0"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
+        android:layout_marginLeft="8dip"
+        android:layout_marginRight="8dip"
         android:orientation="horizontal">
         <ImageView
             android:id="@+id/magnify"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="8dip"
+            android:paddingLeft="4dip"
             android:paddingRight="8dip"
             android:visibility="gone"
             android:src="@drawable/ic_search_category_suggest" />
@@ -37,23 +39,25 @@
             android:id="@+id/incognito_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="8dip"
+            android:paddingLeft="4dip"
             android:visibility="gone"
             android:src="@drawable/ic_incognito_holo_dark" />
         <FrameLayout
             android:id="@+id/iconcombo"
-            android:layout_width="52dip"
+            android:layout_width="44dip"
             android:layout_height="match_parent"
             style="@style/HoloButton">
             <ImageView
                 android:id="@+id/favicon"
-                android:layout_width="20dip"
-                android:layout_height="20dip"
+                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="33dip"
+                android:layout_height="32dip"
                 android:layout_gravity="center"
                 android:visibility="gone" />
         </FrameLayout>
@@ -62,6 +66,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:paddingLeft="4dip"
             android:contentDescription="@string/accessibility_button_stop"
             android:src="@drawable/ic_stop_holo_dark"
             style="@style/HoloButton" />
@@ -87,6 +92,7 @@
             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_holo_dark"
             style="@style/HoloButton"
@@ -95,6 +101,7 @@
             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_holo_dark"
             style="@style/HoloButton"