diff --git a/toolkit/components/help/content/help.xul b/toolkit/components/help/content/help.xul
index f8a11c869bd..493e826761b 100644
--- a/toolkit/components/help/content/help.xul
+++ b/toolkit/components/help/content/help.xul
@@ -182,9 +182,8 @@
         <toolbarspring flex="1"/>
         <toolbaritem id="search-box"
                      align="center" pack="center">
-          <label value="&searchtab.label;" accesskey="&searchtab.accesskey;" 
-                 control="findText"/>
-          <textbox id="findText" type="search" oncommand="doFind();"/>
+          <textbox id="findText" type="search" emptytext="&search.emptytext;"
+                   oncommand="doFind();"/>
         </toolbaritem>
       </toolbar>
     </toolbox>
@@ -234,10 +233,8 @@
         </vbox>
         <vbox id="help-search-sidebar" hidden="true" flex="1">
           <sidebarheader align="center">
-            <label id="help-search-sidebar-header" flex="1" crop="end" value="&searchtab.label;"/>
-            <toolbarbutton id="search-sidebar-closebutton"
-                           tooltiptext="&searchClose.tooltip;"
-                           oncommand="hideSearchSidebar();"/>
+            <label id="help-search-sidebar-header" flex="1" crop="end"
+                   value="&searchHeader.label;"/>
           </sidebarheader>
           <tree id="help-search-tree" class="focusring"
                 flex="1" hidecolumnpicker="true"
diff --git a/toolkit/locales/en-US/chrome/mozapps/help/help.dtd b/toolkit/locales/en-US/chrome/mozapps/help/help.dtd
index 49904f1322d..806d8bb5d98 100644
--- a/toolkit/locales/en-US/chrome/mozapps/help/help.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/help/help.dtd
@@ -22,9 +22,8 @@
 <!ENTITY printButton.tooltip            "Print this page">
 <!ENTITY closeWindow.commandkey         "W">
 
-<!ENTITY searchtab.label                "Search">
-<!ENTITY searchtab.accesskey            "S">
-<!ENTITY searchClose.tooltip            "Close search results">
+<!ENTITY search.emptytext               "Search">
+<!ENTITY searchHeader.label             "Search results">
 <!ENTITY toctab.label                   "Contents">
 <!ENTITY toctab.accesskey               "C">
 
diff --git a/toolkit/themes/gnomestripe/help/help.css b/toolkit/themes/gnomestripe/help/help.css
index 64886c13f35..ff11cfa1309 100644
--- a/toolkit/themes/gnomestripe/help/help.css
+++ b/toolkit/themes/gnomestripe/help/help.css
@@ -107,10 +107,6 @@
 /* Set the minimum sidebar width so the help contents aren't squeezed together.*/
 #help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
 
-#search-sidebar-closebutton {
-  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
-}
-
 #context-copy[disabled="true"] {
   display: none;
 }
diff --git a/toolkit/themes/pinstripe/help/help.css b/toolkit/themes/pinstripe/help/help.css
index 3386286db8b..a3d2e187f2f 100644
--- a/toolkit/themes/pinstripe/help/help.css
+++ b/toolkit/themes/pinstripe/help/help.css
@@ -59,7 +59,6 @@
   border: 0px !important;
 }
 
-
 /* Hide labels for the toolbar because we really don't need them what with the
    tooltips */
 #HelpToolbar .toolbarbutton-text {
@@ -69,22 +68,6 @@
 /* Set the minimum sidebar width so the help contents aren't squeezed together.*/
 #help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
 
-#search-sidebar-closebutton {
-  -moz-binding: url(chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-image);
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
-  padding-right: 4px;
-  margin: 0;
-  border: 0;
-}
-
-#search-sidebar-closebutton:hover {
-  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
-}
-
-#search-sidebar-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
-}
-
 #help-back-button { -moz-image-region: rect(0px 24px 24px 0px); }
 #help-back-button:not([disabled="true"]):hover { -moz-image-region: rect(24px 24px 48px 0px); }
 #help-back-button[disabled="true"] { -moz-image-region: rect(48px 24px 72px 0px); }
@@ -150,28 +133,6 @@
   -moz-image-region: rect(72px, 14px, 96px, 0px);
 }
 
-
 #helpsidebar-splitter {
   border-right: 1px solid #bebebe;
 }
-
-#helpsidebar-box toolbarbutton {
-  background-image: url("chrome://global/skin/icons/white-gray-gradient.gif");
-  background-repeat: repeat-x;
-  background-position: bottom right;
-  background-color: rgb(246, 246, 246);
-  border-bottom: 1px solid #b3b3b3;
-  border-right: 1px solid #bebebe;
-  margin: 0px;
-  text-align: left;
-  color: #505050;
-}
-
-#helpsidebar-box toolbarbutton[selected="true"] {
-  color: #000;
-}
-
-#helpsidebar-box tree {
-  margin: 0px !important;
-  padding: 0px !important;
-}
diff --git a/toolkit/themes/winstripe/help/help.css b/toolkit/themes/winstripe/help/help.css
index 11baae5871f..5eb8a609380 100644
--- a/toolkit/themes/winstripe/help/help.css
+++ b/toolkit/themes/winstripe/help/help.css
@@ -64,22 +64,6 @@
 /* Set the minimum sidebar width so the help contents aren't squeezed together.*/
 #help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
 
-#search-sidebar-closebutton {
-  border: 1px solid transparent;
-  padding: 3px 2px 4px 2px !important;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-appearance: none;
-  -moz-image-region: rect(0px, 14px, 14px, 0px);
-}
-
-#search-sidebar-closebutton:hover {
-  -moz-image-region: rect(0px, 28px, 14px, 14px);
-}
-
-#search-sidebar-closebutton:hover:active {
-  -moz-image-region: rect(0px, 42px, 14px, 28px);
-}
-
 /* ----- BACK BUTTON ----- */
 
 #help-back-button {