diff --git a/toolkit/components/help/content/help.js b/toolkit/components/help/content/help.js
index 80b3f92450df..0aefaeaee5da 100644
--- a/toolkit/components/help/content/help.js
+++ b/toolkit/components/help/content/help.js
@@ -342,7 +342,7 @@ function goForward() {
 
 function goHome() {
     // Load "Welcome" page
-    loadURI("chrome://help/locale/welcome.xhtml");
+    loadURI("chrome://help/locale/firefox_welcome.xhtml");
 }
 
 function print() {
diff --git a/toolkit/components/help/content/help.xul b/toolkit/components/help/content/help.xul
index cb0f86413d80..e1d71295a42c 100644
--- a/toolkit/components/help/content/help.xul
+++ b/toolkit/components/help/content/help.xul
@@ -39,8 +39,6 @@
 <?xml-stylesheet href="chrome://help/skin/sidebar.css" type="text/css"?>
 
 <?xul-overlay href="chrome://help/content/helpContextOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-
 <!DOCTYPE window [
     <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
     %brandDTD;
@@ -60,7 +58,6 @@
     <script type="application/x-javascript" src="chrome://help/content/toolbarCustomization.js"/>
     <script type="application/x-javascript" src="chrome://help/content/help.js"/>
     <script type="application/x-javascript" src="chrome://browser/content/sessionHistoryUI.js"/>
-    <script type="application/x-javascript" src="chrome://communicator/content/Utils.js"/>
     <script type="application/x-javascript" src="chrome://global/content/findUtils.js"/>
     <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
     <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
@@ -176,7 +173,7 @@
             <toolbar id="helpToolbar" toolbarname="Help Toolbar" class="toolbar-primary
                     chromeclass-toolbar" mode="icons" iconsize="small"
                     customizable="true"
-                    defaultset="help-sidebar-button,spacer,separator,spacer,help-back-button,help-forward-button,help-home-button,spacer,separator,spacer,help-print-button,spacer,separator,spacer,help-toolbar-customization,spring,throbber-box"
+                    defaultset="help-sidebar-button,spacer,separator,spacer,help-back-button,help-forward-button,help-home-button,spacer,separator,spacer,help-print-button,spacer,separator,spacer,help-toolbar-customization"
                     context="toolbar-context-menu"/>
 	    <toolbarset id="customToolbars"/>
         </toolbox>
diff --git a/toolkit/components/help/content/helpContextOverlay.xul b/toolkit/components/help/content/helpContextOverlay.xul
index 31e289916968..a82f040f4afb 100644
--- a/toolkit/components/help/content/helpContextOverlay.xul
+++ b/toolkit/components/help/content/helpContextOverlay.xul
@@ -32,24 +32,24 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 
-<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" [
+<!DOCTYPE overlay [
     <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
     %helpDTD;
 ]>
 <overlay id="contentAreaContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <!-- Help Window's right-click menu -->
+# Help Window's right-click menu
   <popupset id="contentAreaContextSet">
     <popup id="contentAreaContextMenu">
       <menuitem id="context-back"
-                label="&goBackCmd.label;"
-                accesskey="&goBackCmd.accesskey;"
+                label="&backButton.label;"
+                accesskey="&backButton.accesskey;"
                 observes="canGoBack"
                 oncommand="goBack()"/>
       <menuitem id="context-forward"
-                label="&goForwardCmd.label;"
-                accesskey="&goForwardCmd.accesskey;"
+                label="&forwardButton.label;"
+                accesskey="&forwardButton.accesskey;"
                 observes="canGoForward"
                 oncommand="goForward()"/>
       <menuitem id="context-reload"
@@ -59,9 +59,11 @@
       <menuseparator/>
       <menuitem id="zoom-out"
       		label="&textZoomReduceBtn.label;"
+      		accesskey="&textZoomReduceBtn.accesskey;"
       		oncommand="ZoomManager.prototype.getInstance().reduce();"/>
       <menuitem id="zoom-in"
       		label="&textZoomEnlargeBtn.label;"
+      		accesskey="textZoomEnlargeBtn.accesskey;"
       		oncommand="ZoomManager.prototype.getInstance().enlarge();"/>
     </popup>
   </popupset>
diff --git a/toolkit/components/help/content/helpMenuOverlay.xul b/toolkit/components/help/content/helpMenuOverlay.xul
index ad4d82553e23..e9d3d6578ef3 100644
--- a/toolkit/components/help/content/helpMenuOverlay.xul
+++ b/toolkit/components/help/content/helpMenuOverlay.xul
@@ -58,10 +58,13 @@
             position="1"
             accesskey="&helpContents.accesskey;"
             key="key_openHelp"
-#ifdef MOZ_PHOENIX
-            oncommand="openHelp('firefox-help');"/>
-#elifdef MOZ_THUNDERBIRD
+# Use the Thunderbird content pack if we're building thunderbird. Otherwise use the Firefox content
+# pack. We should use else instead of elseif to prevent build errors if MOZ_PHOENIX and MOZ_THUNDERBIRD
+# are not built.
+#ifdef MOZ_THUNDERBIRD
             oncommand="openHelp('smtp-docs','chrome://help/locale/thunderbirdhelp.rdf');"/>
+#else
+            oncommand="openHelp('firefox-help');"/>
 #endif
 
 # Disable For IE Users menu item on Unix systems and if we're not building