--- a/mobile/android/app/src/photon/res/values-large/dimens.xml
+++ b/mobile/android/app/src/photon/res/values-large/dimens.xml
@@ -14,17 +14,21 @@
     <dimen name="tabs_panel_indicator_selected_padding_top">50dp</dimen>
 
     <dimen name="browser_toolbar_height_flipper">@dimen/browser_toolbar_height</dimen>
     <dimen name="browser_toolbar_button_padding">16dp</dimen>
     <dimen name="browser_toolbar_icon_width">@dimen/browser_toolbar_height</dimen>
     <dimen name="browser_toolbar_menu_radius">4dp</dimen>
     <dimen name="browser_toolbar_favicon_size">16dp</dimen>
 
-    <dimen name="browser_toolbar_image_button_width">56dp</dimen>
+    <dimen name="browser_toolbar_image_button_width">48dp</dimen>
+    <!-- ToolbarImageButton's pressed-highlight region is different from clickable region.
+         Our design is to make pressed-highlight region to be square. this vertical spacing value
+         helps drawable xml to set padding: (56 - 48) / 2 -->
+    <dimen name="browser_toolbar_image_button_v_spacing">4dp</dimen>
     <dimen name="browser_toolbar_image_button_h_spacing">4dp</dimen>
 
     <dimen name="browser_toolbar_site_security_width">34dp</dimen>
     <dimen name="browser_toolbar_site_security_margin_end">6dp</dimen>
 
     <dimen name="firstrun_background_height">300dp</dimen>
 
     <dimen name="tabs_panel_indicator_width">96dp</dimen>
@@ -36,11 +40,10 @@
     <item name="tab_strip_content_start" type="dimen">72dp</item>
 
     <dimen name="tab_panel_grid_hpadding_autofit">30dp</dimen>
     <dimen name="tab_panel_grid_vpadding_autofit">30dp</dimen>
     <dimen name="tab_panel_grid_item_hpadding_autofit">20dp</dimen>
     <dimen name="tab_panel_grid_item_vpadding_autofit">8dp</dimen>
 
     <!-- PageActionButtons dimensions -->
-    <dimen name="page_action_button_width">56dp</dimen>
-
+    <dimen name="page_action_button_width">@dimen/browser_toolbar_icon_width</dimen>
 </resources>

--- a/mobile/android/app/src/photon/res/values-v17/styles.xml
+++ b/mobile/android/app/src/photon/res/values-v17/styles.xml
@@ -26,17 +26,17 @@
     <style name="UrlBar.V17.Menu" parent="UrlBar.Base.Menu">
         <item name="android:layout_alignParentEnd">true</item>
     </style>
 
     <style name="UrlBar.Tabs" parent="UrlBar.V17.Tabs" />
 
     <style name="UrlBar.V17.Tabs" parent="UrlBar.Base.Tabs">
         <item name="android:layout_toStartOf">@id/menu</item>
-        <item name="android:layout_marginEnd">-4dp</item>
+        <item name="android:layout_marginEnd">-3dp</item>
     </style>
 
     <style name="UrlBar.TabCounter" parent="UrlBar.V17.TabCounter" />
 
     <style name="UrlBar.V17.TabCounter" parent="UrlBar.Base.TabCounter">
         <item name="android:layout_alignEnd">@id/tabs</item>
         <item name="android:layout_alignStart">@id/tabs</item>
         <item name="android:layout_toStartOf">@id/menu</item>
@@ -50,25 +50,25 @@
 
     <style name="UrlBar.EditLayout" parent="UrlBar.V17.EditLayout" />
 
     <style name="UrlBar.V17.EditLayout" parent="UrlBar.Base.EditLayout">
         <item name="android:layout_alignStart">@id/url_bar_entry</item>
         <item name="android:layout_toStartOf">@id/edit_cancel</item>
         <item name="android:paddingStart">8dp</item>
         <item name="android:paddingEnd">0dp</item>
-        <item name="android:layout_marginEnd">-2dp</item>
+        <item name="android:layout_marginEnd">-3dp</item>
     </style>
 
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V17.DisplayLayout" />
 
     <style name="UrlBar.V17.DisplayLayout" parent="UrlBar.Base.DisplayLayout">
         <item name="android:layout_alignStart">@id/url_bar_entry</item>
         <item name="android:layout_alignEnd">@id/url_bar_entry</item>
-        <item name="android:layout_marginEnd">-2dp</item>
+        <item name="android:layout_marginEnd">-3dp</item>
     </style>
 
-    <style name="UrlBar.QRCode" parent="UrlBar.V15.QRCode"/>
-    <style name="UrlBar.V15.QRCode" parent="UrlBar.ImageButton">
-        <item name="android:layout_marginRight">-2dp</item>
+    <style name="UrlBar.QRCode" parent="UrlBar.V17.QRCode"/>
+    <style name="UrlBar.V17.QRCode" parent="UrlBar.ImageButton">
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
 </resources>

