diff --git a/browser/components/prefwindow/content/plugins.xul b/browser/components/prefwindow/content/plugins.xul
index 57e2f37cb048..8f5d1ae36ebf 100644
--- a/browser/components/prefwindow/content/plugins.xul
+++ b/browser/components/prefwindow/content/plugins.xul
@@ -38,6 +38,7 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pref/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://browser/locale/pref/plugins.dtd">
diff --git a/browser/components/prefwindow/content/pref-advanced.xul b/browser/components/prefwindow/content/pref-advanced.xul
index e6dd7d1aff89..fe8955f688aa 100644
--- a/browser/components/prefwindow/content/pref-advanced.xul
+++ b/browser/components/prefwindow/content/pref-advanced.xul
@@ -1,6 +1,7 @@
 <?xml version="1.0"?> 
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pref/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref-advanced.dtd" >
diff --git a/browser/components/prefwindow/content/pref-extensions.xul b/browser/components/prefwindow/content/pref-extensions.xul
index 5eef4baec928..24351788cfb1 100644
--- a/browser/components/prefwindow/content/pref-extensions.xul
+++ b/browser/components/prefwindow/content/pref-extensions.xul
@@ -36,6 +36,7 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pref/pref.css" type="text/css"?>
 
 <!DOCTYPE page SYSTEM "chrome://browser/locale/pref/pref-extensions.dtd" >
diff --git a/browser/components/prefwindow/content/pref-features.xul b/browser/components/prefwindow/content/pref-features.xul
index eeeaac17eb6a..e6e4de904b05 100644
--- a/browser/components/prefwindow/content/pref-features.xul
+++ b/browser/components/prefwindow/content/pref-features.xul
@@ -37,6 +37,7 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pref/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref-features.dtd">
diff --git a/browser/components/prefwindow/content/pref-privacy.xul b/browser/components/prefwindow/content/pref-privacy.xul
index 40cf28afe1c3..1d1e913bcaea 100644
--- a/browser/components/prefwindow/content/pref-privacy.xul
+++ b/browser/components/prefwindow/content/pref-privacy.xul
@@ -37,6 +37,7 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pref/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref-privacy.dtd" >
diff --git a/browser/components/prefwindow/content/pref-themes.xul b/browser/components/prefwindow/content/pref-themes.xul
index f0dfebcd580a..7a85635f5533 100644
--- a/browser/components/prefwindow/content/pref-themes.xul
+++ b/browser/components/prefwindow/content/pref-themes.xul
@@ -37,6 +37,7 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pref/pref.css" type="text/css"?>
 
 <!DOCTYPE window [
diff --git a/browser/components/prefwindow/content/pref.xul b/browser/components/prefwindow/content/pref.xul
index 91f9c5fefda6..627a6e77e33c 100644
--- a/browser/components/prefwindow/content/pref.xul
+++ b/browser/components/prefwindow/content/pref.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css"?>
 <?xml-stylesheet href="chrome://browser/skin/pref/pref.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref.dtd" >
@@ -82,7 +83,7 @@
       <button id="catFeaturesbutton"  orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&features.label;"  
               url="chrome://browser/content/pref/pref-features.xul"/>
       <button id="catDownloadsButton" orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&downloads.label;" 
-              url="chrome://browser/content/pref/pref-downloads.xul"/>
+              url="chrome://mozapps/content/downloads/pref-downloads.xul"/>
       <button id="catThemesButton"    orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&themes.label;"    
               url="chrome://browser/content/pref/pref-themes.xul"/>
       <button id="catExtButton"       orient="vertical" class="buttonBoxButton" type="radio" group="categories" label="&ext.label;"       
diff --git a/browser/components/prefwindow/jar.mn b/browser/components/prefwindow/jar.mn
index 9f72c4e360ad..63a88ee9dcdd 100644
--- a/browser/components/prefwindow/jar.mn
+++ b/browser/components/prefwindow/jar.mn
@@ -1,6 +1,5 @@
 browser.jar:
 *   content/browser/pref/nsPrefWindow.js                   (content/nsPrefWindow.js)
-*   content/browser/pref/overrideHandler.js                (content/overrideHandler.js)
 *   content/browser/pref/pref.xul                          (content/pref.xul)
 *   content/browser/pref/pref-advanced.xul                 (content/pref-advanced.xul)
 *   content/browser/pref/pref-advancedscripts.xul          (content/pref-advancedscripts.xul)
@@ -21,10 +20,6 @@ browser.jar:
 *   content/browser/pref/pref-features-images.js           (content/pref-features-images.js)
 *   content/browser/pref/pref-themes.xul                   (content/pref-themes.xul)
 *   content/browser/pref/pref-themes.js                    (content/pref-themes.js)
-*   content/browser/pref/pref-downloads.xul                (content/pref-downloads.xul)
-*   content/browser/pref/pref-downloads.js                 (content/pref-downloads.js)
-*   content/browser/pref/editAction.xul                    (content/editAction.xul)
-*   content/browser/pref/editAction.js                     (content/editAction.js)
 *   content/browser/pref/plugins.xul                       (content/plugins.xul)
 *   content/browser/pref/plugins.js                        (content/plugins.js)
 *   content/browser/pref/permissions.js                    (content/permissions.js)
@@ -42,14 +37,10 @@ en-US.jar:
     locale/en-US/browser/pref/pref-fonts.dtd               (locale/pref-fonts.dtd)
     locale/en-US/browser/pref/pref-privacy.dtd             (locale/pref-privacy.dtd)
     locale/en-US/browser/pref/pref-themes.dtd              (locale/pref-themes.dtd)
-    locale/en-US/browser/pref/pref-downloads.dtd           (locale/pref-downloads.dtd)
     locale/en-US/browser/pref/prefutilities.properties     (locale/prefutilities.properties)
-    locale/en-US/browser/pref/editAction.dtd               (locale/editAction.dtd)
     locale/en-US/browser/pref/plugins.dtd                  (locale/plugins.dtd)
 
 classic.jar:
     skin/classic/browser/pref/pref.css                     (skin/pref.css)
     skin/classic/browser/pref/Options.png                  (skin/Options.png)
-    skin/classic/browser/pref/dot.gif                      (skin/dot.gif)
-    skin/classic/browser/pref/check.gif                    (skin/check.gif)
     
diff --git a/browser/components/prefwindow/skin/pref.css b/browser/components/prefwindow/skin/pref.css
index 032c40a0e59f..ab5a4ff47f1b 100644
--- a/browser/components/prefwindow/skin/pref.css
+++ b/browser/components/prefwindow/skin/pref.css
@@ -37,17 +37,6 @@
 # ***** END LICENSE BLOCK *****
 */
 
-.listBox {
-  -moz-appearance: listbox;
-  margin: 2px 4px;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  background-color: -moz-Field;
-}
-
 .buttonBox {
   margin: 0px 5px 0px 0px !important;
 }
@@ -109,82 +98,3 @@
   min-width: 8em;
 }
 
