From 9edc1b6866efd3dce229c46e27db5608e60d80bf Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Tue, 14 Mar 2000 11:31:54 +0000
Subject: [PATCH] pref panel appearance tweaks, r=hyatt

---
 .../prefs/resources/content/pref-addressing.xul        |  8 ++------
 .../base/prefs/resources/content/pref-diskspace.xul    |  8 ++------
 .../base/prefs/resources/content/pref-mailnews.xul     |  8 ++------
 .../base/prefs/resources/content/pref-receipts.xul     |  9 ++-------
 .../base/prefs/resources/content/pref-winsetting.xul   |  9 ++-------
 .../prefs/resources/content/pref-formatting.xul        |  8 ++------
 .../compose/prefs/resources/content/pref-messages.xul  |  9 +++------
 .../prefwindow/resources/content/pref-advanced.xul     |  7 ++-----
 .../prefwindow/resources/content/pref-appearance.xul   |  7 ++-----
 .../prefwindow/resources/content/pref-applications.xul |  7 ++-----
 .../prefwindow/resources/content/pref-cache.xul        |  7 ++-----
 .../prefwindow/resources/content/pref-charset.xul      | 10 +++-------
 .../prefwindow/resources/content/pref-colors.xul       |  8 ++------
 .../prefwindow/resources/content/pref-composer.xul     |  8 ++------
 .../prefwindow/resources/content/pref-cookies.xul      |  7 ++-----
 .../prefwindow/resources/content/pref-debug.xul        |  9 +++------
 .../prefwindow/resources/content/pref-download.xul     |  8 ++------
 .../prefwindow/resources/content/pref-editing.xul      |  7 ++-----
 .../prefwindow/resources/content/pref-fonts.xul        |  8 +++-----
 .../prefwindow/resources/content/pref-languages.xul    |  7 ++-----
 .../prefwindow/resources/content/pref-mousewheel.xul   |  7 ++-----
 .../prefwindow/resources/content/pref-navigator.xul    |  7 ++-----
 .../prefwindow/resources/content/pref-offline.xul      |  7 ++-----
 .../prefwindow/resources/content/pref-proxies.xul      |  7 ++-----
 .../prefwindow/resources/content/pref-publish.xul      |  1 +
 .../prefwindow/resources/content/pref-search.xul       |  8 ++------
 .../resources/content/pref-smart_browsing.xul          |  8 ++------
 .../prefwindow/resources/content/pref-smartupdate.xul  |  7 ++-----
 .../prefwindow/resources/content/pref-themes.xul       |  7 ++-----
 .../prefwindow/resources/content/pref-wallet.xul       |  7 ++-----
 30 files changed, 63 insertions(+), 162 deletions(-)

diff --git a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
index 279ba8fd7763..d8cf98bdc32d 100644
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://addressbook/locale/pref-addressing.dtd">
 
@@ -9,12 +10,7 @@
         class="dialog"
 		align="vertical">
 
-	<box class="header" align="horizontal">
-		<html:div class="left-header-text">&pane.title;</html:div>
-		<spring flex="100%"/>
-		<html:div class="right-header-text">&pane.description;</html:div>
-	</box>
-
+  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
 	<titledbox orient="vertical">
 		<title>
 			<text value="&pinpoint.label;"/>
diff --git a/mailnews/base/prefs/resources/content/pref-diskspace.xul b/mailnews/base/prefs/resources/content/pref-diskspace.xul
index 949007cd7c93..972ebc236b73 100644
--- a/mailnews/base/prefs/resources/content/pref-diskspace.xul
+++ b/mailnews/base/prefs/resources/content/pref-diskspace.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-diskspace.dtd">
 
@@ -9,12 +10,7 @@
 		onload="if (parent.handle) parent.handle.onpageload('pref-diskspace'); else parent.queuedTag='pref-diskspace';"
 		align="vertical">
 
-	<box class="header" align="horizontal">
-		<html:div class="left-header-text">&pane.title;</html:div>
-		<spring flex="100%"/>
-		<html:div class="right-header-text">&pane.description;</html:div>
-	</box>
-
+  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
 	<titledbox orient="vertical">
 		<title>
 			<text value="&allMsg.label;"/>
