diff --git a/mozilla/suite/common/pref/pref-applications.xul b/mozilla/suite/common/pref/pref-applications.xul
index f32be4f4172..2c16b5a1a6d 100644
--- a/mozilla/suite/common/pref/pref-applications.xul
+++ b/mozilla/suite/common/pref/pref-applications.xul
@@ -49,9 +49,9 @@
 			</box>
 	<box align="vertical">
 
-		<titledbutton id="newTypeButton" value="&newTypeButton.label;" />
-		<titledbutton id="editButton" value="&editButton.label;" />
-		<titledbutton id="removeButton" value="&removeButton.label;" />
+		<titledbutton class="dialog push" id="newTypeButton" value="&newTypeButton.label;" />
+		<titledbutton class="dialog push" id="editButton" value="&editButton.label;" />
+		<titledbutton class="dialog push" id="removeButton" value="&removeButton.label;" />
 
 	</box>
   </box>
diff --git a/mozilla/suite/common/pref/pref-cache.xul b/mozilla/suite/common/pref/pref-cache.xul
index de55ae8175a..3775344a702 100644
--- a/mozilla/suite/common/pref/pref-cache.xul
+++ b/mozilla/suite/common/pref/pref-cache.xul
@@ -50,20 +50,20 @@
 			<spring style="width:5px"/>
 			<html:input name="disk" type="text" size="3" id="pref:string:browser.cache.memory_cache_size" />
 			<html:div>&kbyes;</html:div>
-			<titledbutton name="clearm" value="&clearMemcacheButton.label;" />
+			<titledbutton class="dialog push" name="clearm" value="&clearMemcacheButton.label;" />
 		</box> 
 		<box align="horizontal" style="width: 100%;"> 
 			<html:div>&diskCache;</html:div>
 			<spring style="width:5px"/>
 			<html:input name="disk" type="text" size="3" id="pref:string:browser.cache.disk_cache_size" />
 			<html:div>&kbyes;</html:div>
-			<titledbutton name="clearm" value="&clearDiskcacheButton.label;" />
+			<titledbutton class="dialog push" name="clearm" value="&clearDiskcacheButton.label;" />
 		</box>
 		<box align="horizontal" style="width: 100%;"> 
 			<html:div>&diskCacheFolder;</html:div>
 			<html:input name="disk" type="text" size="20" id="pref:string:browser.cache.directory" />
 			<html:div>
-				<titledbutton value="Choose File..." align="left" onclick="PrefCacheSelectFolder()"/>
+				<titledbutton class="dialog push" value="Choose File..." align="left" onclick="PrefCacheSelectFolder()"/>
 			</html:div>
 		</box>
 
diff --git a/mozilla/suite/common/pref/pref-download.xul b/mozilla/suite/common/pref/pref-download.xul
index 5af206d0604..9542e896bb0 100644
--- a/mozilla/suite/common/pref/pref-download.xul
+++ b/mozilla/suite/common/pref/pref-download.xul
@@ -88,7 +88,7 @@
 					</html:legend>
          <!--   <html:div>&offlineMsgs;</html:div>  -->
 			<box flex="100%"><html:div>
-				<titledbutton value="&select;" align="left"/>
+				<titledbutton class="dialog push" value="&select;" align="left"/>
 			</html:div></box>
 		</html:fieldset>
 	</box>
diff --git a/mozilla/suite/common/pref/pref-navigator.xul b/mozilla/suite/common/pref/pref-navigator.xul
index b994e316c4c..b26b0fc9c8f 100644
--- a/mozilla/suite/common/pref/pref-navigator.xul
+++ b/mozilla/suite/common/pref/pref-navigator.xul
@@ -75,8 +75,8 @@
 			<html:input name="homepage" type="text"	id="pref:string:browser.startup.homepage" size="30" /> 
 			<html:div>
 				<spring flex="100%"/>
-				<titledbutton name="starts" type="button" value="&useCurrent;" onclick="SetHomePageToCurrentPage();" />
-				<titledbutton name="browse" type="button" value="&browseFile;" onclick="PrefNavSelectFile()"/>
+				<titledbutton class="dialog push" name="starts" type="button" value="&useCurrent;" onclick="SetHomePageToCurrentPage();" />
+				<titledbutton class="dialog push" name="browse" type="button" value="&browseFile;" onclick="PrefNavSelectFile()"/>
 			</html:div>		
 		</html:fieldset>  
 	</box> 
@@ -89,7 +89,7 @@
 			<html:div>&historyPages;</html:div>	
 			&pagesHis;<html:input type="text" value="&histDay;" size="3" />
 			&daysRadio; 
