Bug 818071: Replace private browsing resources for the url-bar. [r=mfinkle]

mobile/android/base/resources/layout-land-v14/browser_toolbar.xml.in

@@ -44,8 +44,8 @@
                 <ImageView android:id="@+id/awesome_bar_entry"
                            style="@style/AddressBar.Button"
                            android:duplicateParentState="true"
-                           android:layout_marginTop="3dp"
-                           android:layout_marginBottom="3dp"
+                           android:layout_marginTop="4dp"
+                           android:layout_marginBottom="4dp"
                            android:layout_marginRight="45dp"
                            android:clickable="false"
                            android:focusable="false"
@@ -56,8 +56,8 @@
                       style="@style/AddressBar.ImageButton"
                       android:layout_width="50dp"
                       android:layout_height="fill_parent"
-                      android:paddingTop="3dp"
-                      android:paddingBottom="3dp"
+                      android:paddingTop="4dp"
+                      android:paddingBottom="4dp"
                       android:layout_centerVertical="true"
                       android:layout_alignParentRight="true"
                       android:layout_marginRight="20dp"

mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml.in

@@ -44,8 +44,8 @@
                 <ImageView android:id="@+id/awesome_bar_entry"
                            style="@style/AddressBar.Button"
                            android:duplicateParentState="true"
-                           android:layout_marginTop="3dp"
-                           android:layout_marginBottom="3dp"
+                           android:layout_marginTop="4dp"
+                           android:layout_marginBottom="4dp"
                            android:layout_marginRight="80dp"
                            android:clickable="false"
                            android:focusable="false"
@@ -56,8 +56,8 @@
                       style="@style/AddressBar.ImageButton"
                       android:layout_width="50dp"
                       android:layout_height="fill_parent"
-                      android:paddingTop="3dp"
-                      android:paddingBottom="3dp"
+                      android:paddingTop="4dp"
+                      android:paddingBottom="4dp"
                       android:layout_centerVertical="true"
                       android:layout_alignParentRight="true"
                       android:layout_marginRight="55dp"

mobile/android/base/resources/layout-large-v11/awesomebar_search.xml.in

@@ -20,7 +20,10 @@
           android:id="@+id/awesomebar_text"
           style="@style/AddressBar.Button"
           android:background="@drawable/address_bar_url"
-          android:layout_margin="6dip"
+          android:layout_marginLeft="6dip"
+          android:layout_marginRight="6dip"
+          android:layout_marginTop="7dip"
+          android:layout_marginBottom="7dip"
           android:layout_alignParentBottom="true"
           android:layout_centerVertical="true"
           android:paddingLeft="15dip"

mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in

@@ -36,8 +36,8 @@
                            style="@style/AddressBar.Button"
                            android:duplicateParentState="true"
                            android:layout_marginLeft="6dp"
-                           android:layout_marginTop="6dp"
-                           android:layout_marginBottom="6dp"
+                           android:layout_marginTop="7dp"
+                           android:layout_marginBottom="7dp"
                            android:layout_marginRight="0dp"
                            android:clickable="false"
                            android:focusable="false"
@@ -48,8 +48,8 @@
                       style="@style/AddressBar.ImageButton"
                       android:layout_width="100dp"
                       android:layout_height="fill_parent"
-                      android:paddingTop="6dp"
-                      android:paddingBottom="6dp"
+                      android:paddingTop="7dp"
+                      android:paddingBottom="7dp"
                       android:layout_centerVertical="true"
                       android:layout_alignParentRight="true"
                       android:duplicateParentState="true"

mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml.in

@@ -31,8 +31,8 @@
           android:background="@drawable/address_bar_url"
           android:layout_marginLeft="0dip"
           android:layout_marginRight="56dip"
-          android:layout_marginTop="6dip"
-          android:layout_marginBottom="6dip"
+          android:layout_marginTop="7dip"
+          android:layout_marginBottom="7dip"
           android:layout_toRightOf="@id/dummy_tab"
           android:layout_alignParentBottom="true"
           android:layout_centerVertical="true"

mobile/android/base/resources/layout-xlarge-v11/browser_toolbar_menu.xml.in

@@ -73,8 +73,8 @@
                 <Gecko.ImageView style="@style/AddressBar.Button"
                                  android:layout_marginLeft="20dp"
                                  android:layout_marginRight="0dp"
-                                 android:layout_marginTop="6dp"
-                                 android:layout_marginBottom="6dp"
+                                 android:layout_marginTop="7dp"
+                                 android:layout_marginBottom="7dp"
                                  android:duplicateParentState="true"
                                  android:clickable="false"
                                  android:focusable="false"
@@ -85,8 +85,8 @@
                       style="@style/AddressBar.ImageButton"
                       android:layout_width="25dp"
                       android:layout_height="fill_parent"
-                      android:paddingTop="6dp"
-                      android:paddingBottom="6dp"
+                      android:paddingTop="7dp"
+                      android:paddingBottom="7dp"
                       android:layout_centerVertical="true"
                       android:layout_alignParentRight="true"
                       android:duplicateParentState="true">

mobile/android/base/resources/layout/awesomebar_search.xml.in

@@ -20,7 +20,10 @@
           android:id="@+id/awesomebar_text"
           style="@style/AddressBar.Button"
           android:background="@drawable/address_bar_url"
-          android:layout_margin="4dip"
+          android:layout_marginLeft="4dip"
+          android:layout_marginRight="4dip"
+          android:layout_marginTop="5dip"
+          android:layout_marginBottom="5dip"
           android:layout_alignParentBottom="true"
           android:layout_centerVertical="true"
           android:paddingLeft="15dip"

mobile/android/base/resources/layout/browser_toolbar.xml.in

@@ -44,8 +44,8 @@
                 <ImageView android:id="@+id/awesome_bar_entry"
                            style="@style/AddressBar.Button"
                            android:duplicateParentState="true"
-                           android:layout_marginTop="4dp"
-                           android:layout_marginBottom="4dp"
+                           android:layout_marginTop="5dp"
+                           android:layout_marginBottom="5dp"
                            android:layout_marginRight="52dp"
                            android:clickable="false"
                            android:focusable="false"
@@ -56,8 +56,8 @@
                       style="@style/AddressBar.ImageButton"
                       android:layout_width="50dp"
                       android:layout_height="fill_parent"
-                      android:paddingTop="4dp"
-                      android:paddingBottom="4dp"
+                      android:paddingTop="5dp"
+                      android:paddingBottom="5dp"
                       android:layout_centerVertical="true"
                       android:layout_alignParentRight="true"
                       android:layout_marginRight="27dp"

mobile/android/base/resources/layout/browser_toolbar_menu.xml.in

@@ -44,8 +44,8 @@
                 <ImageView android:id="@+id/awesome_bar_entry"
                            style="@style/AddressBar.Button"
                            android:duplicateParentState="true"
-                           android:layout_marginTop="4dp"
-                           android:layout_marginBottom="4dp"
+                           android:layout_marginTop="5dp"
+                           android:layout_marginBottom="5dp"
                            android:layout_marginRight="100dp"
                            android:clickable="false"
                            android:focusable="false"
@@ -56,8 +56,8 @@
                       style="@style/AddressBar.ImageButton"
                       android:layout_width="50dp"
                       android:layout_height="fill_parent"
-                      android:paddingTop="4dp"
-                      android:paddingBottom="4dp"
+                      android:paddingTop="5dp"
+                      android:paddingBottom="5dp"
                       android:layout_centerVertical="true"
                       android:layout_alignParentRight="true"
                       android:layout_marginRight="75dp"