diff --git a/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 35d4d7ea40f5..891744a88ab4 100644
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">
 
@@ -12,12 +13,7 @@
 <html:script language="javascript" src="chrome://pref/content/prefutilities.js"/>
 <html:script language="javascript" src="chrome://messenger/content/pref-mailnews.js"/>
 
-	<box class="header" align="horizontal">
-		<html:div class="left-header-text">&pane.title;</html:div>
-		<spring flex="100%"/>
-		<html:div class="right-header-text">&pane.description;</html:div>
-	</box>
-
+	  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
 	<titledbox orient="vertical">
 
 		<title>
diff --git a/mailnews/base/prefs/resources/content/pref-receipts.xul b/mailnews/base/prefs/resources/content/pref-receipts.xul
index cc919de45873..6cbbafc2445b 100644
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
-
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">
 
@@ -22,12 +22,7 @@ function DoCustomize()
 </html:script>
 
 
-	<box class="header" align="horizontal">
-		<html:div class="left-header-text">&pane.title;</html:div>
-		<spring flex="100%"/>
-		<html:div class="right-header-text">&pane.description;</html:div>
-	</box>
-
+  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
 	<titledbox orient="vertical">
 		<title>
 			<text value="&requestReceipt.label;"/>
diff --git a/mailnews/base/prefs/resources/content/pref-winsetting.xul b/mailnews/base/prefs/resources/content/pref-winsetting.xul
index 8005018b45b4..76d362a71511 100644
--- a/mailnews/base/prefs/resources/content/pref-winsetting.xul
+++ b/mailnews/base/prefs/resources/content/pref-winsetting.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-winsetting.dtd">
 
@@ -9,13 +10,7 @@
 		onload="if (parent.handle) parent.handle.onpageload('pref-winsetting'); else parent.queuedTag='pref-winsetting';"
 		align="vertical">
 
-	<box class="header" align="horizontal">
-		<html:div class="left-header-text">&pane.title;</html:div>
-		<spring flex="100%"/>
-		<html:div class="right-header-text">&pane.description;</html:div>
-	</box>
-
-
+	  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
 	<titledbox orient="vertical">
 		<title>
 			<text value="&chooseLayout.label;"/>
diff --git a/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mailnews/compose/prefs/resources/content/pref-formatting.xul
index 3d72686e734c..85be97a3063c 100644
--- a/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messengercompose/locale/pref-formatting.dtd">
 
@@ -9,12 +10,7 @@
 		align="vertical"
 		class="dialog">
 
-	<box class="header" align="horizontal">
-		<html:div class="left-header-text">&pane.title;</html:div>
-		<spring flex="100%"/>
-		<html:div class="right-header-text">&pane.description;</html:div>
-	</box>
-
+  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
 	<titledbox orient="vertical">
 		<html:div class="vertical-gap">&sendMail.label;</html:div>
 		<spring class="vgap"/>
diff --git a/mailnews/compose/prefs/resources/content/pref-messages.xul b/mailnews/compose/prefs/resources/content/pref-messages.xul
index 4faf2568c666..ae74635de954 100644
--- a/mailnews/compose/prefs/resources/content/pref-messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-messages.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messengercompose/locale/pref-messages.dtd">
 
@@ -8,12 +9,8 @@
 		onload="if (parent.handle) parent.handle.onpageload('pref-messages'); else parent.queuedTag='pref-messages';"
 		align="vertical"
 		class="dialog">
-
-	<box class="header" align="horizontal">
-		<html:div class="left-header-text">&pane.title;</html:div>
-		<spring flex="100%"/>
-		<html:div class="right-header-text">&pane.description;</html:div>
-	</box>
+    
+  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
 
 	<titledbox orient="vertical">
 		<title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index 161f72428dc5..717c9df86c51 100644
--- a/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -20,6 +20,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-advanced.dtd" >
 
@@ -29,11 +30,7 @@
         align="vertical" title="&window.title;"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-advanced' ); else parent.queuedTag = 'pref-advanced';">
 
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
 <titledbox orient="vertical">
 	<html:div>