-			<titledbutton name="Clearit" value="&clearHis;" />		
+			<titledbutton class="dialog push" name="Clearit" value="&clearHis;" />		
 		</html:fieldset>  
 	</box> 
 
@@ -99,7 +99,7 @@
 						<html:div>&header4.label;</html:div> 
 					</html:legend>
 					&clearBar; 
-					<titledbutton name="starts" type="button" value="&clearLoc;" />		
+					<titledbutton class="dialog push" name="starts" type="button" value="&clearLoc;" />		
 		</html:fieldset>  
 	</box> 
 </html:div>
diff --git a/mozilla/suite/common/pref/pref-proxies.xul b/mozilla/suite/common/pref/pref-proxies.xul
index dfb7c107daa..d3eca97fc2f 100644
--- a/mozilla/suite/common/pref/pref-proxies.xul
+++ b/mozilla/suite/common/pref/pref-proxies.xul
@@ -56,7 +56,7 @@
 			<html:label for="pref:1:int:network.proxy.type" accesskey="m" tabindex="0">
 			&manualTypeRadio.label;
 			</html:label>
-			<titledbutton value="&view.label;" align="left" onclick="openit();"/>
+			<titledbutton class="dialog push" value="&view.label;" align="left" onclick="openit();"/>
 	</html:div>
 	<html:div id="manual-proxy" style="display: none">
 	<box align="horizontal">
@@ -137,7 +137,7 @@
 				<html:label for="pref:2:int:network.proxy.type" accesskey="a" tabindex="0">
 				&autoTypeRadio.label;
 				</html:label>
-				<titledbutton value="&reload.label;" align="left"/>
+				<titledbutton class="dialog push" value="&reload.label;" align="left"/>
 			</html:div>
 
 
@@ -147,7 +147,7 @@
 				&configAutoconfigText.label;
 				<html:input name="" type="text" size="15" id="pref:0:string:network.proxy.autoconfig_url" />
 			</html:div>
-				<spring flex="100%"/><titledbutton value="&view.label;" align="right"/>
+				<spring flex="100%"/><titledbutton class="dialog push" value="&view.label;" align="right"/>
 		</html:fieldset>
 	</box>
 </html:div>
diff --git a/mozilla/suite/common/pref/pref-smartupdate.xul b/mozilla/suite/common/pref/pref-smartupdate.xul
index ea770e5dff1..1a225cbf7ae 100644
--- a/mozilla/suite/common/pref/pref-smartupdate.xul
+++ b/mozilla/suite/common/pref/pref-smartupdate.xul
@@ -52,7 +52,7 @@
             <html:textarea name="textstyle" ROWS="40" COLS="30" id="pref:string:browser.related.disabledForDomains">
             </html:textarea>
             <spring flex="15%"/>
-            <titledbutton id="pref:0:bool:smartupdate" value="&uninstallButton.label;" flex="1" style="max-height:13px;"/>
+            <titledbutton class="dialog push" id="pref:0:bool:smartupdate" value="&uninstallButton.label;" flex="1" style="max-height:13px;"/>
         </box>
       </html:fieldset>
     </box>
diff --git a/mozilla/suite/common/pref/pref.xul b/mozilla/suite/common/pref/pref.xul
index 6389e9ed7f8..7643395215a 100644
--- a/mozilla/suite/common/pref/pref.xul
+++ b/mozilla/suite/common/pref/pref.xul
@@ -41,9 +41,9 @@
 	src="chrome://pref/content/pref-appearance.xul" width="72%" height="356" resize="yes" scrolling="auto"/>
 <box>
    <spring flex="100%" />
-   <titledbutton align="bottom" value="&helpButton.label;" />				
-   <titledbutton align="bottom" value="&cancelButton.label;" onclick="prefwindow.cancelPrefs();" />				
-   <titledbutton align="bottom" value="&okButton.label;" onclick="prefwindow.savePrefs();" />
+   <titledbutton class="dialog push" align="bottom" value="&helpButton.label;" />				
+   <titledbutton class="dialog push" align="bottom" value="&cancelButton.label;" onclick="prefwindow.cancelPrefs();" />				
+   <titledbutton class="dialog push" align="bottom" value="&okButton.label;" onclick="prefwindow.savePrefs();" />
 </box>
 </html:div>
 </window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
index f32be4f4172..2c16b5a1a6d 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -49,9 +49,9 @@
 			</box>
 	<box align="vertical">
 
-		<titledbutton id="newTypeButton" value="&newTypeButton.label;" />
-		<titledbutton id="editButton" value="&editButton.label;" />
-		<titledbutton id="removeButton" value="&removeButton.label;" />
+		<titledbutton class="dialog push" id="newTypeButton" value="&newTypeButton.label;" />
+		<titledbutton class="dialog push" id="editButton" value="&editButton.label;" />
+		<titledbutton class="dialog push" id="removeButton" value="&removeButton.label;" />
 
 	</box>
   </box>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
