diff --git a/suite/common/search/internetresults.xul b/suite/common/search/internetresults.xul
index 6ba4f0afde51..74ff718ab373 100644
--- a/suite/common/search/internetresults.xul
+++ b/suite/common/search/internetresults.xul
@@ -4,7 +4,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://search/locale/internetresults.dtd">
 
-<window style="width:100%; height:100%; background-color:white" align="vertical" onload="onLoadInternetResults()"
+<window class="dialog" align="vertical" onload="onLoadInternetResults()"
 	xmlns:html="http://www.w3.org/TR/REC-html40"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/xpfe/components/search/resources/find.xul b/xpfe/components/search/resources/find.xul
index 6c0b808c1068..6e7bc15c6329 100644
--- a/xpfe/components/search/resources/find.xul
+++ b/xpfe/components/search/resources/find.xul
@@ -2,7 +2,9 @@
 
 <!DOCTYPE window SYSTEM "chrome://search/locale/find.dtd">
 
-<window title="&window.title.label;" style="width:100%; height:100%; background-color:white" align="horizontal" flex="100%"
+<window title="&window.title.label;" 
+    class="dialog"
+    align="horizontal" flex="100%"
 	xmlns:html="http://www.w3.org/TR/REC-html40"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/xpfe/components/search/resources/findresults.css b/xpfe/components/search/resources/findresults.css
index af7fcb1c5f00..8b3879d5b283 100755
--- a/xpfe/components/search/resources/findresults.css
+++ b/xpfe/components/search/resources/findresults.css
@@ -1,25 +1,7 @@
-window { 
- display: block;
- background-color: white; 
- width: 100%;
-}
-
 treecol[sortActive="true"] {
  background-color: lightgray;
 }
 
-titledbutton {
-  display: inline;
-  color:black; 
-  border: 0px outset white;
-  padding: 0px;
-  margin: 0px;
-  text-align: center;
-  font: inherit;
-  background-color: inherit;
-  background-image: inherit;
-}
-
 treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > titledbutton {
  list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
 }
diff --git a/xpfe/components/search/resources/findresults.xul b/xpfe/components/search/resources/findresults.xul
index 121dcf802a5d..389ac2282ea5 100644
--- a/xpfe/components/search/resources/findresults.xul
+++ b/xpfe/components/search/resources/findresults.xul
@@ -3,7 +3,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://search/locale/findresults.dtd">
 
-<window title="&window.title.label;" style="width:100%; height:100%; background-color:white" align="vertical"
+<window class="dialog" title="&window.title.label;" style="width:100%; height:100%; background-color:white" align="vertical"
 	xmlns:html="http://www.w3.org/TR/REC-html40"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/xpfe/components/search/resources/internet.css b/xpfe/components/search/resources/internet.css
index d8ac32681d1b..6e928f8257fd 100755
--- a/xpfe/components/search/resources/internet.css
+++ b/xpfe/components/search/resources/internet.css
@@ -1,8 +1,3 @@
-window { 
- display: block;
- background-color: white;
-}
-
 tree[id="searchengines"] {
  width: 300px;
 }
@@ -14,15 +9,3 @@ tree[id="searchengines"] > treecol[id="CheckboxColumn"] {
 treecol[sortActive="true"] {
  background-color: lightgray;
 }
-
-titledbutton {
-  display: inline;
-  color:black; 
-  border: 0px outset white;
-  padding: 0px;
-  margin: 0px;
-  text-align: center;
-  font: inherit;
-  background-color: inherit;
-  background-image: inherit;
-}
diff --git a/xpfe/components/search/resources/internet.xul b/xpfe/components/search/resources/internet.xul
index ca2486aa6278..6f39e335e40b 100644
--- a/xpfe/components/search/resources/internet.xul
+++ b/xpfe/components/search/resources/internet.xul
@@ -4,7 +4,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://search/locale/internet.dtd">
 
-<window style="width:100%; height:100%; background-color:white" align="vertical"
+<window class="dialog" align="vertical"
 	xmlns:html="http://www.w3.org/TR/REC-html40"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="loadPage()" onunload="unloadPage()">
diff --git a/xpfe/components/search/resources/internetresults.css b/xpfe/components/search/resources/internetresults.css
index 70b383501476..c1be6c92dec8 100755
--- a/xpfe/components/search/resources/internetresults.css
+++ b/xpfe/components/search/resources/internetresults.css
@@ -1,20 +1,3 @@
-window { 
- display: block;
- background-color: white; 
- width: 100%;
-}
-
-titledbutton {
-  display: inline;
-  color:black; 
-  border: 0px outset white;
-  padding: 0px;
-  margin: 0px;
-  text-align: center;
-  font: inherit;
-  background-color: inherit;
-  background-image: inherit;
-}
 
 treecol[sortActive="true"] {
  background-color: lightgray;
diff --git a/xpfe/components/search/resources/internetresults.xul b/xpfe/components/search/resources/internetresults.xul
index 6ba4f0afde51..74ff718ab373 100644
--- a/xpfe/components/search/resources/internetresults.xul
+++ b/xpfe/components/search/resources/internetresults.xul
@@ -4,7 +4,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://search/locale/internetresults.dtd">
 
-<window style="width:100%; height:100%; background-color:white" align="vertical" onload="onLoadInternetResults()"
+<window class="dialog" align="vertical" onload="onLoadInternetResults()"
 	xmlns:html="http://www.w3.org/TR/REC-html40"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/xpfe/components/search/resources/search.css b/xpfe/components/search/resources/search.css
index 3f8e539b09da..f138d0c972a0 100755
--- a/xpfe/components/search/resources/search.css
+++ b/xpfe/components/search/resources/search.css
@@ -1,20 +1,3 @@
-window { 
- display: block;
- background-color: white; 
- width: 100%;
-} 
-
-iframe {
-  width: 100%;
-  height: 100%;
-  border: 0px;
-}
-
-box {
-  width: 100%;
-  height: 100%;
-  display: block;
-}
 
 box.sidebartitle {
   background-color: #505888;
@@ -35,7 +18,6 @@ box.panelbar {
 box#sidebox {
   width: 100%;
   height: 100%;
-  display:block;
 }
 
 titledbutton.sidebartitle:hover { 
@@ -43,33 +25,6 @@ titledbutton.sidebartitle:hover {
   margin: 1px; 
 }
 
-titledbutton.active { 
-  color: yellow;
-  border: 0px;
-  margin: 1px; 
-  padding: 3px 2px 0px 1px
-}
-
-titledbutton[disabled] { 
-  color: black;
-}
-
-titledbutton:hover[disabled] { 
-  border: 0px;
-  margin: 1px; 
-}
-
 titledbutton.paneltitle { 
   horizontal-align: left;
 }
-
-titledbutton { 
-  color: white;
-  margin: 1px;
-  padding: 2px 1px 1px 2px
-}
-
-titledbutton:hover {
-  border: 1px outset white;
-  margin: 0px; 
-}
diff --git a/xpfe/components/search/resources/search.xul b/xpfe/components/search/resources/search.xul
index 53f38789b40b..886c4dbb56d7 100644
--- a/xpfe/components/search/resources/search.xul
+++ b/xpfe/components/search/resources/search.xul
@@ -4,6 +4,7 @@
 <!DOCTYPE window SYSTEM "chrome://search/locale/search.dtd">
 
 <window id="search-window" title="&window.title.label;"
+    class="dialog"
 	width="500" height="400" x="20" y="20" persist="width height x y" align="vertical"
 	xmlns:html="http://www.w3.org/TR/REC-html40"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"