diff --git a/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
index 08293f85dfd3..efe0ab4290c4 100644
--- a/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -23,6 +23,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-appearance.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -31,11 +32,7 @@
     		align="vertical"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-appearance' ); else parent.queuedTag = 'pref-appearance';">
 
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
 <titledbox orient="vertical" id="generalStartupPreferences">
   <title><text value="&onStartLegend.label;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-applications.xul b/xpfe/components/prefwindow/resources/content/pref-applications.xul
index 60a874b87ee6..21f856adf058 100644
--- a/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-applications.dtd" >
 
@@ -39,11 +40,7 @@
               from the list as appropriate to pass to the Data Manager
       -->              
 
- 	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-   	<spring class="header-spring" flex="1"/>
-		<titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
   <html:fieldset flex="100%" style="width: 100%">
     <html:legend align="left">&descript;</html:legend>
diff --git a/xpfe/components/prefwindow/resources/content/pref-cache.xul b/xpfe/components/prefwindow/resources/content/pref-cache.xul
index 7f38414295fb..025dad244e02 100644
--- a/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -21,6 +21,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-cache.dtd" >
 <window debug="false" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -33,11 +34,7 @@
   <html:script language="javascript" src="chrome://pref/content/prefutilities.js"/>
   <html:script language="javascript" src="chrome://pref/content/pref-cache.js"/>
 
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
   <titledbox orient="vertical">
    	<box orient="vertical" flex="1" >
diff --git a/xpfe/components/prefwindow/resources/content/pref-charset.xul b/xpfe/components/prefwindow/resources/content/pref-charset.xul
index f3dd0dc38843..d72736150ce6 100644
--- a/xpfe/components/prefwindow/resources/content/pref-charset.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-charset.xul
@@ -19,6 +19,7 @@
 -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-charset.dtd" >
@@ -37,13 +38,8 @@
 
   <html:script language="javascript" src="pref-charset.js"/>
 
-    <!-- horz 1 -->
-	<box class="header" align="horizontal">  
-		<titledbutton class="left-header-text" value="&charset.customize.left.header;"/>
-		<spring class="header-spring" flex="1"/>
-		<titledbutton class="right-header-text" value="&charset.customize.right.header;"/>
-	</box>
-	<!-- horz1 -->
+    <box type="smallheader" title="&charset.customize.left.header;" description="&charset.customize.right.header;"/>
+
 
 
   <!-- The two-pane -->
diff --git a/xpfe/components/prefwindow/resources/content/pref-colors.xul b/xpfe/components/prefwindow/resources/content/pref-colors.xul
index e60e1b531078..a5bba1930924 100644
--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-colors.dtd" >
 <window debug="false" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -32,12 +33,7 @@
 
 <html:script language="JavaScript" src="chrome://pref/content/pref-colors.js"/>
 
- 	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-   	  <spring class="header-spring" flex="1"/>
-		<titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
-
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
   <box align="horizontal">
     <!-- back and foreground colors -->
diff --git a/xpfe/components/prefwindow/resources/content/pref-composer.xul b/xpfe/components/prefwindow/resources/content/pref-composer.xul
index 04ba2d2fb6d2..52e1f830d012 100644
--- a/xpfe/components/prefwindow/resources/content/pref-composer.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-composer.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-composer.dtd" >
 
@@ -33,12 +34,7 @@
 
   <html:script language="JavaScript" src="chrome://pref/content/pref-composer.js"/>
 
-
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-    <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
 		<titledbox orient="vertical">
 		<box autostretch="never" valign="middle">
diff --git a/xpfe/components/prefwindow/resources/content/pref-cookies.xul b/xpfe/components/prefwindow/resources/content/pref-cookies.xul
index 3abfdda730e7..f6dd3f3991b8 100644
--- a/xpfe/components/prefwindow/resources/content/pref-cookies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cookies.xul
@@ -20,6 +20,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-cookies.dtd" >
 
@@ -36,11 +37,7 @@
     }
   </html:script>
         
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
  	<titledbox orient="vertical">
   	<title><text value="&cookies;"/></title>  
diff --git a/xpfe/components/prefwindow/resources/content/pref-debug.xul b/xpfe/components/prefwindow/resources/content/pref-debug.xul
index 14b64a2a157f..dac95eeaa600 100644
--- a/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug.xul
@@ -21,6 +21,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-debug.dtd" >
 
