diff --git a/mozilla/toolkit/content/widgets/findbar.xml b/mozilla/toolkit/content/widgets/findbar.xml
index f8441a642be..6e905eac359 100644
--- a/mozilla/toolkit/content/widgets/findbar.xml
+++ b/mozilla/toolkit/content/widgets/findbar.xml
@@ -217,22 +217,24 @@
                 class="find-field-container findbar-find-fast">
         <xul:textbox class="findbar-textbox" anonid="findbar-textbox"/>
       </xul:hbox>
-      <xul:toolbarbutton anonid="find-next"
-                         class="findbar-find-next tabbable"
-                         label="&next.label;"
-                         accesskey="&next.accesskey;"
-                         tooltiptext="&next.tooltip;"
-                         oncommand="onFindAgainCommand(false);"
-                         disabled="true"
-                         xbl:inherits="accesskey=findnextaccesskey"/>
-      <xul:toolbarbutton anonid="find-previous"
-                         class="findbar-find-previous tabbable"
-                         label="&previous.label;"
-                         accesskey="&previous.accesskey;"
-                         tooltiptext="&previous.tooltip;"
-                         oncommand="onFindAgainCommand(true);"
-                         disabled="true"
-                         xbl:inherits="accesskey=findpreviousaccesskey"/>
+      <xul:hbox anonid="find-buttons-container" class="find-buttons-container">
+        <xul:toolbarbutton anonid="find-next"
+                           class="findbar-find-next tabbable"
+                           label="&next.label;"
+                           accesskey="&next.accesskey;"
+                           tooltiptext="&next.tooltip;"
+                           oncommand="onFindAgainCommand(false);"
+                           disabled="true"
+                           xbl:inherits="accesskey=findnextaccesskey"/>
+        <xul:toolbarbutton anonid="find-previous"
+                           class="findbar-find-previous tabbable"
+                           label="&previous.label;"
+                           accesskey="&previous.accesskey;"
+                           tooltiptext="&previous.tooltip;"
+                           oncommand="onFindAgainCommand(true);"
+                           disabled="true"
+                           xbl:inherits="accesskey=findpreviousaccesskey"/>
+      </xul:hbox>
       <xul:toolbarbutton anonid="highlight"
                          class="findbar-highlight tabbable"
                          label="&highlight.label;"
diff --git a/mozilla/toolkit/themes/gnomestripe/global/findBar.css b/mozilla/toolkit/themes/gnomestripe/global/findBar.css
new file mode 100644
index 00000000000..225d8231e3f
--- /dev/null
+++ b/mozilla/toolkit/themes/gnomestripe/global/findBar.css
@@ -0,0 +1,94 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.findbar-closebutton {
+  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
+}
+
+findbar {
+  -moz-appearance: none !important;
+  border-top: 2px solid;
+  -moz-border-top-colors: ThreeDShadow ThreeDHighlight !important;
+  border-bottom: 1px solid;
+  -moz-border-bottom-colors: transparent;
+  min-width: 1px;
+}
+
+.find-buttons-container {
+  -moz-box-direction: reverse;
+}
+
+/* find-next button */
+
+.findbar-find-next {
+  list-style-image: url("moz-icon://stock/gtk-go-forward?size=menu");
+}
+
+.findbar-find-next[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-go-forward?size=menu&state=disabled");
+}
+
+/* find-previous button */
+
+.findbar-find-previous {
+  list-style-image: url("moz-icon://stock/gtk-go-back?size=menu");
+}
+
+.findbar-find-previous[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-go-back?size=menu&state=disabled");
+}
+
+/* highlight button */
+
+.findbar-highlight {
+  list-style-image: url("moz-icon://stock/gtk-select-all?size=menu");
+}
+
+.findbar-highlight[disabled="true"] {
+  list-style-image: url("moz-icon://stock/gtk-select-all?size=menu&state=disabled");
+}
+
+.find-status-icon {
+  list-style-image: none;
+  margin-top: 2px;
+  margin-bottom: 0;
+  -moz-margin-start: 12px;
+  -moz-margin-end: 0;
+  width: 16px;
+  height: 16px;
+}
+
+.findbar-find-status {
+  margin-top: 0;
+  margin-bottom: 0;
+  -moz-margin-start: 3px;
+  -moz-margin-end: 0;
+  padding: 2px;
+}
+
+.find-status-icon[status="notfound"] {
+  list-style-image: url("moz-icon://stock/gtk-stop?size=menu");
+}
+
+.findbar-textbox {
+  -moz-binding: url("chrome://global/content/bindings/findbar.xml#findbar-textbox");
+  -moz-appearance: none;
+  border: none;
+  margin: 0;
+}
+
+.findbar-textbox[status="notfound"] {
+  background-color: #FF6666;
+  color: #FFFFFF;
+}
+
+findbar[flash="true"]  > .find-field-container > .findbar-textbox {
+  background-color: yellow;
+}
+
+.find-status-icon[status="wrapped"] {
+  list-style-image: url("chrome://global/skin/icons/wrap.png");
+}
+
+.find-field-container {
+  -moz-appearance: textfield;
+}
diff --git a/mozilla/toolkit/themes/gnomestripe/global/jar.mn b/mozilla/toolkit/themes/gnomestripe/global/jar.mn
index bb01132b17d..a57b5943497 100644
--- a/mozilla/toolkit/themes/gnomestripe/global/jar.mn
+++ b/mozilla/toolkit/themes/gnomestripe/global/jar.mn
@@ -12,6 +12,7 @@ classic.jar:
 +  skin/classic/global/tree.css
 +  skin/classic/global/listbox.css
 +  skin/classic/global/groupbox.css
++  skin/classic/global/findBar.css
 +  skin/classic/global/icons/notfound.png                      (icons/notfound.png)
 +  skin/classic/global/icons/wrap.png                          (icons/wrap.png)
 +  skin/classic/global/menu/Menu-arrow.png                     (menu/Menu-arrow.png)