diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 6b858d29db4a..9bf0745168c3 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -78,21 +78,23 @@
                    showcommentcolumn="true"
                    tabscrolling="true"
                    xbl:inherits="disabled,disableautocomplete,searchengine,src,newlines">
-        <xul:button class="searchbar-engine-button"
-                    type="menu"
-                    anonid="searchbar-engine-button"
-                    chromedir="&locale.dir;">
-          <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
-          <xul:image class="searchbar-dropmarker-image"/>
-          <xul:menupopup class="searchbar-popup"
-                         anonid="searchbar-popup">
-            <xul:menuseparator/>
-            <xul:menuitem class="open-engine-manager"
-                          anonid="open-engine-manager"
-                          label="&cmd_engineManager.label;"
-                          oncommand="openManager(event);"/>
-          </xul:menupopup>
-        </xul:button>
+        <xul:box>
+          <xul:button class="searchbar-engine-button"
+                      type="menu"
+                      anonid="searchbar-engine-button"
+                      chromedir="&locale.dir;">
+            <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
+            <xul:image class="searchbar-dropmarker-image"/>
+            <xul:menupopup class="searchbar-popup"
+                           anonid="searchbar-popup">
+              <xul:menuseparator/>
+              <xul:menuitem class="open-engine-manager"
+                            anonid="open-engine-manager"
+                            label="&cmd_engineManager.label;"
+                            oncommand="openManager(event);"/>
+            </xul:menupopup>
+          </xul:button>
+        </xul:box>
         <xul:hbox class="search-go-container" chromedir="&locale.dir;">
           <xul:image class="search-go-button"
                      anonid="search-go-button"
diff --git a/browser/themes/gnomestripe/browser/searchbar.css b/browser/themes/gnomestripe/browser/searchbar.css
index d034e68922ad..8198c68addf6 100644
--- a/browser/themes/gnomestripe/browser/searchbar.css
+++ b/browser/themes/gnomestripe/browser/searchbar.css
@@ -5,6 +5,10 @@
   background-color: -moz-field;
 }
 
+.autocomplete-textbox-container {
+  -moz-box-align: stretch;
+}
+
 .textbox-input-box {
   margin: 0;
 }
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index bc43be2381d0..01fdd97e1931 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -779,8 +779,12 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
 /* ::::: nav-bar-inner ::::: */
 
 #urlbar {
-  direction: ltr !important;
-  font: icon !important;
+  direction: ltr;
+}
+
+.searchbar-textbox,
+#urlbar {
+  font: icon;
   width: 7em;
   min-width: 7em;
   -moz-appearance: none;
@@ -798,6 +802,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-padding-end: 6px;
 }
 
+.searchbar-textbox[focused="true"],
 #urlbar[focused="true"] {
   -moz-border-top-colors: rgba(0,0,0,.3);
   -moz-border-right-colors: rgba(0,0,0,.2);
@@ -809,6 +814,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
                    0 0 2px 1px -moz-mac-focusring;
 }
 
+.searchbar-engine-button,
 #identity-box {
   background: #fff url(navbar-textbox-button.png) bottom repeat-x;
   -moz-background-clip: padding;
@@ -822,6 +828,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   margin-top: -1px;
   margin-bottom: -1px;
   -moz-margin-start: -1px;
+  -moz-margin-end: 0;
 }
 
 #identity-box:focus:not(:active):not([open="true"]) #page-proxy-stack {
@@ -830,6 +837,13 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
                    0 0 3px 2px -moz-mac-focusring;
 }
 
+.searchbar-textbox[focused="true"] .searchbar-engine-button,
+#urlbar[focused="true"] > #identity-box {
+  -moz-box-shadow: 0 0 1px -moz-mac-focusring inset;
+}
+
+.searchbar-engine-button[open="true"],
+.searchbar-engine-button:hover:active,
 #identity-box[open="true"],
 #identity-box:hover:active {
   border-style: none;
@@ -839,7 +853,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-box-shadow: 0 0 50px rgba(0,0,0,.3) inset,
                    0 3px 3px rgba(0,0,0,.6) inset,
                    2px 0 2px rgba(0,0,0,.3) inset,
-                   0 -2px 2px rgba(0,0,0,.1) inset;
+                   0 -2px 2px rgba(0,0,0,.1) inset !important;
 }
 
 #identity-box.verifiedDomain {
@@ -858,17 +872,30 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   display: none;
 }
 
+.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box,
 #urlbar > .autocomplete-textbox-container > .textbox-input-box {
-  -moz-border-radius-topleft: 100%;
-  -moz-border-radius-bottomleft: 100%;
   -moz-margin-end: 0;
   -moz-margin-start: -16px;
   background-color: -moz-field;
   -moz-padding-start: 10px;
