diff --git a/mozilla/profile/resources/content/profileSelection.js b/mozilla/profile/resources/content/profileSelection.js
index 2f7902797e6..6330d173bd6 100644
--- a/mozilla/profile/resources/content/profileSelection.js
+++ b/mozilla/profile/resources/content/profileSelection.js
@@ -261,9 +261,8 @@ function onExit()
 
 function SetUpOKCancelButtons()
 {
-  doSetOKCancel( onStart, onExit, null, null );
-  var okButton = document.getElementById("ok");
-  var cancelButton = document.getElementById("cancel");
+  var okButton = document.documentElement.getButton("accept");
+  var cancelButton = document.documentElement.getButton("cancel");
 
   var okButtonString;
   var cancelButtonString;
@@ -284,6 +283,5 @@ function SetUpOKCancelButtons()
   }
 
   okButton.setAttribute( "label", okButtonString );
-  okButton.setAttribute( "class", ( okButton.getAttribute("class") + " padded" ) );
   cancelButton.setAttribute( "label", cancelButtonString );
 }
diff --git a/mozilla/profile/resources/content/profileSelection.xul b/mozilla/profile/resources/content/profileSelection.xul
index 42806dc5810..b710d5d541e 100644
--- a/mozilla/profile/resources/content/profileSelection.xul
+++ b/mozilla/profile/resources/content/profileSelection.xul
@@ -28,23 +28,21 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/profile/profile.css" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % profileDTD SYSTEM "chrome://communicator/locale/profile/profileSelection.dtd">
 %profileDTD;
 ]>
 
-<window
+<dialog
   id="profileWindow"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  class="color-dialog non-resizable"
+  class="non-resizable"
   title="&windowtitle.label;"
-  orient="vertical"
   style="width: 42em;"
-  onclose="onExit();"
+  ondialogaccept="return onStart();"
+  ondialogcancel="return onExit();"
   onload="StartUp();"> 
       
   <stringbundle id="bundle_profileManager"
@@ -55,8 +53,6 @@
   <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/profile/profileSelection.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/profile/profileManager.js"/>
-  
-  <keyset id="dialogKeys"/>
 
   <dialogheader class="header-large" id="header" title="&profilemanager.label;" description="&windowtitle.label;"/>
   
@@ -101,7 +97,8 @@
     <separator class="thin" orient="vertical"/>
     <button id="manage" label="&manage.label;" accesskey="&manage.accesskey;" oncommand="SwitchProfileManagerMode();"/>
     <spacer flex="1"/>
-    <hbox id="okCancelButtons"/>
+    <button dlgtype="accept" class="dialog-button padded"/>
+    <button dlgtype="cancel" class="dialog-button"/>
     <separator class="thin" orient="vertical"/>
   </hbox>
   
@@ -109,4 +106,4 @@
   
   <hbox id="profileManager-status" class="box-status" value="&profilemanager.label;" progress=""/>
   
-</window>
+</dialog>