diff --git a/mozilla/browser/components/prefwindow/content/pref-appearance.xul b/mozilla/browser/components/prefwindow/content/pref-appearance.xul
index 6977f1bffbb..c2e37f5d9c9 100644
--- a/mozilla/browser/components/prefwindow/content/pref-appearance.xul
+++ b/mozilla/browser/components/prefwindow/content/pref-appearance.xul
@@ -37,26 +37,13 @@
   <script type="application/x-javascript">
   <![CDATA[
     var panel = "chrome://communicator/content/pref/pref-appearance.xul";
-    var _elementIDs = ["generalStartupBrowser", "showHideTooltips", "useSiteIcons"];
+    var _elementIDs = ["useSiteIcons"];
   ]]>
   </script>
           
-  <groupbox id="generalStartupPreferences" align="start">
-    <caption label="&onStartLegend.label;"/>
-    <!-- XXX remove when navigator overlays.rdf works -->
-    <checkbox id="generalStartupBrowser"
-              label="&navCheck.label;" accesskey="&navCheck.accesskey;"
-              prefstring="general.startup.browser"/>
-    <!-- XXX -->
-  </groupbox>
-  
   <vbox class="box-padded" align="start">
     <separator class="thin" />
 
-    <checkbox id="showHideTooltips" label="&showHideTooltips.label;"
-              accesskey="&showHideTooltips.accesskey;"
-              prefstring="browser.chrome.toolbar_tips"/>
-    
     <checkbox id="useSiteIcons" label="&useSiteIcons.label;"
               accesskey="&useSiteIcons.accesskey;"
               prefstring="browser.chrome.site_icons"/>
diff --git a/mozilla/browser/components/prefwindow/content/pref-colors.xul b/mozilla/browser/components/prefwindow/content/pref-colors.xul
index f00f9e6a43e..5da2bed9e64 100644
--- a/mozilla/browser/components/prefwindow/content/pref-colors.xul
+++ b/mozilla/browser/components/prefwindow/content/pref-colors.xul
@@ -23,9 +23,9 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>
+<?xul-overlay href="chrome://browser/content/pref/platformPrefOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-colors.dtd" >
+<!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref-colors.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');"
@@ -33,11 +33,11 @@
 
   <script type="application/x-javascript">
   <![CDATA[
-    var _elementIDs = ["foregroundText", "background", "browserUseSystemColors", "unvisitedLinks", "visitedLinks", "browserUnderlineAnchors", "browserUseDocumentColors", "syntaxHighlight"];
+    var _elementIDs = ["foregroundText", "background", "browserUseSystemColors", "unvisitedLinks", "visitedLinks", "browserUnderlineAnchors", "browserUseDocumentColors"];
   ]]>
   </script>
   
-  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-colors.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/pref/pref-colors.js"/>
 
   <hbox>
     <groupbox flex="1" id="pageColours">
@@ -93,12 +93,4 @@
     </radiogroup>
     
   </groupbox>
-
-  <groupbox>
-      <caption label="&viewsource;"/>
-      <hbox align="center">
-        <checkbox id="syntaxHighlight" label="&syntaxHighlight.label;" accesskey="&syntaxHighlight.accesskey;"
-                  prefstring="view_source.syntax_highlight"/>
-      </hbox>
-  </groupbox>
 </page>
diff --git a/mozilla/browser/components/prefwindow/content/pref-navigator.xul b/mozilla/browser/components/prefwindow/content/pref-navigator.xul
index 9bdd65191fd..7db6e368a6f 100644
--- a/mozilla/browser/components/prefwindow/content/pref-navigator.xul
+++ b/mozilla/browser/components/prefwindow/content/pref-navigator.xul
@@ -22,25 +22,21 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>
+<?xul-overlay href="chrome://browser/content/pref/platformPrefOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-navigator.dtd" >
+<!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref-navigator.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       id="pref-navigator"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');"
+      onload="parent.initPanel('chrome://browser/content/pref/pref-navigator.xul');"
       headertitle="&lHeader;">
 
-  <stringbundle id="bundle_prefutilities" src="chrome://communicator/locale/pref/prefutilities.properties"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-navigator.js"/>
+  <stringbundle id="bundle_prefutilities" src="chrome://browser/locale/pref/prefutilities.properties"/>
+  <script type="application/x-javascript" src="chrome://browser/content/pref/pref-navigator.js"/>
 
   <script type="application/x-javascript">
   <![CDATA[
-    var _elementIDs = ["startupPage", "browserStartupHomepage",
-                       "bookmarksButton", "goButton",
-                       "homeButton", "printButton",
-                       "searchButton"];
+    var _elementIDs = ["startupPage", "browserStartupHomepage"];
   ]]>
   </script>
   
@@ -85,34 +81,5 @@
       </hbox>
     </vbox>
   </groupbox>
-  
-  <!-- toolbar buttons customization -->
-  <groupbox flex="1" id="prefShowButtons" orient="horizontal">
-    <caption label="&toolbarIntro.label;"/>
-    <vbox id="prefShowButtonsBox1">
-
-              <checkbox id="bookmarksButton"
-                        label="&bookmarksButton.label;"
-                        prefstring="browser.toolbars.showbutton.bookmarks"/>
-              <checkbox id="goButton"
-                        label="&goButton.label;"
-                        prefstring="browser.toolbars.showbutton.go"/>
-              <checkbox id="homeButton"
-                        label="&homeButton.label;"
-                        prefstring="browser.toolbars.showbutton.home"/>
-     </vbox>
-     <vbox id="prefShowButtonsbox">
-
-              <checkbox id="searchButton"
-                        label="&searchButton.label;"
-                        prefstring="browser.toolbars.showbutton.search"/>
-      	      <checkbox id="printButton"
-                        label="&printButton.label;"
-                        prefstring="browser.toolbars.showbutton.print"/>
-      </vbox>
-      <vbox id="prefShowButtonBox">
-
-      </vbox>
-   </groupbox>
 </page>