diff --git a/xpfe/components/prefwindow/resources/content/pref-colors.xul b/xpfe/components/prefwindow/resources/content/pref-colors.xul
index 59f9f1a4abc..b3ea5316292 100644
--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -47,7 +47,7 @@
           <spring flex="100%"/>
     			<menu id="foregroundtextmenu" allowevents="true" class="colorpicker">
     				<html:div id="browserForegroundColorDiv" style="width:30px; background-color:white"/>
-    				<titledbutton class="popup dialog push" align="right"/>
+    				<titledbutton class="popup" align="right"/>
     				<menupopup id="foregroundMenuPopup">
     					<colorpicker allowevents="true" id="foregroundColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'foregroundtext', false);"/>
     				</menupopup>
@@ -61,7 +61,7 @@
     			<menu id="backgroundmenu" allowevents="true" class="colorpicker">
     				<html:div id="browserBackgroundColorDiv" style="width:30px; background-color:white"/>
             <spring flex="100%"/>
-    				<titledbutton class="popup dialog push" align="right"/>
+    				<titledbutton class="popup" align="right"/>
     				<menupopup id="backgroundMenuPopup">
     					<colorpicker allowevents="true" id="backgroundColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'background', false);"/>
     				</menupopup>
@@ -85,7 +85,7 @@
     			<menu id="unvisitedlinkmenu" allowevents="true" class="colorpicker">
     				<html:div id="browserUnvisitedLinksColorDiv" style="width:30px; background-color:white"/>
             <spring flex="100%"/>
-    				<titledbutton class="popup dialog push" align="right"/>
+    				<titledbutton class="popup" align="right" flex="100%"/>
     				<menupopup id="unvisitedLinksMenuPopup">
     					<colorpicker allowevents="true" id="unvisitedLinksColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'background', false);"/>
     				</menupopup>
@@ -99,7 +99,7 @@
     			<menu id="visitedlinkmenu" allowevents="true" class="colorpicker">
     				<html:div id="browserVisitedLinksColorDiv" style="width:30px; background-color:white"/>
             <spring flex="100%"/>
-    				<titledbutton class="popup dialog push" align="right"/>
+    				<titledbutton class="popup" align="right"/>
     				<menupopup id="visitedLinksMenuPopup">
     					<colorpicker allowevents="true" id="visitedLinksColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'background', false);"/>
     				</menupopup>
diff --git a/xpfe/components/prefwindow/resources/content/pref-composer.xul b/xpfe/components/prefwindow/resources/content/pref-composer.xul
index 42f9eecb807..0d37858845a 100644
--- a/xpfe/components/prefwindow/resources/content/pref-composer.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-composer.xul
@@ -118,7 +118,7 @@
       <spring flex="100%"/>
 			<menu id="normaltextmenu" allowevents="true" class="colorpicker">
 				<html:div id="pref:#000000:color:editor.text_color" style="width:30px; background-color:white"/>
-				<titledbutton class="dialog push popup" align="right" flex="100%"/>
+				<titledbutton class="popup" align="right" flex="100%"/>
 				<menupopup id="normalMenuPopup">
 					<colorpicker allowevents="true" id="normalColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'normaltext', false);"/>
 				</menupopup>
@@ -134,7 +134,7 @@
       <spring flex="100%"/>
 			<menu id="linktextmenu" class="colorpicker">
 				<html:div id="pref:#000000:color:editor.link_color" style="width:30px; background-color:white"/>
-				<titledbutton class="dialog push popup" align="right" flex="100%"/>
+				<titledbutton class="popup" align="right" flex="100%"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode,'linktext',false);"/>
 				</menupopup>
@@ -150,7 +150,7 @@
       <spring flex="100%"/>
 			<menu id="activelinktextmenu" class="colorpicker">
 				<html:div id="pref:#000000:color:editor.active_link_color" style="width:30px; background-color:white"/>
-				<titledbutton class="dialog push popup" align="right" flex="100%"/>
+				<titledbutton class="popup" align="right" flex="100%"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode,'activelinktext',false);"/>
 				</menupopup>
@@ -166,7 +166,7 @@
       <spring flex="100%"/>
 			<menu id="followedlinktextmenu" class="colorpicker">
 				<html:div id="pref:#000000:color:editor.followed_link_color" style="width:30px; background-color:white"/>
-				<titledbutton class="dialog push popup" align="right" flex="100%"/>
+				<titledbutton class="popup" align="right" flex="100%"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode,'followedlinktext',false);"/>
 				</menupopup>
@@ -182,7 +182,7 @@
       <spring flex="100%"/>
 			<menu id="colorpreviewmenu" class="colorpicker">
 				<html:div id="pref:#000000:color:editor.background_color" style="width:30px; background-color:white"/>
-				<titledbutton class="dialog push popup" align="right" flex="100%"/>
+				<titledbutton class="popup" align="right" flex="100%"/>
 				<menupopup>
 					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode,'colorpreview',true);"/>
 				</menupopup>