diff --git a/mozilla/suite/common/bindings/prefwindow.xml b/mozilla/suite/common/bindings/prefwindow.xml
index 967765b5902..1d763dd81fb 100644
--- a/mozilla/suite/common/bindings/prefwindow.xml
+++ b/mozilla/suite/common/bindings/prefwindow.xml
@@ -129,7 +129,7 @@
           </xul:deck>
         </xul:vbox>
       </xul:hbox>
-      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end">
+      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end" xbl:inherits="type">
 #ifdef XP_UNIX
         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
         <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
@@ -455,6 +455,10 @@
 
   <binding id="prefpane"
            extends="chrome://global/content/bindings/preferences.xml#prefpane">
+    <resources>
+      <stylesheet src="chrome://communicator/skin/preferences.css"/>
+    </resources>
+
     <handlers>
       <handler event="paneload">
       <![CDATA[
diff --git a/mozilla/suite/themes/modern/communicator/preferences.css b/mozilla/suite/themes/modern/communicator/preferences.css
index c29323c7736..b4dfee33872 100644
--- a/mozilla/suite/themes/modern/communicator/preferences.css
+++ b/mozilla/suite/themes/modern/communicator/preferences.css
@@ -40,8 +40,11 @@
 
 /* ::::: Main Window ::::: */
 
-prefwindow
-{ 
-  padding: 8px 10px 0px 8px;
+prefwindow {
+  padding: 7px 5px 5px 5px;
 }
 
+prefpane,
+.prefWindow-dlgbuttons {
+  padding: 0px;
+}
diff --git a/mozilla/suite/themes/modern/global/preferences.css b/mozilla/suite/themes/modern/global/preferences.css
index b3aa057050b..bd5a20fe020 100644
--- a/mozilla/suite/themes/modern/global/preferences.css
+++ b/mozilla/suite/themes/modern/global/preferences.css
@@ -47,12 +47,12 @@ prefwindow {
   padding: 0px;
 }
 
-prefpane {
+prefwindow[type="child"] {
   padding: 7px 5px 5px 5px;
 }
 
-prefwindow[type="child"] {
-  padding: 7px 5px 5px 5px;
+prefpane {
+  padding: 7px 5px 0px 5px;
 }
 
 prefwindow[type="child"] > prefpane {
@@ -63,7 +63,7 @@ prefwindow[type="child"] > prefpane {
   padding: 0px 5px 5px 5px;
 }
 
-prefwindow[type="child"] .prefWindow-dlgbuttons {
+.prefWindow-dlgbuttons[type="child"] {
   padding: 0px;
 }
 
@@ -75,6 +75,15 @@ radio[pane] {
   color: #000000;
 }
 
+radio[pane][selected="true"] {
+  background-color: #C7D0D9;
+}
+
+radio[pane]:hover:active {
+  background-color: #90A1B3;
+  color: #FFFFFF;
+}
+
 .paneSelector {
   border-bottom: 2px solid;
   -moz-border-bottom-colors: #ECEFF2 #2D3B49;
@@ -88,12 +97,3 @@ radio[pane] {
   width: 32px;
   height: 32px;
 }
-
-radio[pane]:hover:active {
-  background-color: #90A1B3;
-  color: #FFFFFF;
-}
-
-radio[pane][selected="true"] {
-  background-color: #C7D0D9;
-}