diff --git a/mozilla/calendar/resources/content/applicationUtil.js b/mozilla/calendar/resources/content/applicationUtil.js
index d79279af1ee..bc1f914e0b2 100644
--- a/mozilla/calendar/resources/content/applicationUtil.js
+++ b/mozilla/calendar/resources/content/applicationUtil.js
@@ -137,29 +137,20 @@ function goToggleToolbar(id, elementID)
 }
 
 
-function goOpenExtensions(aOpenMode)
+function goOpenAddons()
 {
     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);
 }
 
 
diff --git a/mozilla/calendar/resources/locale/en-US/menuOverlay.dtd b/mozilla/calendar/resources/locale/en-US/menuOverlay.dtd
index 25850531ae8..9bf32d980ba 100644
--- a/mozilla/calendar/resources/locale/en-US/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/en-US/menuOverlay.dtd
@@ -168,11 +168,8 @@
 <!ENTITY calendar.fullscreen.label              "Full Screen">
 <!ENTITY calendar.fullscreen.accesskey          "F">
 
-<!ENTITY calendar.extensions.label              "Extensions">
-<!ENTITY calendar.extensions.accesskey          "E">
-
-<!ENTITY calendar.themes.label                  "Themes">
-<!ENTITY calendar.themes.accesskey              "T">
+<!ENTITY calendar.addons.label                  "Addons">
+<!ENTITY calendar.addons.accesskey              "d">
 
 <!ENTITY goMenu.label                           "Go">
 <!ENTITY goMenu.accesskey                       "G">
diff --git a/mozilla/calendar/sunbird/app/profile/sunbird.js b/mozilla/calendar/sunbird/app/profile/sunbird.js
index af402207613..fcb5f4c2dcf 100644
--- a/mozilla/calendar/sunbird/app/profile/sunbird.js
+++ b/mozilla/calendar/sunbird/app/profile/sunbird.js
@@ -45,10 +45,10 @@ pref("toolkit.defaultChromeURI","chrome://calendar/content/");
 pref("browser.hiddenWindowChromeURL", "chrome://calendar/content/hiddenWindow.xul");
 pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
 pref("xpinstall.dialog.progress", "chrome://mozapps/content/downloads/downloads.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");
 
 #expand pref("app.extensions.version", "__APP_VERSION__");
 
diff --git a/mozilla/calendar/sunbird/base/content/calendar-menubar.inc b/mozilla/calendar/sunbird/base/content/calendar-menubar.inc
index d5404d7634b..4e0ae7bc97d 100644
--- a/mozilla/calendar/sunbird/base/content/calendar-menubar.inc
+++ b/mozilla/calendar/sunbird/base/content/calendar-menubar.inc
@@ -353,14 +353,10 @@
 #                     accesskey="&calendar.wizard.accesskey;"
 #                     observes="wizard_command"/>
 #           <menuseparator/>
-           <menuitem id="extensionsManager"
-                     label="&calendar.extensions.label;"
-                     accesskey="&calendar.extensions.accesskey;"
-                     command="Tools:Extensions"/>
-           <menuitem id="themesManager"
-                     label="&calendar.themes.label;"
-                     accesskey="&calendar.themes.accesskey;"
-                     command="Tools:Themes"/>
+           <menuitem id="addonsManager"
+                     label="&calendar.addons.label;"
+                     accesskey="&calendar.addons.accesskey;"
+                     command="Tools:Addons"/>
            <menuseparator id="devToolsSeparator"/>
            <menuitem id="javascriptConsole" 
                      label="&javaScriptConsoleCmd.label;"
diff --git a/mozilla/calendar/sunbird/base/content/calendar-sets.inc b/mozilla/calendar/sunbird/base/content/calendar-sets.inc
index d57ca67f2ba..577e4d4c4f3 100644
--- a/mozilla/calendar/sunbird/base/content/calendar-sets.inc
+++ b/mozilla/calendar/sunbird/base/content/calendar-sets.inc
@@ -105,8 +105,7 @@
   <command id="cmd_showStatusBar"       oncommand="goToggleToolbar('status-bar', 'menu_showStatusBar');"/>
   <command id="cmd_showTaskBox"         oncommand="goToggleToolbar('taskBox', 'menu_showTaskBox');"/>
 
-  <command id="Tools:Extensions" oncommand="goOpenExtensions('extensions');"/>
-  <command id="Tools:Themes"     oncommand="goOpenExtensions('themes');"/>
+  <command id="Tools:Addons" oncommand="goOpenAddons();"/>
 
 #ifdef XP_MACOSX
   <command id="minimizeWindowCmd" oncommand="window.minimize();"/>