diff --git a/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.xul b/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.xul
index b956729891a..56136177769 100644
--- a/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.xul
+++ b/mozilla/toolkit/components/passwordmgr/resources/content/passwordManager.xul
@@ -83,9 +83,9 @@
             </tree>
             <separator class="thin"/>
             <hbox>
-              <button id="removeSignon" disabled="true"
+              <button id="removeSignon" disabled="true" icon="remove"
                       label="&remove.label;" oncommand="DeleteSignon();"/>
-              <button id="removeAllSignons"
+              <button id="removeAllSignons" icon="clear"
                       label="&removeall.label;"
                       oncommand="DeleteAllSignons();"/>
               <spacer flex="1"/>
@@ -108,10 +108,10 @@
             </tree>
             <separator class="thin"/>
             <hbox>
-              <button id="removeReject" disabled="true"
+              <button id="removeReject" disabled="true" icon="remove"
                       label="&remove.label;" oncommand="DeleteReject();"/>
               <button id="removeAllRejects"
-                      label="&removeall.label;"
+                      icon="clear" label="&removeall.label;"
                       oncommand="DeleteAllRejects();"/>
             </hbox>
         </vbox>
diff --git a/mozilla/toolkit/content/widgets/preferences.xml b/mozilla/toolkit/content/widgets/preferences.xml
index fb745fc2a1d..3f6b0bec322 100644
--- a/mozilla/toolkit/content/widgets/preferences.xml
+++ b/mozilla/toolkit/content/widgets/preferences.xml
@@ -410,10 +410,10 @@
       <xul:hbox pack="end" anonid="dlg-buttons" class="prefWindow-dlgbuttons">
         <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
         <xul:spacer anonid="spacer" flex="1" hidden="true"/>
-        <xul:button dlgtype="accept" class="dialog-button"/>
+        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
         <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
-        <xul:button dlgtype="cancel" class="dialog-button"/>
-        <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
+        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
       </xul:hbox>
       <xul:hbox>
@@ -440,6 +440,7 @@
             var acceptButton = docElt.getButton("accept");
             acceptButton.hidden = true;
             var cancelButton  = docElt.getButton("cancel");
+            cancelButton.setAttribute ("icon", "close");
             cancelButton.label = docElt.getAttribute("closebuttonlabel");
             cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
 #endif
diff --git a/mozilla/toolkit/themes/gnomestripe/global/button.css b/mozilla/toolkit/themes/gnomestripe/global/button.css
index 24be030bd84..b1627258439 100644
--- a/mozilla/toolkit/themes/gnomestripe/global/button.css
+++ b/mozilla/toolkit/themes/gnomestripe/global/button.css
@@ -262,6 +262,10 @@ button[icon="select-font"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-select-font?size=button");
 }
 
+button[icon="select-color"] .button-icon {
+  list-style-image: url("moz-icon://stock/gtk-color-picker?size=button");
+}
+
 button[icon="network"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-network?size=button");
 }