--- a/toolkit/mozapps/handling/content/dialog.xul
+++ b/toolkit/mozapps/handling/content/dialog.xul
@@ -40,13 +40,18 @@
       </richlistitem>
     </richlistbox>
   </vbox>
 
   <checkbox id="remember" aria-describedby="remember-text" oncommand="dialog.onCheck();"/>
   <description id="remember-text"/>
 
   <hbox class="dialog-button-box" pack="end">
+#ifdef XP_UNIX
     <button dlgtype="cancel" class="dialog-button"/>
     <button dlgtype="extra1" label="&accept;" class="dialog-button"/>
+#else
+    <button dlgtype="extra1" label="&accept;" class="dialog-button"/>
+    <button dlgtype="cancel" class="dialog-button"/>
+#endif
   </hbox>
 
 </dialog>

--- a/toolkit/mozapps/handling/jar.mn
+++ b/toolkit/mozapps/handling/jar.mn
@@ -1,9 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 toolkit.jar:
 % content mozapps %content/mozapps/
   content/mozapps/handling/handler.css                          (content/handler.css)
-  content/mozapps/handling/dialog.xul                           (content/dialog.xul)
+* content/mozapps/handling/dialog.xul                           (content/dialog.xul)
   content/mozapps/handling/dialog.js                            (content/dialog.js)