diff --git a/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
index 3f9f32efde6..a82ea5e3cf6 100644
--- a/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
@@ -11,16 +11,16 @@
 
   <box id="okCancelButtons" align="horizontal">
     <spring flex="1"/>
-    <button class="exit-dialog" id="Button3" value="" hidden="true" oncommand="doButton3();"/>
-    <button class="exit-dialog" id="Button2" value="" hidden="true" oncommand="doButton2();"/>
+    <button class="exit-dialog" id="Button3" value="" collapsed="true" oncommand="doButton3();"/>
+    <button class="exit-dialog" id="Button2" value="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" value="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="right exit-dialog" id="ok" default="true" value="&okButton.label;" oncommand="doOKButton();"/>
   </box>
 
   <box id="okCancelButtonsRight" align="horizontal">
     <spring flex="1"/>
-    <button class="exit-dialog" id="Button3" value="" hidden="true" oncommand="doButton3();"/>
-    <button class="exit-dialog" id="Button2" value="" hidden="true" oncommand="doButton2();"/>
+    <button class="exit-dialog" id="Button3" value="" collapsed="true" oncommand="doButton3();"/>
+    <button class="exit-dialog" id="Button2" value="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" value="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="right exit-dialog" id="ok" default="true" value="&okButton.label;" oncommand="doOKButton();"/>
   </box>
diff --git a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
index bb116549326..6bc2ced6b79 100644
--- a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
@@ -12,8 +12,8 @@
   <box id="okCancelButtons" align="horizontal">
     <spring flex="1"/>
     <button class="right dialog" id="ok" value="&okButton.label;" default="true" onclick="doOKButton()"/>	
-    <button class="dialog" id="Button2" value="&cancelButton.label;" hidden="true" onclick="doButton2()"/>	
-    <button class="dialog" id="Button3" value="&cancelButton.label;" hidden="true" onclick="doButton3()"/>	
+    <button class="dialog" id="Button2" value="&cancelButton.label;" collapsed="true" onclick="doButton2()"/>	
+    <button class="dialog" id="Button3" value="&cancelButton.label;" collapsed="true" onclick="doButton3()"/>	
     <button class="dialog" id="cancel" value="&cancelButton.label;" onclick="doCancelButton()"/>
     <spring flex="1"/>
   </box>
@@ -21,8 +21,8 @@
   <box id="okCancelButtonsRight" align="horizontal">
     <spring flex="1"/>
     <button class="right dialog" id="ok" value="&okButton.label;" default="true" onclick="doOKButton()"/>	
-    <button class="dialog" id="Button2" value="&cancelButton.label;" hidden="true" onclick="doButton2()"/>	
-    <button class="dialog" id="Button3" value="&cancelButton.label;" hidden="true" onclick="doButton3()"/>	
+    <button class="dialog" id="Button2" value="&cancelButton.label;" collapsed="true" onclick="doButton2()"/>	
+    <button class="dialog" id="Button3" value="&cancelButton.label;" collapsed="true" onclick="doButton3()"/>	
     <button class="dialog" id="cancel" value="&cancelButton.label;" onclick="doCancelButton()"/>
     <spring flex="1"/>
   </box>
diff --git a/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
index 0ba86a36896..ff00d20d358 100644
--- a/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
@@ -12,8 +12,8 @@
   <box id="okCancelButtons" align="horizontal">
     <spring flex="1"/>
     <button class="right exit-dialog" id="ok" value="&okButton.label;" default="true" onclick="doOKButton()"/>	
-    <button class="exit-dialog" id="Button2" value="&cancelButton.label;" hidden="true" onclick="doButton2()"/>	
-    <button class="exit-dialog" id="Button3" value="&cancelButton.label;" hidden="true" onclick="doButton3()"/>	
+    <button class="exit-dialog" id="Button2" value="&cancelButton.label;" collapsed="true" onclick="doButton2()"/>	
+    <button class="exit-dialog" id="Button3" value="&cancelButton.label;" collapsed="true" onclick="doButton3()"/>	
     <button class="exit-dialog" id="cancel" value="&cancelButton.label;" onclick="doCancelButton()"/>
     <spring flex="1"/>
   </box>
@@ -21,8 +21,8 @@
   <box id="okCancelButtonsRight" align="horizontal">
     <spring flex="1"/>
     <button class="right exit-dialog" id="ok" value="&okButton.label;" default="true" onclick="doOKButton()"/>	
-    <button class="exit-dialog" id="Button2" value="&cancelButton.label;" hidden="true" onclick="doButton2()"/>	
-    <button class="exit-dialog" id="Button3" value="&cancelButton.label;" hidden="true" onclick="doButton3()"/>	
+    <button class="exit-dialog" id="Button2" value="&cancelButton.label;" collapsed="true" onclick="doButton2()"/>	
+    <button class="exit-dialog" id="Button3" value="&cancelButton.label;" collapsed="true" onclick="doButton3()"/>	
     <button class="exit-dialog" id="cancel" value="&cancelButton.label;" onclick="doCancelButton()"/>
     <spring flex="1"/>
   </box>
diff --git a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
index f2b8dfcd29a..6451fe20abb 100644
--- a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
@@ -12,8 +12,8 @@
   <box id="okCancelButtons">
     <spring flex="1"/>
     <button class="right exit-dialog" id="ok" value="&okButton.label;" default="true" onclick="doOKButton()"/>	
-    <button class="exit-dialog" id="Button2" value="&cancelButton.label;" hidden="true" onclick="doButton2()"/>	
-    <button class="exit-dialog" id="Button3" value="&cancelButton.label;" hidden="true" onclick="doButton3()"/>	
+    <button class="exit-dialog" id="Button2" value="&cancelButton.label;" collapsed="true" onclick="doButton2()"/>	
+    <button class="exit-dialog" id="Button3" value="&cancelButton.label;" collapsed="true" onclick="doButton3()"/>	
     <button class="exit-dialog" id="cancel" value="&cancelButton.label;" onclick="doCancelButton()"/>
     <spring flex="1"/>
   </box>
@@ -21,8 +21,8 @@
   <box id="okCancelButtonsRight" halign="right">
     <spring flex="1"/>
     <button class="right exit-dialog" id="ok" value="&okButton.label;" default="true" onclick="doOKButton()"/>	
-    <button class="exit-dialog" id="Button2" value="&cancelButton.label;" hidden="true" onclick="doButton2()"/>	
-    <button class="exit-dialog" id="Button3" value="&cancelButton.label;" hidden="true" onclick="doButton3()"/>	
+    <button class="exit-dialog" id="Button2" value="&cancelButton.label;" collapsed="true" onclick="doButton2()"/>	
+    <button class="exit-dialog" id="Button3" value="&cancelButton.label;" collapsed="true" onclick="doButton3()"/>	
     <button class="exit-dialog" id="cancel" value="&cancelButton.label;" onclick="doCancelButton()"/>
   </box>