diff --git a/mozilla/extensions/xforms/resources/content/xforms-prefs-ui.xul b/mozilla/extensions/xforms/resources/content/xforms-prefs-ui.xul
index c1bffe59f8c..70e9bad45f9 100644
--- a/mozilla/extensions/xforms/resources/content/xforms-prefs-ui.xul
+++ b/mozilla/extensions/xforms/resources/content/xforms-prefs-ui.xul
@@ -37,38 +37,46 @@
 
 <!DOCTYPE overlay [
 <!ENTITY % xformsDTD SYSTEM "chrome://xforms/locale/xforms.dtd">
-<!ENTITY % contentDTD SYSTEM "chrome://browser/locale/preferences/content.dtd">
+<!ENTITY % securityDTD SYSTEM "chrome://browser/locale/preferences/security.dtd">
+<!ENTITY % preferencesDTD SYSTEM "chrome://browser/locale/preferences/preferences.dtd">
   %xformsDTD;
-  %contentDTD;
+  %securityDTD;
+  %preferencesDTD;
 ]>
 
-<overlay id="XFormsContentPaneOverlayUI"
+<overlay id="XFormsSecurityPaneOverlayUI"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<prefwindow id="BrowserPreferences">
-  <prefpane id="paneContent">
+<prefwindow id="BrowserPreferences"
+#ifdef USE_WIN_TITLE_STYLE
+            style="&prefWindow.styleWin;">
+#else
+#ifdef XP_MACOSX
+            style="&prefWindow.styleMac;">
+#else
+            style="&prefWindow.styleGNOME;">
+#endif
+#endif
+>
 
-    <preferences id="contentPreferences">
+  <prefpane id="paneSecurity">
+
+    <preferences id="securityPreferences">
       <preference id="xforms.crossdomain.enabled" name="xforms.crossdomain.enabled" type="bool"/>
     </preferences>
 
-    <groupbox id="contentGroupbox">
-      <grid id="contentGrid">
-        <rows id="contentRows-1">
-          <row insertafter="enableSoftwareInstallRow">
-            <vbox align="start">
-              <checkbox id="xformsCrossDomain" preference="xforms.crossdomain.enabled"
-                        label="&xforms.crossdomain.ui.label;"
-                        accesskey="&xforms.crossdomain.ui.accesskey;"
-                        onsyncfrompreference="return gContentPane.updateButtons('xformsCrossDomainButton', 'xforms.crossdomain.enabled');"/>
-            </vbox>
-            <button id="xformsCrossDomainButton"
-                    label="&allowedSitesXForms.label;"
-                    accesskey="&allowedSitesXForms.accesskey;"
-                    oncommand="loadXFormsPermission()"/>
-          </row>
-        </rows>
-      </grid>
+    <groupbox id="addonsPhishingGroup">
+      <hbox insertafter="addonInstallBox">
+        <checkbox id="xformsCrossDomain" preference="xforms.crossdomain.enabled"
+                  flex="1"
+                  label="&xforms.crossdomain.ui.label;"
+                  accesskey="&xforms.crossdomain.ui.accesskey;"
+                  onsyncfrompreference="return gContentPane.updateButtons('xformsCrossDomainButton', 'xforms.crossdomain.enabled');"/>
+        <button id="xformsCrossDomainButton"
+                label="&allowedSitesXForms.label;"
+                accesskey="&allowedSitesXForms.accesskey;"
+                oncommand="loadXFormsPermission()"/>
+      </hbox>
     </groupbox>
   </prefpane>
 </prefwindow>
diff --git a/mozilla/extensions/xforms/resources/content/xforms-prefs.js b/mozilla/extensions/xforms/resources/content/xforms-prefs.js
index 65b3ca40ee3..b6ca8afb076 100644
--- a/mozilla/extensions/xforms/resources/content/xforms-prefs.js
+++ b/mozilla/extensions/xforms/resources/content/xforms-prefs.js
@@ -62,7 +62,7 @@ function XFormsUIClass() {
 }
 
 XFormsUIClass.prototype.pageLoad = function(aEvent) {
-  var pane = document.getElementById("paneContent");
+  var pane = document.getElementById("paneSecurity");
   if (pane.loaded) {
     xformsUI.loadOverlay();
   } else {
diff --git a/mozilla/extensions/xforms/resources/content/xforms-prefs.xul b/mozilla/extensions/xforms/resources/content/xforms-prefs.xul
index 642cb2c8e53..9e7b3f36b7c 100644
--- a/mozilla/extensions/xforms/resources/content/xforms-prefs.xul
+++ b/mozilla/extensions/xforms/resources/content/xforms-prefs.xul
@@ -35,13 +35,33 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<overlay id="XFormsContentPaneOverlay"
+<!DOCTYPE overlay [
+<!ENTITY % xformsDTD SYSTEM "chrome://xforms/locale/xforms.dtd">
+<!ENTITY % securityDTD SYSTEM "chrome://browser/locale/preferences/security.dtd">
+<!ENTITY % preferencesDTD SYSTEM "chrome://browser/locale/preferences/preferences.dtd">
+  %xformsDTD;
+  %securityDTD;
+  %preferencesDTD;
+]>
+
+<overlay id="XFormsSecurityPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<prefwindow id="BrowserPreferences">
-  <prefpane id="paneContent">
+<prefwindow id="BrowserPreferences"
+#ifdef USE_WIN_TITLE_STYLE
+            style="&prefWindow.styleWin;">
+#else
+#ifdef XP_MACOSX
+            style="&prefWindow.styleMac;">
+#else
+            style="&prefWindow.styleGNOME;">
+#endif
+#endif
+>
 
-    <preferences id="contentPreferences">
+  <prefpane id="paneSecurity">
+
+    <preferences id="securityPreferences">
       <preference id="xforms.crossdomain.enabled" name="xforms.crossdomain.enabled" type="bool"/>
     </preferences>
 
diff --git a/mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd b/mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd
index 6c565d85cb4..d82ee38f42b 100644
--- a/mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd
+++ b/mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd
@@ -86,3 +86,6 @@
 <!ENTITY xforms.date.day.label.field        "&#34;Day&#34;">
 <!ENTITY xforms.range.start.separator.field "<![CDATA[&#34; >> &#34;]]>">
 <!ENTITY xforms.range.end.separator.field   "<![CDATA[&#34; << &#34;]]>">
+
+<!ENTITY  prefWindow.styleWin     "width: 42em; height: 42em;">
+<!ENTITY  prefWindow.styleGNOME   "width: 42em; height: 40.5em;">