-/** Privacy/Advanced Panels Expander Boxes **/
-.settingsBox {
-  margin: 5px;
-  padding: 5px;
-}
-
-/* Themes/Extensions Items */
-.themesLink {
-  margin-left: 5px;
-  text-decoration: underline;
-  color: blue;
-  cursor: pointer;
-}
-
-.themesLink:active {
-  color: red;
-}
-
-#previewImageContainer {
-  height: 93px;
-  padding: 1px;
-}
-
-#previewImage {
-  max-width: 355px;
-  min-width: 355px;
-  max-height: 85px;
-  min-height: 85px;
-}
-
-.extensionInfoArea {
-  background-color: -moz-Field !important;
-  height: 10em;
-}
-
-#fileExtension {
-  width: 5em; 
-}
-
-#fileExtension.pluginsList {
-  width: 5.5em; 
-}
-
-#typeIcon, 
-.extensionChildren::-moz-tree-image(fileExtension),
-.pluginTypesChildren::-moz-tree-image(fileExtension) {
-  margin: 0px 5px 0px 0px;
-}
-
-.pluginTypesChildren::-moz-tree-image(pluginEnabled) {
-  margin: 0px 5px 0px 0px;
-  list-style-image: url(chrome://browser/skin/pref/dot.gif);  
-}
-
-.pluginTypesChildren::-moz-tree-image(pluginEnabled, enabled) {
-  margin: 0px 5px 0px 0px;
-  list-style-image: url(chrome://browser/skin/pref/check.gif);  
-}
-
-.biggerIndent {
-  margin-left: 28px; 
-}
-
-#typeField {
-  font-weight: bold; 
-}
-
-#defaultAppName {
-  margin-left: 6px !important; 
-}
-
-expander {
-  margin: 2px;
-}
-
-#privacyCategories > expander[open="true"] {
-  background-color: #FFFFCC;
-  border: 1px solid black;
-}
\ No newline at end of file