@@ -30,12 +31,8 @@
         align="vertical" title="&window.title;"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-debug' ); else parent.queuedTag = 'pref-debug';">
 
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
-	
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
+  
 	<!-- Temporary hack to turn on gfx-rendered widgets -->  
 		<titledbox orient="vertical">
     	<title><text value="&widgetRendering.label;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-download.xul b/xpfe/components/prefwindow/resources/content/pref-download.xul
index 4e92988e76c2..6991d5840444 100644
--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-download.dtd" >
 
@@ -66,12 +67,7 @@
   }
   </html:script>
   
- 	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-    <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
-
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 	
 	<html:fieldset>
 		<html:legend align="left">&newmes;</html:legend>
diff --git a/xpfe/components/prefwindow/resources/content/pref-editing.xul b/xpfe/components/prefwindow/resources/content/pref-editing.xul
index 77cbe22a9245..c1c404613634 100644
--- a/xpfe/components/prefwindow/resources/content/pref-editing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-editing.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-composer.dtd" >
 
@@ -35,11 +36,7 @@
   <html:script language="JavaScript" src="chrome://pref/content/pref-editing.js"/>
 -->
 
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-    <titledbutton class="right-header-text" value="&rHeader2;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader2;"/>
 
 <!-- Take out Auto-Save; not supported at this time
 		<titledbox orient="vertical">
diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index 8819ef6dbeea..1802c5ad6a6b 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -23,6 +23,7 @@
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://pref/content/fontScalingOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-fonts.dtd" >
 <window debug="false" id="fontPanel"
@@ -35,11 +36,8 @@
 
 <html:script language="javascript" src="pref-fonts.js"/>
 
-  <box class="header" align="horizontal">  
-	  <titledbutton class="left-header-text" value="&lHeader;"/>
-    <spring class="header-spring" flex="1"/>
-		<titledbutton class="right-header-text" value="&rHeader;"/>
-  </box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
+  
 		<titledbox orient="vertical">
       <title><html:div>&displayFonts;</html:div></title>
 	  <html:div  style="width: 50px; height: 50px">
diff --git a/xpfe/components/prefwindow/resources/content/pref-languages.xul b/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 1365c6371792..d7ae34998fd6 100644
--- a/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -21,6 +21,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-languages.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -29,11 +30,7 @@
         align="vertical" title="window.title"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-languages' ); else parent.queuedTag = 'pref-languages';">
 		
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
   <html:fieldset flex="100%">
     <html:div class="hspace-both">&prefLangDecript;</html:div>
