diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 5c1f3a3aa2f6..6b8c0b302ea3 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -797,12 +797,12 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   direction: ltr !important;
   border: none;
   background: url("chrome://browser/skin/urlbar/endcap.png") transparent right center no-repeat;
-  margin: 0px 4px 1px 4px;
-  -moz-padding-end: 10px;
+  margin: 0 3px 1px;
+  -moz-padding-end: 11px;
   font: icon !important;
   width: 7em;
   min-width: 7em;
-  height: 26px;
+  height: 28px;
 }
 
 #urlbar[focused="true"] {
@@ -830,7 +830,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 
 #urlbar-icons {
   -moz-box-align: center;
-  min-height: 26px;
 }
 
 #urlbar-search-splitter {
@@ -877,7 +876,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 }
 
 #page-proxy-stack {
-  -moz-margin-start: 9px;
+  -moz-margin-start: 10px;
   width: 24px;
   height: 20px;
   padding: 2px 4px;
@@ -1856,7 +1855,7 @@ tabpanels.plain {
 
 #identity-box {
   background: url("chrome://browser/skin/urlbar/startcap.png") left center no-repeat;
-  min-width: 44px;
+  min-width: 45px;
 }
 
 #urlbar[focused="true"] > #identity-box {
@@ -1876,7 +1875,7 @@ tabpanels.plain {
 #identity-icon-label {
   margin: 0;
   color: black;
-  padding: 2px 6px 3px;
+  padding: 4px 6px 3px;
   -moz-padding-end: 14px;
 }
 
@@ -1889,7 +1888,7 @@ tabpanels.plain {
 /* - Normal state */
 #identity-box.verifiedDomain {
   background-image: url("chrome://browser/skin/urlbar/startcap-secure-start.png");
-  -moz-padding-start: 12px;
+  -moz-padding-start: 13px;
 }
 
 #identity-box.verifiedDomain > hbox {
@@ -1943,7 +1942,7 @@ tabpanels.plain {
 /* - Normal state */
 #identity-box.verifiedIdentity {
   background-image: url("chrome://browser/skin/urlbar/startcap-verified-start.png");
-  -moz-padding-start: 12px;
+  -moz-padding-start: 13px;
 }
 
 #identity-box.verifiedIdentity > hbox {
diff --git a/browser/themes/pinstripe/browser/searchbar.css b/browser/themes/pinstripe/browser/searchbar.css
index d0419b1ad82d..9b7e52f5f15b 100644
--- a/browser/themes/pinstripe/browser/searchbar.css
+++ b/browser/themes/pinstripe/browser/searchbar.css
@@ -3,10 +3,9 @@
 .searchbar-textbox {
   -moz-appearance: none;
   font: icon;
-  height: 26px;
+  height: 28px;
   width: 5em;
-  margin-top: 3px;
-  -moz-margin-start: 4px;
+  margin: 0 3px 1px;
   min-width: 5em;
   border: none;
   background-color: transparent;
@@ -14,8 +13,9 @@
 
 .searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box {
   background: url("chrome://browser/skin/urlbar/textfield-mid.png") repeat-x;
-  padding: 0 !important;
-  margin: 0 !important;
+  padding: 0;
+  margin: 0;
+  -moz-margin-start: 45px;
 }
 
 .searchbar-textbox[focused="true"] > .autocomplete-textbox-container > .textbox-input-box {
@@ -26,22 +26,18 @@
   width: 16px;
   height: 16px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  -moz-margin-start: 2px;
-}
-
-.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box {
-  -moz-margin-start: 44px !important;
+  -moz-margin-start: 3px;
 }
 
 .searchbar-engine-button {
   background: url("chrome://browser/skin/urlbar/startcap.png") center center no-repeat;
   -moz-appearance: none;
-  height: 26px;
-  min-width: 44px;
+  height: 28px;
+  min-width: 45px;
   border: 0;
   -moz-box-align: center;
   margin: 0;
-  -moz-margin-start: -44px;
+  -moz-margin-start: -45px;
   padding: 0;
 }
 
@@ -97,7 +93,7 @@
 .search-go-container {
   -moz-box-align: center;
   background: url("chrome://browser/skin/urlbar/endcap.png") no-repeat right top;
-  -moz-padding-end: 4px;
+  -moz-padding-end: 5px;
 }
 
 .search-go-container[chromedir="rtl"] {
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png
index fa42ddc05cc7..b7cb9c63c0f5 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png and b/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused.png
index b4b5b28f680c..786fd2979e57 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-focused.png and b/browser/themes/pinstripe/browser/urlbar/endcap-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png
index e3cfd6ec35fb..e26eaebf8a15 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png and b/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap.png b/browser/themes/pinstripe/browser/urlbar/endcap.png
index 261982b2489b..60069850d307 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap.png and b/browser/themes/pinstripe/browser/urlbar/endcap.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png
index 764ac7165aea..ed2bb4403068 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png and b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png
index 0489198499d1..7076d1df6cd2 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png and b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png
index d8cd489ec386..2047ada0fc5c 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png and b/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-active.png
index f094426dddad..33603dea2499 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active.png and b/browser/themes/pinstripe/browser/urlbar/startcap-active.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png
index 782f049c65b9..26909af696fc 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png and b/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused.png
index 6715e8e78f8e..499d1c4df50b 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-focused.png and b/browser/themes/pinstripe/browser/urlbar/startcap-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png
index 834bb6efaab0..a73a41e50a63 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png and b/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png
index 343fca8b67e3..aa4183cac7cc 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png
index 35c4e03a79a3..9dc0637949be 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png
index ffdd9561b2cb..8fc0939b8b6f 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png
index 77bc47549217..6bfe1260248f 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png
index cd33dd289d3e..ebe4f69e5bcc 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png
index e053ef37923c..e9fc57660b22 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png
index 74a65262e025..8c8fd080b236 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png
index 70c18f96eaea..bc0e4064da20 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png
index 6caf8557c694..46a282fee1e5 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png and b/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png
index 124bc03717a3..ca0bad20bd3f 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png
index a7e05b21fa44..65e097bb2701 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png
index ef2297fcb30c..bcee816e211d 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png
index d1d10fa3150d..853aa7d8407e 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused.png
index fa00943f2b60..b7c85e8f5ad5 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid.png
index cf003ed170f8..e135410df021 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png
index 03726eff83b5..73e26174bc09 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused.png
index adcf3d421a06..3e1a2f6c129e 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start.png b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start.png
index cfb34d436f35..e5d3752a2016 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-verified-start.png and b/browser/themes/pinstripe/browser/urlbar/startcap-verified-start.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap.png b/browser/themes/pinstripe/browser/urlbar/startcap.png
index 5b40cc518588..5d822e9c0745 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap.png and b/browser/themes/pinstripe/browser/urlbar/startcap.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png
index c0d905c6ead3..0d8706580557 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png and b/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid.png
index 559ec892c2dc..b1ba5e9343a5 100644
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid.png and b/browser/themes/pinstripe/browser/urlbar/textfield-mid.png differ