diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index da15eff2f60..07ceab52ef5 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -192,11 +192,11 @@
                          type="checkbox"
                          xbl:inherits="accesskey=matchcaseaccesskey"/>
       <xul:label anonid="match-case-status" class="findbar-find-fast"/>
-      <xul:toolbarbutton anonid="find-closebutton"
-                         class="findbar-closebutton"
-                         tooltiptext="&findCloseButton.tooltip;"
-                         oncommand="close();"/>
     </xul:hbox>
+    <xul:toolbarbutton anonid="find-closebutton"
+                       class="findbar-closebutton"
+                       tooltiptext="&findCloseButton.tooltip;"
+                       oncommand="close();"/>
     </content>
 
     <implementation implements="nsIDOMEventListener, nsIEditActionListener">
diff --git a/toolkit/themes/linux/global/findBar.css b/toolkit/themes/linux/global/findBar.css
index b38eac31e02..44e128e6bd7 100644
--- a/toolkit/themes/linux/global/findBar.css
+++ b/toolkit/themes/linux/global/findBar.css
@@ -5,7 +5,6 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 findbar {
-  padding: 4px 8px;
   border-top: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
   min-width: 1px;
@@ -23,6 +22,12 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
+.findbar-container {
+  -moz-padding-start: 8px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
 .findbar-closebutton {
   -moz-margin-start: 4px;
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
diff --git a/toolkit/themes/osx/global/findBar.css b/toolkit/themes/osx/global/findBar.css
index e4a18a0f229..7acc1878666 100644
--- a/toolkit/themes/osx/global/findBar.css
+++ b/toolkit/themes/osx/global/findBar.css
@@ -9,7 +9,6 @@ findbar {
   background: @scopeBarBackground@;
   border-top: @scopeBarSeparatorBorder@;
   min-width: 1px;
-  padding: 4px 2px;
   transition-property: margin-bottom, opacity, visibility;
   transition-duration: 150ms, 150ms, 0s;
   transition-timing-function: ease-in-out, ease-in-out, linear;
@@ -30,6 +29,12 @@ findbar:-moz-lwtheme {
   border-style: none;
 }
 
+.findbar-container {
+  -moz-padding-start: 2px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
 label.findbar-find-fast {
   color: @scopeBarTitleColor@;
   margin: 0;
@@ -44,8 +49,9 @@ label.findbar-find-fast:-moz-lwtheme,
 }
 
 .findbar-closebutton {
-  padding: 0;
-  margin: 0 4px;
+  -moz-margin-start: 4px;
+  -moz-padding-start: 0;
+  -moz-padding-end: 8px;
   list-style-image: url("chrome://global/skin/icons/close.png");
   border: none;
   -moz-image-region: rect(0, 16px, 16px, 0);
diff --git a/toolkit/themes/windows/global/findBar.css b/toolkit/themes/windows/global/findBar.css
index 6d2527ae5a2..86de66ed0d6 100644
--- a/toolkit/themes/windows/global/findBar.css
+++ b/toolkit/themes/windows/global/findBar.css
@@ -5,7 +5,6 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 findbar {
-  padding: 4px 8px;
   box-shadow: 0 1px 1px rgba(0,0,0,.1) inset;
   background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px);
   background-size: 100% 2px;
@@ -25,10 +24,17 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
+.findbar-container {
+  -moz-padding-start: 8px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
 .findbar-closebutton {
   -moz-margin-start: 4px;
+  -moz-padding-start: 0;
+  -moz-padding-end: 8px;
   border: none;
-  padding: 0;
   list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
   -moz-image-region: rect(0, 16px, 16px, 0);