--- a/suite/common/bindings/prefwindow.xml
+++ b/suite/common/bindings/prefwindow.xml
@@ -62,17 +62,17 @@
 ]>
 
 <bindings id="prefwindowBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="prefwindow"
-           extends="chrome://global/content/bindings/preferences.xml#prefwindow">
+           extends="chrome://communicator/content/bindings/preferences.xml#prefwindow">
     <resources>
       <stylesheet src="chrome://communicator/skin/preferences.css"/>
     </resources>
 
     <!-- The only difference between the following <content> and its toolkit
          ancestor is the help button and the 'navTrees' <vbox> before the 'paneDeck'! -->
     <content dlgbuttons="accept,cancel" persist="lastSelected screenX screenY"
              closebuttonlabel="&preferencesCloseButton.label;"
@@ -491,17 +491,17 @@
           event.preventDefault();
         }
       ]]>
       </handler>
     </handlers>
   </binding>
 
   <binding id="prefpane"
-           extends="chrome://global/content/bindings/preferences.xml#prefpane">
+           extends="chrome://communicator/content/bindings/preferences.xml#prefpane">
     <resources>
       <stylesheet src="chrome://communicator/skin/preferences.css"/>
     </resources>
 
     <handlers>
       <handler event="paneload">
       <![CDATA[
         // Since all <prefpane>s now share the same global document, their

--- a/suite/common/communicator.css
+++ b/suite/common/communicator.css
@@ -100,22 +100,57 @@ toolbar > toolbarpaletteitem > toolbarit
 .menubar-items {
   -moz-box-orient: vertical; /* for flex hack */
 }
 
 .menubar-items > menubar {
   -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
+prefwindow,
+prefwindow:root,
+prefpane {
+  -moz-box-orient: vertical;
+}
+
+prefwindow[type="child"] > .paneDeckContainer {
+  overflow: -moz-hidden-unscrollable;
+}
+
+prefwindow[type="child"] > prefpane > .content-box {
+  -moz-box-flex: 1;
+  overflow: -moz-hidden-unscrollable;
+}
+
+preferences {
+  -moz-binding: url("chrome://communicator/content/bindings/preferences.xml#preferences");
+  visibility: collapse;
+}
+
+preference {
+  -moz-binding: url("chrome://communicator/content/bindings/preferences.xml#preference");
+  visibility: collapse;
+}
+
+radio[pane] {
+  -moz-binding: url("chrome://communicator/content/bindings/preferences.xml#panebutton") !important;
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+}
+
+prefwindow[chromehidden~="toolbar"] .chromeclass-toolbar {
+  display: none;
+}
+
 prefwindow[xpfe="false"] {
-  -moz-binding: url("chrome://global/content/bindings/preferences.xml#prefwindow");
+  -moz-binding: url("chrome://communicator/content/bindings/preferences.xml#prefwindow");
 }
 
 prefpane[xpfe="false"] {
-  -moz-binding: url("chrome://global/content/bindings/preferences.xml#prefpane");
+  -moz-binding: url("chrome://communicator/content/bindings/preferences.xml#prefpane");
 }
 
 findbar[xpfe="false"] {
   -moz-binding: url("chrome://global/content/bindings/findbar.xml#findbar");
 }
 
 prefwindow[xpfe="false"] > .paneDeckContainer,
 prefpane[xpfe="false"] > .content-box {

--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -107,16 +107,17 @@ comm.jar:
    content/communicator/platformCommunicatorOverlay.xul             (unix/platformCommunicatorOverlay.xul)
 #endif
 #endif
    content/communicator/autocomplete.css                            (autocomplete/autocomplete.css)
    content/communicator/bindings/findbar.xml                        (bindings/findbar.xml)
    content/communicator/bindings/general.xml                        (bindings/general.xml)
    content/communicator/bindings/generalBindings.xml                (../../common/bindings/generalBindings.xml)
    content/communicator/bindings/notification.xml                   (bindings/notification.xml)
+*  content/communicator/bindings/preferences.xml                    (../../common/bindings/preferences.xml)
    content/communicator/bindings/toolbar.xml                        (bindings/toolbar.xml)
 *  content/communicator/bindings/prefwindow.xml                     (bindings/prefwindow.xml)
    content/communicator/bookmarks/bm-panel.js                       (bookmarks/bm-panel.js)
    content/communicator/bookmarks/bm-panel.xul                      (bookmarks/bm-panel.xul)
    content/communicator/bookmarks/bm-props.js                       (bookmarks/bm-props.js)
    content/communicator/bookmarks/bm-props.xul                      (bookmarks/bm-props.xul)
 # Provide another URI for the bookmark properties dialog so we can persist the attributes separately
 % override chrome://communicator/content/bookmarks/bm-props2.xul chrome://communicator/content/bookmarks/bm-props.xul