diff --git a/mozilla/extensions/cookie/resources/content/p3p.xul b/mozilla/extensions/cookie/resources/content/p3p.xul
index c5ef1869530..510008a59a0 100644
--- a/mozilla/extensions/cookie/resources/content/p3p.xul
+++ b/mozilla/extensions/cookie/resources/content/p3p.xul
@@ -43,12 +43,10 @@
 
 <dialog id="privacySettings"
         buttons="accept,cancel,help"
-        class="dialog"
         title="&windowtitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
         onload="init();"
-        ondialogaccept="return onOK(event);"
+        ondialogaccept="return onOK();"
         ondialoghelp="return doHelpButton();"
         style="width: 45em;">
 
@@ -145,8 +143,6 @@
   ]]>
   </script>
 
-  <keyset id="dialogKeys"/>
-           
   <groupbox orient="vertical">
     <caption label="&privacyLevel.label;"/>
 
diff --git a/mozilla/extensions/cookie/resources/content/p3pDialog.xul b/mozilla/extensions/cookie/resources/content/p3pDialog.xul
index 97b6131b4fe..11fe683970a 100644
--- a/mozilla/extensions/cookie/resources/content/p3pDialog.xul
+++ b/mozilla/extensions/cookie/resources/content/p3pDialog.xul
@@ -43,16 +43,15 @@
 
 <dialog id="p3pDialog"
         buttons="accept,cancel,extra1,extra2,help"
+        buttonalign="center"
         acceptLabel="&p3pDialogOff.label;"
         cancelLabel="&p3pDialogClose.label;"
         extra1Label="&p3pDialogViewCookies.label;"
         extra2Label="&p3pDialogViewLevels.label;"
-        class="dialog"
         title="&p3pDialogTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
         onload="init();"
-        ondialogaccept="P3POff();"
+        ondialogaccept="return P3POff();"
         ondialogextra1="ViewCookieManager();"
         ondialogextra2="ViewPrivacyLevels();"
         ondialoghelp="return doHelpButton();"
@@ -93,6 +92,8 @@
     pref = pref.getService();
     pref = pref.QueryInterface(Components.interfaces.nsIPrefBranch);
     pref.setIntPref("network.cookie.cookieBehavior", 0);
+
+    return true;
   }
 
   function doHelpButton()
diff --git a/mozilla/xpfe/components/permissions/content/cookieP3P.xul b/mozilla/xpfe/components/permissions/content/cookieP3P.xul
index c5ef1869530..510008a59a0 100644
--- a/mozilla/xpfe/components/permissions/content/cookieP3P.xul
+++ b/mozilla/xpfe/components/permissions/content/cookieP3P.xul
@@ -43,12 +43,10 @@
 
 <dialog id="privacySettings"
         buttons="accept,cancel,help"
-        class="dialog"
         title="&windowtitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
         onload="init();"
-        ondialogaccept="return onOK(event);"
+        ondialogaccept="return onOK();"
         ondialoghelp="return doHelpButton();"
         style="width: 45em;">
 
@@ -145,8 +143,6 @@
   ]]>
   </script>
 
-  <keyset id="dialogKeys"/>
-           
   <groupbox orient="vertical">
     <caption label="&privacyLevel.label;"/>
 
diff --git a/mozilla/xpfe/components/permissions/content/cookieP3PDialog.xul b/mozilla/xpfe/components/permissions/content/cookieP3PDialog.xul
index 97b6131b4fe..11fe683970a 100644
--- a/mozilla/xpfe/components/permissions/content/cookieP3PDialog.xul
+++ b/mozilla/xpfe/components/permissions/content/cookieP3PDialog.xul
@@ -43,16 +43,15 @@
 
 <dialog id="p3pDialog"
         buttons="accept,cancel,extra1,extra2,help"
+        buttonalign="center"
         acceptLabel="&p3pDialogOff.label;"
         cancelLabel="&p3pDialogClose.label;"
         extra1Label="&p3pDialogViewCookies.label;"
         extra2Label="&p3pDialogViewLevels.label;"
-        class="dialog"
         title="&p3pDialogTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
         onload="init();"
-        ondialogaccept="P3POff();"
+        ondialogaccept="return P3POff();"
         ondialogextra1="ViewCookieManager();"
         ondialogextra2="ViewPrivacyLevels();"
         ondialoghelp="return doHelpButton();"
@@ -93,6 +92,8 @@
     pref = pref.getService();
     pref = pref.QueryInterface(Components.interfaces.nsIPrefBranch);
     pref.setIntPref("network.cookie.cookieBehavior", 0);
+
+    return true;
   }
 
   function doHelpButton()