index de55ae8175a..3775344a702 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -50,20 +50,20 @@
 			<spring style="width:5px"/>
 			<html:input name="disk" type="text" size="3" id="pref:string:browser.cache.memory_cache_size" />
 			<html:div>&kbyes;</html:div>
-			<titledbutton name="clearm" value="&clearMemcacheButton.label;" />
+			<titledbutton class="dialog push" name="clearm" value="&clearMemcacheButton.label;" />
 		</box> 
 		<box align="horizontal" style="width: 100%;"> 
 			<html:div>&diskCache;</html:div>
 			<spring style="width:5px"/>
 			<html:input name="disk" type="text" size="3" id="pref:string:browser.cache.disk_cache_size" />
 			<html:div>&kbyes;</html:div>
-			<titledbutton name="clearm" value="&clearDiskcacheButton.label;" />
+			<titledbutton class="dialog push" name="clearm" value="&clearDiskcacheButton.label;" />
 		</box>
 		<box align="horizontal" style="width: 100%;"> 
 			<html:div>&diskCacheFolder;</html:div>
 			<html:input name="disk" type="text" size="20" id="pref:string:browser.cache.directory" />
 			<html:div>
-				<titledbutton value="Choose File..." align="left" onclick="PrefCacheSelectFolder()"/>
+				<titledbutton class="dialog push" value="Choose File..." align="left" onclick="PrefCacheSelectFolder()"/>
 			</html:div>
 		</box>
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul
index 565c0077616..10514a4c583 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul
@@ -86,7 +86,7 @@
 		</html:div>
 		<html:div>
 			<html:input name="&chooseButton.label;" type="text" id="pref:string:editor.html_editor" />
-			<titledbutton name=""  value="&chooseButton.label;" />
+			<titledbutton class="dialog push" name=""  value="&chooseButton.label;" />
 		</html:div>
 		<html:input name="htmlImageEditorCheckbox" type="checkbox" id="pref:0:int:editor.use_image_editor" />
 	<html:div>
@@ -94,7 +94,7 @@
 		</html:div>
 		<html:div>
 			<html:input name="chooseButton.label" type="text" id="pref:string:editor.image_editor" />
-			<titledbutton name=""  value="&chooseButton.label;" />
+			<titledbutton class="dialog push" name=""  value="&chooseButton.label;" />
 		</html:div> 
 
 	</html:fieldset>
@@ -127,7 +127,7 @@
 			<html:label for="pref:0:int:editor.text_color" accesskey="t" tabindex="0">			
 			</html:label>
 			<menu>
-				<titledbutton value="&NormalText.label;" class="popup" align="right"/>
+				<titledbutton class="dialog push" value="&NormalText.label;" class="popup" align="right"/>
 				<html:div style="width:30px; background-color:white"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
@@ -140,7 +140,7 @@
 			<html:label for="pref:0:int:editor.link_color" accesskey="l" tabindex="0">
 			</html:label>
 			<menu>
-				<titledbutton value="&LinkText.label;" class="popup" align="right"/>
+				<titledbutton class="dialog push" value="&LinkText.label;" class="popup" align="right"/>
 				<html:div style="width:30px; background-color:white"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
@@ -153,7 +153,7 @@
 			<html:label for="pref:0:int:editor.active_link_color" accesskey="c" tabindex="0">			
 			</html:label>
 			<menu>
-				<titledbutton value="&ActiveLinkText.label;" class="popup" align="right"/>
+				<titledbutton class="dialog push" value="&ActiveLinkText.label;" class="popup" align="right"/>
 				<html:div style="width:30px; background-color:white"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
@@ -167,7 +167,7 @@
 			<html:label for="pref:0:int:editor.followed_link_color" accesskey="f" tabindex="0">			
 			</html:label>
 			<menu>
-				<titledbutton value="&FollowedLinkText.label;" class="popup" align="right"/>
+				<titledbutton class="dialog push" value="&FollowedLinkText.label;" class="popup" align="right"/>
 				<html:div style="width:30px; background-color:white"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
@@ -182,7 +182,7 @@
 
 			&colorPick; &BackgroundColor.label;
 			<menu>
-				<titledbutton value="&BackgroundColor.label;" class="popup" align="right"/>
+				<titledbutton class="dialog push" value="&BackgroundColor.label;" class="popup" align="right"/>
 				<html:div style="width:30px; background-color:white"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
index 5af206d0604..9542e896bb0 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -88,7 +88,7 @@
 					</html:legend>
          <!--   <html:div>&offlineMsgs;</html:div>  -->
 			<box flex="100%"><html:div>
