diff --git a/browser/components/places/content/editBookmarkOverlay.xul b/browser/components/places/content/editBookmarkOverlay.xul
index 6dcbc6728cb4..ed9e3d04d0f4 100644
--- a/browser/components/places/content/editBookmarkOverlay.xul
+++ b/browser/components/places/content/editBookmarkOverlay.xul
@@ -121,7 +121,6 @@
           <hbox flex="1" align="center">
             <textbox id="editBMPanel_tagsField"
                      type="autocomplete"
-                     class="padded"
                      flex="1"
                      autocompletesearch="places-tag-autocomplete" 
                      completedefaultindex="true"
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 850427766364..6772f78f8cf5 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -166,10 +166,6 @@ menuitem.bookmark-item {
   border-color: Highlight;
 }
 
-.urlbar-textbox-container {
-  -moz-box-align: stretch;
-}
-
 /* ::::: URL Bar Zoom Reset Button ::::: */
 @keyframes urlbar-zoom-reset-pulse {
   0% {
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
index 977a3145adf2..d7fec035b882 100644
--- a/browser/themes/shared/urlbar-searchbar.inc.css
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
@@ -29,6 +29,7 @@
   padding: 0;
   margin: 3px 5px;
   min-height: 30px;
+  cursor: default;
   overflow: -moz-hidden-unscrollable;
 }
 
@@ -72,11 +73,6 @@
   -moz-box-align: center;
 }
 
-.urlbar-input-box,
-.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box {
-  margin: 0;
-}
-
 #urlbar-search-splitter {
   /* The splitter width should equal the location and search bars' combined
      neighboring margin and border width. */
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index cda779db256b..28e3d6d2ce68 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -529,10 +529,6 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
   color: #777;
 }
 
-.urlbar-textbox-container {
-  -moz-box-align: stretch;
-}
-
 /* ::::: URL Bar Zoom Reset Button ::::: */
 @keyframes urlbar-zoom-reset-pulse {
   0% {
diff --git a/editor/reftests/xul/autocomplete-1.xul b/editor/reftests/xul/autocomplete-1.xul
index 4ba8edb8ccaa..f30e35fa543a 100644
--- a/editor/reftests/xul/autocomplete-1.xul
+++ b/editor/reftests/xul/autocomplete-1.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="autocomplete.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/editor/reftests/xul/autocomplete.css b/editor/reftests/xul/autocomplete.css
new file mode 100644
index 000000000000..a71546f434b3
--- /dev/null
+++ b/editor/reftests/xul/autocomplete.css
@@ -0,0 +1,3 @@
+.textbox-input {
+  border-style: none;
+}
diff --git a/editor/reftests/xul/input.css b/editor/reftests/xul/input.css
index 09eb3bce7304..811aa6e8cc65 100644
--- a/editor/reftests/xul/input.css
+++ b/editor/reftests/xul/input.css
@@ -1,29 +1,17 @@
 @namespace url('http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul');
 @namespace html url('http://www.w3.org/1999/xhtml');
 
+html|input, html|textarea {
+  margin: 2px 4px;
+  padding: 2px 2px 3px;
+  padding-inline-start: 5px;
+}
+
 #mac html|input, #mac html|textarea {
   margin: 4px;
   padding: 0 1px;
 }
 
-#win html|input, #win html|textarea {
-  margin: 2px 4px;
-  padding: 2px 3px 3px;
-  padding-inline-start: 5px;
-}
-
-@media (-moz-windows-default-theme) {
-  #win html|input {
-    padding: 1px 2px 2px;
-    padding-inline-start: 4px;
-  }
-}
-
-#linux html|input, #linux html|textarea {
-  margin: 2px 4px;
-  padding: 2px 5px 3px;
-}
-
 textbox[multiline="true"], html|textarea {
   border: none !important;
   -moz-appearance: none !important;
@@ -36,10 +24,6 @@ html|input, html|textarea {
   font: inherit;
 }
 
-html|input.ac {
-  padding: 0 4px !important;
-}
-
 html|input.empty {
   color: graytext;
 }
diff --git a/toolkit/themes/linux/global/autocomplete.css b/toolkit/themes/linux/global/autocomplete.css
index 5f52eb37c1b7..3ab08be29f51 100644
--- a/toolkit/themes/linux/global/autocomplete.css
+++ b/toolkit/themes/linux/global/autocomplete.css
@@ -11,28 +11,10 @@
 
 /* ::::: autocomplete ::::: */
 
-/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
-textbox:not(.padded) {
-  cursor: default;
-  padding: 0;
-}
-
 textbox[nomatch="true"][highlightnonmatches="true"] {
   color: red;
 }
 
-.autocomplete-textbox-container {
-  -moz-box-align: center;
-}
-
-textbox:not(.padded) .textbox-input-box {
-  margin: 0 3px;
-}
-
-.textbox-input-box {
-  -moz-box-align: center;
-}
-
 /* ::::: autocomplete popups ::::: */
 
 panel[type="autocomplete"],
diff --git a/toolkit/themes/osx/global/autocomplete.css b/toolkit/themes/osx/global/autocomplete.css
index ccbbbe6e1399..50aa895d9e63 100644
--- a/toolkit/themes/osx/global/autocomplete.css
+++ b/toolkit/themes/osx/global/autocomplete.css
@@ -5,24 +5,10 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
-/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
-textbox:not(.padded) {
-  cursor: default;
-  padding: 0;
-}
-
 textbox[nomatch="true"][highlightnonmatches="true"] {
   color: red;
 }
 
-textbox:not(.padded) .textbox-input-box {
-  margin: 0 3px;
-}
-
-.textbox-input-box {
-  -moz-box-align: center;
-}
-
 /* ::::: autocomplete popups ::::: */
 
 panel[type="autocomplete"],
diff --git a/toolkit/themes/windows/global/autocomplete.css b/toolkit/themes/windows/global/autocomplete.css
index 00276be28840..757bc8c9e3e8 100644
--- a/toolkit/themes/windows/global/autocomplete.css
+++ b/toolkit/themes/windows/global/autocomplete.css
@@ -11,28 +11,10 @@
 
 /* ::::: autocomplete ::::: */
 
-/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
-textbox:not(.padded) {
-  cursor: default;
-  padding: 0;
-}
-
 textbox[nomatch="true"][highlightnonmatches="true"] {
   color: red;
 }
 
-.autocomplete-textbox-container {
-  -moz-box-align: center;
-}
-
-textbox:not(.padded) .textbox-input-box {
-  margin: 0 3px;
-}
-
-.textbox-input-box {
-  -moz-box-align: center;
-}
-
 /* ::::: autocomplete popups ::::: */
 
 panel[type="autocomplete"],