ok so I checked in a slightly older version of the files I should have checked in last night.

also including some more slight CSS tweaks. a=jevering, r=german, johng

xpfe/components/search/resources/locale/en-US/search-panel.dtd

@@ -19,10 +19,10 @@
    - Contributor(s):
   --> 
 
-<!ENTITY search.button.label      "SEARCH">
+<!ENTITY search.button.label      "Search">
 <!ENTITY search.results.tab       "Apply">
 <!ENTITY search.advanced.tab      "Settings for ">
-<!ENTITY allengines.label         "All categories combined">
+<!ENTITY allengines.label         "the Web">
 <!ENTITY within.label             "within">
 <!ENTITY whenSearching.label      "When searching ">
 <!ENTITY useTheseProviders.label  "use these engines:">

xpfe/components/search/resources/search-panel.js

@@ -496,10 +496,9 @@ function doSearch()
       for( var i = 0; i < treeChildrenNode.childNodes.length; i++ )
       {
         var currItem = treeChildrenNode.childNodes[i];
-          dump("*** the current URI is = " + currItem.getAttribute("id") + "\n");
-        if( currItem.getAttribute("id").indexOf("Open_Directory") != -1 ) {
-          
-          engineURIs[engineURIs.length] = treeItem.getAttribute("id");
+        dump("*** the current URI is = " + currItem.getAttribute("id") + "\n");
+        if( currItem.getAttribute("id").indexOf("NetscapeSearch.src") != -1 ) {
+          engineURIs[engineURIs.length] = currItem.getAttribute("id");
           break;
         }
       }

xpfe/components/search/resources/search-panel.xul

@@ -40,11 +40,10 @@
       
       <!-- results panel -->
       <box class="searchpanel-outerbox" align="vertical" flex="100%">
-      <spring style="height: 8px;"/>
         <box align="horizontal" class="spaced">
         	<html:input id="sidebar-search-text" flex="1" onkeyup="if (event.which == 13) { return doSearch(); }" />
-          <titledbutton id="searchbutton" value="&search.button.label;" onclick="return doSearch();" class="dialog search-button"/>
-          <titledbutton id="stopbutton" value="&stop.button.label;" onclick="return doStop();" class="dialog search-button" style="display:none;"/>
+          <titledbutton id="searchbutton" value="&search.button.label;" onclick="return doSearch();" class="dialog toolbar-non-iconic"/>
+          <titledbutton id="stopbutton" value="&stop.button.label;" onclick="return doStop();" class="dialog toolbar-non-iconic" style="display:none;"/>
         </box>
         <box align="horizontal" class="spaced">
           <html:label for="">&within.label;</html:label>

xpfe/components/search/resources/search.css

@@ -128,3 +128,15 @@ tree[singleclick="true"] treeitem > treerow > treecell:active {
 tree[singleclick="true"] treeitem[selected="true"] > treerow { 
   background-color: transparent;
 }
+
+#sidebar-search-text {
+  border: 1px solid black;
+}
+
+#Tree, #searchengines {
+  border: 1px solid black;
+}
+
+titledbutton.push {
+  background-color: #CCCCCC;
+}