diff --git a/mozilla/browser/app/profile/firefox.js b/mozilla/browser/app/profile/firefox.js
index faeabe769d1..62534fb68fe 100644
--- a/mozilla/browser/app/profile/firefox.js
+++ b/mozilla/browser/app/profile/firefox.js
@@ -54,10 +54,10 @@ pref("general.startup.browser", true);
 pref("browser.chromeURL","chrome://browser/content/");
 pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
 pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
-pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul?type=themes");
-pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul?type=extensions");
-pref("xpinstall.dialog.progress.type.skin", "Extension:Manager-themes");
-pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager-extensions");
+pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul?view=installs");
+pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul?view=installs");
+pref("xpinstall.dialog.progress.type.skin", "Extension:Manager");
+pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager");
 
 // Developers can set this to |true| if they are constantly changing files in their 
 // extensions directory so that the extension system does not constantly think that
diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc
index 20fbc31eab7..f6a474d76ba 100644
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
@@ -474,10 +474,8 @@
               <menuseparator/>
               <menuitem label="&downloads.label;" accesskey="&downloads.accesskey;"
                         key="key_openDownloads" command="Tools:Downloads"/>
-              <menuitem label="&extensions.label;" accesskey="&extensions.accesskey;" 
-                        command="Tools:Extensions"/>
-              <menuitem label="&themes.label;" accesskey="&themes.accesskey;" 
-                        command="Tools:Themes"/>
+              <menuitem label="&addons.label;" accesskey="&addons.accesskey;" 
+                        command="Tools:Addons"/>
               <menuseparator id="devToolsSeparator"/>
               <menuitem id="javascriptConsole" 
                         label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" 
diff --git a/mozilla/browser/base/content/browser-sets.inc b/mozilla/browser/base/content/browser-sets.inc
index 1ac0981c679..e83092d94cf 100644
--- a/mozilla/browser/base/content/browser-sets.inc
+++ b/mozilla/browser/base/content/browser-sets.inc
@@ -168,8 +168,7 @@
     <command id="Tools:Downloads" oncommand="toOpenWindowByType('Download:Manager', 
                                                                 'chrome://mozapps/content/downloads/downloads.xul',
                                                                 'chrome,dialog=no,resizable');"/>
-    <command id="Tools:Extensions" oncommand="BrowserOpenExtensions('extensions');"/>
-    <command id="Tools:Themes" oncommand="BrowserOpenExtensions('themes');"/>
+    <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize" oncommand="gBrowserGlue.sanitize(window || null);"/>
 #ifdef MOZ_PLACES
 #include ../../components/places/content/commands.inc
diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 3e45652225c..654181a0a83 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -5790,29 +5790,20 @@ var MailIntegration = {
   }
 };
 
-function BrowserOpenExtensions(aOpenMode)
+function BrowserOpenAddonsMgr()
 {
   const EMTYPE = "Extension:Manager";
-
   var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                      .getService(Components.interfaces.nsIWindowMediator);
-  var needToOpen = true;
-  var windowType = EMTYPE + "-" + aOpenMode;
-  var windows = wm.getEnumerator(windowType);
-  while (windows.hasMoreElements()) {
-    var theEM = windows.getNext().QueryInterface(Components.interfaces.nsIDOMWindowInternal);
-    if (theEM.document.documentElement.getAttribute("windowtype") == windowType) {
-      theEM.focus();
-      needToOpen = false;
-      break;
-    }
+  var theEM = wm.getMostRecentWindow(EMTYPE);
+  if (theEM) {
+    theEM.focus();
+    return;
   }
 
-  if (needToOpen) {
-    const EMURL = "chrome://mozapps/content/extensions/extensions.xul?type=" + aOpenMode;
-    const EMFEATURES = "chrome,dialog=no,resizable";
-    window.openDialog(EMURL, "", EMFEATURES);
-  }
+  const EMURL = "chrome://mozapps/content/extensions/extensions.xul";
+  const EMFEATURES = "chrome,menubar,extra-chrome,toolbar,dialog=no,resizable";
+  window.openDialog(EMURL, "", EMFEATURES);
 }
 
 function escapeNameValuePair(aName, aValue, aIsFormUrlEncoded)
diff --git a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
index 106995efd30..7b63a5e41c1 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
@@ -123,12 +123,9 @@
 <!ENTITY downloads.accesskey          "D">
 <!ENTITY downloads.commandkey         "j">
 <!ENTITY downloadsUnix.commandkey     "y">
-<!ENTITY extensions.label             "Extensions">
-<!ENTITY extensions.tooltip           "Show and Manage installed Extensions">
-<!ENTITY extensions.accesskey         "E">
-<!ENTITY themes.label                 "Themes">
-<!ENTITY themes.tooltip               "Change the Theme">
-<!ENTITY themes.accesskey             "T">
+<!ENTITY addons.label                 "Addons">
+<!ENTITY addons.tooltip               "Show and Manage installed Addons">
+<!ENTITY addons.accesskey             "A">
 
 <!ENTITY javaConsoleCmd.label         "Java Console">
 <!ENTITY javaConsoleCmd.accesskey     "J">