--- a/mobile/android/app/src/photon/res/values/dimens.xml
+++ b/mobile/android/app/src/photon/res/values/dimens.xml
@@ -7,21 +7,21 @@
 <resources>
 
     <dimen name="standard_corner_radius">4dp</dimen>
 
     <dimen name="autocomplete_min_width">200dp</dimen>
     <dimen name="autocomplete_row_height">32dp</dimen>
 
     <dimen name="browser_toolbar_height">56dp</dimen>
-    <dimen name="browser_toolbar_image_button_width">48dp</dimen>
+    <dimen name="browser_toolbar_image_button_width">42dp</dimen>
     <!-- ToolbarImageButton's pressed-highlight region is different from clickable region.
          Our design is to make pressed-highlight region to be square. this vertical spacing value
-         helps drawable xml to set padding: (56 - 48) / 2 -->
-    <dimen name="browser_toolbar_image_button_v_spacing">4dp</dimen>
+         helps drawable xml to set padding: (56 - 42) / 2 -->
+    <dimen name="browser_toolbar_image_button_v_spacing">7dp</dimen>
     <dimen name="browser_toolbar_image_button_h_spacing">0dp</dimen>
 
     <!-- This value is the height of the Tabs Panel header view
          (browser_toolbar_height) minus the height of the indicator
          (6dp). This value should change when the height of the view changes. -->
     <dimen name="tabs_panel_indicator_selected_padding_top">50dp</dimen>
 
     <!-- We use two different values for browser_toolbar_height on tablet
@@ -179,17 +179,17 @@
 
     <!-- TabsListLayout -->
     <dimen name="tab_panel_list_item_top_padding">6dp</dimen>
 
 
     <dimen name="tab_highlight_stroke_width">5dp</dimen>
 
     <!-- PageActionButtons dimensions -->
-    <dimen name="page_action_button_width">48dp</dimen>
+    <dimen name="page_action_button_width">@dimen/browser_toolbar_image_button_width</dimen>
 
     <!-- Banner -->
     <dimen name="home_banner_height">72dp</dimen>
     <dimen name="home_banner_close_width">42dp</dimen>
     <dimen name="home_banner_icon_height">48dip</dimen>
     <dimen name="home_banner_icon_width">48dip</dimen>
 
     <!-- Icon Grid -->

--- a/mobile/android/app/src/photon/res/values/styles.xml
+++ b/mobile/android/app/src/photon/res/values/styles.xml
@@ -844,17 +844,17 @@
     <style name="UrlBar.V15.Menu" parent="UrlBar.Base.Menu">
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
     <style name="UrlBar.Tabs" parent="UrlBar.V15.Tabs"/>
     <style name="UrlBar.Base.Tabs" parent="UrlBar.ImageButton"/>
     <style name="UrlBar.V15.Tabs" parent="UrlBar.Base.Tabs">
         <item name="android:layout_toLeftOf">@id/menu</item>
-        <item name="android:layout_marginRight">-4dp</item>
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
     <style name="UrlBar.TabCounter" parent="UrlBar.V15.TabCounter"/>
     <style name="UrlBar.Base.TabCounter" parent="UrlBar.ImageButton"/>
     <style name="UrlBar.V15.TabCounter" parent="UrlBar.Base.TabCounter">
         <item name="android:layout_alignLeft">@id/tabs</item>
         <item name="android:layout_alignRight">@id/tabs</item>
         <item name="android:layout_toLeftOf">@id/menu</item>
@@ -873,26 +873,26 @@
 
     <style name="UrlBar.EditLayout" parent="UrlBar.V15.EditLayout"/>
     <style name="UrlBar.Base.EditLayout" parent="UrlBar.Button"/>
     <style name="UrlBar.V15.EditLayout" parent="UrlBar.Base.EditLayout">
         <item name="android:layout_alignLeft">@id/url_bar_entry</item>
         <item name="android:layout_toLeftOf">@id/edit_cancel</item>
         <item name="android:paddingLeft">8dp</item>
         <item name="android:paddingRight">0dp</item>
-        <item name="android:layout_marginRight">-2dp</item>
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V15.DisplayLayout"/>
     <style name="UrlBar.Base.DisplayLayout" parent="UrlBar.Button"/>
 
     <style name="UrlBar.V15.DisplayLayout" parent="UrlBar.Base.DisplayLayout">
         <item name="android:layout_alignLeft">@id/url_bar_entry</item>
         <item name="android:layout_alignRight">@id/url_bar_entry</item>
-        <item name="android:layout_marginRight">-2dp</item>
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
     <style name="UrlBar.QRCode" parent="UrlBar.V15.QRCode"/>
     <style name="UrlBar.V15.QRCode" parent="UrlBar.ImageButton">
-        <item name="android:layout_marginRight">-2dp</item>
+        <item name="android:layout_marginRight">-3dp</item>
     </style>
 
 </resources>