-				<titledbutton value="&select;" align="left"/>
+				<titledbutton class="dialog push" value="&select;" align="left"/>
 			</html:div></box>
 		</html:fieldset>
 	</box>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index b994e316c4c..b26b0fc9c8f 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -75,8 +75,8 @@
 			<html:input name="homepage" type="text"	id="pref:string:browser.startup.homepage" size="30" /> 
 			<html:div>
 				<spring flex="100%"/>
-				<titledbutton name="starts" type="button" value="&useCurrent;" onclick="SetHomePageToCurrentPage();" />
-				<titledbutton name="browse" type="button" value="&browseFile;" onclick="PrefNavSelectFile()"/>
+				<titledbutton class="dialog push" name="starts" type="button" value="&useCurrent;" onclick="SetHomePageToCurrentPage();" />
+				<titledbutton class="dialog push" name="browse" type="button" value="&browseFile;" onclick="PrefNavSelectFile()"/>
 			</html:div>		
 		</html:fieldset>  
 	</box> 
@@ -89,7 +89,7 @@
 			<html:div>&historyPages;</html:div>	
 			&pagesHis;<html:input type="text" value="&histDay;" size="3" />
 			&daysRadio; 
-			<titledbutton name="Clearit" value="&clearHis;" />		
+			<titledbutton class="dialog push" name="Clearit" value="&clearHis;" />		
 		</html:fieldset>  
 	</box> 
 
@@ -99,7 +99,7 @@
 						<html:div>&header4.label;</html:div> 
 					</html:legend>
 					&clearBar; 
-					<titledbutton name="starts" type="button" value="&clearLoc;" />		
+					<titledbutton class="dialog push" name="starts" type="button" value="&clearLoc;" />		
 		</html:fieldset>  
 	</box> 
 </html:div>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
index dfb7c107daa..d3eca97fc2f 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -56,7 +56,7 @@
 			<html:label for="pref:1:int:network.proxy.type" accesskey="m" tabindex="0">
 			&manualTypeRadio.label;
 			</html:label>
-			<titledbutton value="&view.label;" align="left" onclick="openit();"/>
+			<titledbutton class="dialog push" value="&view.label;" align="left" onclick="openit();"/>
 	</html:div>
 	<html:div id="manual-proxy" style="display: none">
 	<box align="horizontal">
@@ -137,7 +137,7 @@
 				<html:label for="pref:2:int:network.proxy.type" accesskey="a" tabindex="0">
 				&autoTypeRadio.label;
 				</html:label>
-				<titledbutton value="&reload.label;" align="left"/>
+				<titledbutton class="dialog push" value="&reload.label;" align="left"/>
 			</html:div>
 
 
@@ -147,7 +147,7 @@
 				&configAutoconfigText.label;
 				<html:input name="" type="text" size="15" id="pref:0:string:network.proxy.autoconfig_url" />
 			</html:div>
-				<spring flex="100%"/><titledbutton value="&view.label;" align="right"/>
+				<spring flex="100%"/><titledbutton class="dialog push" value="&view.label;" align="right"/>
 		</html:fieldset>
 	</box>
 </html:div>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index ea770e5dff1..1a225cbf7ae 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -52,7 +52,7 @@
             <html:textarea name="textstyle" ROWS="40" COLS="30" id="pref:string:browser.related.disabledForDomains">
             </html:textarea>
             <spring flex="15%"/>
-            <titledbutton id="pref:0:bool:smartupdate" value="&uninstallButton.label;" flex="1" style="max-height:13px;"/>
+            <titledbutton class="dialog push" id="pref:0:bool:smartupdate" value="&uninstallButton.label;" flex="1" style="max-height:13px;"/>
         </box>
       </html:fieldset>
     </box>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref.xul
index 6389e9ed7f8..7643395215a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref.xul
@@ -41,9 +41,9 @@
 	src="chrome://pref/content/pref-appearance.xul" width="72%" height="356" resize="yes" scrolling="auto"/>
 <box>
    <spring flex="100%" />
-   <titledbutton align="bottom" value="&helpButton.label;" />				
-   <titledbutton align="bottom" value="&cancelButton.label;" onclick="prefwindow.cancelPrefs();" />				
-   <titledbutton align="bottom" value="&okButton.label;" onclick="prefwindow.savePrefs();" />
+   <titledbutton class="dialog push" align="bottom" value="&helpButton.label;" />				
+   <titledbutton class="dialog push" align="bottom" value="&cancelButton.label;" onclick="prefwindow.cancelPrefs();" />				
+   <titledbutton class="dialog push" align="bottom" value="&okButton.label;" onclick="prefwindow.savePrefs();" />
 </box>
 </html:div>
 </window>