--- a/browser/components/places/content/editBookmarkOverlay.xul
+++ b/browser/components/places/content/editBookmarkOverlay.xul
@@ -173,16 +173,17 @@
 
         <row align="center" id="editBMPanel_tagsRow">
           <label value="&editBookmarkOverlay.tags.label;"
                  accesskey="&editBookmarkOverlay.tags.accesskey;"
                  control="editBMPanel_tagsField"
                  observes="paneElementsBroadcaster"/>
           <textbox id="editBMPanel_tagsField"
                    type="autocomplete"
+                   class="padded"
                    autocompletesearch="places-tag-autocomplete" 
                    completedefaultindex="true"
                    tabscrolling="true"
                    showcommentcolumn="true"
                    onblur="gEditItemOverlay.onTagsFieldBlur();"
                    observes="paneElementsBroadcaster"
                    emptytext="&editBookmarkOverlay.tagsEmptyDesc.label;"/>
           <button id="editBMPanel_tagsSelectorExpander"

--- a/browser/themes/gnomestripe/browser/preferences/preferences.css
+++ b/browser/themes/gnomestripe/browser/preferences/preferences.css
@@ -68,25 +68,16 @@ radio[pane=panePrivacy] {
 radio[pane=paneSecurity] {
   -moz-image-region: rect(0px, 192px,  32px, 160px)
 }
 
 radio[pane=paneAdvanced] {
   -moz-image-region: rect(0px, 224px, 32px, 192px)
 }
 
-/* General Pane */
-#browserHomePage {
-  padding-top: 2px;
-  padding-bottom: 3px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
-  background-color: -moz-Dialog;
-}
-
 /* Applications Pane */
 #BrowserPreferences[animated="true"] #handlersView {
   height: 25em;
 }
 
 #BrowserPreferences[animated="false"] #handlersView {
   -moz-box-flex: 1;
 }

--- a/browser/themes/winstripe/browser/preferences/preferences.css
+++ b/browser/themes/winstripe/browser/preferences/preferences.css
@@ -95,25 +95,16 @@ radio[pane=paneSecurity][selected="true"
 radio[pane=paneAdvanced] {
 	-moz-image-region: rect(0px, 224px, 32px, 192px)
 }
 radio[pane=paneAdvanced]:hover, 
 radio[pane=paneAdvanced][selected="true"] {
 	-moz-image-region: rect(32px, 224px, 64px, 192px)
 }
 
-/* General Pane */
-#browserHomePage {
-  padding-top: 2px;
-  padding-bottom: 3px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
-  background-color: -moz-Dialog;
-}
-
 /* Applications Pane */
 #BrowserPreferences[animated="true"] #handlersView {
   height: 25em;
 }
 
 #BrowserPreferences[animated="false"] #handlersView {
   -moz-box-flex: 1;
 }

--- a/toolkit/themes/gnomestripe/global/autocomplete.css
+++ b/toolkit/themes/gnomestripe/global/autocomplete.css
@@ -41,49 +41,45 @@
   == Styles used by the autocomplete widget.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 /* ::::: autocomplete ::::: */
 
-textbox {
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
   cursor: default;
   padding: 0;
 }
 
 textbox[enablehistory="true"] {
   -moz-appearance: none;
   border: 0;
   background-color: transparent;
 }
 
 textbox[nomatch="true"][highlightnonmatches="true"] {
   color: red;
 }
 
-/* Used by autocomplete widgets that don't have an icon. Gross. -dwh */
-textbox.padded {
-  padding-top: 1px;
-  padding-bottom: 1px;
-  -moz-padding-start: 2px;
-  -moz-padding-end: 0px;
-}
-
 .autocomplete-textbox-container {
   -moz-box-align: center;
 }
 
 textbox[enablehistory="true"] > .autocomplete-textbox-container {
   -moz-appearance: menulist-textfield;
 }
 
+textbox:not(.padded) .textbox-input-box {
+  margin: 0 3px;
+}
+
 .textbox-input-box {
-  margin: 0 3px;
   -moz-box-align: center;
 }
 
 /* ::::: autocomplete popups ::::: */
 
 panel[type="autocomplete"],
 panel[type="autocomplete-richlistbox"],
 .autocomplete-history-popup {

--- a/toolkit/themes/pinstripe/global/autocomplete.css
+++ b/toolkit/themes/pinstripe/global/autocomplete.css
@@ -41,32 +41,31 @@
   == Styles used by the autocomplete widget.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 /* ::::: autocomplete ::::: */
 
-textbox {
+/* .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;
 }
 
-/* Used by autocomplete widgets that don't have an icon. Gross. -dwh */
-textbox.padded {
-  padding: 1px 0px 1px 2px;
+textbox:not(.padded) .textbox-input-box {
+  margin: 0 3px;
 }
 
 .textbox-input-box {
-  margin: 0 3px;
   -moz-box-align: center;
 }
 
 /* ::::: history button ::::: */
 
 .autocomplete-history-dropmarker {
   -moz-appearance: none !important;
   border: none !important;

--- a/toolkit/themes/winstripe/global/autocomplete.css
+++ b/toolkit/themes/winstripe/global/autocomplete.css
@@ -41,39 +41,35 @@
   == Styles used by the autocomplete widget.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 /* ::::: autocomplete ::::: */
 
-textbox {
+/* .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;
 }
 
-/* Used by autocomplete widgets that don't have an icon. Gross. -dwh */
-textbox.padded {
-  padding-top: 1px;
-  padding-bottom: 1px;
-  -moz-padding-start: 2px;
-  -moz-padding-end: 0px;
-}
-
 .autocomplete-textbox-container {
   -moz-box-align: center;
 }
 
+textbox:not(.padded) .textbox-input-box {
+  margin: 0 3px;
+}
+
 .textbox-input-box {
-  margin: 0 3px;
   -moz-box-align: center;
 }
 
 /* ::::: autocomplete popups ::::: */
 
 panel[type="autocomplete"],
 panel[type="autocomplete-richlistbox"],
 .autocomplete-history-popup {