+}
+
+.searchbar-textbox[chromedir="ltr"] > .autocomplete-textbox-container > .textbox-input-box,
+#urlbar > .autocomplete-textbox-container > .textbox-input-box {
+  -moz-border-radius-topleft: 100%;
+  -moz-border-radius-bottomleft: 100%;
   -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset,
                    1px 0 0 rgba(0,0,0,.2) inset;
 }
 
+.searchbar-textbox[chromedir="rtl"] > .autocomplete-textbox-container > .textbox-input-box {
+  -moz-border-radius-topright: 100%;
+  -moz-border-radius-bottomright: 100%;
+  -moz-box-shadow: -1px 1px 1px rgba(0,0,0,.3) inset,
+                   -1px 0 0 rgba(0,0,0,.2) inset;
+}
+
+.searchbar-textbox[focused="true"][chromedir="ltr"] > .autocomplete-textbox-container > .textbox-input-box,
 #urlbar[focused="true"] > .autocomplete-textbox-container > .textbox-input-box {
   -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset,
                    1px 0 0 rgba(0,0,0,.2) inset,
@@ -876,8 +903,11 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
                    1px 0 1px -moz-mac-focusring inset;
 }
 
-#urlbar[focused="true"] > #identity-box {
-  -moz-box-shadow: 0 0 1px -moz-mac-focusring inset;
+.searchbar-textbox[focused="true"][chromedir="rtl"] > .autocomplete-textbox-container > .textbox-input-box {
+  -moz-box-shadow: -1px 1px 1px rgba(0,0,0,.3) inset,
+                   -1px 0 0 rgba(0,0,0,.2) inset,
+                   -2px 0 0 -moz-field inset,
+                   -1px 0 1px -moz-mac-focusring inset;
 }
 
 #urlbar-icons {
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index 85f0add328e9..8ffd59b568f1 100644
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -125,19 +125,5 @@ classic.jar:
   skin/classic/browser/tabbrowser/tabbrowser-tabs-bkgnd.png              (tabbrowser/tabbrowser-tabs-bkgnd.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabbrowser/tab-bkgnd.png                          (tabbrowser/tab-bkgnd.png)
-  skin/classic/browser/urlbar/endcap.png                                 (urlbar/endcap.png)
-  skin/classic/browser/urlbar/endcap-rtl.png                             (urlbar/endcap-rtl.png)
-  skin/classic/browser/urlbar/endcap-focused.png                         (urlbar/endcap-focused.png)
-  skin/classic/browser/urlbar/endcap-focused-rtl.png                     (urlbar/endcap-focused-rtl.png)
-  skin/classic/browser/urlbar/startcap.png                               (urlbar/startcap.png)
-  skin/classic/browser/urlbar/startcap-rtl.png                           (urlbar/startcap-rtl.png)
-  skin/classic/browser/urlbar/startcap-focused.png                       (urlbar/startcap-focused.png)
-  skin/classic/browser/urlbar/startcap-focused-rtl.png                   (urlbar/startcap-focused-rtl.png)
-  skin/classic/browser/urlbar/startcap-active.png                        (urlbar/startcap-active.png)
-  skin/classic/browser/urlbar/startcap-active-rtl.png                    (urlbar/startcap-active-rtl.png)
-  skin/classic/browser/urlbar/startcap-active-focused.png                (urlbar/startcap-active-focused.png)
-  skin/classic/browser/urlbar/startcap-active-focused-rtl.png            (urlbar/startcap-active-focused-rtl.png)
-  skin/classic/browser/urlbar/textfield-mid.png                          (urlbar/textfield-mid.png)
-  skin/classic/browser/urlbar/textfield-mid-focused.png                  (urlbar/textfield-mid-focused.png)
   icon.png
   preview.png
diff --git a/browser/themes/pinstripe/browser/searchbar.css b/browser/themes/pinstripe/browser/searchbar.css
index 1e5c2cee67e1..70080c09066a 100644
--- a/browser/themes/pinstripe/browser/searchbar.css
+++ b/browser/themes/pinstripe/browser/searchbar.css
@@ -1,27 +1,3 @@
-/* *** pinstripe *** */
-
-.searchbar-textbox {
-  -moz-appearance: none;
-  font: icon;
-  height: 28px;
-  width: 5em;
-  margin: 0 3px 1px;
-  min-width: 5em;
-  border: none;
-  background-color: transparent;
-}
-
-.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box {
-  background: url("chrome://browser/skin/urlbar/textfield-mid.png") repeat-x;
-  padding: 0;
-  margin: 0;
-  -moz-margin-start: 45px;
-}
-
-.searchbar-textbox[focused="true"] > .autocomplete-textbox-container > .textbox-input-box {
-  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused.png");
-}
-
 .searchbar-engine-image {
   width: 16px;
   height: 16px;
@@ -30,47 +6,8 @@
 }
 
 .searchbar-engine-button {
-  background: url("chrome://browser/skin/urlbar/startcap.png") center center no-repeat;
   -moz-appearance: none;
-  height: 28px;
-  min-width: 45px;
-  border: 0;
-  -moz-box-align: center;
-  margin: 0;
-  -moz-margin-start: -45px;
-  padding: 0;
-}
-
-.searchbar-engine-button[chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-rtl.png");
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button {
-  background-image: url("chrome://browser/skin/urlbar/startcap-focused.png");
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-focused-rtl.png");
-}
-
-.searchbar-engine-button:hover:active,
-.searchbar-engine-button[open="true"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active.png") !important;
-}
-
-.searchbar-engine-button:hover:active[chromedir="rtl"],
-.searchbar-engine-button[open="true"][chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active-rtl.png") !important;
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button:active,
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused.png") !important;
-}
-
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active,
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-rtl.png") !important;
+  min-width: 0;
 }
 
 .searchbar-engine-button > .button-box {
@@ -81,7 +18,11 @@
 }
 
 .searchbar-engine-button[addengines="true"] > .button-box {
-  background: transparent url(chrome://browser/skin/Search-addengines.png) no-repeat 25px 50%;
+  background: transparent url(chrome://browser/skin/Search-addengines.png) no-repeat right center;
+}
+
+.searchbar-textbox[chromedir="rtl"] .searchbar-engine-button[addengines="true"] > .button-box {
+  background-position: left center;
 }
 
 .searchbar-dropmarker-image {
@@ -92,28 +33,10 @@
 
 .search-go-container {
   -moz-box-align: center;
-  background: url("chrome://browser/skin/urlbar/endcap.png") no-repeat right top;
-  -moz-padding-end: 5px;
-}
-
-.search-go-container[chromedir="rtl"] {
-  background-image: url("chrome://browser/skin/urlbar/endcap-rtl.png");
-}
-
-.searchbar-textbox[focused="true"] > .search-go-container {
-  background-image: url("chrome://browser/skin/urlbar/endcap-focused.png");
-}
-
-.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"] {
-  background: url("chrome://browser/skin/urlbar/endcap-focused-rtl.png") no-repeat left top;
 }
 
 .search-go-button {
-  padding: 1px;
   list-style-image: url("chrome://browser/skin/Search.png");
-  margin: 0;
-  padding: 0;
-  -moz-padding-end: 6px;
 }
 
 .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png
deleted file mode 100644
index b7cb9c63c0f5..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused.png
deleted file mode 100644
index 786fd2979e57..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png
deleted file mode 100644
index e26eaebf8a15..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/endcap.png b/browser/themes/pinstripe/browser/urlbar/endcap.png
deleted file mode 100644
index 60069850d307..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/endcap.png and /dev/null 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
deleted file mode 100644
index ed2bb4403068..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png
deleted file mode 100644
index 7076d1df6cd2..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png
deleted file mode 100644
index 2047ada0fc5c..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-active.png
deleted file mode 100644
index 33603dea2499..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-active.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png
deleted file mode 100644
index 26909af696fc..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused.png
deleted file mode 100644
index 499d1c4df50b..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png
deleted file mode 100644
index a73a41e50a63..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/startcap.png b/browser/themes/pinstripe/browser/urlbar/startcap.png
deleted file mode 100644
index 5d822e9c0745..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/startcap.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png
deleted file mode 100644
index 0d8706580557..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid.png
deleted file mode 100644
index b1ba5e9343a5..000000000000
Binary files a/browser/themes/pinstripe/browser/urlbar/textfield-mid.png and /dev/null differ
diff --git a/browser/themes/winstripe/browser/searchbar.css b/browser/themes/winstripe/browser/searchbar.css
index 7684ba79fa6d..c855c4dd6641 100644
--- a/browser/themes/winstripe/browser/searchbar.css
+++ b/browser/themes/winstripe/browser/searchbar.css
@@ -4,6 +4,10 @@
   min-width: 6em;
 }
 
+.autocomplete-textbox-container {
+  -moz-box-align: stretch;
+}
+
 .searchbar-textbox:-moz-system-metric(windows-default-theme) {
   -moz-appearance: none;
   border-width: 1px;
@@ -33,8 +37,6 @@
   margin: 0;
   -moz-margin-end: 3px;
   padding: 0;
-  height: 1.23em;
-  min-height: 20px;
   -moz-box-align: center;
   background: -moz-dialog url(navbar-textbox-buttons.png) repeat-x;
   border: 0 solid;