diff --git a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
index 1ca6476f6c84..c6b016529149 100644
--- a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -24,6 +24,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
   
 
 <!DOCTYPE window [
@@ -42,11 +43,7 @@
 
 <html:script language="JavaScript" src="chrome://pref/content/pref-mousewheel.js"/>
     
-<box class="header" align="horizontal">  
-  <titledbutton class="left-header-text" value="&info.label;"/>
-	<spring class="header-spring" flex="1"/>
-	<titledbutton class="right-header-text" value=""/>
-</box>
+  <box type="smallheader" title="&title.label;" description="&info.label;"/>
 
 <titledbox orient="vertical">
   <box orient="horizontal">
diff --git a/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index c50348687fae..49b9057aa5a4 100644
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-navigator.dtd" >
 
@@ -35,11 +36,7 @@
   <html:script language="javascript" src="chrome://pref/content/prefutilities.js"/>
   <html:script language="javascript" src="chrome://pref/content/pref-navigator.js"/>
 
-  <box class="header" orient="horizontal">  
-	  <titledbutton class="left-header-text" value="&lHeader;"/>
-   	<spring class="header-spring" flex="1"/>
-		<titledbutton class="right-header-text" value="&rHeader;"/>
-  </box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
   <!-- navigator starts with -->  
   <titledbox  orient="vertical">
diff --git a/xpfe/components/prefwindow/resources/content/pref-offline.xul b/xpfe/components/prefwindow/resources/content/pref-offline.xul
index a93150e3f6fa..6fc49b6fcbb7 100644
--- a/xpfe/components/prefwindow/resources/content/pref-offline.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-offline.xul
@@ -22,6 +22,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-offline.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -31,11 +32,7 @@
         align="vertical"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-offline' ); else parent.queuedTag = 'pref-offline';">
 
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
   <html:fieldset>
     <html:div class="hspace-both">&descipt1;</html:div>
diff --git a/xpfe/components/prefwindow/resources/content/pref-proxies.xul b/xpfe/components/prefwindow/resources/content/pref-proxies.xul
index 3469bcfb7678..340f603dbda9 100644
--- a/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -21,6 +21,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-proxies.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -33,11 +34,7 @@
   <html:script language="javascript" src="chrome://pref/content/prefutilities.js"/>
   <html:script language="JavaScript" src="chrome://pref/content/pref-proxies.js"/>
   
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
   <box align="vertical" style="width: 100%;">
 		<titledbox orient="vertical">
diff --git a/xpfe/components/prefwindow/resources/content/pref-publish.xul b/xpfe/components/prefwindow/resources/content/pref-publish.xul
index de08ab968e74..05ffd7699696 100644
--- a/xpfe/components/prefwindow/resources/content/pref-publish.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-publish.xul
@@ -21,6 +21,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-publish.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/xpfe/components/prefwindow/resources/content/pref-search.xul b/xpfe/components/prefwindow/resources/content/pref-search.xul
index 69064083d992..9c6e37525d1e 100755
--- a/xpfe/components/prefwindow/resources/content/pref-search.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-search.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-search.dtd" >
 <window debug="false" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -32,12 +33,7 @@
 
 	<html:script language="javascript" src="chrome://pref/content/pref-search.js"/>
 
- 	<box class="header" orient="horizontal">  
-		<titledbutton class="left-header-text" value="&lHeader;"/>
-		<spring class="header-spring" flex="1"/>
-		<titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
-
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
 	<box orient="vertical">
 		<titledbox orient="vertical" flex="1">
diff --git a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index e7b839ecd917..0c83a4360f26 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-smart_browsing.dtd" >
 <window debug="false" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -30,12 +31,7 @@
         title="&title.label;" orient="vertical"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-smart_browsing' ); else parent.queuedTag = 'pref-smart_browsing';">
 
-  <box class="header" align="horizontal">  
-	  <titledbutton class="left-header-text" value="&lHeader;"/>
-   	<spring class="header-spring" flex="1"/>
-		<titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
-
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
 		<titledbox orient="vertical">
 			<title><text value="&lHeader;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index 37b1ec62eff3..901267eefc56 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?> 
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-smartupdate.dtd" >
  
@@ -10,11 +11,7 @@
         title="&title.label;"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-smartupdate' ); else parent.queuedTag = 'pref-smartupdate';">
 
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
     
   <titledbox orient="vertical">
     <html:div class="vertical-gap">
diff --git a/xpfe/components/prefwindow/resources/content/pref-themes.xul b/xpfe/components/prefwindow/resources/content/pref-themes.xul
index f6ac4ac346fd..e57c57ad336e 100644
--- a/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -22,6 +22,7 @@
   -->
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-themes.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -29,11 +30,7 @@
         class="dialog"
         align="vertical">
 
-<box class="header" align="horizontal">
-  <titledbutton class="left-header-text" value="&lHeader;"/>
-  <spring class="header-spring" flex="1"/>
-  <titledbutton class="right-header-text" value="&rHeader;"/>
-</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
 <tabcontrol flex="1" align="vertical">
   <tabbox>
diff --git a/xpfe/components/prefwindow/resources/content/pref-wallet.xul b/xpfe/components/prefwindow/resources/content/pref-wallet.xul
index fcbcf101b2e4..030c1533c9d8 100644
--- a/xpfe/components/prefwindow/resources/content/pref-wallet.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-wallet.xul
@@ -20,6 +20,7 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-wallet.dtd" >
 
@@ -41,11 +42,7 @@
     }
   </html:script>
         
-	<box class="header" align="horizontal">  
-    <titledbutton class="left-header-text" value="&lHeader;"/>
-	  <spring class="header-spring" flex="1"/>
-	  <titledbutton class="right-header-text" value="&rHeader;"/>
-	</box>
+  <box type="smallheader" title="&lHeader;" description="&rHeader;"/>
 
   <!--should use titledbox instead of fieldset, but that was causing an assertion
       when pref.js was setting it to display:none-->