diff --git a/xpfe/components/directory/directory.css b/xpfe/components/directory/directory.css
index e349edfc6b8..3ed3cce8550 100644
--- a/xpfe/components/directory/directory.css
+++ b/xpfe/components/directory/directory.css
@@ -28,10 +28,6 @@
 
 @import url(chrome://communicator/skin/);
 
-treecol[sortActive="true"] {
-  background-color: lightgray;
-}
-
 /* Hide the twisty when type != DIRECTORY (XXX is there a '!=' in CSS?) */
 treeitem[type="FILE"] > treerow > treecell > .twisty {
   list-style-image: none;
diff --git a/xpfe/components/directory/directory.xul b/xpfe/components/directory/directory.xul
index a29afb515bd..61283f2d035 100644
--- a/xpfe/components/directory/directory.xul
+++ b/xpfe/components/directory/directory.xul
@@ -56,9 +56,12 @@
 
       <treehead>
         <treerow>
-          <treecell value="&directoryWindow.filename.label;" onclick="return doSort('FilenameColumn');" observes="FilenameColumn" sortActive="true" sortDirection="ascending" />
-          <treecell value="&directoryWindow.contentlength.label;" onclick="return doSort('ContentLengthColumn');" observes="ContentLengthColumn" />
-          <treecell value="&directoryWindow.lastmodified.label;" onclick="return doSort('LastModColumn');" observes="LastModColumn" />
+          <treecell class="treecell-header sortDirectionIndicator" value="&directoryWindow.filename.label;"
+          	onclick="return doSort('FilenameColumn');" observes="FilenameColumn" sortActive="true" sortDirection="ascending" />
+          <treecell class="treecell-header sortDirectionIndicator" value="&directoryWindow.contentlength.label;"
+          	onclick="return doSort('ContentLengthColumn');" observes="ContentLengthColumn" />
+          <treecell class="treecell-header sortDirectionIndicator" value="&directoryWindow.lastmodified.label;"
+          	onclick="return doSort('LastModColumn');" observes="LastModColumn" />
         </treerow>
       </treehead>
 
diff --git a/xpfe/components/search/resources/internetresults.xul b/xpfe/components/search/resources/internetresults.xul
index 60169e6a1da..8fd16abdcb3 100644
--- a/xpfe/components/search/resources/internetresults.xul
+++ b/xpfe/components/search/resources/internetresults.xul
@@ -102,35 +102,35 @@
 
 		<treehead>
 			<treerow>
-				<treecell id="NameCell" align="center"
+				<treecell id="NameCell" align="center" class="treecell-header sortDirectionIndicator"
 					value="&name.column.label;" observes="NameColumn"
 					resource="http://home.netscape.com/NC-rdf#Name"
 					onclick="return doSort('NameColumn', null);" />
-				<treecell id="PageRankCell" align="center"
+				<treecell id="PageRankCell" align="center" class="treecell-header sortDirectionIndicator"
 					value="&pagerank.column.label;" observes="PageRankColumn"
 					resource="http://home.netscape.com/NC-rdf#PageRank"
 					onclick="return doSort('PageRankColumn', null);" />
-				<treecell id="RelevanceCell" align="center"
+				<treecell id="RelevanceCell" align="center" class="treecell-header sortDirectionIndicator"
 					value="&relevance.column.label;" observes="RelevanceColumn"
 					resource="http://home.netscape.com/NC-rdf#Relevance"
 					onclick="return doSort('RelevanceColumn', null);" />
-				<treecell id="PriceCell" align="center"
+				<treecell id="PriceCell" align="center" class="treecell-header sortDirectionIndicator"
 					value="&price.column.label;" observes="PriceColumn"
 					resource="http://home.netscape.com/NC-rdf#Price"
 					onclick="return doSort('PriceColumn', null);" />
-				<treecell id="AvailabilityCell" align="center"
+				<treecell id="AvailabilityCell" align="center" class="treecell-header sortDirectionIndicator"
 					value="&availability.column.label;" observes="AvailabilityColumn"
 					resource="http://home.netscape.com/NC-rdf#Availability"
 					onclick="return doSort('AvailabilityColumn', null);" />
-				<treecell id="DateCell" align="center"
+				<treecell id="DateCell" align="center" class="treecell-header sortDirectionIndicator"
 					value="&date.column.label;" observes="DateColumn"
 					resource="http://home.netscape.com/NC-rdf#Date"
 					onclick="return doSort('DateColumn', null);" />
-				<treecell id="SiteCell" align="center"
+				<treecell id="SiteCell" align="center" class="treecell-header sortDirectionIndicator"
 					value="&site.column.label;" observes="SiteColumn"
 					resource="http://home.netscape.com/NC-rdf#Site"
 					onclick="return doSort('SiteColumn', null);" />
-				<treecell id="EngineCell" align="center"
+				<treecell id="EngineCell" align="center" class="treecell-header sortDirectionIndicator"
 					value="&engine.column.label;" observes="EngineColumn"
 					resource="http://home.netscape.com/NC-rdf#Engine"
 					onclick="return doSort('EngineColumn', null);" />
diff --git a/xpfe/components/search/resources/search-editor.xul b/xpfe/components/search/resources/search-editor.xul
index 7a934f1b84f..71e5e5c335e 100644
--- a/xpfe/components/search/resources/search-editor.xul
+++ b/xpfe/components/search/resources/search-editor.xul
@@ -85,7 +85,9 @@
 
 				<treehead>
 					<treerow>
-						<treecell observes="EngineColumn" align="center" value="&engine.column.label;" resource="http://home.netscape.com/NC-rdf#Name" flex="100%"/>
+						<treecell class="treecell-header sortDirectionIndicator" observes="EngineColumn"
+						align="center" value="&engine.column.label;" flex="100%"
+						resource="http://home.netscape.com/NC-rdf#Name" />
 					</treerow>
 				</treehead>
 			</tree>
@@ -137,7 +139,10 @@
 
 				<treehead>
 					<treerow>
-						<treecell observes="NameColumn" align="center" value="&allengines.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('NameColumn', null);" sortActive="true" sortDirection="ascending" flex="100%"/>
+						<treecell class="treecell-header sortDirectionIndicator" observes="NameColumn" align="center"
+							value="&allengines.label;" resource="http://home.netscape.com/NC-rdf#Name"
+							sortActive="true" sortDirection="ascending" flex="100%"
+							onclick="return doSort('NameColumn', null);" />
 					</treerow>
 				</treehead>
 			</tree>
diff --git a/xpfe/components/search/resources/search-panel.xul b/xpfe/components/search/resources/search-panel.xul
index 43aeb6e129b..27a13c5b9ad 100644
--- a/xpfe/components/search/resources/search-panel.xul
+++ b/xpfe/components/search/resources/search-panel.xul
@@ -123,7 +123,7 @@
 
           <treehead>
             <treerow>
-              <treecell observes="SortNameColumn" align="center" value="&results.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('SortNameColumn', 'http://home.netscape.com/NC-rdf#PageRank');" sortActive="true" sortDirection="ascending" flex="1"/>
+              <treecell class="treecell-header sortDirectionIndicator" observes="SortNameColumn" align="center" value="&results.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('SortNameColumn', 'http://home.netscape.com/NC-rdf#PageRank');" sortActive="true" sortDirection="ascending" flex="1"/>
             </treerow>
           </treehead>
 
@@ -161,10 +161,11 @@
               </treeitem>
             </treechildren>
           </template>
+
           <treehead>
             <treerow>
-              <treecell value="&checkbox.column.label;" style="width: 23px;"/>
-              <treecell observes="NameColumn" align="center" value="&engine.column.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('NameColumn', null);" flex="1"/>
+              <treecell class="treecell-header sortDirectionIndicator" value="&checkbox.column.label;" style="width: 23px;"/>
+              <treecell class="treecell-header sortDirectionIndicator" observes="NameColumn" align="center" value="&engine.column.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('NameColumn', null);" flex="1"/>
             </treerow>
           </treehead>
         </tree>
diff --git a/xpfe/components/search/resources/search.css b/xpfe/components/search/resources/search.css
index fddf22daddb..e69de29bb2d 100755
--- a/xpfe/components/search/resources/search.css
+++ b/xpfe/components/search/resources/search.css
@@ -1,142 +0,0 @@
-@import url(chrome://global/skin);
-
-box.sidebartitle {
-  background-color: #505888;
-  padding: 2px 3px 3px 3px;
-  border: 0px;
-  margin: 0px;
-  font: 10pt sans-serif;
-}
-
-box.panelbar {
-  background-color: #006870;
-  padding: 2px 3px 3px 3px;
-  border: 0px;
-  margin: 0px;
-  font: 10pt sans-serif;
-}
-
-box#sidebox {
-  width: 100%;
-  height: 100%;
-}
-
-titledbutton.sidebartitle:hover { 
-  border: 0px;
-  margin: 1px; 
-}
-
-titledbutton.paneltitle { 
-  horizontal-align: left;
-}
-
-treecol.checkboxColumn {
-  width: 30px ! important;
-}
-
-box.spaced { 
-  padding-top: 5px;
-  paddimg-bottom: 2px;
-}
-
-box#engineTabs {
-  background-color: #808080;
-  border-bottom: 1px solid threedhighlight;
-}
-
-box#engineTabs > titledbutton {
-  background-color: #CCCCCC;
-  margin-bottom: 0px;
-  border-bottom: 1px solid #CCCCCC;
-}
-
-titledbutton#allEngines {
-  margin-right: 12px;
-}
-
-treecol[sortActive="true"] {
- background-color: lightgray;
-}
-
-titledbutton.engine[loading="true"] {
- list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
-}
-
-titledbutton.iconic {
- list-style-image: url("resource:/res/rdf/document.gif") ! important ;
-}
-
-treeitem > treerow.searchresult > treecell > titledbutton {
-   cursor: pointer;
-}
-
-treeitem > treerow.searchresult > treecell {
-   color: black;
-   text-decoration: none;
-}
-
-treeitem > treerow.searchresult > treecell:hover {
-   color: blue;
-   text-decoration: underline;
-}
-
-treeitem > treerow.searchresult > treecell > titledbutton:active {
-   color: red;
-   text-decoration: underline;
-}
-
-/*undo regular search tree selection look*/
-treeitem[selected="true"] > treerow.searchresult { 
-  background-color: transparent;
-}
-
-
-
-.searchpanel-outerbox {
-	padding: 8px 4px 4px 4px;
-}
-
-.indented-label {
-	padding-left: 8px;
-}
-
-titledbutton.panelbtn {
-	margin-left: 1em; 
-	margin-right: 1em; 
-}
-
-tree[singleclick="true"] treeitem > treerow > treecell > titledbutton {
-	cursor: pointer;
-}
-
-tree[singleclick="true"] treeitem > treerow > treecell {
-	color: black;
-	text-decoration: none;
-}
-
-tree[singleclick="true"] treeitem > treerow > treecell:hover {
-	color: blue;
-	text-decoration: underline;
-}
-
-tree[singleclick="true"] treeitem > treerow > treecell:active {
-	color: red;
-	text-decoration: underline;
-}
-
-/*undo regular search tree selection look*/
-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;
-}
\ No newline at end of file