diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index faf69568af0e..abd5fadfb713 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1236,9 +1236,11 @@ pref("devtools.hud.loglimit.console", 200);
 // - tabsize: how many spaces to use when a Tab character is displayed.
 // - expandtab: expand Tab characters to spaces.
 // - keymap: which keymap to use (can be 'default', 'emacs' or 'vim')
+// - autoclosebrackets: whether to permit automatic bracket/quote closing.
 pref("devtools.editor.tabsize", 4);
 pref("devtools.editor.expandtab", true);
 pref("devtools.editor.keymap", "default");
+pref("devtools.editor.autoclosebrackets", true);
 
 // Enable the Font Inspector
 pref("devtools.fontinspector.enabled", true);
diff --git a/browser/base/content/aboutaccounts/aboutaccounts.js b/browser/base/content/aboutaccounts/aboutaccounts.js
index c43c45dae283..c6e19ea0e0b3 100644
--- a/browser/base/content/aboutaccounts/aboutaccounts.js
+++ b/browser/base/content/aboutaccounts/aboutaccounts.js
@@ -9,7 +9,8 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FxAccounts.jsm");
 
-const PREF_LAST_FXA_USER = "identity.fxaccounts.lastSignedInUser";
+const PREF_LAST_FXA_USER = "identity.fxaccounts.lastSignedInUserHash";
+const PREF_SYNC_SHOW_CUSTOMIZATION = "services.sync.ui.showCustomizationDialog";
 
 function log(msg) {
   //dump("FXA: " + msg + "\n");
@@ -19,7 +20,7 @@ function error(msg) {
   console.log("Firefox Account Error: " + msg + "\n");
 };
 
-function getPreviousAccountName() {
+function getPreviousAccountNameHash() {
   try {
     return Services.prefs.getComplexValue(PREF_LAST_FXA_USER, Ci.nsISupportsString).data;
   } catch (_) {
@@ -27,24 +28,39 @@ function getPreviousAccountName() {
   }
 }
 
-function setPreviousAccountName(acctName) {
+function setPreviousAccountNameHash(acctName) {
   let string = Cc["@mozilla.org/supports-string;1"]
                .createInstance(Ci.nsISupportsString);
-  string.data = acctName;
+  string.data = sha256(acctName);
   Services.prefs.setComplexValue(PREF_LAST_FXA_USER, Ci.nsISupportsString, string);
 }
 
-function needRelinkWarning(accountData) {
-  let prevAcct = getPreviousAccountName();
-  return prevAcct && prevAcct != accountData.email;
+function needRelinkWarning(acctName) {
+  let prevAcctHash = getPreviousAccountNameHash();
+  return prevAcctHash && prevAcctHash != sha256(acctName);
 }
 
-function promptForRelink() {
+// Given a string, returns the SHA265 hash in base64
+function sha256(str) {
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                    .createInstance(Ci.nsIScriptableUnicodeConverter);
+  converter.charset = "UTF-8";
+  // Data is an array of bytes.
+  let data = converter.convertToByteArray(str, {});
+  let hasher = Cc["@mozilla.org/security/hash;1"]
+                 .createInstance(Ci.nsICryptoHash);
+  hasher.init(hasher.SHA256);
+  hasher.update(data, data.length);
+
+  return hasher.finish(true);
+}
+
+function promptForRelink(acctName) {
   let sb = Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
   let continueLabel = sb.GetStringFromName("continue.label");
   let title = sb.GetStringFromName("relink.verify.title");
   let description = sb.formatStringFromName("relink.verify.description",
-                                            [Services.prefs.getCharPref(PREF_LAST_FXA_USER)], 1);
+                                            [acctName], 1);
   let body = sb.GetStringFromName("relink.verify.heading") +
              "\n\n" + description;
   let ps = Services.prompt;
@@ -104,7 +120,7 @@ let wrapper = {
     log("Received: 'login'. Data:" + JSON.stringify(accountData));
 
     if (accountData.customizeSync) {
-      Services.prefs.setBoolPref("services.sync.needsCustomization", true);
+      Services.prefs.setBoolPref(PREF_SYNC_SHOW_CUSTOMIZATION, true);
       delete accountData.customizeSync;
     }
 
@@ -113,7 +129,8 @@ let wrapper = {
     // (This is sync-specific, so ideally would be in sync's identity module,
     // but it's a little more seamless to do here, and sync is currently the
     // only fxa consumer, so...
-    if (needRelinkWarning(accountData) && !promptForRelink()) {
+    let newAccountEmail = accountData.email;
+    if (needRelinkWarning(newAccountEmail) && !promptForRelink(newAccountEmail)) {
       // we need to tell the page we successfully received the message, but
       // then bail without telling fxAccounts
       this.injectData("message", { status: "login" });
@@ -123,7 +140,7 @@ let wrapper = {
     }
 
     // Remember who it was so we can log out next time.
-    setPreviousAccountName(accountData.email);
+    setPreviousAccountNameHash(newAccountEmail);
 
     fxAccounts.setSignedInUser(accountData).then(
       () => {
diff --git a/browser/base/content/aboutaccounts/aboutaccounts.xhtml b/browser/base/content/aboutaccounts/aboutaccounts.xhtml
index d57763c62da4..a9ae5ba16f48 100644
--- a/browser/base/content/aboutaccounts/aboutaccounts.xhtml
+++ b/browser/base/content/aboutaccounts/aboutaccounts.xhtml
@@ -61,14 +61,14 @@
         <section>
             <div class="graphic graphic-sync-intro"> </div>
 
-            <div class="description">&aboutAccountsSetup.description;</div>
+            <div class="description">&aboutAccountsConfig.description;</div>
 
             <div class="button-row">
-              <a class="button" href="#" onclick="getStarted()">&aboutAccountsSetup.startButton.label;</a>
+              <a class="button" href="#" onclick="getStarted()">&aboutAccountsConfig.startButton.label;</a>
             </div>
 
             <div class="links">
-              <a id="oldsync" href="#" onclick="handleOldSync();">&aboutAccountsSetup.useOldSync.label;</a>
+              <a id="oldsync" href="#" onclick="handleOldSync();">&aboutAccountsConfig.useOldSync.label;</a>
             </div>
         </section>
       </div>
diff --git a/browser/base/content/browser-fullZoom.js b/browser/base/content/browser-fullZoom.js
index fd26ffad5f42..5137bb36b8a1 100644
--- a/browser/base/content/browser-fullZoom.js
+++ b/browser/base/content/browser-fullZoom.js
@@ -310,6 +310,11 @@ var FullZoom = {
       if (token.isCurrent) {
         ZoomManager.setZoomForBrowser(browser, value === undefined ? 1 : value);
         this._ignorePendingZoomAccesses(browser);
+        this._executeSoon(function () {
+          // _getGlobalValue may be either sync or async, so notify asyncly so
+          // observers are guaranteed consistent behavior.
+          Services.obs.notifyObservers(null, "browser-fullZoom:reset", "");
+        });
       }
     });
     this._removePref(browser);
diff --git a/browser/base/content/browser-fxaccounts.js b/browser/base/content/browser-fxaccounts.js
index 846a0a953272..c5280075ba48 100644
--- a/browser/base/content/browser-fxaccounts.js
+++ b/browser/base/content/browser-fxaccounts.js
@@ -6,10 +6,11 @@ XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function () {
   return Cu.import("resource://gre/modules/FxAccountsCommon.js", {});
 });
 
+const PREF_SYNC_START_DOORHANGER = "services.sync.ui.showSyncStartDoorhanger";
+
 let gFxAccounts = {
 
   _initialized: false,
-  _originalLabel: null,
   _inCustomizationMode: false,
 
   get weave() {
@@ -20,29 +21,46 @@ let gFxAccounts = {
   },
 
   get topics() {
+    // Do all this dance to lazy-load FxAccountsCommon.
     delete this.topics;
     return this.topics = [
+      "weave:service:sync:start",
+      "weave:service:login:error",
       FxAccountsCommon.ONLOGIN_NOTIFICATION,
       FxAccountsCommon.ONVERIFIED_NOTIFICATION,
       FxAccountsCommon.ONLOGOUT_NOTIFICATION
     ];
   },
 
+  // The set of topics that only the active window should handle.
+  get activeWindowTopics() {
+    // Do all this dance to lazy-load FxAccountsCommon.
+    delete this.activeWindowTopics;
+    return this.activeWindowTopics = new Set([
+      "weave:service:sync:start",
+      FxAccountsCommon.ONVERIFIED_NOTIFICATION
+    ]);
+  },
+
   get button() {
     delete this.button;
     return this.button = document.getElementById("PanelUI-fxa-status");
   },
 
-  get syncNeedsCustomization() {
-    try {
-      return Services.prefs.getBoolPref("services.sync.needsCustomization");
-    } catch (e) {
-      return false;
-    }
+  get loginFailed() {
+    return Weave.Service.identity.readyToAuthenticate &&
+           Weave.Status.login != Weave.LOGIN_SUCCEEDED;
+  },
+
+  get isActiveWindow() {
+    let mostRecentNonPopupWindow =
+      RecentWindow.getMostRecentBrowserWindow({allowPopups: false});
+    return window == mostRecentNonPopupWindow;
   },
 
   init: function () {
-    if (this._initialized) {
+    // Bail out if we're already initialized and for pop-up windows.
+    if (this._initialized || !window.toolbar.visible) {
       return;
     }
 
@@ -53,9 +71,6 @@ let gFxAccounts = {
     gNavToolbox.addEventListener("customizationstarting", this);
     gNavToolbox.addEventListener("customizationending", this);
 
-    // Save the button's original label so that
-    // we can restore it if overridden later.
-    this._originalLabel = this.button.getAttribute("label");
     this._initialized = true;
 
     this.updateUI();
@@ -74,9 +89,33 @@ let gFxAccounts = {
   },
 
   observe: function (subject, topic) {
-    if (topic != FxAccountsCommon.ONVERIFIED_NOTIFICATION) {
-      this.updateUI();
-    } else if (!this.syncNeedsCustomization) {
+    // Ignore certain topics if we're not the active window.
+    if (this.activeWindowTopics.has(topic) && !this.isActiveWindow) {
+      return;
+    }
+
+    switch (topic) {
+      case FxAccountsCommon.ONVERIFIED_NOTIFICATION:
+        Services.prefs.setBoolPref(PREF_SYNC_START_DOORHANGER, true);
+        break;
+      case "weave:service:sync:start":
+        this.onSyncStart();
+        break;
+      default:
+        this.updateUI();
+        break;
+    }
+  },
+
+  onSyncStart: function () {
+    let showDoorhanger = false;
+
+    try {
+      showDoorhanger = Services.prefs.getBoolPref(PREF_SYNC_START_DOORHANGER);
+    } catch (e) { /* The pref might not exist. */ }
+
+    if (showDoorhanger) {
+      Services.prefs.clearUserPref(PREF_SYNC_START_DOORHANGER);
       this.showSyncStartedDoorhanger();
     }
   },
@@ -122,17 +161,27 @@ let gFxAccounts = {
       this.button.removeAttribute("disabled");
     }
 
+    let defaultLabel = this.button.getAttribute("defaultlabel");
+    let errorLabel = this.button.getAttribute("errorlabel");
+
     // If the user is signed into their Firefox account and we are not
     // currently in customization mode, show their email address.
     fxAccounts.getSignedInUser().then(userData => {
-      if (userData && !this._inCustomizationMode) {
-        this.button.setAttribute("signedin", "true");
-        this.button.setAttribute("label", userData.email);
-        this.button.setAttribute("tooltiptext", userData.email);
-      } else {
-        this.button.removeAttribute("signedin");
-        this.button.setAttribute("label", this._originalLabel);
-        this.button.removeAttribute("tooltiptext");
+      // Reset the button to its original state.
+      this.button.setAttribute("label", defaultLabel);
+      this.button.removeAttribute("tooltiptext");
+      this.button.removeAttribute("signedin");
+      this.button.removeAttribute("failed");
+
+      if (!this._inCustomizationMode) {
+        if (this.loginFailed) {
+          this.button.setAttribute("failed", "true");
+          this.button.setAttribute("label", errorLabel);
+        } else if (userData) {
+          this.button.setAttribute("signedin", "true");
+          this.button.setAttribute("label", userData.email);
+          this.button.setAttribute("tooltiptext", userData.email);
+        }
       }
     });
   },
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index fd8758cb8983..46f687c03423 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -15,6 +15,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CharsetMenu",
                                   "resource://gre/modules/CharsetMenu.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "ShortcutUtils",
+                                  "resource://gre/modules/ShortcutUtils.jsm");
 
 const nsIWebNavigation = Ci.nsIWebNavigation;
 
@@ -3731,6 +3733,22 @@ var XULBrowserWindow = {
       setTimeout(function () { XULBrowserWindow.asyncUpdateUI(); }, 0);
     else
       this.asyncUpdateUI();
+
+#ifdef MOZ_CRASHREPORTER
+    if (aLocationURI) {
+      let uri = aLocationURI.clone();
+      try {
+        // If the current URI contains a username/password, remove it.
+        uri.userPass = "";
+      } catch (ex) { /* Ignore failures on about: URIs. */ }
+
+      try {
+        gCrashReporter.annotateCrashReport("URL", uri.spec);
+      } catch (ex if ex.result == Components.results.NS_ERROR_NOT_INITIALIZED) {
+        // Don't make noise when the crash reporter is built but not enabled.
+      }
+    }
+#endif
   },
 
   asyncUpdateUI: function () {
@@ -3990,15 +4008,6 @@ var CombinedStopReload = {
 
 var TabsProgressListener = {
   onStateChange: function (aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
-#ifdef MOZ_CRASHREPORTER
-    if (aRequest instanceof Ci.nsIChannel &&
-        aStateFlags & Ci.nsIWebProgressListener.STATE_START &&
-        aStateFlags & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT &&
-        gCrashReporter.enabled) {
-      gCrashReporter.annotateCrashReport("URL", aRequest.URI.spec);
-    }
-#endif
-
     // Collect telemetry data about tab load times.
     if (aWebProgress.isTopLevel) {
       if (aStateFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW) {
@@ -4820,6 +4829,44 @@ var gHomeButton = {
   },
 };
 
+const nodeToTooltipMap = {
+  "bookmarks-menu-button": "bookmarksMenuButton.tooltip",
+#ifdef XP_MACOSX
+  "print-button": "printButton.tooltip",
+#endif
+  "new-window-button": "newWindowButton.tooltip",
+  "fullscreen-button": "fullscreenButton.tooltip",
+  "tabview-button": "tabviewButton.tooltip",
+};
+const nodeToShortcutMap = {
+  "bookmarks-menu-button": "manBookmarkKb",
+#ifdef XP_MACOSX
+  "print-button": "printKb",
+#endif
+  "new-window-button": "key_newNavigator",
+  "fullscreen-button": "key_fullScreen",
+  "tabview-button": "key_tabview",
+};
+const gDynamicTooltipCache = new Map();
+function UpdateDynamicShortcutTooltipText(popupTriggerNode) {
+  let label = document.getElementById("dynamic-shortcut-tooltip-label");
+  let nodeId = popupTriggerNode.id;
+  if (!gDynamicTooltipCache.has(nodeId) && nodeId in nodeToTooltipMap) {
+    let strId = nodeToTooltipMap[nodeId];
+    let args = [];
+    if (nodeId in nodeToShortcutMap) {
+      let shortcutId = nodeToShortcutMap[nodeId];
+      let shortcut = document.getElementById(shortcutId);
+      if (shortcut) {
+        args.push(ShortcutUtils.prettifyShortcut(shortcut));
+      }
+    }
+    gDynamicTooltipCache.set(nodeId, gNavigatorBundle.getFormattedString(strId, args));
+  }
+  let desiredLabel = gDynamicTooltipCache.get(nodeId);
+  label.setAttribute("value", desiredLabel);
+}
+
 /**
  * Gets the selected text in the active browser. Leading and trailing
  * whitespace is removed, and consecutive whitespace is replaced by a single
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 6b1034a20bed..1994baac4bc2 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -210,7 +210,11 @@
         <vbox flex="1">
           <label id="UITourTooltipTitle" flex="1"/>
           <description id="UITourTooltipDescription" flex="1"/>
-          <hbox id="UITourTooltipButtons" flex="1" align="end"/>
+          <hbox id="UITourTooltipButtons" flex="1" align="center"/>
+        </vbox>
+        <vbox align="start">
+          <toolbarbutton id="UITourTooltipClose" class="close-icon"
+                         tooltiptext="&uiTour.infoPanel.close;"/>
         </vbox>
       </hbox>
     </panel>
@@ -463,6 +467,11 @@
         <vbox id="downloads-indicator-notification"/>
       </vbox>
     </hbox>
+
+    <tooltip id="dynamic-shortcut-tooltip"
+             onpopupshowing="UpdateDynamicShortcutTooltipText(this.triggerNode)">
+      <label id="dynamic-shortcut-tooltip-label"/>
+    </tooltip>
   </popupset>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
@@ -744,7 +753,7 @@
                        removable="true"
                        type="menu-button"
                        label="&bookmarksMenuButton.label;"
-                       tooltiptext="&bookmarksMenuButton.tooltip;"
+                       tooltip="dynamic-shortcut-tooltip"
                        anchor="dropmarker"
                        ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
                        ondragover="PlacesMenuDNDHandler.onDragOver(event);"
@@ -964,17 +973,17 @@
 
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 #ifdef XP_MACOSX
-                     command="cmd_print"
+                     command="cmd_print" tooltip="dynamic-shortcut-tooltip"
 #else
-                     command="cmd_printPreview"
+                     command="cmd_printPreview" tooltiptext="&printButton.tooltip;"
 #endif
-                     label="&printButton.label;" tooltiptext="&printButton.tooltip;"/>
+                     label="&printButton.label;"/>
 
 
       <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&newNavigatorCmd.label;"
                      command="key_newNavigator"
-                     tooltiptext="&newWindowButton.tooltip;"
+                     tooltip="dynamic-shortcut-tooltip"
                      ondrop="newWindowButtonObserver.onDrop(event)"
                      ondragover="newWindowButtonObserver.onDragOver(event)"
                      ondragenter="newWindowButtonObserver.onDragOver(event)"
@@ -984,7 +993,7 @@
                      observes="View:FullScreen"
                      type="checkbox"
                      label="&fullScreenCmd.label;"
-                     tooltiptext="&fullScreenButton.tooltip;"/>
+                     tooltip="dynamic-shortcut-tooltip"/>
 
 #ifdef MOZ_SERVICES_SYNC
       <toolbarbutton id="sync-button"
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 04d255bc664b..d3625c2a1056 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1708,11 +1708,13 @@
           // solve the problem of windows "obscuring" the prompt.
           // see bug #350299 for more details
           window.focus();
+          var warningMessage =
+            PluralForm.get(tabsToClose, bundle.getString("tabs.closeWarningMultiple"))
+                      .replace("#1", tabsToClose);
           var buttonPressed =
             ps.confirmEx(window,
                          bundle.getString("tabs.closeWarningTitle"),
-                         bundle.getFormattedString("tabs.closeWarningMultipleTabs",
-                                                   [tabsToClose]),
+                         warningMessage,
                          (ps.BUTTON_TITLE_IS_STRING * ps.BUTTON_POS_0)
                          + (ps.BUTTON_TITLE_CANCEL * ps.BUTTON_POS_1),
                          bundle.getString("tabs.closeButtonMultiple"),
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 6d6541369237..290139b684ed 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -15,7 +15,9 @@
       </vbox>
 
       <footer id="PanelUI-footer">
-        <toolbarbutton id="PanelUI-fxa-status" label="&fxaSignIn.label;"
+        <toolbarbutton id="PanelUI-fxa-status"
+                       defaultlabel="&fxaSignIn.label;"
+                       errorlabel="&fxaSignInError.label;"
                        oncommand="gFxAccounts.toggle(event);"
                        hidden="true"/>
 
diff --git a/browser/components/customizableui/test/browser_946320_tabs_from_other_computers.js b/browser/components/customizableui/test/browser_946320_tabs_from_other_computers.js
index 9ed9e7d46ce2..80cf9e13395f 100644
--- a/browser/components/customizableui/test/browser_946320_tabs_from_other_computers.js
+++ b/browser/components/customizableui/test/browser_946320_tabs_from_other_computers.js
@@ -1,50 +1,125 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-let Preferences = Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
-Cu.import("resource://gre/modules/Promise.jsm");
-
-add_task(function() {
-  yield PanelUI.show({type: "command"});
-
-  let historyButton = document.getElementById("history-panelmenu");
-  let historySubview = document.getElementById("PanelUI-history");
-  let subviewShownPromise = subviewShown(historySubview);
-  EventUtils.synthesizeMouseAtCenter(historyButton, {});
-  yield subviewShownPromise;
-
-  let tabsFromOtherComputers = document.getElementById("sync-tabs-menuitem2");
-  is(tabsFromOtherComputers.hidden, true, "The Tabs From Other Computers menuitem should be hidden when sync isn't enabled.");
-
-  let hiddenPanelPromise = promisePanelHidden(window);
-  PanelUI.hide();
-  yield hiddenPanelPromise;
-
-  // Part 2 - When Sync is enabled the menuitem should be shown.
-  Weave.Service.createAccount("john@doe.com", "mysecretpw",
-                              "challenge", "response");
-  Weave.Service.identity.account = "john@doe.com";
-  Weave.Service.identity.basicPassword = "mysecretpw";
-  Weave.Service.identity.syncKey = Weave.Utils.generatePassphrase();
-  Weave.Svc.Prefs.set("firstSync", "newAccount");
-  Weave.Service.persistLogin();
-
-  yield PanelUI.show({type: "command"});
-
-  subviewShownPromise = subviewShown(historySubview);
-  EventUtils.synthesizeMouseAtCenter(historyButton, {});
-  yield subviewShownPromise;
-
-  is(tabsFromOtherComputers.hidden, false, "The Tabs From Other Computers menuitem should be shown when sync is enabled.");
-
-  let syncPrefBranch = new Preferences("services.sync.");
-  syncPrefBranch.resetBranch("");
-  Services.logins.removeAllLogins();
-
-  hiddenPanelPromise = promisePanelHidden(window);
-  PanelUI.toggle({type: "command"});
-  yield hiddenPanelPromise;
-});
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+let Preferences = Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
+Cu.import("resource://gre/modules/Promise.jsm");
+
+let tmp = {};
+Cu.import("resource://gre/modules/FxAccounts.jsm", tmp);
+Cu.import("resource://gre/modules/FxAccountsCommon.js", tmp);
+Cu.import("resource://services-sync/browserid_identity.js", tmp);
+let {FxAccounts, BrowserIDManager, DATA_FORMAT_VERSION, CERT_LIFETIME} = tmp;
+let fxaSyncIsEnabled = Weave.Service.identity instanceof BrowserIDManager;
+
+add_task(function() {
+  yield PanelUI.show({type: "command"});
+
+  let historyButton = document.getElementById("history-panelmenu");
+  let historySubview = document.getElementById("PanelUI-history");
+  let subviewShownPromise = subviewShown(historySubview);
+  EventUtils.synthesizeMouseAtCenter(historyButton, {});
+  yield subviewShownPromise;
+
+  let tabsFromOtherComputers = document.getElementById("sync-tabs-menuitem2");
+  is(tabsFromOtherComputers.hidden, true, "The Tabs From Other Computers menuitem should be hidden when sync isn't enabled.");
+
+  let hiddenPanelPromise = promisePanelHidden(window);
+  PanelUI.hide();
+  yield hiddenPanelPromise;
+
+  // Part 2 - When Sync is enabled the menuitem should be shown.
+  yield configureIdentity();
+  yield PanelUI.show({type: "command"});
+
+  subviewShownPromise = subviewShown(historySubview);
+  EventUtils.synthesizeMouseAtCenter(historyButton, {});
+  yield subviewShownPromise;
+
+  is(tabsFromOtherComputers.hidden, false, "The Tabs From Other Computers menuitem should be shown when sync is enabled.");
+
+  let syncPrefBranch = new Preferences("services.sync.");
+  syncPrefBranch.resetBranch("");
+  Services.logins.removeAllLogins();
+
+  hiddenPanelPromise = promisePanelHidden(window);
+  PanelUI.toggle({type: "command"});
+  yield hiddenPanelPromise;
+
+  if (fxaSyncIsEnabled) {
+    yield fxAccounts.signOut();
+  }
+});
+
+function configureIdentity() {
+  // do the FxAccounts thang...
+  configureFxAccountIdentity();
+
+  if (fxaSyncIsEnabled) {
+    return Weave.Service.identity.initializeWithCurrentIdentity().then(() => {
+      // need to wait until this identity manager is readyToAuthenticate.
+      return Weave.Service.identity.whenReadyToAuthenticate.promise;
+    });
+  }
+
+  Weave.Service.createAccount("john@doe.com", "mysecretpw",
+                              "challenge", "response");
+  Weave.Service.identity.account = "john@doe.com";
+  Weave.Service.identity.basicPassword = "mysecretpw";
+  Weave.Service.identity.syncKey = Weave.Utils.generatePassphrase();
+  Weave.Svc.Prefs.set("firstSync", "newAccount");
+  Weave.Service.persistLogin();
+  return Promise.resolve();
+}
+
+// Configure an instance of an FxAccount identity provider with the specified
+// config (or the default config if not specified).
+function configureFxAccountIdentity() {
+  let user = {
+    assertion: "assertion",
+    email: "email",
+    kA: "kA",
+    kB: "kB",
+    sessionToken: "sessionToken",
+    uid: "user_uid",
+    verified: true,
+  };
+
+  let token = {
+    endpoint: Weave.Svc.Prefs.get("tokenServerURI"),
+    duration: 300,
+    id: "id",
+    key: "key",
+    // uid will be set to the username.
+  };
+
+  let MockInternal = {
+    signedInUser: {
+      version: DATA_FORMAT_VERSION,
+      accountData: user
+    },
+    getCertificate: function(data, keyPair, mustBeValidUntil) {
+      this.cert = {
+        validUntil: Date.now() + CERT_LIFETIME,
+        cert: "certificate",
+      };
+      return Promise.resolve(this.cert.cert);
+    },
+  };
+
+  let mockTSC = { // TokenServerClient
+    getTokenFromBrowserIDAssertion: function(uri, assertion, cb) {
+      token.uid = "username";
+      cb(null, token);
+    },
+  };
+
+  let authService = Weave.Service.identity;
+  authService._fxaService = new FxAccounts(MockInternal);
+  authService._tokenServerClient = mockTSC;
+  // Set the "account" of the browserId manager to be the "email" of the
+  // logged in user of the mockFXA service.
+  authService._account = user.email;
+}
diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js
index 5b80cbbf22f8..c33c2c908158 100644
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -5,6 +5,10 @@
 Components.utils.import("resource://services-sync/main.js");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
+XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function () {
+  return Components.utils.import("resource://gre/modules/FxAccountsCommon.js", {});
+});
+
 const PAGE_NO_ACCOUNT = 0;
 const PAGE_HAS_ACCOUNT = 1;
 const PAGE_NEEDS_UPDATE = 2;
@@ -83,7 +87,8 @@ let gSyncPane = {
                   "weave:service:login:finish",
                   "weave:service:start-over",
                   "weave:service:setup-complete",
-                  "weave:service:logout:finish"];
+                  "weave:service:logout:finish",
+                  FxAccountsCommon.ONVERIFIED_NOTIFICATION];
 
     // Add the observers now and remove them on unload
     //XXXzpao This should use Services.obs.* but Weave's Obs does nice handling
@@ -127,7 +132,10 @@ let gSyncPane = {
           fxaLoginStatus.selectedIndex = FXA_LOGIN_UNVERIFIED;
           enginesListDisabled = true;
         // So we think we are logged in, so login problems are next.
-        } else if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
+        // (Although if the Sync identity manager is still initializing, we
+        // ignore login errors and assume all will eventually be good.)
+        } else if (Weave.Service.identity.readyToAuthenticate &&
+                   Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
           fxaLoginStatus.selectedIndex = FXA_LOGIN_FAILED;
           enginesListDisabled = true;
         // Else we must be golden!
diff --git a/browser/components/preferences/sync.xul b/browser/components/preferences/sync.xul
index 95dfd143f567..687de604d581 100644
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -226,7 +226,7 @@
                 <spacer flex="1"/>
                 <vbox align="end">
                   <button onclick="gSyncPane.verifyFirefoxAccount();"
-                          caption="&verify.label;"/>
+                          label="&verify.label;"/>
                   <label class="text-link"
                          onclick="/* no warning as account can't have previously synced */ gSyncPane.unlinkFirefoxAccount(false);"
                          value="&forget.label;"/>
@@ -253,9 +253,8 @@
           </groupbox>
 
           <groupbox id="syncOptions">
-            <caption label="&syncBrand.fullName.label;"/>
+            <caption label="&syncBrand.shortName.label;"/>
             <vbox>
-              <label value="&syncMy.label;" />
               <richlistbox id="fxaSyncEnginesList"
                            orient="vertical"
                            onselect="if (this.selectedCount) this.clearSelection();">
diff --git a/browser/components/sessionstore/content/content-sessionStore.js b/browser/components/sessionstore/content/content-sessionStore.js
index 4ec782424ca1..ef7bcd331013 100644
--- a/browser/components/sessionstore/content/content-sessionStore.js
+++ b/browser/components/sessionstore/content/content-sessionStore.js
@@ -87,16 +87,15 @@ let EventListener = {
     // If we're in the process of restoring, this load may signal
     // the end of the restoration.
     let epoch = gContentRestore.getRestoreEpoch();
-    if (epoch) {
-      // Restore the form data and scroll position.
-      gContentRestore.restoreDocument();
-
-      // Ask SessionStore.jsm to trigger SSTabRestored.
-      sendAsyncMessage("SessionStore:restoreDocumentComplete", {epoch: epoch});
+    if (!epoch) {
+      return;
     }
 
-    // Send a load message for all loads.
-    sendAsyncMessage("SessionStore:load");
+    // Restore the form data and scroll position.
+    gContentRestore.restoreDocument();
+
+    // Ask SessionStore.jsm to trigger SSTabRestored.
+    sendAsyncMessage("SessionStore:restoreDocumentComplete", {epoch: epoch});
   }
 };
 
diff --git a/browser/components/sessionstore/src/SessionHistory.jsm b/browser/components/sessionstore/src/SessionHistory.jsm
index 80a2b7b8dd04..13814cf8b135 100644
--- a/browser/components/sessionstore/src/SessionHistory.jsm
+++ b/browser/components/sessionstore/src/SessionHistory.jsm
@@ -105,6 +105,21 @@ let SessionHistoryInternal = {
     return data;
   },
 
+  /**
+   * Determines whether a given session history entry has been added dynamically.
+   *
+   * @param shEntry
+   *        The session history entry.
+   * @return bool
+   */
+  isDynamic: function (shEntry) {
+    // shEntry.isDynamicallyAdded() is true for dynamically added
+    // <iframe> and <frameset>, but also for <html> (the root of the
+    // document) so we use shEntry.parent to ensure that we're not looking
+    // at the root of the document
+    return shEntry.parent && shEntry.isDynamicallyAdded();
+  },
+
   /**
    * Get an object that is a serialized representation of a History entry.
    *
@@ -183,7 +198,7 @@ let SessionHistoryInternal = {
       for (let i = 0; i < shEntry.childCount; i++) {
         let child = shEntry.GetChildAt(i);
 
-        if (child) {
+        if (child && !this.isDynamic(child)) {
           // Don't try to restore framesets containing wyciwyg URLs.
           // (cf. bug 424689 and bug 450595)
           if (child.URI.schemeIs("wyciwyg")) {
diff --git a/browser/components/sessionstore/src/SessionStore.jsm b/browser/components/sessionstore/src/SessionStore.jsm
index 0c9e6b11fd2c..1878707c75f4 100644
--- a/browser/components/sessionstore/src/SessionStore.jsm
+++ b/browser/components/sessionstore/src/SessionStore.jsm
@@ -57,9 +57,6 @@ const MESSAGES = [
   // be saved to disk.
   "SessionStore:update",
 
-  // A "load" event happened.
-  "SessionStore:load",
-
   // The restoreHistory code has run. This is a good time to run SSTabRestoring.
   "SessionStore:restoreHistoryComplete",
 
@@ -131,11 +128,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "TabStateCache",
 XPCOMUtils.defineLazyModuleGetter(this, "Utils",
   "resource:///modules/sessionstore/Utils.jsm");
 
-#ifdef MOZ_CRASHREPORTER
-XPCOMUtils.defineLazyServiceGetter(this, "CrashReporter",
-  "@mozilla.org/xre/app-info;1", "nsICrashReporter");
-#endif
-
 /**
  * |true| if we are in debug mode, |false| otherwise.
  * Debug mode is controlled by preference browser.sessionstore.debug
@@ -598,9 +590,6 @@ let SessionStoreInternal = {
         TabState.update(browser, aMessage.data);
         this.saveStateDelayed(win);
         break;
-      case "SessionStore:load":
-        this.onTabLoad(win, browser);
-        break;
       case "SessionStore:restoreHistoryComplete":
         if (this.isCurrentEpoch(browser, aMessage.data.epoch)) {
           // Notify the tabbrowser that the tab chrome has been restored.
@@ -1300,8 +1289,6 @@ let SessionStoreInternal = {
     if (!aNoNotification) {
       this.saveStateDelayed(aWindow);
     }
-
-    this._updateCrashReportURL(aWindow);
   },
 
   /**
@@ -1385,29 +1372,6 @@ let SessionStoreInternal = {
     }
   },
 
-  /**
-   * When a tab loads, invalidate its cached state, trigger async save.
-   *
-   * @param aWindow
-   *        Window reference
-   * @param aBrowser
-   *        Browser reference
-   */
-  onTabLoad: function ssi_onTabLoad(aWindow, aBrowser) {
-    // It's possible to get a load event after calling stop on a browser (when
-    // overwriting tabs). We want to return early if the tab hasn't been restored yet.
-    if (aBrowser.__SS_restoreState &&
-        aBrowser.__SS_restoreState == TAB_STATE_NEEDS_RESTORE) {
-      return;
-    }
-
-    delete aBrowser.__SS_data;
-    this.saveStateDelayed(aWindow);
-
-    // attempt to update the current URL we send in a crash report
-    this._updateCrashReportURL(aWindow);
-  },
-
   /**
    * When a tab is selected, save session data
    * @param aWindow
@@ -1424,9 +1388,6 @@ let SessionStoreInternal = {
       if (tab.linkedBrowser.__SS_restoreState &&
           tab.linkedBrowser.__SS_restoreState == TAB_STATE_NEEDS_RESTORE)
         this.restoreTabContent(tab);
-
-      // attempt to update the current URL we send in a crash report
-      this._updateCrashReportURL(aWindow);
     }
   },
 
@@ -3066,29 +3027,6 @@ let SessionStoreInternal = {
     return Services.io.newURI(aString, null, null);
   },
 
-  /**
-   * Annotate a breakpad crash report with the currently selected tab's URL.
-   */
-  _updateCrashReportURL: function ssi_updateCrashReportURL(aWindow) {
-#ifdef MOZ_CRASHREPORTER
-    try {
-      var currentURI = aWindow.gBrowser.currentURI.clone();
-      // if the current URI contains a username/password, remove it
-      try {
-        currentURI.userPass = "";
-      }
-      catch (ex) { } // ignore failures on about: URIs
-
-      CrashReporter.annotateCrashReport("URL", currentURI.spec);
-    }
-    catch (ex) {
-      // don't make noise when crashreporter is built but not enabled
-      if (ex.result != Components.results.NS_ERROR_NOT_INITIALIZED)
-        debug(ex);
-    }
-#endif
-  },
-
   /**
    * @param aState is a session state
    * @param aRecentCrashes is the number of consecutive crashes
diff --git a/browser/components/sessionstore/test/browser.ini b/browser/components/sessionstore/test/browser.ini
index 4a201a38cc79..16ead9038361 100644
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -16,6 +16,14 @@ support-files =
   browser_formdata_xpath_sample.html
   browser_frametree_sample.html
   browser_frametree_sample_frameset.html
+  browser_frame_history_index.html
+  browser_frame_history_index2.html
+  browser_frame_history_index_blank.html
+  browser_frame_history_a.html
+  browser_frame_history_b.html
+  browser_frame_history_c.html
+  browser_frame_history_c1.html
+  browser_frame_history_c2.html
   browser_form_restore_events_sample.html
   browser_formdata_format_sample.html
   browser_pageStyle_sample.html
@@ -33,12 +41,6 @@ support-files =
   browser_463206_sample.html
   browser_466937_sample.html
   browser_485482_sample.html
-  browser_597315_index.html
-  browser_597315_a.html
-  browser_597315_b.html
-  browser_597315_c.html
-  browser_597315_c1.html
-  browser_597315_c2.html
   browser_662743_sample.html
   browser_739531_sample.html
   browser_911547_sample.html
@@ -58,11 +60,13 @@ support-files =
 [browser_broadcast.js]
 [browser_capabilities.js]
 [browser_dying_cache.js]
+[browser_dynamic_frames.js]
 [browser_form_restore_events.js]
 [browser_formdata.js]
 [browser_formdata_format.js]
 [browser_formdata_xpath.js]
 [browser_frametree.js]
+[browser_frame_history.js]
 [browser_global_store.js]
 [browser_label_and_icon.js]
 [browser_merge_closed_tabs.js]
@@ -141,7 +145,6 @@ skip-if = true
 [browser_590268.js]
 [browser_590563.js]
 [browser_595601-restore_hidden.js]
-[browser_597315.js]
 [browser_599909.js]
 [browser_600545.js]
 [browser_601955.js]
diff --git a/browser/components/sessionstore/test/browser_597315.js b/browser/components/sessionstore/test/browser_597315.js
deleted file mode 100644
index d139e83ae0fa..000000000000
--- a/browser/components/sessionstore/test/browser_597315.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-function test() {
-  /** Test for Bug 597315 - Frameset history does not work properly when restoring a tab **/
-  waitForExplicitFinish();
-
-  let testURL = getRootDirectory(gTestPath) + "browser_597315_index.html";
-  let tab = gBrowser.addTab(testURL);
-  gBrowser.selectedTab = tab;
-
-  waitForLoadsInBrowser(tab.linkedBrowser, 4, function() {
-    let browser_b = tab.linkedBrowser.contentDocument.getElementsByTagName("frame")[1];
-    let document_b = browser_b.contentDocument;
-    let links = document_b.getElementsByTagName("a");
-
-    // We're going to click on the first link, so listen for another load event
-    waitForLoadsInBrowser(tab.linkedBrowser, 1, function() {
-      waitForLoadsInBrowser(tab.linkedBrowser, 1, function() {
-
-        gBrowser.removeTab(tab);
-        // wait for 4 loads again...
-        let newTab = ss.undoCloseTab(window, 0);
-
-        waitForLoadsInBrowser(newTab.linkedBrowser, 4, function() {
-          gBrowser.goBack();
-          waitForLoadsInBrowser(newTab.linkedBrowser, 1, function() {
-
-            let expectedURLEnds = ["a.html", "b.html", "c1.html"];
-            let frames = newTab.linkedBrowser.contentDocument.getElementsByTagName("frame");
-            for (let i = 0; i < frames.length; i++) {
-              is(frames[i].contentDocument.location,
-                 getRootDirectory(gTestPath) + "browser_597315_" + expectedURLEnds[i],
-                 "frame " + i + " has the right url");
-            }
-            gBrowser.removeTab(newTab);
-            executeSoon(finish);
-          });
-        });
-      });
-      EventUtils.sendMouseEvent({type:"click"}, links[1], browser_b.contentWindow);
-    });
-    EventUtils.sendMouseEvent({type:"click"}, links[0], browser_b.contentWindow);
-  });
-}
-
-// helper function
-function waitForLoadsInBrowser(aBrowser, aLoadCount, aCallback) {
-  let loadCount = 0;
-  aBrowser.addEventListener("load", function(aEvent) {
-    if (++loadCount < aLoadCount)
-      return;
-
-    aBrowser.removeEventListener("load", arguments.callee, true);
-    aCallback();
-  }, true);
-}
diff --git a/browser/components/sessionstore/test/browser_597315_b.html b/browser/components/sessionstore/test/browser_597315_b.html
deleted file mode 100755
index f8dbfb2a27e4..000000000000
--- a/browser/components/sessionstore/test/browser_597315_b.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-  <body>
-    I'm B!<br/>
-    <a target="c" href="browser_597315_c1.html">click me first</a><br/>
-    <a target="c" href="browser_597315_c2.html">then click me</a><br/>
-    Close this tab.<br/>
-    Restore this tab.<br/>
-    Click back.<br/>
-  </body>
-</html>
diff --git a/browser/components/sessionstore/test/browser_597315_index.html b/browser/components/sessionstore/test/browser_597315_index.html
deleted file mode 100644
index 1465ddf044be..000000000000
--- a/browser/components/sessionstore/test/browser_597315_index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-  <frameset cols="20%,80%">
-    <frameset rows="30%,70%">
-      <frame src="browser_597315_a.html"/>
-      <frame src="browser_597315_b.html"/>
-    </frameset>
-    <frame src="browser_597315_c.html" name="c"/>
-  </frameset>
-</html>
-
diff --git a/browser/components/sessionstore/test/browser_819510_perwindowpb.js b/browser/components/sessionstore/test/browser_819510_perwindowpb.js
index 2824b77fecfd..5b83fa2e8da6 100644
--- a/browser/components/sessionstore/test/browser_819510_perwindowpb.js
+++ b/browser/components/sessionstore/test/browser_819510_perwindowpb.js
@@ -178,6 +178,10 @@ function testOnWindow(aIsPrivate, aCallback) {
 }
 
 function waitForTabLoad(aWin, aURL, aCallback) {
-  whenBrowserLoaded(aWin.gBrowser.selectedBrowser, aCallback);
-  aWin.gBrowser.selectedBrowser.loadURI(aURL);
+  let browser = aWin.gBrowser.selectedBrowser;
+  whenBrowserLoaded(browser, function () {
+    SyncHandlers.get(browser).flush();
+    executeSoon(aCallback);
+  });
+  browser.loadURI(aURL);
 }
diff --git a/browser/components/sessionstore/test/browser_dynamic_frames.js b/browser/components/sessionstore/test/browser_dynamic_frames.js
new file mode 100644
index 000000000000..4029be3dd866
--- /dev/null
+++ b/browser/components/sessionstore/test/browser_dynamic_frames.js
@@ -0,0 +1,95 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Ensure that static frames of framesets are serialized but dynamically
+ * inserted iframes are ignored.
+ */
+add_task(function () {
+  // This URL has the following frames:
+  //  + about:mozilla (static)
+  //  + about:robots (static)
+  //  + about:rights (dynamic iframe)
+  const URL = "data:text/html;charset=utf-8," +
+              "<frameset cols=50%25,50%25><frame src=about%3Amozilla>" +
+              "<frame src=about%3Arobots></frameset>" +
+              "<script>var i=document.createElement('iframe');" +
+              "i.setAttribute('src', 'about%3Arights');" +
+              "document.body.appendChild(i);</script>";
+
+  // Add a new tab with two "static" and one "dynamic" frame.
+  let tab = gBrowser.addTab(URL);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+
+  SyncHandlers.get(browser).flush();
+  let {entries} = JSON.parse(ss.getTabState(tab));
+
+  // Check URLs.
+  ok(entries[0].url.startsWith("data:text/html"), "correct root url");
+  is(entries[0].children[0].url, "about:mozilla", "correct url for 1st frame");
+  is(entries[0].children[1].url, "about:robots", "correct url for 2nd frame");
+
+  // Check the number of children.
+  is(entries.length, 1, "there is one root entry ...");
+  is(entries[0].children.length, 2, "... with two child entries");
+
+  // Cleanup.
+  gBrowser.removeTab(tab);
+});
+
+/**
+ * Ensure that iframes created by the network parser are serialized but
+ * dynamically inserted iframes are ignored. Navigating a subframe should
+ * create a second root entry that doesn't contain any dynamic children either.
+ */
+add_task(function () {
+  // This URL has the following frames:
+  //  + about:mozilla (static iframe)
+  //  + about:rights (dynamic iframe)
+  const URL = "data:text/html;charset=utf-8," +
+              "<iframe name=t src=about%3Amozilla></iframe>" +
+              "<a id=lnk href=about%3Arobots target=t>clickme</a>" +
+              "<script>var i=document.createElement('iframe');" +
+              "i.setAttribute('src', 'about%3Arights');" +
+              "document.body.appendChild(i);</script>";
+
+  // Add a new tab with one "static" and one "dynamic" frame.
+  let tab = gBrowser.addTab(URL);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+
+  SyncHandlers.get(browser).flush();
+  let {entries} = JSON.parse(ss.getTabState(tab));
+
+  // Check URLs.
+  ok(entries[0].url.startsWith("data:text/html"), "correct root url");
+  is(entries[0].children[0].url, "about:mozilla", "correct url for static frame");
+
+  // Check the number of children.
+  is(entries.length, 1, "there is one root entry ...");
+  is(entries[0].children.length, 1, "... with a single child entry");
+
+  // Navigate the subframe.
+  browser.messageManager.sendAsyncMessage("ss-test:click", {id: "lnk"});
+  yield promiseBrowserLoaded(browser, false /* don't ignore subframes */);
+
+  SyncHandlers.get(browser).flush();
+  let {entries} = JSON.parse(ss.getTabState(tab));
+
+  // Check URLs.
+  ok(entries[0].url.startsWith("data:text/html"), "correct 1st root url");
+  ok(entries[1].url.startsWith("data:text/html"), "correct 2nd root url");
+  is(entries[0].children[0].url, "about:mozilla", "correct url for 1st static frame");
+  is(entries[1].children[0].url, "about:robots", "correct url for 2ns static frame");
+
+  // Check the number of children.
+  is(entries.length, 2, "there are two root entries ...");
+  is(entries[0].children.length, 1, "... with a single child entry ...");
+  is(entries[1].children.length, 1, "... each");
+
+  // Cleanup.
+  gBrowser.removeTab(tab);
+});
diff --git a/browser/components/sessionstore/test/browser_frame_history.js b/browser/components/sessionstore/test/browser_frame_history.js
new file mode 100644
index 000000000000..85f36d3726a0
--- /dev/null
+++ b/browser/components/sessionstore/test/browser_frame_history.js
@@ -0,0 +1,170 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ Ensure that frameset history works properly when restoring a tab,
+ provided that the frameset is static.
+ */
+
+// Loading a toplevel frameset
+add_task(function() {
+  let testURL = getRootDirectory(gTestPath) + "browser_frame_history_index.html";
+  let tab = gBrowser.addTab(testURL);
+  gBrowser.selectedTab = tab;
+
+  info("Opening a page with three frames, 4 loads should take place");
+  yield waitForLoadsInBrowser(tab.linkedBrowser, 4);
+
+  let browser_b = tab.linkedBrowser.contentDocument.getElementsByTagName("frame")[1];
+  let document_b = browser_b.contentDocument;
+  let links = document_b.getElementsByTagName("a");
+
+  // We're going to click on the first link, so listen for another load event
+  info("Clicking on link 1, 1 load should take place");
+  let promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
+  EventUtils.sendMouseEvent({type:"click"}, links[0], browser_b.contentWindow);
+  yield promise;
+
+  info("Clicking on link 2, 1 load should take place");
+  promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
+  EventUtils.sendMouseEvent({type:"click"}, links[1], browser_b.contentWindow);
+  yield promise;
+
+  info("Close then un-close page, 4 loads should take place");
+  gBrowser.removeTab(tab);
+  let newTab = ss.undoCloseTab(window, 0);
+  yield waitForLoadsInBrowser(newTab.linkedBrowser, 4);
+
+  info("Go back in time, 1 load should take place");
+  gBrowser.goBack();
+  yield waitForLoadsInBrowser(newTab.linkedBrowser, 1);
+
+  let expectedURLEnds = ["a.html", "b.html", "c1.html"];
+  let frames = newTab.linkedBrowser.contentDocument.getElementsByTagName("frame");
+  for (let i = 0; i < frames.length; i++) {
+    is(frames[i].contentDocument.location,
+       getRootDirectory(gTestPath) + "browser_frame_history_" + expectedURLEnds[i],
+       "frame " + i + " has the right url");
+  }
+  gBrowser.removeTab(newTab);
+});
+
+// Loading the frameset inside an iframe
+add_task(function() {
+  let testURL = getRootDirectory(gTestPath) + "browser_frame_history_index2.html";
+  let tab = gBrowser.addTab(testURL);
+  gBrowser.selectedTab = tab;
+
+  info("iframe: Opening a page with an iframe containing three frames, 5 loads should take place");
+  yield waitForLoadsInBrowser(tab.linkedBrowser, 5);
+
+  let browser_b = tab.linkedBrowser.contentDocument.
+    getElementById("iframe").contentDocument.
+    getElementsByTagName("frame")[1];
+  let document_b = browser_b.contentDocument;
+  let links = document_b.getElementsByTagName("a");
+
+  // We're going to click on the first link, so listen for another load event
+  info("iframe: Clicking on link 1, 1 load should take place");
+  let promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
+  EventUtils.sendMouseEvent({type:"click"}, links[0], browser_b.contentWindow);
+  yield promise;
+
+  info("iframe: Clicking on link 2, 1 load should take place");
+  promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
+  EventUtils.sendMouseEvent({type:"click"}, links[1], browser_b.contentWindow);
+  yield promise;
+
+  info("iframe: Close then un-close page, 5 loads should take place");
+  gBrowser.removeTab(tab);
+  let newTab = ss.undoCloseTab(window, 0);
+  yield waitForLoadsInBrowser(newTab.linkedBrowser, 5);
+
+  info("iframe: Go back in time, 1 load should take place");
+  gBrowser.goBack();
+  yield waitForLoadsInBrowser(newTab.linkedBrowser, 1);
+
+  let expectedURLEnds = ["a.html", "b.html", "c1.html"];
+  let frames = newTab.linkedBrowser.contentDocument.
+    getElementById("iframe").contentDocument.
+        getElementsByTagName("frame");
+  for (let i = 0; i < frames.length; i++) {
+    is(frames[i].contentDocument.location,
+       getRootDirectory(gTestPath) + "browser_frame_history_" + expectedURLEnds[i],
+       "frame " + i + " has the right url");
+  }
+  gBrowser.removeTab(newTab);
+});
+
+// Now, test that we don't record history if the iframe is added dynamically
+add_task(function() {
+  // Start with an empty history
+    let blankState = JSON.stringify({
+      windows: [{
+        tabs: [{ entries: [{ url: "about:blank" }] }],
+        _closedTabs: []
+      }],
+      _closedWindows: []
+    });
+    ss.setBrowserState(blankState);
+
+  let testURL = getRootDirectory(gTestPath) + "browser_frame_history_index_blank.html";
+  let tab = gBrowser.addTab(testURL);
+  gBrowser.selectedTab = tab;
+  yield waitForLoadsInBrowser(tab.linkedBrowser, 1);
+
+  info("dynamic: Opening a page with an iframe containing three frames, 4 dynamic loads should take place");
+  let doc = tab.linkedBrowser.contentDocument;
+  let iframe = doc.createElement("iframe");
+  iframe.id = "iframe";
+  iframe.src="browser_frame_history_index.html";
+  doc.body.appendChild(iframe);
+  yield waitForLoadsInBrowser(tab.linkedBrowser, 4);
+
+  let browser_b = tab.linkedBrowser.contentDocument.
+    getElementById("iframe").contentDocument.
+    getElementsByTagName("frame")[1];
+  let document_b = browser_b.contentDocument;
+  let links = document_b.getElementsByTagName("a");
+
+  // We're going to click on the first link, so listen for another load event
+  info("dynamic: Clicking on link 1, 1 load should take place");
+  let promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
+  EventUtils.sendMouseEvent({type:"click"}, links[0], browser_b.contentWindow);
+  yield promise;
+
+  info("dynamic: Clicking on link 2, 1 load should take place");
+  promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
+  EventUtils.sendMouseEvent({type:"click"}, links[1], browser_b.contentWindow);
+  yield promise;
+
+  info("Check in the state that we have not stored this history");
+  let state = ss.getBrowserState();
+  info(JSON.stringify(JSON.parse(state), null, "\t"));
+  is(state.indexOf("c1.html"), -1, "History entry was not stored in the session state");;
+  gBrowser.removeTab(tab);
+});
+
+// helper functions
+function waitForLoadsInBrowser(aBrowser, aLoadCount) {
+  let deferred = Promise.defer();
+  let loadCount = 0;
+  aBrowser.addEventListener("load", function(aEvent) {
+    if (++loadCount < aLoadCount) {
+      info("Got " + loadCount + " loads, waiting until we have " + aLoadCount);
+      return;
+    }
+
+    aBrowser.removeEventListener("load", arguments.callee, true);
+    deferred.resolve();
+  }, true);
+  return deferred.promise;
+}
+
+function timeout(delay, task) {
+  let deferred = Promise.defer();
+  setTimeout(() => deferred.resolve(true), delay);
+  task.then(() => deferred.resolve(false), deferred.reject);
+  return deferred.promise;
+}
diff --git a/browser/components/sessionstore/test/browser_597315_a.html b/browser/components/sessionstore/test/browser_frame_history_a.html
similarity index 100%
rename from browser/components/sessionstore/test/browser_597315_a.html
rename to browser/components/sessionstore/test/browser_frame_history_a.html
diff --git a/browser/components/sessionstore/test/browser_frame_history_b.html b/browser/components/sessionstore/test/browser_frame_history_b.html
new file mode 100755
index 000000000000..38b43da211d4
--- /dev/null
+++ b/browser/components/sessionstore/test/browser_frame_history_b.html
@@ -0,0 +1,10 @@
+<html>
+  <body>
+    I'm B!<br/>
+    <a target="c" href="browser_frame_history_c1.html">click me first</a><br/>
+    <a target="c" href="browser_frame_history_c2.html">then click me</a><br/>
+    Close this tab.<br/>
+    Restore this tab.<br/>
+    Click back.<br/>
+  </body>
+</html>
diff --git a/browser/components/sessionstore/test/browser_597315_c.html b/browser/components/sessionstore/test/browser_frame_history_c.html
similarity index 100%
rename from browser/components/sessionstore/test/browser_597315_c.html
rename to browser/components/sessionstore/test/browser_frame_history_c.html
diff --git a/browser/components/sessionstore/test/browser_597315_c1.html b/browser/components/sessionstore/test/browser_frame_history_c1.html
similarity index 100%
rename from browser/components/sessionstore/test/browser_597315_c1.html
rename to browser/components/sessionstore/test/browser_frame_history_c1.html
diff --git a/browser/components/sessionstore/test/browser_597315_c2.html b/browser/components/sessionstore/test/browser_frame_history_c2.html
similarity index 100%
rename from browser/components/sessionstore/test/browser_597315_c2.html
rename to browser/components/sessionstore/test/browser_frame_history_c2.html
diff --git a/browser/components/sessionstore/test/browser_frame_history_index.html b/browser/components/sessionstore/test/browser_frame_history_index.html
new file mode 100644
index 000000000000..76eeb4c4d029
--- /dev/null
+++ b/browser/components/sessionstore/test/browser_frame_history_index.html
@@ -0,0 +1,10 @@
+<html>
+  <frameset cols="20%,80%">
+    <frameset rows="30%,70%">
+      <frame src="browser_frame_history_a.html"/>
+      <frame src="browser_frame_history_b.html"/>
+    </frameset>
+    <frame src="browser_frame_history_c.html" name="c"/>
+  </frameset>
+</html>
+
diff --git a/browser/components/sessionstore/test/browser_frame_history_index2.html b/browser/components/sessionstore/test/browser_frame_history_index2.html
new file mode 100644
index 000000000000..e4dfb40831e3
--- /dev/null
+++ b/browser/components/sessionstore/test/browser_frame_history_index2.html
@@ -0,0 +1,4 @@
+<html>
+  <iframe src="browser_frame_history_index.html" id="iframe" />
+</html>
+
diff --git a/browser/components/sessionstore/test/browser_frame_history_index_blank.html b/browser/components/sessionstore/test/browser_frame_history_index_blank.html
new file mode 100644
index 000000000000..30fd1f58cacb
--- /dev/null
+++ b/browser/components/sessionstore/test/browser_frame_history_index_blank.html
@@ -0,0 +1,5 @@
+<html>
+ <body>
+ </body>
+</html>
+
diff --git a/browser/devtools/app-manager/content/connection-footer.js b/browser/devtools/app-manager/content/connection-footer.js
index f255872b542c..52d34025a7c9 100644
--- a/browser/devtools/app-manager/content/connection-footer.js
+++ b/browser/devtools/app-manager/content/connection-footer.js
@@ -13,6 +13,7 @@ const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const {require} = devtools;
 
 const {ConnectionManager, Connection} = require("devtools/client/connection-manager");
+const {getDeviceFront} = require("devtools/server/actors/device");
 const ConnectionStore = require("devtools/app-manager/connection-store");
 const DeviceStore = require("devtools/app-manager/device-store");
 const simulatorsStore = require("devtools/app-manager/simulators-store");
@@ -187,4 +188,22 @@ let UI = {
       this.connect();
     });
   },
+  
+  screenshot: function() {
+    this.connection.client.listTabs(
+      response => {
+        let front = getDeviceFront(this.connection.client, response);
+        front.screenshotToBlob().then(blob => {
+          let topWindow = Services.wm.getMostRecentWindow("navigator:browser");
+          let gBrowser = topWindow.gBrowser;
+          let url = topWindow.URL.createObjectURL(blob);
+          let tab = gBrowser.selectedTab = gBrowser.addTab(url);
+          tab.addEventListener("TabClose", function onTabClose() {
+            tab.removeEventListener("TabClose", onTabClose, false);
+            topWindow.URL.revokeObjectURL(url);
+          }, false);
+        }).then(null, console.error);
+      }
+    );
+  },
 }
diff --git a/browser/devtools/app-manager/content/connection-footer.xhtml b/browser/devtools/app-manager/content/connection-footer.xhtml
index 8530043d7c46..a1e645ab4fda 100644
--- a/browser/devtools/app-manager/content/connection-footer.xhtml
+++ b/browser/devtools/app-manager/content/connection-footer.xhtml
@@ -26,6 +26,7 @@
             <div class="banner-content">
               <span template='{"type":"localizedContent","property":"connection.connectedToDevice","paths":["device.description.name"]}'></span>
               <button class="action-cancel" onclick="UI.disconnect()" title="&connection.disconnectTooltip;">&connection.disconnect;</button>
+              <button class="action-primary" onclick="UI.screenshot()" title="&device.screenshotTooltip;">&device.screenshot;</button>
             </div>
           </div>
         </div>
diff --git a/browser/devtools/app-manager/content/device.js b/browser/devtools/app-manager/content/device.js
index 84f916c53405..f1748e0e8976 100644
--- a/browser/devtools/app-manager/content/device.js
+++ b/browser/devtools/app-manager/content/device.js
@@ -141,23 +141,6 @@ let UI = {
     if (panel) panel.classList.add("selected");
   },
 
-  screenshot: function() {
-    if (!this.connected) {
-      return;
-    }
-    let front = getDeviceFront(this.connection.client, this.listTabsResponse);
-    front.screenshotToBlob().then(blob => {
-      let topWindow = Services.wm.getMostRecentWindow("navigator:browser");
-      let gBrowser = topWindow.gBrowser;
-      let url = topWindow.URL.createObjectURL(blob);
-      let tab = gBrowser.selectedTab = gBrowser.addTab(url);
-      tab.addEventListener("TabClose", function onTabClose() {
-        tab.removeEventListener("TabClose", onTabClose, false);
-        topWindow.URL.revokeObjectURL(url);
-      }, false);
-    }).then(null, console.error);
-  },
-
   openToolbox: function(manifest) {
     if (!this.connected) {
       return;
diff --git a/browser/devtools/app-manager/content/device.xhtml b/browser/devtools/app-manager/content/device.xhtml
index aa5b510ffcb1..2ed66769e3ec 100644
--- a/browser/devtools/app-manager/content/device.xhtml
+++ b/browser/devtools/app-manager/content/device.xhtml
@@ -36,7 +36,6 @@
             </h3>
             <p template='{"type":"localizedContent","property":"device.deviceSize", "paths":["device.description.width","device.description.height","device.description.dpi"]}'></p>
           </header>
-          <button onclick="UI.screenshot()" title="&device.screenshotTooltip;">&device.screenshot;</button>
           <div id="tabs-headers">
             <div onclick="UI.setTab('apps')" class="tab sidebar-item apps" title="&device.installedAppsTooltip;">&device.installedApps;</div>
             <div onclick="UI.setTab('permissions')" class="tab sidebar-item permissions" title="&device.permissionsTooltip;">
diff --git a/browser/devtools/debugger/debugger.xul b/browser/devtools/debugger/debugger.xul
index 7ec221557011..c6b8507ef90b 100644
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -410,7 +410,7 @@
           <button id="black-boxed-message-button"
                   class="devtools-toolbarbutton"
                   label="&debuggerUI.blackBoxMessage.unBlackBoxButton;"
-                  image="chrome://browser/skin/devtools/debugger-blackboxMessageEye.png"
+                  image="chrome://browser/skin/devtools/debugger-blackbox-eye.png"
                   command="unBlackBoxCommand"/>
         </vbox>
         <vbox id="source-progress-container"
@@ -432,7 +432,7 @@
         <tabpanels flex="1">
           <tabpanel id="variables-tabpanel">
             <vbox id="expressions"/>
-            <splitter class="devtools-horizontal-splitter"/>
+            <splitter class="devtools-horizontal-splitter devtools-invisible splitter"/>
             <vbox id="variables" flex="1"/>
           </tabpanel>
           <tabpanel id="events-tabpanel">
diff --git a/browser/devtools/fontinspector/font-inspector.xhtml b/browser/devtools/fontinspector/font-inspector.xhtml
index 81151d6fd041..3e538a00aa60 100644
--- a/browser/devtools/fontinspector/font-inspector.xhtml
+++ b/browser/devtools/fontinspector/font-inspector.xhtml
@@ -16,7 +16,7 @@
     <link rel="stylesheet" href="chrome://browser/skin/devtools/font-inspector.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://browser/content/devtools/theme-switching.js"/>
   </head>
-  <body class="theme-body devtools-monospace" role="application">
+  <body class="theme-sidebar devtools-monospace" role="application">
     <script type="application/javascript;version=1.8" src="font-inspector.js"></script>
     <div id="root">
       <ul id="all-fonts"></ul>
diff --git a/browser/devtools/inspector/breadcrumbs.js b/browser/devtools/inspector/breadcrumbs.js
index 60af2dee53c3..dec6f5a09c5e 100644
--- a/browser/devtools/inspector/breadcrumbs.js
+++ b/browser/devtools/inspector/breadcrumbs.js
@@ -12,6 +12,9 @@ const ENSURE_SELECTION_VISIBLE_DELAY = 50; // ms
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
+const ELLIPSIS = Services.prefs.getComplexValue("intl.ellipsis", Ci.nsIPrefLocalizedString).data;
+const MAX_LABEL_LENGTH = 40;
 
 let promise = require("sdk/core/promise");
 
@@ -72,6 +75,17 @@ HTMLBreadcrumbs.prototype = {
   _init: function BC__init()
   {
     this.container = this.chromeDoc.getElementById("inspector-breadcrumbs");
+
+    // These separators are used for CSS purposes only, and are positioned
+    // off screen, but displayed with -moz-element.
+    this.separators = this.chromeDoc.createElement("box");
+    this.separators.className = "breadcrumb-separator-container";
+    this.separators.innerHTML =
+                      "<box id='breadcrumb-separator-before'></box>" +
+                      "<box id='breadcrumb-separator-after'></box>" +
+                      "<box id='breadcrumb-separator-normal'></box>";
+    this.container.parentNode.appendChild(this.separators);
+
     this.container.addEventListener("mousedown", this, true);
     this.container.addEventListener("keypress", this, true);
 
@@ -184,16 +198,15 @@ HTMLBreadcrumbs.prototype = {
     let pseudosLabel = this.chromeDoc.createElement("label");
     pseudosLabel.className = "breadcrumbs-widget-item-pseudo-classes plain";
 
-    tagLabel.textContent = aNode.tagName.toLowerCase();
-    idLabel.textContent = aNode.id ? ("#" + aNode.id) : "";
+    let tagText = aNode.tagName.toLowerCase();
+    let idText = aNode.id ? ("#" + aNode.id) : "";
+    let classesText = "";
 
     if (aNode.className) {
-      let classesText = "";
       let classList = aNode.className.split(/\s+/);
       for (let i = 0; i < classList.length; i++) {
         classesText += "." + classList[i];
       }
-      classesLabel.textContent = classesText;
     }
 
     // XXX: Until we have pseudoclass lock in the node.
@@ -201,6 +214,26 @@ HTMLBreadcrumbs.prototype = {
 
     }
 
+    // Figure out which element (if any) needs ellipsing.
+    // Substring for that element, then clear out any extras
+    // (except for pseudo elements).
+    let maxTagLength = MAX_LABEL_LENGTH;
+    let maxIdLength = MAX_LABEL_LENGTH - tagText.length;
+    let maxClassLength = MAX_LABEL_LENGTH - tagText.length - idText.length;
+
+    if (tagText.length > maxTagLength) {
+       tagText = tagText.substr(0, maxTagLength) + ELLIPSIS;
+       idText = classesText = "";
+    } else if (idText.length > maxIdLength) {
+       idText = idText.substr(0, maxIdLength) + ELLIPSIS;
+       classesText = "";
+    } else if (classesText.length > maxClassLength) {
+      classesText = classesText.substr(0, maxClassLength) + ELLIPSIS;
+    }
+
+    tagLabel.textContent = tagText;
+    idLabel.textContent = idText;
+    classesLabel.textContent = classesText;
     pseudosLabel.textContent = aNode.pseudoClassLocks.join("");
 
     fragment.appendChild(tagLabel);
@@ -360,6 +393,10 @@ HTMLBreadcrumbs.prototype = {
     this.container.removeEventListener("mousedown", this, true);
     this.container.removeEventListener("keypress", this, true);
     this.container = null;
+
+    this.separators.remove();
+    this.separators = null;
+
     this.nodeHierarchy = null;
   },
 
diff --git a/browser/devtools/inspector/selector-search.js b/browser/devtools/inspector/selector-search.js
index 561e804e6ce8..136edcda11e0 100644
--- a/browser/devtools/inspector/selector-search.js
+++ b/browser/devtools/inspector/selector-search.js
@@ -53,6 +53,7 @@ function SelectorSearch(aInspector, aContentDocument, aInputNode) {
     autoSelect: true,
     position: "before_start",
     direction: "ltr",
+    theme: "auto",
     onClick: this._onListBoxKeypress,
     onKeypress: this._onListBoxKeypress,
   };
diff --git a/browser/devtools/netmonitor/netmonitor.xul b/browser/devtools/netmonitor/netmonitor.xul
index ee818d7d099a..34bf0c1d49de 100644
--- a/browser/devtools/netmonitor/netmonitor.xul
+++ b/browser/devtools/netmonitor/netmonitor.xul
@@ -35,7 +35,7 @@
   </popupset>
 
   <box id="body"
-       class="devtools-responsive-container theme-body"
+       class="devtools-responsive-container theme-sidebar"
        flex="1">
     <vbox id="network-table" flex="1">
       <toolbar id="requests-menu-toolbar"
@@ -119,6 +119,7 @@
                        tabindex="0"/>
       </toolbar>
       <label id="requests-menu-empty-notice"
+             class="side-menu-widget-empty-text"
              value="&netmonitorUI.emptyNotice2;"/>
       <vbox id="requests-menu-contents" flex="1" context="network-request-popup">
         <hbox id="requests-menu-item-template" hidden="true">
diff --git a/browser/devtools/profiler/profiler.xul b/browser/devtools/profiler/profiler.xul
index a7567bf7ef5f..30e630374575 100644
--- a/browser/devtools/profiler/profiler.xul
+++ b/browser/devtools/profiler/profiler.xul
@@ -22,7 +22,7 @@
   <script type="text/javascript" src="sidebar.js"/>
   <box flex="1" id="profiler-chrome"
     class="devtools-responsive-container theme-body">
-    <vbox class="profiler-sidebar">
+    <vbox class="profiler-sidebar theme-sidebar">
       <toolbar class="devtools-toolbar">
         <hbox id="profiler-controls">
           <toolbarbutton id="profiler-start"
@@ -40,7 +40,7 @@
       </vbox>
     </vbox>
 
-    <splitter class="devtools-side-splitter"/>
+    <splitter class="devtools-side-splitter devtools-invisible-splitter"/>
 
     <vbox flex="1" id="profiler-report">
       <!-- Example:
diff --git a/browser/devtools/shadereditor/shadereditor.xul b/browser/devtools/shadereditor/shadereditor.xul
index 7cc0ab81a09d..1fbf466aa747 100644
--- a/browser/devtools/shadereditor/shadereditor.xul
+++ b/browser/devtools/shadereditor/shadereditor.xul
@@ -19,7 +19,7 @@
 
   <script type="application/javascript" src="shadereditor.js"/>
 
-  <vbox id="body" flex="1">
+  <vbox class="theme-body" flex="1">
     <hbox id="reload-notice"
           class="notice-container"
           align="center"
@@ -44,8 +44,10 @@
              value="&shaderEditorUI.emptyNotice;"/>
     </hbox>
 
-    <box id="content" flex="1" hidden="true"
-        class="devtools-responsive-container theme-body">
+    <box id="content"
+         class="devtools-responsive-container"
+         flex="1"
+         hidden="true">
       <vbox id="shaders-pane"/>
       <splitter class="devtools-side-splitter"/>
       <box id="shaders-editors" class="devtools-responsive-container" flex="1">
diff --git a/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm b/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm
index 74bc464d9632..578494492459 100644
--- a/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm
+++ b/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm
@@ -46,6 +46,17 @@ this.BreadcrumbsWidget = function BreadcrumbsWidget(aNode) {
   this._list.addEventListener("underflow", this._onUnderflow.bind(this), false);
   this._list.addEventListener("overflow", this._onOverflow.bind(this), false);
 
+
+  // These separators are used for CSS purposes only, and are positioned
+  // off screen, but displayed with -moz-element.
+  this._separators = this.document.createElement("box");
+  this._separators.className = "breadcrumb-separator-container";
+  this._separators.innerHTML =
+                    "<box id='breadcrumb-separator-before'></box>" +
+                    "<box id='breadcrumb-separator-after'></box>" +
+                    "<box id='breadcrumb-separator-normal'></box>";
+  this._parent.appendChild(this._separators);
+
   // This widget emits events that can be handled in a MenuContainer.
   EventEmitter.decorate(this);
 
diff --git a/browser/devtools/shared/widgets/SideMenuWidget.jsm b/browser/devtools/shared/widgets/SideMenuWidget.jsm
index 86344f771e86..77ea19d80a7f 100644
--- a/browser/devtools/shared/widgets/SideMenuWidget.jsm
+++ b/browser/devtools/shared/widgets/SideMenuWidget.jsm
@@ -38,7 +38,7 @@ this.SideMenuWidget = function SideMenuWidget(aNode, aOptions={}) {
 
   // Create an internal scrollbox container.
   this._list = this.document.createElement("scrollbox");
-  this._list.className = "side-menu-widget-container theme-body";
+  this._list.className = "side-menu-widget-container theme-sidebar";
   this._list.setAttribute("flex", "1");
   this._list.setAttribute("orient", "vertical");
   this._list.setAttribute("with-arrows", this._showArrows);
diff --git a/browser/devtools/sourceeditor/editor.js b/browser/devtools/sourceeditor/editor.js
index a3f2e13e00fc..9393bfc547d0 100644
--- a/browser/devtools/sourceeditor/editor.js
+++ b/browser/devtools/sourceeditor/editor.js
@@ -10,6 +10,7 @@ const { Cu, Cc, Ci, components } = require("chrome");
 const TAB_SIZE    = "devtools.editor.tabsize";
 const EXPAND_TAB  = "devtools.editor.expandtab";
 const KEYMAP      = "devtools.editor.keymap";
+const AUTO_CLOSE  = "devtools.editor.autoclosebrackets";
 const L10N_BUNDLE = "chrome://browser/locale/devtools/sourceeditor.properties";
 const XUL_NS      = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
@@ -132,6 +133,7 @@ function Editor(config) {
   const tabSize = Services.prefs.getIntPref(TAB_SIZE);
   const useTabs = !Services.prefs.getBoolPref(EXPAND_TAB);
   const keyMap = Services.prefs.getCharPref(KEYMAP);
+  const useAutoClose = Services.prefs.getBoolPref(AUTO_CLOSE);
 
   this.version = null;
   this.config = {
@@ -144,7 +146,8 @@ function Editor(config) {
     extraKeys:         {},
     indentWithTabs:    useTabs,
     styleActiveLine:   true,
-    autoCloseBrackets: true,
+    autoCloseBrackets: "()[]{}''\"\"",
+    autoCloseEnabled:  useAutoClose,
     theme:             "mozilla"
   };
 
@@ -187,6 +190,10 @@ function Editor(config) {
     }
   }
 
+  // Configure automatic bracket closing.
+  if (!this.config.autoCloseEnabled)
+    this.config.autoCloseBrackets = false;
+
   // Overwrite default tab behavior. If something is selected,
   // indent those lines. If nothing is selected and we're
   // indenting with tabs, insert one tab. Otherwise insert N
diff --git a/browser/devtools/styleeditor/styleeditor.xul b/browser/devtools/styleeditor/styleeditor.xul
index 3ad821137b6e..76b61a21c215 100644
--- a/browser/devtools/styleeditor/styleeditor.xul
+++ b/browser/devtools/styleeditor/styleeditor.xul
@@ -72,7 +72,7 @@
 
   <xul:keyset id="sourceEditorKeys"/>
 
-  <xul:box id="style-editor-chrome" class="splitview-root loading"
+  <xul:box id="style-editor-chrome" class="theme-body splitview-root loading"
            context="sidebar-context">
     <xul:box class="splitview-controller">
       <xul:box class="splitview-main">
@@ -87,7 +87,7 @@
                       label="&importButton.label;"/>
         </xul:toolbar>
       </xul:box>
-      <xul:box id="splitview-resizer-target" class="splitview-nav-container"
+      <xul:box id="splitview-resizer-target" class="theme-sidebar splitview-nav-container"
               persist="height">
         <ol class="splitview-nav" tabindex="0"></ol>
         <div class="splitview-nav placeholder empty">
@@ -99,7 +99,7 @@
         </div>
       </xul:box> <!-- .splitview-nav-container -->
     </xul:box>   <!-- .splitview-controller -->
-    <xul:splitter class="devtools-side-splitter splitview-landscape-splitter"/>
+    <xul:splitter class="devtools-side-splitter splitview-landscape-splitter devtools-invisible-splitter"/>
     <xul:box class="splitview-side-details"/>
 
     <div id="splitview-templates" hidden="true">
diff --git a/browser/devtools/styleinspector/computedview.xhtml b/browser/devtools/styleinspector/computedview.xhtml
index 3f1c8062e804..4ab8a9db2b1e 100644
--- a/browser/devtools/styleinspector/computedview.xhtml
+++ b/browser/devtools/styleinspector/computedview.xhtml
@@ -21,7 +21,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      class="theme-body">
+      class="theme-sidebar">
 
   <head>
 
diff --git a/browser/devtools/styleinspector/cssruleview.xhtml b/browser/devtools/styleinspector/cssruleview.xhtml
index fa69cf533136..40e260d363e9 100644
--- a/browser/devtools/styleinspector/cssruleview.xhtml
+++ b/browser/devtools/styleinspector/cssruleview.xhtml
@@ -11,7 +11,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      class="theme-body">
+      class="theme-sidebar">
 
   <head>
     <title>&ruleViewTitle;</title>
diff --git a/browser/locales/en-US/chrome/browser/aboutAccounts.dtd b/browser/locales/en-US/chrome/browser/aboutAccounts.dtd
index 1e1a13438af2..7ef1110ebd49 100644
--- a/browser/locales/en-US/chrome/browser/aboutAccounts.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutAccounts.dtd
@@ -4,6 +4,6 @@
 
 <!ENTITY aboutAccounts.pageTitle "Welcome to Sync">
 
-<!ENTITY aboutAccountsSetup.description "Sign in to sync your tabs, bookmarks, passwords &amp; more.">
-<!ENTITY aboutAccountsSetup.startButton.label "Get started">
-<!ENTITY aboutAccountsSetup.useOldSync.label "Using an older version of Sync?">
+<!ENTITY aboutAccountsConfig.description "Sign in to sync your tabs, bookmarks, passwords &amp; more.">
+<!ENTITY aboutAccountsConfig.startButton.label "Get started">
+<!ENTITY aboutAccountsConfig.useOldSync.label "Using an older version of Sync?">
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 0c0dbcd98999..bc274db3a4a1 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -97,6 +97,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY showAllTabsCmd.accesskey "A">
 
 <!ENTITY fxaSignIn.label "Sign in to &syncBrand.shortName.label;">
+<!ENTITY fxaSignInError.label "Reconnect to &syncBrand.shortName.label;">
 <!ENTITY syncStartPanel.title "&brandShortName; is now syncing.">
 <!ENTITY syncStartPanel.subTitle "You can manage &syncBrand.shortName.label; in Options.">
 <!ENTITY syncStartPanel.subTitleUnix "You can manage &syncBrand.shortName.label; in Preferences.">
@@ -183,7 +184,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Bookmarks">
-<!ENTITY bookmarksMenuButton.tooltip        "Display your bookmarks">
 <!ENTITY bookmarksMenuButton.unsorted.label "Unsorted Bookmarks">
 <!ENTITY viewBookmarksSidebar2.label        "View Bookmarks Sidebar">
 <!ENTITY viewBookmarksToolbar.label         "View Bookmarks Toolbar">
@@ -737,6 +737,8 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY tabCrashed.checkSendReport "Tell &vendorShortName; about this crash so they can fix it.">
 <!ENTITY tabCrashed.tryAgain "Try Again">
 
+<!ENTITY uiTour.infoPanel.close "Close">
+
 <!-- LOCALIZATION NOTE: the following strings are unused in Australis, they're
      kept here to avoid warnings from l10n tools like compare-locales on
      l10n-central. They will be definitely removed when Australis is ready
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index 58baac5fbc84..2ad728254f11 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -232,11 +232,27 @@ refreshBlocked.goButton.accesskey=A
 refreshBlocked.refreshLabel=%S prevented this page from automatically reloading.
 refreshBlocked.redirectLabel=%S prevented this page from automatically redirecting to another page.
 
+# General bookmarks button
+# LOCALIZATION NOTE (bookmarksMenuButton.tooltip):
+# %S is the keyboard shortcut for "Show All Bookmarks"
+bookmarksMenuButton.tooltip=Show your bookmarks (%S)
 # Star button
 starButtonOn.tooltip=Edit this bookmark
 starButtonOff.tooltip=Bookmark this page
 starButtonOverflowed.label=Bookmark This Page
 
+# Print button tooltip on OS X
+# LOCALIZATION NOTE (printButton.tooltip):
+# Use the unicode ellipsis char, \u2026,
+# or use "..." if \u2026 doesn't suit traditions in your locale.
+# %S is the keyboard shortcut for "Print"
+printButton.tooltip=Print this page… (%S)
+
+# New Window button tooltip
+# LOCALIZATION NOTE (newWindowButton.tooltip):
+# %S is the keyboard shortcut for "New Window"
+newWindowButton.tooltip=Open a new window (%S)
+
 # Offline web applications
 offlineApps.available=This website (%S) is asking to store data on your computer for offline use.
 offlineApps.allow=Allow
@@ -358,6 +374,9 @@ tabview.title=%S - Group Your Tabs
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label=#1 and 1 more;#1 and #2 more
 
+# LOCALIZATION NOTE (tabviewButton.tooltip): %S is the keyboard shortcut for tab groups
+tabviewButton.tooltip=Group your tabs (%S)
+
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme.
 
@@ -414,6 +433,9 @@ fullscreen.entered=%S is now fullscreen.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Remember decision for %S
 
+# LOCALIZATION NOTE (fullscreenButton.tooltip): %S is the keyboard shortcut for full screen
+fullscreenButton.tooltip=Display the window in full screen (%S)
+
 service.toolbarbutton.label=Services
 service.toolbarbutton.tooltiptext=Services
 
diff --git a/browser/locales/en-US/chrome/browser/preferences/sync.dtd b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
index b2c78987ccb3..fe9d658e186d 100644
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -58,7 +58,7 @@
 <!ENTITY notSignedIn.label           "You are not signed in.">
 <!ENTITY signIn.label                "Sign in">
 <!ENTITY manage.label                "Manage">
-<!ENTITY unlink.label                "Unlink This Browser…">
+<!ENTITY unlink.label                "Unlink this Browser…">
 <!ENTITY verify.label                "Verify Email">
 <!ENTITY forget.label                "Forget this Email">
 
diff --git a/browser/locales/en-US/chrome/browser/tabbrowser.properties b/browser/locales/en-US/chrome/browser/tabbrowser.properties
index 0d21d4d148b8..2d95f0c23574 100644
--- a/browser/locales/en-US/chrome/browser/tabbrowser.properties
+++ b/browser/locales/en-US/chrome/browser/tabbrowser.properties
@@ -21,6 +21,11 @@ tabs.emptyTabTitle=New Tab
 tabs.closeTab=Close Tab
 tabs.close=Close
 tabs.closeWarningTitle=Confirm close
-tabs.closeWarningMultipleTabs=You are about to close %S tabs. Are you sure you want to continue?
+# LOCALIZATION NOTE (tabs.closeWarningMultiple):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# The singular form is not considered since this string is used only for
+# multiple tabs.
+tabs.closeWarningMultiple=;You are about to close #1 tabs. Are you sure you want to continue?
 tabs.closeButtonMultiple=Close tabs
 tabs.closeWarningPromptMe=Warn me when I attempt to close multiple tabs
diff --git a/browser/metro/base/content/bindings/urlbar.xml b/browser/metro/base/content/bindings/urlbar.xml
index 6aa4bc68501e..86a432a4e578 100644
--- a/browser/metro/base/content/bindings/urlbar.xml
+++ b/browser/metro/base/content/bindings/urlbar.xml
@@ -500,11 +500,11 @@
   </binding>
 
   <binding id="urlbar-autocomplete">
-    <content class="meta-section-container">
-      <xul:vbox class="meta-section" anonid="results-container" flex="1">
+    <content class="meta-section-container" pack="end">
+      <xul:vbox class="meta-section" anonid="results-container" flex="2">
         <xul:label class="meta-section-title"
                    value="&autocompleteResultsHeader.label;"/>
-        <richgrid anonid="results" rows="3" flex="1" minSlots="1"
+        <richgrid anonid="results" rows="3" minSlots="8"
                   seltype="single" nocontext="true" deferlayout="true"/>
       </xul:vbox>
 
@@ -600,6 +600,17 @@
             this.clearSelection();
             this.invalidate();
 
+            let viewstate = this.getAttribute("viewstate");
+            switch (viewstate) {
+              case "portrait":
+              case "snapped":
+                this._results.setAttribute("vertical", true);
+                break;
+              default:
+                this._results.removeAttribute("vertical");
+                break;
+            }
+
             this._results.arrangeItemsNow();
             this._searches.arrangeItemsNow();
 
@@ -658,8 +669,8 @@
             if (!this.popupOpen)
               return;
 
-            this.updateResults();
             this.updateSearchEngineHeader();
+            this.updateResults();
           ]]>
         </body>
       </method>
@@ -676,22 +687,27 @@
               return;
 
             let haveNoResults = (this.matchCount == 0);
-            this._resultsContainer.hidden = haveNoResults;
 
             if (haveNoResults) {
               this._results.clearAll();
+              this.setAttribute("nomatch", true);
+              this._resultsContainer.removeAttribute("flex");
               return;
             }
 
+            this.removeAttribute("nomatch");
+            this._resultsContainer.setAttribute("flex", 1);
+
             let controller = this.input.controller;
             let lastMatch = this.matchCount - 1;
             let iterCount = Math.max(this._results.itemCount, this.matchCount);
 
             // Swap out existing items for new search hit results
             for (let i = 0; i < iterCount; i++) {
+              let item = this._results._slotAt(i);
               if (i > lastMatch) {
-                let lastItem = this._results.itemCount - 1;
-                this._results.removeItemAt(lastItem, true);
+                item.removeAttribute("value");
+                item.removeAttribute("autocomplete");
                 continue;
               }
 
@@ -699,15 +715,9 @@
               let label = controller.getCommentAt(i) || value;
               let iconURI = controller.getImageAt(i);
 
-              let item = this._results.getItemAtIndex(i);
-              if (item == null) {
-                item = this._results.appendItem(label, value, true);
-                item.setAttribute("autocomplete", "true");
-              } else {
-                item.setAttribute("label", label);
-                item.setAttribute("value", value);
-              }
-
+              item.setAttribute("autocomplete", true);
+              item.setAttribute("label", label);
+              item.setAttribute("value", value);
               item.setAttribute("iconURI", iconURI);
             }
 
diff --git a/browser/metro/base/content/browser.js b/browser/metro/base/content/browser.js
index b336aa4971e0..59a4dd0bb395 100644
--- a/browser/metro/base/content/browser.js
+++ b/browser/metro/base/content/browser.js
@@ -747,7 +747,7 @@ var Browser = {
     Services.metro.pinTileAsync(this._currentPageTileID,
                                 Browser.selectedBrowser.contentTitle, // short name
                                 Browser.selectedBrowser.contentTitle, // display name
-                                "metrobrowser -url " + Browser.selectedBrowser.currentURI.spec,
+                                "-url " + Browser.selectedBrowser.currentURI.spec,
                             uriSpec, uriSpec);
   },
 
diff --git a/browser/metro/base/content/browser.xul b/browser/metro/base/content/browser.xul
index 247471a651b2..167ea56825d6 100644
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -227,7 +227,7 @@ Desktop browser's sync prefs.
 
       <vbox id="toolbar-overlay" flex="1">
         <!-- Autocomplete -->
-        <scrollbox flex="1">
+        <scrollbox flex="1" id="urlbar-autocomplete-scroll" observes="bcast_urlbarState">
           <hbox id="urlbar-autocomplete" observes="bcast_windowState"/>
         </scrollbox>
 
diff --git a/browser/metro/base/tests/mochitest/browser_selection_urlbar.js b/browser/metro/base/tests/mochitest/browser_selection_urlbar.js
index 9671bcfd76bf..0c5bd0be0459 100644
--- a/browser/metro/base/tests/mochitest/browser_selection_urlbar.js
+++ b/browser/metro/base/tests/mochitest/browser_selection_urlbar.js
@@ -102,6 +102,11 @@ gTests.push({
     edit.select();
 
     let editCoords = logicalCoordsForElement(edit);
+
+    // wait for popup animation to complete, it interferes with edit selection testing
+    let autocompletePopup = document.getElementById("urlbar-autocomplete-scroll");
+    yield waitForEvent(autocompletePopup, "transitionend");
+
     SelectionHelperUI.attachEditSession(ChromeSelectionHandler, editCoords.x, editCoords.y);
     ok(SelectionHelperUI.isSelectionUIVisible, "selection enabled");
 
diff --git a/browser/metro/base/tests/mochitest/browser_urlbar.js b/browser/metro/base/tests/mochitest/browser_urlbar.js
index e67081d40dd3..9d4fd20e84de 100644
--- a/browser/metro/base/tests/mochitest/browser_urlbar.js
+++ b/browser/metro/base/tests/mochitest/browser_urlbar.js
@@ -325,15 +325,16 @@ gTests.push({
     let opened = yield waitForCondition(() => gEdit.popup.popupOpen);
     yield waitForCondition(() => gEdit.popup._results.itemCount > 0);
 
-    ok(!gEdit.popup._resultsContainer.hidden, "'Your results' are visible");
+    ok(!gEdit.popup.hasAttribute("nomatch"), "'Popup doesnt have nomatch attribute when there are results");
+    ok(gEdit.popup._resultsContainer.getBoundingClientRect().width, "'Your results' are visible");
     ok(gEdit.popup._results.itemCount > 0, "'Your results' are populated");
 
     // Append a string to make sure it doesn't match anything in 'your results'
     EventUtils.sendString("zzzzzzzzzzzzzzzzzz", window);
 
-    yield waitForCondition(() => gEdit.popup._resultsContainer.hidden);
+    yield waitForCondition(() => gEdit.popup.hasAttribute("nomatch"));
 
-    ok(gEdit.popup._resultsContainer.hidden, "'Your results' are hidden");
+    is(gEdit.popup._resultsContainer.getBoundingClientRect().width, 0, "'Your results' are hidden");
     ok(gEdit.popup._results.itemCount === 0, "'Your results' are empty");
 
     EventUtils.synthesizeKey("VK_DOWN", {}, window);
diff --git a/browser/metro/theme/platform.css b/browser/metro/theme/platform.css
index f011309f5590..2b5fc61f536f 100644
--- a/browser/metro/theme/platform.css
+++ b/browser/metro/theme/platform.css
@@ -728,6 +728,45 @@ tabmodalprompt:not([promptType="promptUserAndPass"]) .infoContainer {
   transition-property: none;
 }
 
+/* Autocomplete ----------------------------------------------------------------- */
+
+#urlbar-autocomplete-scroll:not([autocomplete]) {
+  transform: translateY(calc(3 * @grid_row_height@ + 64px));
+  visibility: collapse;
+}
+
+#urlbar-autocomplete-scroll[autocomplete] {
+  height: calc(3 * @grid_row_height@ + 64px);
+  max-height: calc(3 * @grid_row_height@ + 64px);
+  transform: translateY(0);
+  transition-timing-function: @metro_animation_easing@;
+  transition-property: transform;
+  transition-duration: @metro_animation_duration@;
+  transition-delay: 0s;
+  visibility: visible;
+}
+
+#urlbar-autocomplete-scroll:not([autocomplete]) > .meta-section-container > .meta-section {
+  opacity: 0;
+}
+
+#urlbar-autocomplete > .meta-section {
+  opacity: 1;
+  transition-property: opacity;
+  transition-timing-function: @metro_animation_easing@;
+  transition-duration: @metro_animation_duration@;
+  transition-delay: 0s;
+  visibility: visible;
+}
+
+#urlbar-autocomplete[nomatch] > .meta-section[anonid="results-container"] {
+  opacity: 0;
+  visibility: collapse;
+}
+
+#urlbar-autocomplete richgriditem:not([value]) {
+  visibility: collapse;
+}
 
 /* App bars ----------------------------------------------------------------- */
 
diff --git a/browser/modules/UITour.jsm b/browser/modules/UITour.jsm
index df7cd4b90cc6..31eeb51e7053 100644
--- a/browser/modules/UITour.jsm
+++ b/browser/modules/UITour.jsm
@@ -33,6 +33,15 @@ this.UITour = {
 
   highlightEffects: ["random", "wobble", "zoom", "color"],
   targets: new Map([
+    ["accountStatus", {
+      query: (aDocument) => {
+        let statusButton = aDocument.getElementById("PanelUI-fxa-status");
+        return aDocument.getAnonymousElementByAttribute(statusButton,
+                                                        "class",
+                                                        "toolbarbutton-icon");
+      },
+      widgetName: "PanelUI-fxa-status",
+    }],
     ["addons",      {query: "#add-ons-button"}],
     ["appMenu",     {query: "#PanelUI-menu-button"}],
     ["backForward", {
@@ -157,6 +166,9 @@ this.UITour = {
                 if (typeof buttonData.icon == "string")
                   button.iconURL = this.resolveURL(contentDocument, buttonData.icon);
 
+                if (typeof buttonData.style == "string")
+                  button.style = buttonData.style;
+
                 buttons.push(button);
 
                 if (buttons.length == MAX_BUTTONS)
@@ -298,6 +310,14 @@ this.UITour = {
         }
         break;
       }
+
+      case "command": {
+        if (aEvent.target.id == "UITourTooltipClose") {
+          let window = aEvent.target.ownerDocument.defaultView;
+          this.hideInfo(window);
+        }
+        break;
+      }
     }
   },
 
@@ -628,6 +648,9 @@ this.UITour = {
         if (button.iconURL)
           el.setAttribute("image", button.iconURL);
 
+        if (button.style == "link")
+          el.setAttribute("class", "button-link");
+
         let callbackID = button.callbackID;
         el.addEventListener("command", event => {
           tooltip.hidePopup();
@@ -639,6 +662,9 @@ this.UITour = {
 
       tooltipButtons.hidden = !aButtons.length;
 
+      let tooltipClose = document.getElementById("UITourTooltipClose");
+      tooltipClose.addEventListener("command", this);
+
       tooltip.hidden = false;
       let alignment = "bottomcenter topright";
       tooltip.openPopup(aAnchorEl, alignment);
diff --git a/browser/modules/test/uitour.js b/browser/modules/test/uitour.js
index 0b10d00f5f56..bcef8b67b2d1 100644
--- a/browser/modules/test/uitour.js
+++ b/browser/modules/test/uitour.js
@@ -78,6 +78,7 @@ if (typeof Mozilla == 'undefined') {
 				buttonData.push({
 					label: buttons[i].label,
 					icon: buttons[i].icon,
+					style: buttons[i].style,
 					callbackID: _waitForCallback(buttons[i].callback)
 			});
 			}
diff --git a/browser/themes/linux/Toolbar-inverted.png b/browser/themes/linux/Toolbar-inverted.png
index d63ac8cf69ea..0ffa8f286b85 100644
Binary files a/browser/themes/linux/Toolbar-inverted.png and b/browser/themes/linux/Toolbar-inverted.png differ
diff --git a/browser/themes/linux/Toolbar.png b/browser/themes/linux/Toolbar.png
index c05a0a5ff759..dce0b0a7d994 100644
Binary files a/browser/themes/linux/Toolbar.png and b/browser/themes/linux/Toolbar.png differ
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index f6160f68a97b..c2beb6d6c350 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1958,3 +1958,20 @@ chatbox {
 }
 
 %include ../shared/UITour.inc.css
+
+#UITourTooltipDescription {
+  font-size: 1.05rem;
+}
+
+#UITourTooltipClose {
+  -moz-appearance: toolbarbutton;
+  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
+}
+
+#UITourTooltipClose > .toolbarbutton-icon {
+  margin: -4px;
+}
+
+#UITourTooltipButtons {
+  margin-bottom: 0;
+}
diff --git a/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png b/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png
deleted file mode 100644
index 722438060a89..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png
deleted file mode 100644
index 1b0fcf98659e..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png
deleted file mode 100644
index c7c2f39ab2c4..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png
deleted file mode 100644
index c7c2f39ab2c4..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end.png
deleted file mode 100644
index 2a65f402ad84..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-end.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png
deleted file mode 100644
index 1d2611ddaf0b..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png
deleted file mode 100644
index d2b7f8dae062..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png
deleted file mode 100644
index 2311685f8642..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png
deleted file mode 100644
index a99e9fabe969..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png
deleted file mode 100644
index 30c2c29463bd..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png
deleted file mode 100644
index a5bc6124e552..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png
deleted file mode 100644
index a08fb902db8b..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start.png
deleted file mode 100644
index b8a43b58cd7a..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-start.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png
deleted file mode 100644
index 4c57d76f18b5..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png
deleted file mode 100644
index cd2f0a5e837f..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png
deleted file mode 100644
index cd2f0a5e837f..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end.png
deleted file mode 100644
index ea9bc32556ae..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-end.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png
deleted file mode 100644
index d6a8a4385689..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png
deleted file mode 100644
index 61bbcb13419b..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png
deleted file mode 100644
index 066c34528030..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png
deleted file mode 100644
index cb87d62b24b9..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png
deleted file mode 100644
index 155f6380bf22..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png
deleted file mode 100644
index dab1153284f5..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png
deleted file mode 100644
index a520e8088c78..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start.png
deleted file mode 100644
index 86912e0668d7..000000000000
Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-start.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-blackbox.png b/browser/themes/linux/devtools/debugger-blackbox.png
deleted file mode 100644
index 11a45b5d0378..000000000000
Binary files a/browser/themes/linux/devtools/debugger-blackbox.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-blackboxMessageEye.png b/browser/themes/linux/devtools/debugger-blackboxMessageEye.png
deleted file mode 100644
index dbd7a3e5ec9f..000000000000
Binary files a/browser/themes/linux/devtools/debugger-blackboxMessageEye.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-collapse.png b/browser/themes/linux/devtools/debugger-collapse.png
deleted file mode 100644
index cde5299b75df..000000000000
Binary files a/browser/themes/linux/devtools/debugger-collapse.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-expand.png b/browser/themes/linux/devtools/debugger-expand.png
deleted file mode 100644
index ee8012ff315b..000000000000
Binary files a/browser/themes/linux/devtools/debugger-expand.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-pause.png b/browser/themes/linux/devtools/debugger-pause.png
deleted file mode 100644
index 7f908bf8b404..000000000000
Binary files a/browser/themes/linux/devtools/debugger-pause.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-play.png b/browser/themes/linux/devtools/debugger-play.png
deleted file mode 100644
index 91719826a4a6..000000000000
Binary files a/browser/themes/linux/devtools/debugger-play.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-step-in.png b/browser/themes/linux/devtools/debugger-step-in.png
deleted file mode 100644
index c80ee72a285e..000000000000
Binary files a/browser/themes/linux/devtools/debugger-step-in.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-step-out.png b/browser/themes/linux/devtools/debugger-step-out.png
deleted file mode 100644
index 1a7145a983b3..000000000000
Binary files a/browser/themes/linux/devtools/debugger-step-out.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/debugger-step-over.png b/browser/themes/linux/devtools/debugger-step-over.png
deleted file mode 100644
index 7c9b82ad48f6..000000000000
Binary files a/browser/themes/linux/devtools/debugger-step-over.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/itemToggle.png b/browser/themes/linux/devtools/itemToggle.png
deleted file mode 100644
index cf70394e6a1c..000000000000
Binary files a/browser/themes/linux/devtools/itemToggle.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/styleeditor.css b/browser/themes/linux/devtools/styleeditor.css
deleted file mode 100644
index 4df8ea8e6520..000000000000
--- a/browser/themes/linux/devtools/styleeditor.css
+++ /dev/null
@@ -1,131 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#style-editor-chrome {
-  background-color: hsl(208,11%,27%);
-}
-
-.stylesheet-title,
-.stylesheet-name {
-  text-decoration: none;
-  color: hsl(207,17%,88%);
-}
-
-.stylesheet-name {
-  font-size: 13px;
-}
-
-.stylesheet-rule-count,
-.stylesheet-saveButton {
-  color: hsl(211,12%,60%);
-}
-
-.stylesheet-saveButton {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.splitview-active .stylesheet-title,
-.splitview-active .stylesheet-name {
-  color: hsl(0,0%,100%);
-}
-
-.splitview-active .stylesheet-rule-count,
-.splitview-active .stylesheet-saveButton {
-  color: hsl(200,66%,70%);
-}
-
-.splitview-nav:focus {
-  outline: 0; /* focus ring is on the stylesheet name */
-}
-
-.splitview-nav > li.unsaved > hgroup .stylesheet-name {
-  font-style: italic;
-}
-
-.splitview-nav:-moz-locale-dir(ltr) > li.unsaved > hgroup .stylesheet-name:before,
-.splitview-nav:-moz-locale-dir(rtl) > li.unsaved > hgroup .stylesheet-name:after {
-  font-style: italic;
-}
-
-.splitview-nav.empty > p {
-  padding: 0 10px;
-}
-
-.stylesheet-enabled {
-  padding: 8px 0;
-  margin: 0 8px;
-  background-image: url(itemToggle.png);
-  background-repeat: no-repeat;
-  background-clip: content-box;
-  background-position: 0 8px;
-  width: 24px;
-  height: 40px;
-}
-
-.disabled > .stylesheet-enabled {
-  background-position: -24px 8px;
-}
-
-.splitview-nav > li > .stylesheet-enabled:focus,
-.splitview-nav > li:hover > .stylesheet-enabled {
-  outline: 0;
-}
-
-.stylesheet-error-message {
-  color: red;
-}
-
-.stylesheet-more > h3 {
-  font-size: 11px;
-  -moz-margin-end: 2px;
-}
-
-.devtools-searchinput {
-  max-width: 25ex;
-  font-size: 11px;
-}
-
-.placeholder {
-  color: white;
-}
-
-.placeholder a {
-  text-decoration: underline;
-}
-
-h1,
-h2,
-h3 {
-  font-size: inherit;
-  font-weight: normal;
-  margin: 0;
-  padding: 0;
-}
-
-/* portrait mode */
-@media (max-width: 550px) {
-  .splitview-nav {
-    box-shadow: none;
-  }
-
-  .splitview-nav > li.splitview-active {
-    background-size: 0 0, 0 0, auto;
-  }
-
-  .stylesheet-enabled {
-    padding: 0;
-    background-position: 0 0;
-    height: 24px;
-  }
-
-  .disabled > .stylesheet-enabled {
-    background-position: -24px 0;
-  }
-
-  .splitview-nav > li > hgroup.stylesheet-info {
-    -moz-box-align: baseline;
-  }
-}
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 484c9005c9e0..8ff891ddddbb 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -153,6 +153,7 @@ browser.jar:
 * skin/classic/browser/devtools/common.css            (../shared/devtools/common.css)
 * skin/classic/browser/devtools/dark-theme.css        (../shared/devtools/dark-theme.css)
 * skin/classic/browser/devtools/light-theme.css       (../shared/devtools/light-theme.css)
+  skin/classic/browser/devtools/filters.svg          (../shared/devtools/filters.svg)
   skin/classic/browser/devtools/controls.png          (../shared/devtools/controls.png)
 * skin/classic/browser/devtools/widgets.css           (devtools/widgets.css)
   skin/classic/browser/devtools/commandline-icon.png  (devtools/commandline-icon.png)
@@ -178,61 +179,40 @@ browser.jar:
   skin/classic/browser/devtools/editor-error.png       (devtools/editor-error.png)
   skin/classic/browser/devtools/editor-breakpoint.png  (devtools/editor-breakpoint.png)
   skin/classic/browser/devtools/editor-debug-location.png (devtools/editor-debug-location.png)
-  skin/classic/browser/devtools/breadcrumbs-scrollbutton.png                 (devtools/breadcrumbs-scrollbutton.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png     (devtools/breadcrumbs/ltr-end-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png             (devtools/breadcrumbs/ltr-end-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end.png                      (devtools/breadcrumbs/ltr-end.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png           (devtools/breadcrumbs/ltr-middle-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png  (devtools/breadcrumbs/ltr-middle-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png          (devtools/breadcrumbs/ltr-middle-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle.png                   (devtools/breadcrumbs/ltr-middle.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png            (devtools/breadcrumbs/ltr-start-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png   (devtools/breadcrumbs/ltr-start-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start.png                    (devtools/breadcrumbs/ltr-start.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png           (devtools/breadcrumbs/ltr-start-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png              (devtools/breadcrumbs/rtl-end-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png     (devtools/breadcrumbs/rtl-end-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png             (devtools/breadcrumbs/rtl-end-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end.png                      (devtools/breadcrumbs/rtl-end.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png           (devtools/breadcrumbs/rtl-middle-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png  (devtools/breadcrumbs/rtl-middle-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png          (devtools/breadcrumbs/rtl-middle-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle.png                   (devtools/breadcrumbs/rtl-middle.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png            (devtools/breadcrumbs/rtl-start-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png   (devtools/breadcrumbs/rtl-start-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start.png                    (devtools/breadcrumbs/rtl-start.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png           (devtools/breadcrumbs/rtl-start-selected.png)
-  skin/classic/browser/devtools/splitview.css         (devtools/splitview.css)
-  skin/classic/browser/devtools/styleeditor.css       (devtools/styleeditor.css)
+  skin/classic/browser/devtools/breadcrumbs-divider@2x.png      (../shared/devtools/images/breadcrumbs-divider@2x.png)
+  skin/classic/browser/devtools/breadcrumbs-scrollbutton.png    (../shared/devtools/images/breadcrumbs-scrollbutton.png)
+  skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
+  skin/classic/browser/devtools/splitview.css         (../shared/devtools/splitview.css)
+  skin/classic/browser/devtools/styleeditor.css       (../shared/devtools/styleeditor.css)
 * skin/classic/browser/devtools/shadereditor.css      (devtools/shadereditor.css)
 * skin/classic/browser/devtools/debugger.css          (devtools/debugger.css)
 * skin/classic/browser/devtools/profiler.css          (devtools/profiler.css)
 * skin/classic/browser/devtools/netmonitor.css        (devtools/netmonitor.css)
 * skin/classic/browser/devtools/scratchpad.css        (devtools/scratchpad.css)
   skin/classic/browser/devtools/magnifying-glass.png  (devtools/magnifying-glass.png)
-  skin/classic/browser/devtools/option-icon.png       (devtools/option-icon.png)
-  skin/classic/browser/devtools/itemToggle.png        (devtools/itemToggle.png)
+  skin/classic/browser/devtools/option-icon.png       (../shared/devtools/images/option-icon.png)
+  skin/classic/browser/devtools/itemToggle.png        (../shared/devtools/images/itemToggle.png)
+  skin/classic/browser/devtools/itemToggle-light.png  (../shared/devtools/images/itemToggle-light.png)
   skin/classic/browser/devtools/itemArrow-dark-rtl.png (../shared/devtools/images/itemArrow-dark-rtl.png)
   skin/classic/browser/devtools/itemArrow-dark-ltr.png (../shared/devtools/images/itemArrow-dark-ltr.png)
-  skin/classic/browser/devtools/itemArrow-rtl.png      (../shared/devtools/images/itemArrow-rtl.png)
-  skin/classic/browser/devtools/itemArrow-ltr.png      (../shared/devtools/images/itemArrow-ltr.png)
+  skin/classic/browser/devtools/itemArrow-rtl.svg      (../shared/devtools/images/itemArrow-rtl.svg)
+  skin/classic/browser/devtools/itemArrow-ltr.svg      (../shared/devtools/images/itemArrow-ltr.svg)
   skin/classic/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
   skin/classic/browser/devtools/noise.png             (devtools/noise.png)
   skin/classic/browser/devtools/inspect-button.png    (devtools/inspect-button.png)
   skin/classic/browser/devtools/dropmarker.png        (devtools/dropmarker.png)
   skin/classic/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
   skin/classic/browser/devtools/layoutview.css        (devtools/layoutview.css)
-  skin/classic/browser/devtools/debugger-collapse.png  (devtools/debugger-collapse.png)
-  skin/classic/browser/devtools/debugger-expand.png    (devtools/debugger-expand.png)
-  skin/classic/browser/devtools/debugger-pause.png     (devtools/debugger-pause.png)
-  skin/classic/browser/devtools/debugger-play.png      (devtools/debugger-play.png)
-  skin/classic/browser/devtools/debugger-step-in.png   (devtools/debugger-step-in.png)
-  skin/classic/browser/devtools/debugger-step-out.png  (devtools/debugger-step-out.png)
-  skin/classic/browser/devtools/debugger-step-over.png (devtools/debugger-step-over.png)
-  skin/classic/browser/devtools/debugger-blackbox.png  (devtools/debugger-blackbox.png)
-  skin/classic/browser/devtools/debugger-blackboxMessageEye.png (devtools/debugger-blackboxMessageEye.png)
-  skin/classic/browser/devtools/debugger-toggleBreakpoints.png (devtools/debugger-toggleBreakpoints.png)
+  skin/classic/browser/devtools/debugger-collapse.png  (../shared/devtools/images/debugger-collapse.png)
+  skin/classic/browser/devtools/debugger-expand.png    (../shared/devtools/images/debugger-expand.png)
+  skin/classic/browser/devtools/debugger-pause.png     (../shared/devtools/images/debugger-pause.png)
+  skin/classic/browser/devtools/debugger-play.png      (../shared/devtools/images/debugger-play.png)
+  skin/classic/browser/devtools/debugger-step-in.png   (../shared/devtools/images/debugger-step-in.png)
+  skin/classic/browser/devtools/debugger-step-out.png  (../shared/devtools/images/debugger-step-out.png)
+  skin/classic/browser/devtools/debugger-step-over.png (../shared/devtools/images/debugger-step-over.png)
+  skin/classic/browser/devtools/debugger-blackbox-eye.png  (../shared/devtools/images/debugger-blackbox-eye.png)
+  skin/classic/browser/devtools/debugger-blackbox.png  (../shared/devtools/images/debugger-blackbox.png)
+  skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
   skin/classic/browser/devtools/tracer-icon.png        (devtools/tracer-icon.png)
   skin/classic/browser/devtools/tracer-icon@2x.png     (devtools/tracer-icon@2x.png)
   skin/classic/browser/devtools/responsive-se-resizer.png (devtools/responsive-se-resizer.png)
@@ -245,7 +225,7 @@ browser.jar:
   skin/classic/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
   skin/classic/browser/devtools/floating-scrollbars-light.css (devtools/floating-scrollbars-light.css)
   skin/classic/browser/devtools/inspector.css             (devtools/inspector.css)
-  skin/classic/browser/devtools/profiler-stopwatch.png    (devtools/profiler-stopwatch.png)
+  skin/classic/browser/devtools/profiler-stopwatch.png    (../shared/devtools/images/profiler-stopwatch.png)
   skin/classic/browser/devtools/tool-options.svg            (../shared/devtools/images/tool-options.svg)
   skin/classic/browser/devtools/tool-webconsole.svg         (../shared/devtools/images/tool-webconsole.svg)
   skin/classic/browser/devtools/tool-debugger.svg           (../shared/devtools/images/tool-debugger.svg)
diff --git a/browser/themes/linux/menuPanel.png b/browser/themes/linux/menuPanel.png
index 59061ec0aaa3..5821f40bd938 100644
Binary files a/browser/themes/linux/menuPanel.png and b/browser/themes/linux/menuPanel.png differ
diff --git a/browser/themes/osx/Toolbar-inverted.png b/browser/themes/osx/Toolbar-inverted.png
index 332c09c8884c..ae37cddeba3d 100644
Binary files a/browser/themes/osx/Toolbar-inverted.png and b/browser/themes/osx/Toolbar-inverted.png differ
diff --git a/browser/themes/osx/Toolbar-inverted@2x.png b/browser/themes/osx/Toolbar-inverted@2x.png
index 865dc21c9f7c..14329b60663e 100644
Binary files a/browser/themes/osx/Toolbar-inverted@2x.png and b/browser/themes/osx/Toolbar-inverted@2x.png differ
diff --git a/browser/themes/osx/Toolbar.png b/browser/themes/osx/Toolbar.png
index 159d7a20aff4..522f0b230337 100644
Binary files a/browser/themes/osx/Toolbar.png and b/browser/themes/osx/Toolbar.png differ
diff --git a/browser/themes/osx/Toolbar@2x.png b/browser/themes/osx/Toolbar@2x.png
index 71981cf88cb6..4d0d07880826 100644
Binary files a/browser/themes/osx/Toolbar@2x.png and b/browser/themes/osx/Toolbar@2x.png differ
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 9622c5b950ab..95ca147d9d57 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -761,11 +761,11 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
   }
 
   #email-link-button[cui-areatype="toolbar"] {
-    -moz-image-region: rect(0, 612px, 36px, 576px);
+    -moz-image-region: rect(0, 1332px, 36px, 1296px);
   }
 
   #email-link-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-    -moz-image-region: rect(36px, 612px, 72px, 576px);
+    -moz-image-region: rect(36px, 1368px, 72px, 1332px);
   }
 
   #characterencoding-button[cui-areatype="toolbar"] {
@@ -1054,12 +1054,7 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
 
   #email-link-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #email-link-button {
-    -moz-image-region: rect(0px, 896px, 64px, 832px);
-  }
-
-  /* This is temporary until we have an email-link icon (Bug 932235) */
-  #email-link-button > image {
-    transform: scale(-1, -1);
+    -moz-image-region: rect(0px, 1600px, 64px, 1536px);
   }
 
   /* Footer and wide panel control icons */
@@ -4129,3 +4124,17 @@ window > chatbox {
 }
 
 %include ../shared/UITour.inc.css
+
+#UITourTooltipIcon {
+  -moz-margin-start: 0;
+}
+
+#UITourTooltipDescription {
+  font-size: 1.1rem;
+  line-height: 1.9rem;
+}
+
+#UITourTooltipClose {
+  -moz-margin-end: -15px;
+  margin-top: -12px;
+}
\ No newline at end of file
diff --git a/browser/themes/osx/devtools/breadcrumbs-scrollbutton.png b/browser/themes/osx/devtools/breadcrumbs-scrollbutton.png
deleted file mode 100644
index 722438060a89..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs-scrollbutton.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-end-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-end-pressed.png
deleted file mode 100644
index 1b0fcf98659e..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-end-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected-pressed.png
deleted file mode 100644
index c7c2f39ab2c4..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected.png b/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected.png
deleted file mode 100644
index c7c2f39ab2c4..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-end.png b/browser/themes/osx/devtools/breadcrumbs/ltr-end.png
deleted file mode 100644
index 2a65f402ad84..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-end.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-middle-pressed.png
deleted file mode 100644
index 1d2611ddaf0b..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected-pressed.png
deleted file mode 100644
index d2b7f8dae062..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected.png b/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected.png
deleted file mode 100644
index 2311685f8642..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-middle.png b/browser/themes/osx/devtools/breadcrumbs/ltr-middle.png
deleted file mode 100644
index a99e9fabe969..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-middle.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-start-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-start-pressed.png
deleted file mode 100644
index 30c2c29463bd..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-start-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected-pressed.png
deleted file mode 100644
index a5bc6124e552..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected.png b/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected.png
deleted file mode 100644
index a08fb902db8b..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-start.png b/browser/themes/osx/devtools/breadcrumbs/ltr-start.png
deleted file mode 100644
index b8a43b58cd7a..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-start.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-end-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-end-pressed.png
deleted file mode 100644
index 4c57d76f18b5..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-end-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected-pressed.png
deleted file mode 100644
index cd2f0a5e837f..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected.png b/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected.png
deleted file mode 100644
index cd2f0a5e837f..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-end.png b/browser/themes/osx/devtools/breadcrumbs/rtl-end.png
deleted file mode 100644
index ea9bc32556ae..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-end.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-middle-pressed.png
deleted file mode 100644
index d6a8a4385689..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected-pressed.png
deleted file mode 100644
index 61bbcb13419b..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected.png b/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected.png
deleted file mode 100644
index 066c34528030..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-middle.png b/browser/themes/osx/devtools/breadcrumbs/rtl-middle.png
deleted file mode 100644
index cb87d62b24b9..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-middle.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-start-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-start-pressed.png
deleted file mode 100644
index 155f6380bf22..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-start-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected-pressed.png
deleted file mode 100644
index dab1153284f5..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected.png b/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected.png
deleted file mode 100644
index a520e8088c78..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-start.png b/browser/themes/osx/devtools/breadcrumbs/rtl-start.png
deleted file mode 100644
index 86912e0668d7..000000000000
Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-start.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-blackbox.png b/browser/themes/osx/devtools/debugger-blackbox.png
deleted file mode 100644
index 11a45b5d0378..000000000000
Binary files a/browser/themes/osx/devtools/debugger-blackbox.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-blackboxMessageEye.png b/browser/themes/osx/devtools/debugger-blackboxMessageEye.png
deleted file mode 100644
index dbd7a3e5ec9f..000000000000
Binary files a/browser/themes/osx/devtools/debugger-blackboxMessageEye.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-collapse.png b/browser/themes/osx/devtools/debugger-collapse.png
deleted file mode 100644
index cde5299b75df..000000000000
Binary files a/browser/themes/osx/devtools/debugger-collapse.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-expand.png b/browser/themes/osx/devtools/debugger-expand.png
deleted file mode 100644
index ee8012ff315b..000000000000
Binary files a/browser/themes/osx/devtools/debugger-expand.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-pause.png b/browser/themes/osx/devtools/debugger-pause.png
deleted file mode 100644
index 7f908bf8b404..000000000000
Binary files a/browser/themes/osx/devtools/debugger-pause.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-play.png b/browser/themes/osx/devtools/debugger-play.png
deleted file mode 100644
index 91719826a4a6..000000000000
Binary files a/browser/themes/osx/devtools/debugger-play.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-step-in.png b/browser/themes/osx/devtools/debugger-step-in.png
deleted file mode 100644
index c80ee72a285e..000000000000
Binary files a/browser/themes/osx/devtools/debugger-step-in.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-step-out.png b/browser/themes/osx/devtools/debugger-step-out.png
deleted file mode 100644
index 1a7145a983b3..000000000000
Binary files a/browser/themes/osx/devtools/debugger-step-out.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-step-over.png b/browser/themes/osx/devtools/debugger-step-over.png
deleted file mode 100644
index 7c9b82ad48f6..000000000000
Binary files a/browser/themes/osx/devtools/debugger-step-over.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/debugger-toggleBreakpoints.png b/browser/themes/osx/devtools/debugger-toggleBreakpoints.png
deleted file mode 100644
index c4b7dcbfe574..000000000000
Binary files a/browser/themes/osx/devtools/debugger-toggleBreakpoints.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/itemToggle.png b/browser/themes/osx/devtools/itemToggle.png
deleted file mode 100644
index cf70394e6a1c..000000000000
Binary files a/browser/themes/osx/devtools/itemToggle.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/splitview.css b/browser/themes/osx/devtools/splitview.css
deleted file mode 100644
index 0eb870c9fb10..000000000000
--- a/browser/themes/osx/devtools/splitview.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.splitview-nav-container {
-  background-color: hsl(208,11%,27%);
-  color: white;
-}
-
-.loading .splitview-nav-container {
-  background-image: url(chrome://global/skin/icons/loading_16.png);
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-
-.splitview-nav {
-  -moz-appearance: none;
-  margin: 0;
-  box-shadow: inset -1px 0 0 #222426;
-}
-
-.splitview-nav > li {
-  color: white;
-  background-clip: padding-box;
-  border-bottom: 1px solid hsla(210,16%,76%,.1);
-  box-shadow: inset 0 -1px 0 hsla(210,8%,5%,.25);
-  -moz-padding-end: 8px;
-  -moz-box-align: center;
-}
-
-.splitview-nav {
-  list-style-image: none;
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.splitview-nav > li {
-  outline: 0;
-  vertical-align: bottom;
-}
-
-.placeholder {
-  -moz-box-flex: 1;
-  text-align: center;
-}
-
-.splitview-nav > li.splitview-active {
-  background-image: url(itemArrow-ltr.png),
-                    linear-gradient(to right, black, black),
-                    linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%));
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center right, top right, top left;
-  background-size: auto, 1px 100%, auto;
-  border-bottom: 1px solid hsla(210,8%,5%,.25);
-  box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15),
-              inset 0 -1px 0 hsla(210,40%,83%,.05);
-}
-
-.splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-rtl.png),
-                    linear-gradient(to right, black, black),
-                    linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%));
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center left, top left, top right;
-}
-
-/* Toolbars */
-
-.splitview-main > .devtools-toolbar {
-  background-origin: border-box;
-  background-clip: border-box;
-  border-bottom: 1px solid hsla(210,8%,5%,.65);
-}
-
-.splitview-main > toolbar:-moz-locale-dir(ltr) {
-  border-right: 1px solid hsla(210,8%,5%,.5);
-}
-
-.splitview-main > toolbar:-moz-locale-dir(rtl) {
-  border-left: 1px solid hsla(210,8%,5%,.5);
-}
-
-.splitview-main > .devtools-toolbarbutton {
-  font-size: 11px;
-  padding: 0 8px;
-  width: auto;
-  min-width: 48px;
-  min-height: 0;
-}
-
-
-/* Resizers */
-
-.splitview-landscape-splitter {
-  -moz-border-start-color: transparent;
-}
-
-.splitview-portrait-resizer {
-  -moz-appearance: none;
-  background: linear-gradient(black 1px, rgba(255,255,255,0.2) 1px),
-              linear-gradient(hsl(210,11%,36%), hsl(210,11%,18%));
-  height: 12px;
-  background-size: 10px 2px, 100% 12px;
-  background-clip: content-box, border-box;
-  background-repeat: repeat-y, no-repeat;
-  background-position: center center;
-  padding: 2px 0;
-  border-top: 1px solid hsla(210,8%,5%,.5);
-  border-bottom: 1px solid hsla(210,8%,5%,.5);
-}
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index e81d1ece497a..c3f30a98db04 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -260,6 +260,7 @@ browser.jar:
 * skin/classic/browser/devtools/common.css                  (../shared/devtools/common.css)
 * skin/classic/browser/devtools/dark-theme.css              (../shared/devtools/dark-theme.css)
 * skin/classic/browser/devtools/light-theme.css             (../shared/devtools/light-theme.css)
+  skin/classic/browser/devtools/filters.svg                 (../shared/devtools/filters.svg)
   skin/classic/browser/devtools/controls.png                (../shared/devtools/controls.png)
 * skin/classic/browser/devtools/widgets.css                 (devtools/widgets.css)
   skin/classic/browser/devtools/commandline-icon.png        (devtools/commandline-icon.png)
@@ -285,61 +286,40 @@ browser.jar:
 * skin/classic/browser/devtools/webconsole.css                  (devtools/webconsole.css)
   skin/classic/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
   skin/classic/browser/devtools/webconsole.png                  (devtools/webconsole.png)
-  skin/classic/browser/devtools/breadcrumbs-scrollbutton.png                 (devtools/breadcrumbs-scrollbutton.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png     (devtools/breadcrumbs/ltr-end-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png             (devtools/breadcrumbs/ltr-end-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-end.png                      (devtools/breadcrumbs/ltr-end.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png           (devtools/breadcrumbs/ltr-middle-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png  (devtools/breadcrumbs/ltr-middle-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png          (devtools/breadcrumbs/ltr-middle-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-middle.png                   (devtools/breadcrumbs/ltr-middle.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png            (devtools/breadcrumbs/ltr-start-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png   (devtools/breadcrumbs/ltr-start-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start.png                    (devtools/breadcrumbs/ltr-start.png)
-  skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png           (devtools/breadcrumbs/ltr-start-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png              (devtools/breadcrumbs/rtl-end-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png     (devtools/breadcrumbs/rtl-end-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png             (devtools/breadcrumbs/rtl-end-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-end.png                      (devtools/breadcrumbs/rtl-end.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png           (devtools/breadcrumbs/rtl-middle-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png  (devtools/breadcrumbs/rtl-middle-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png          (devtools/breadcrumbs/rtl-middle-selected.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-middle.png                   (devtools/breadcrumbs/rtl-middle.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png            (devtools/breadcrumbs/rtl-start-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png   (devtools/breadcrumbs/rtl-start-selected-pressed.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start.png                    (devtools/breadcrumbs/rtl-start.png)
-  skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png           (devtools/breadcrumbs/rtl-start-selected.png)
-  skin/classic/browser/devtools/splitview.css               (devtools/splitview.css)
-  skin/classic/browser/devtools/styleeditor.css             (devtools/styleeditor.css)
+  skin/classic/browser/devtools/breadcrumbs-divider@2x.png      (../shared/devtools/images/breadcrumbs-divider@2x.png)
+  skin/classic/browser/devtools/breadcrumbs-scrollbutton.png    (../shared/devtools/images/breadcrumbs-scrollbutton.png)
+  skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
+  skin/classic/browser/devtools/splitview.css               (../shared/devtools/splitview.css)
+  skin/classic/browser/devtools/styleeditor.css             (../shared/devtools/styleeditor.css)
 * skin/classic/browser/devtools/shadereditor.css            (devtools/shadereditor.css)
 * skin/classic/browser/devtools/debugger.css                (devtools/debugger.css)
 * skin/classic/browser/devtools/profiler.css                (devtools/profiler.css)
 * skin/classic/browser/devtools/netmonitor.css              (devtools/netmonitor.css)
 * skin/classic/browser/devtools/scratchpad.css              (devtools/scratchpad.css)
   skin/classic/browser/devtools/magnifying-glass.png        (devtools/magnifying-glass.png)
-  skin/classic/browser/devtools/option-icon.png             (devtools/option-icon.png)
-  skin/classic/browser/devtools/itemToggle.png              (devtools/itemToggle.png)
+  skin/classic/browser/devtools/option-icon.png             (../shared/devtools/images/option-icon.png)
+  skin/classic/browser/devtools/itemToggle.png              (../shared/devtools/images/itemToggle.png)
+  skin/classic/browser/devtools/itemToggle-light.png        (../shared/devtools/images/itemToggle-light.png)
   skin/classic/browser/devtools/itemArrow-dark-rtl.png      (../shared/devtools/images/itemArrow-dark-rtl.png)
   skin/classic/browser/devtools/itemArrow-dark-ltr.png      (../shared/devtools/images/itemArrow-dark-ltr.png)
-  skin/classic/browser/devtools/itemArrow-rtl.png           (../shared/devtools/images/itemArrow-rtl.png)
-  skin/classic/browser/devtools/itemArrow-ltr.png           (../shared/devtools/images/itemArrow-ltr.png)
+  skin/classic/browser/devtools/itemArrow-rtl.svg           (../shared/devtools/images/itemArrow-rtl.svg)
+  skin/classic/browser/devtools/itemArrow-ltr.svg           (../shared/devtools/images/itemArrow-ltr.svg)
   skin/classic/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
   skin/classic/browser/devtools/noise.png                   (devtools/noise.png)
   skin/classic/browser/devtools/inspect-button.png          (devtools/inspect-button.png)
   skin/classic/browser/devtools/dropmarker.png              (devtools/dropmarker.png)
   skin/classic/browser/devtools/layout-background-grid.png  (devtools/layout-background-grid.png)
   skin/classic/browser/devtools/layoutview.css              (devtools/layoutview.css)
-  skin/classic/browser/devtools/debugger-collapse.png       (devtools/debugger-collapse.png)
-  skin/classic/browser/devtools/debugger-expand.png         (devtools/debugger-expand.png)
-  skin/classic/browser/devtools/debugger-pause.png          (devtools/debugger-pause.png)
-  skin/classic/browser/devtools/debugger-play.png           (devtools/debugger-play.png)
-  skin/classic/browser/devtools/debugger-step-in.png        (devtools/debugger-step-in.png)
-  skin/classic/browser/devtools/debugger-step-out.png       (devtools/debugger-step-out.png)
-  skin/classic/browser/devtools/debugger-step-over.png      (devtools/debugger-step-over.png)
-  skin/classic/browser/devtools/debugger-blackbox.png       (devtools/debugger-blackbox.png)
-  skin/classic/browser/devtools/debugger-blackboxMessageEye.png (devtools/debugger-blackboxMessageEye.png)
-  skin/classic/browser/devtools/debugger-toggleBreakpoints.png (devtools/debugger-toggleBreakpoints.png)
+  skin/classic/browser/devtools/debugger-collapse.png       (../shared/devtools/images/debugger-collapse.png)
+  skin/classic/browser/devtools/debugger-expand.png         (../shared/devtools/images/debugger-expand.png)
+  skin/classic/browser/devtools/debugger-pause.png          (../shared/devtools/images/debugger-pause.png)
+  skin/classic/browser/devtools/debugger-play.png           (../shared/devtools/images/debugger-play.png)
+  skin/classic/browser/devtools/debugger-step-in.png        (../shared/devtools/images/debugger-step-in.png)
+  skin/classic/browser/devtools/debugger-step-out.png       (../shared/devtools/images/debugger-step-out.png)
+  skin/classic/browser/devtools/debugger-step-over.png      (../shared/devtools/images/debugger-step-over.png)
+  skin/classic/browser/devtools/debugger-blackbox.png       (../shared/devtools/images/debugger-blackbox.png)
+  skin/classic/browser/devtools/debugger-blackbox-eye.png (../shared/devtools/images/debugger-blackbox-eye.png)
+  skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
   skin/classic/browser/devtools/tracer-icon.png             (devtools/tracer-icon.png)
   skin/classic/browser/devtools/tracer-icon@2x.png          (devtools/tracer-icon@2x.png)
   skin/classic/browser/devtools/floating-scrollbars.css     (devtools/floating-scrollbars.css)
@@ -352,7 +332,7 @@ browser.jar:
   skin/classic/browser/devtools/dock-bottom@2x.png          (../shared/devtools/images/dock-bottom@2x.png)
   skin/classic/browser/devtools/dock-side@2x.png          (../shared/devtools/images/dock-side@2x.png)
 * skin/classic/browser/devtools/inspector.css               (devtools/inspector.css)
-  skin/classic/browser/devtools/profiler-stopwatch.png      (devtools/profiler-stopwatch.png)
+  skin/classic/browser/devtools/profiler-stopwatch.png      (../shared/devtools/images/profiler-stopwatch.png)
   skin/classic/browser/devtools/tool-options.svg            (../shared/devtools/images/tool-options.svg)
   skin/classic/browser/devtools/tool-webconsole.svg         (../shared/devtools/images/tool-webconsole.svg)
   skin/classic/browser/devtools/tool-debugger.svg           (../shared/devtools/images/tool-debugger.svg)
diff --git a/browser/themes/osx/menuPanel.png b/browser/themes/osx/menuPanel.png
index 4af2c8e2dac3..30111cb8493a 100644
Binary files a/browser/themes/osx/menuPanel.png and b/browser/themes/osx/menuPanel.png differ
diff --git a/browser/themes/osx/menuPanel@2x.png b/browser/themes/osx/menuPanel@2x.png
index 764048a29bde..684a1afd1598 100644
Binary files a/browser/themes/osx/menuPanel@2x.png and b/browser/themes/osx/menuPanel@2x.png differ
diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css
index 53fca47c300f..e905ce519f84 100644
--- a/browser/themes/shared/UITour.inc.css
+++ b/browser/themes/shared/UITour.inc.css
@@ -26,21 +26,55 @@
 #UITourTooltipIcon {
   width: 48px;
   height: 48px;
-  padding: 8px;
+  -moz-margin-start: 8px;
+  -moz-margin-end: 18px;
+}
+
+#UITourTooltipTitle,
+#UITourTooltipDescription {
+  max-width: 20rem;
 }
 
 #UITourTooltipTitle {
-  font-size: 130%;
+  font-size: 1.3rem;
   font-weight: bold;
-  margin: 0 0 5px 0;
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+  margin: 10px 0 19px 0;
 }
 
 #UITourTooltipDescription {
-  max-width: 20em;
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+  font-size: 1.15rem;
+  line-height: 1.8rem;
+}
+
+#UITourTooltipClose {
+  -moz-appearance: none;
+  border: none;
+  background-color: transparent;
+  min-width: 0;
+  -moz-margin-start: 4px;
+  -moz-margin-end: -10px;
+  margin-top: -8px;
 }
 
 #UITourTooltipButtons {
-  height: 5em;
+  margin: 1.5em 0 .9em 0;
+}
+
+#UITourTooltipButtons > button {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+#UITourTooltipButtons > button:first-child {
+  -moz-margin-start: 0;
+}
+
+#UITourTooltipButtons > button:last-child {
+  -moz-margin-end: 24px;
 }
 
 #UITourTooltipButtons > button[image] > .button-box > .button-icon {
@@ -48,3 +82,38 @@
   height: 16px;
   -moz-margin-end: 5px;
 }
+
+#UITourTooltipButtons > button .button-text {
+  font-size: 1.15rem;
+}
+
+#UITourTooltipButtons > button:not(.button-link) {
+  -moz-appearance: none;
+  padding: 2px 10px;
+  background-color: hsla(210,4%,10%,.08);
+  border-radius: 2px;
+  border: 1px solid;
+  border-color: hsla(210,4%,10%,.1);
+  transition-property: background-color, border-color;
+  transition-duration: 150ms;
+}
+
+#UITourTooltipButtons > button:not(.button-link):not(:active):hover {
+  background-color: hsla(210,4%,10%,.15);
+  border-color: hsla(210,4%,10%,.15);
+  box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset;
+}
+
+#UITourTooltipButtons > button.button-link {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  color: rgba(0,0,0,0.35);
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+#UITourTooltipButtons > button.button-link:hover {
+  color: black;
+}
diff --git a/browser/themes/shared/devtools/common.css b/browser/themes/shared/devtools/common.css
index bc2d75800b30..38503daf89ec 100644
--- a/browser/themes/shared/devtools/common.css
+++ b/browser/themes/shared/devtools/common.css
@@ -27,7 +27,7 @@
   background-image: none;
   background-color: transparent;
   border: 0;
-  border-bottom: 1px solid black;
+  border-bottom: 1px solid #aaa;
   min-height: 3px;
   height: 3px;
   margin-top: -3px;
@@ -39,7 +39,7 @@
   background-image: none;
   background-color: transparent;
   border: 0;
-  -moz-border-end: 1px solid black;
+  -moz-border-end: 1px solid #aaa;
   min-width: 3px;
   width: 3px;
   -moz-margin-start: -3px;
diff --git a/browser/themes/shared/devtools/dark-theme.css b/browser/themes/shared/devtools/dark-theme.css
index fc3fbbc148a4..7b6632f1ccb8 100644
--- a/browser/themes/shared/devtools/dark-theme.css
+++ b/browser/themes/shared/devtools/dark-theme.css
@@ -11,6 +11,11 @@
   color: #8fa1b2;
 }
 
+.theme-sidebar {
+  background: #131c26;
+  color: #8fa1b2;
+}
+
 ::-moz-selection {
   background-color: #1d4f73;
   color: #f5f7fa;
@@ -148,10 +153,11 @@
 }
 
 .theme-toolbar,
-.devtools-toolbar { /* General toolbar styling */
-  color: hsl(210,30%,85%);
+.devtools-toolbar,
+.devtools-sidebar-tabs > tabs { /* General toolbar styling */
+  color: #b6babf;
   background-color: #343c45;
-  border-color: #060a0d;
+  border-color: hsla(210,8%,5%,.6);
 }
 
 .theme-fg-contrast { /* To be used for text on theme-bg-contrast */
@@ -302,4 +308,18 @@ div.CodeMirror span.eval-text {
   border-bottom: 0;
 }
 
+.devtools-horizontal-splitter {
+  border-bottom: 1px solid black;
+}
+
+.devtools-side-splitter {
+  -moz-border-end: 1px solid black;
+}
+
+.devtools-textinput,
+.devtools-searchinput {
+  background-color: rgba(24, 29, 32, 1);
+  color: rgba(184, 200, 217, 1);
+}
+
 %include toolbars.inc.css
diff --git a/browser/themes/shared/devtools/debugger.inc.css b/browser/themes/shared/devtools/debugger.inc.css
index be9a3146e150..c937d6ed6a1f 100644
--- a/browser/themes/shared/devtools/debugger.inc.css
+++ b/browser/themes/shared/devtools/debugger.inc.css
@@ -5,17 +5,28 @@
 
 /* Sources and breakpoints pane */
 
-#sources-pane > tabs {
-  -moz-border-end: 1px solid #222426; /* Match the sources list's dark margin. */
-}
 
 #sources-pane[selectedIndex="0"] + #sources-and-editor-splitter {
   border-color: transparent;
 }
 
+#sources-pane > tabs {
+  -moz-border-end: 1px solid;
+}
+
 #sources-pane .devtools-toolbar {
-  border: none; /* Remove the devtools-toolbar's black bottom border. */
-  -moz-border-end: 1px solid #222426; /* Match the sources list's dark margin. */
+  border: none; /* Remove the devtools-toolbar bottom border. */
+  -moz-border-end: 1px solid;
+}
+
+.theme-dark #sources-pane > tabs,
+.theme-dark #sources-pane .devtools-toolbar {
+  -moz-border-end-color: black; /* Match the splitter color. */
+}
+
+.theme-light #sources-pane > tabs,
+.theme-light #sources-pane .devtools-toolbar {
+  -moz-border-end-color: #aaa; /* Match the splitter color. */
 }
 
 /* Sources and breakpoints list */
@@ -68,6 +79,10 @@
 }
 
 #sources .black-boxed {
+  color: rgba(128,128,128,0.4);
+}
+
+#sources .selected > .black-boxed {
   color: rgba(255,255,255,0.4);
 }
 
@@ -103,10 +118,6 @@
 
 /* Breadcrumbs stack frames view */
 
-.breadcrumbs-widget-item {
-  max-width: none;
-}
-
 .dbg-stackframe-details {
   -moz-padding-start: 4px;
 }
diff --git a/browser/themes/shared/devtools/filters.svg b/browser/themes/shared/devtools/filters.svg
new file mode 100644
index 000000000000..9a50a6cc5bc8
--- /dev/null
+++ b/browser/themes/shared/devtools/filters.svg
@@ -0,0 +1,9 @@
+<svg height="0" xmlns="http://www.w3.org/2000/svg">
+<filter id="invert" x="0%" y="0%" width="100%" height="100%" >
+  <feComponentTransfer>
+    <feFuncR type="table" tableValues=".1 0"/>
+    <feFuncG type="table" tableValues=".1 0"/>
+    <feFuncB type="table" tableValues=".1 0"/>
+  </feComponentTransfer>
+</filter>
+</svg>
\ No newline at end of file
diff --git a/browser/themes/shared/devtools/images/breadcrumbs-divider@2x.png b/browser/themes/shared/devtools/images/breadcrumbs-divider@2x.png
new file mode 100644
index 000000000000..9ce5dd74eb33
Binary files /dev/null and b/browser/themes/shared/devtools/images/breadcrumbs-divider@2x.png differ
diff --git a/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton.png b/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton.png
new file mode 100644
index 000000000000..5f28c8b22468
Binary files /dev/null and b/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton.png differ
diff --git a/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton@2x.png b/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton@2x.png
new file mode 100644
index 000000000000..22c3c8667a06
Binary files /dev/null and b/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton@2x.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-blackBoxMessageEye.png b/browser/themes/shared/devtools/images/debugger-blackBoxMessageEye.png
new file mode 100755
index 000000000000..1169100fbb7d
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-blackBoxMessageEye.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-blackbox-eye.png b/browser/themes/shared/devtools/images/debugger-blackbox-eye.png
new file mode 100755
index 000000000000..1169100fbb7d
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-blackbox-eye.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-blackbox.png b/browser/themes/shared/devtools/images/debugger-blackbox.png
new file mode 100644
index 000000000000..c64f4bb92fa9
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-blackbox.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-collapse.png b/browser/themes/shared/devtools/images/debugger-collapse.png
new file mode 100644
index 000000000000..9573fc72d943
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-collapse.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-expand.png b/browser/themes/shared/devtools/images/debugger-expand.png
new file mode 100644
index 000000000000..f317997264a8
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-expand.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-pause.png b/browser/themes/shared/devtools/images/debugger-pause.png
new file mode 100644
index 000000000000..8288bdfc3771
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-pause.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-play.png b/browser/themes/shared/devtools/images/debugger-play.png
new file mode 100644
index 000000000000..9189a0a206b1
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-play.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-step-in.png b/browser/themes/shared/devtools/images/debugger-step-in.png
new file mode 100644
index 000000000000..b16b706024e7
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-step-in.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-step-out.png b/browser/themes/shared/devtools/images/debugger-step-out.png
new file mode 100644
index 000000000000..859c727cdbf5
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-step-out.png differ
diff --git a/browser/themes/shared/devtools/images/debugger-step-over.png b/browser/themes/shared/devtools/images/debugger-step-over.png
new file mode 100644
index 000000000000..ec28fc05e9cf
Binary files /dev/null and b/browser/themes/shared/devtools/images/debugger-step-over.png differ
diff --git a/browser/themes/linux/devtools/debugger-toggleBreakpoints.png b/browser/themes/shared/devtools/images/debugger-toggleBreakpoints.png
similarity index 100%
rename from browser/themes/linux/devtools/debugger-toggleBreakpoints.png
rename to browser/themes/shared/devtools/images/debugger-toggleBreakpoints.png
diff --git a/browser/themes/shared/devtools/images/itemArrow-ltr.png b/browser/themes/shared/devtools/images/itemArrow-ltr.png
deleted file mode 100644
index 317a7c84c8a7..000000000000
Binary files a/browser/themes/shared/devtools/images/itemArrow-ltr.png and /dev/null differ
diff --git a/browser/themes/shared/devtools/images/itemArrow-ltr.svg b/browser/themes/shared/devtools/images/itemArrow-ltr.svg
new file mode 100644
index 000000000000..93913c927471
--- /dev/null
+++ b/browser/themes/shared/devtools/images/itemArrow-ltr.svg
@@ -0,0 +1,4 @@
+<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 7 12">
+<path fill="#f7f7f7" d="M7,11.6 7,.4 1.5,6z"/>
+<path fill="#ababab" d="M7,0 6,0 0,6 6,12 7,12 7,11.6 1.5,6 7,.4z"/>
+</svg>
diff --git a/browser/themes/shared/devtools/images/itemArrow-rtl.png b/browser/themes/shared/devtools/images/itemArrow-rtl.png
deleted file mode 100644
index 9b872afe21a6..000000000000
Binary files a/browser/themes/shared/devtools/images/itemArrow-rtl.png and /dev/null differ
diff --git a/browser/themes/shared/devtools/images/itemArrow-rtl.svg b/browser/themes/shared/devtools/images/itemArrow-rtl.svg
new file mode 100755
index 000000000000..e580b887b693
--- /dev/null
+++ b/browser/themes/shared/devtools/images/itemArrow-rtl.svg
@@ -0,0 +1,4 @@
+<svg width="7" xmlns="http://www.w3.org/2000/svg" height="12" viewBox="0 0 7 12" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 7 12">
+<path fill="#f7f7f7" d="M0,11.6 0,.4 5.5,6z"/>
+<path fill="#ababab" d="M1,0 0,0 0,.4 5.5,6 0,11.6 0,12 1,12 7,6z"/>
+</svg>
diff --git a/browser/themes/shared/devtools/images/itemToggle-light.png b/browser/themes/shared/devtools/images/itemToggle-light.png
new file mode 100644
index 000000000000..c3ef7a8aa3e6
Binary files /dev/null and b/browser/themes/shared/devtools/images/itemToggle-light.png differ
diff --git a/browser/themes/shared/devtools/images/itemToggle.png b/browser/themes/shared/devtools/images/itemToggle.png
new file mode 100644
index 000000000000..dc30c224dcb2
Binary files /dev/null and b/browser/themes/shared/devtools/images/itemToggle.png differ
diff --git a/browser/themes/shared/devtools/images/option-icon.png b/browser/themes/shared/devtools/images/option-icon.png
new file mode 100644
index 000000000000..afdc6a209726
Binary files /dev/null and b/browser/themes/shared/devtools/images/option-icon.png differ
diff --git a/browser/themes/shared/devtools/images/profiler-stopwatch.png b/browser/themes/shared/devtools/images/profiler-stopwatch.png
new file mode 100644
index 000000000000..bed5c77b7f0b
Binary files /dev/null and b/browser/themes/shared/devtools/images/profiler-stopwatch.png differ
diff --git a/browser/themes/shared/devtools/light-theme.css b/browser/themes/shared/devtools/light-theme.css
index 13334cf59076..8bfc618f1380 100644
--- a/browser/themes/shared/devtools/light-theme.css
+++ b/browser/themes/shared/devtools/light-theme.css
@@ -7,8 +7,13 @@
  * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
  */
 .theme-body {
-  background: white;
-  color: black;
+  background: #fcfcfc; /* Background - Editor */
+  color: #18191a;
+}
+
+.theme-sidebar {
+  background: #f7f7f7; /* Background - Sidebars */
+  color: #18191a;
 }
 
 ::-moz-selection {
@@ -151,10 +156,11 @@
 }
 
 .theme-toolbar,
-.devtools-toolbar { /* General toolbar styling */
-  color: hsl(210,30%,85%);
-  background-color: #343c45;
-  border-color: #060a0d;
+.devtools-toolbar,
+.devtools-sidebar-tabs > tabs { /* General toolbar styling */
+  color: #585959;
+  background-color: #f0f1f2;
+  border-color: #aaa;
 }
 
 .ruleview-colorswatch,
@@ -165,8 +171,8 @@
 
 .variables-view-scope:focus > .title,
 .variable-or-property:focus > .title {
-  background:  hsl(208,56%,40%); /* fg-color2 */
-  color: white;
+  background:  #4c9ed9; /* fg-color2 */
+  color: #f5f7fa;
 }
 
 /* CodeMirror specific styles.
diff --git a/browser/themes/shared/devtools/netmonitor.inc.css b/browser/themes/shared/devtools/netmonitor.inc.css
index 7b521c1851ea..763a73d20978 100644
--- a/browser/themes/shared/devtools/netmonitor.inc.css
+++ b/browser/themes/shared/devtools/netmonitor.inc.css
@@ -3,20 +3,25 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#body {
-  background: url(background-noise-toolbar.png), #343c45; /* Dark toolbars */
-}
-
 #requests-menu-empty-notice {
-  background: url(background-noise-toolbar.png), #343c45; /* Dark toolbars */
+  margin: 0;
   padding: 12px;
   font-size: 110%;
+}
+
+.theme-dark #requests-menu-empty-notice {
   color: #f5f7fa; /* Light foreground text */
 }
 
+.theme-light #requests-menu-empty-notice {
+  color: #585959; /* Grey foreground text */
+}
+
 %filter substitution
-%define tableBorderLight rgba(0,0,0,0.2)
-%define tableBorderDark rgba(128,128,128,0.15)
+%define table_itemDarkStartBorder rgba(0,0,0,0.2)
+%define table_itemDarkEndBorder rgba(128,128,128,0.15)
+%define table_itemLightStartBorder rgba(128,128,128,0.25)
+%define table_itemLightEndBorder transparent
 
 /* Network requests table */
 
@@ -33,16 +38,26 @@
   padding: 3px;
 }
 
-.requests-menu-header:not(:last-child):-moz-locale-dir(ltr),
-.requests-menu-subitem:not(:last-child):-moz-locale-dir(ltr) {
-  -moz-border-end: 1px solid @tableBorderLight@;
-  box-shadow: 1px 0 0 @tableBorderDark@;
+.theme-dark .requests-menu-header:not(:last-child),
+.theme-dark .requests-menu-subitem:not(:last-child) {
+  -moz-border-end: 1px solid @table_itemDarkStartBorder@;
+  box-shadow: 1px 0 0 @table_itemDarkEndBorder@;
 }
 
-.requests-menu-header:not(:last-child):-moz-locale-dir(rtl),
-.requests-menu-subitem:not(:last-child):-moz-locale-dir(rtl) {
-  -moz-border-end: 1px solid @tableBorderLight@;
-  box-shadow: -1px 0 0 @tableBorderDark@;
+.theme-dark .requests-menu-header:not(:last-child):-moz-locale-dir(rtl),
+.theme-dark .requests-menu-subitem:not(:last-child):-moz-locale-dir(rtl) {
+  box-shadow: -1px 0 0 @table_itemDarkEndBorder@;
+}
+
+.theme-light .requests-menu-header:not(:last-child),
+.theme-light .requests-menu-subitem:not(:last-child) {
+  -moz-border-end: 1px solid @table_itemLightStartBorder@;
+  box-shadow: 1px 0 0 @table_itemLightEndBorder@;
+}
+
+.theme-light .requests-menu-header:not(:last-child):-moz-locale-dir(rtl),
+.theme-light .requests-menu-subitem:not(:last-child):-moz-locale-dir(rtl) {
+  box-shadow: -1px 0 0 @table_itemLightEndBorder@;
 }
 
 .requests-menu-header-button {
@@ -130,48 +145,84 @@ box.requests-menu-status {
   transition: box-shadow 0.5s ease-in-out;
 }
 
-box.requests-menu-status:not([code]) {
+.theme-dark box.requests-menu-status:not([code]) {
   box-shadow:
     0 0 0 1px rgba(255,255,255,0.4) inset,
     0 -6px 4px 0 rgba(32,32,32,1.0) inset,
     0 0 8px 0 rgba(32,0,0,0.4);
 }
 
-box.requests-menu-status[code^="1"] {
+.theme-light box.requests-menu-status:not([code]) {
+  box-shadow:
+    0 0 0 1px rgba(255,255,255,0.4) inset,
+    0 -6px 4px 0 rgba(32,32,32, 0.5) inset;
+}
+
+.theme-dark box.requests-menu-status[code^="1"] {
   box-shadow:
     0 0 2px 1px rgba(255,255,255,0.8) inset,
     0 -6px 4px 0 rgba(0,0,64,1.0) inset,
     0 0 8px 0 rgba(0,0,128,1.0);
 }
 
-box.requests-menu-status[code^="2"] {
+.theme-light box.requests-menu-status[code^="1"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(0,0,128,1) inset;
+}
+
+.theme-dark box.requests-menu-status[code^="2"] {
   box-shadow:
     0 0 2px 1px rgba(255,255,255,0.8) inset,
     0 -6px 4px 0 rgba(0,64,0,1.0) inset,
     0 0 8px 0 rgba(0,128,0,1.0);
 }
 
-box.requests-menu-status[code^="3"] {
+.theme-light box.requests-menu-status[code^="2"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(0,128,0,1) inset;
+}
+
+.theme-dark box.requests-menu-status[code^="3"] {
   box-shadow:
     0 0 2px 1px rgba(255,255,255,0.8) inset,
     0 -6px 4px 0 rgba(64,32,0,1.0) inset,
     0 0 8px 0 rgba(128,128,0,1.0);
 }
 
-box.requests-menu-status[code^="4"] {
+.theme-light box.requests-menu-status[code^="3"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(128,64,0,1) inset;
+}
+
+.theme-dark box.requests-menu-status[code^="4"] {
   box-shadow:
     0 0 2px 1px rgba(255,255,255,0.8) inset,
     0 -6px 4px 0 rgba(64,0,0,1.0) inset,
     0 0 8px 0 rgba(128,0,0,1.0);
 }
 
-box.requests-menu-status[code^="5"] {
+.theme-light box.requests-menu-status[code^="4"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(128,0,0,1) inset;
+}
+
+.theme-dark box.requests-menu-status[code^="5"] {
   box-shadow:
     0 0 2px 1px rgba(255,255,255,0.8) inset,
     0 -6px 4px 0 rgba(64,0,64,1.0) inset,
     0 0 8px 0 rgba(128,0,128,1.0);
 }
 
+.theme-light box.requests-menu-status[code^="5"] {
+  box-shadow:
+    0 0 2px 1px rgba(255,255,255,0.8) inset,
+    0 -6px 4px 0 rgba(128,0,128,1.0) inset;
+}
+
 /* Network requests table: waterfall header */
 
 #requests-menu-waterfall-label {
@@ -183,12 +234,12 @@ box.requests-menu-status[code^="5"] {
   width: 100px;
   padding-top: 2px;
   -moz-padding-start: 4px;
-  -moz-border-start: 1px dotted #999;
   font-size: 75%;
   pointer-events: none;
 }
 
 .requests-menu-timings-division:not(:first-child) {
+  -moz-border-start: 1px dotted;
   -moz-margin-start: -100px !important; /* Don't affect layout. */
 }
 
@@ -200,26 +251,41 @@ box.requests-menu-status[code^="5"] {
   transform-origin: right center;
 }
 
-.requests-menu-timings-division[division-scale=millisecond] {
+.theme-dark .requests-menu-timings-division[division-scale=millisecond] {
   -moz-border-start-color: #f5f7fa !important; /* Light foreground text */
 }
 
-.requests-menu-timings-division[division-scale=second] {
+.theme-light .requests-menu-timings-division[division-scale=millisecond] {
+  -moz-border-start-color: #585959 !important; /* Grey foreground text */
+}
+
+.theme-dark .requests-menu-timings-division[division-scale=second] {
   -moz-border-start-color: #d99b28 !important; /* Light orange highlight color */
   font-weight: 600;
 }
 
-.requests-menu-timings-division[division-scale=minute] {
+.theme-light .requests-menu-timings-division[division-scale=second] {
+  -moz-border-start-color: #d97e00 !important; /* Light orange highlight color */
+  font-weight: 600;
+}
+
+.theme-dark .requests-menu-timings-division[division-scale=minute] {
   -moz-border-start-color: #eb5368 !important; /* Red highlight color */
   font-weight: 600;
 }
 
+.theme-light .requests-menu-timings-division[division-scale=minute] {
+  -moz-border-start-color: #ed2655 !important; /* Red highlight color */
+  font-weight: 600;
+}
+
 /* Network requests table: waterfall items */
 
 .requests-menu-subitem.requests-menu-waterfall {
   -moz-padding-start: 4px;
   -moz-padding-end: 4px;
   background-repeat: repeat-y; /* Background created on a <canvas> in js. */
+  background-position: -1px center;
   margin-top: -1px; /* Compensate borders. */
   margin-bottom: -1px;
 }
@@ -252,8 +318,16 @@ box.requests-menu-status[code^="5"] {
 
 .requests-menu-timings-cap {
   width: 4px;
-  height: 9px;
-  border: 1px solid #fff;
+  height: 8px;
+  box-shadow: none !important;
+}
+
+.theme-dark .requests-menu-timings-cap {
+  border: 1px solid #b8c8d9; /* Light content text */
+}
+
+.theme-light .requests-menu-timings-cap {
+  border: 1px solid #292e33; /* Dark content text */
 }
 
 .requests-menu-timings-cap.start {
@@ -285,51 +359,81 @@ box.requests-menu-status[code^="5"] {
 }
 
 .requests-menu-timings-box {
-  height: 9px;
-  border-top: 1px solid #fff;
-  border-bottom: 1px solid #fff;
+  height: 8px;
+}
+
+.theme-dark .requests-menu-timings-box {
+  border-top: 1px solid #b8c8d9; /* Light content text */
+  border-bottom: 1px solid #b8c8d9;
+}
+
+.theme-light .requests-menu-timings-box {
+  border-top: 1px solid #292e33; /* Dark content text */
+  border-bottom: 1px solid #292e33;
 }
 
 .requests-menu-timings-box.blocked,
 .requests-menu-timings-cap.blocked {
   background-color: rgba(255,32,32,0.8);
-  box-shadow: 0 0 8px 0 rgba(128,32,32,0.8),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
+  box-shadow: 0 0 2px 0 rgba(128,32,32,0.8),
+              0 0 1px 0 rgba(255,255,255,1.0) inset;
 }
 
 .requests-menu-timings-box.dns,
 .requests-menu-timings-cap.dns {
   background-color: rgba(255,128,255,0.6);
-  box-shadow: 0 0 8px 0 rgba(128,128,255,1.0),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
+  box-shadow: 0 0 2px 0 rgba(128,128,255,1.0),
+              0 0 1px 0 rgba(255,255,255,1.0) inset;
 }
 
 .requests-menu-timings-box.connect,
 .requests-menu-timings-cap.connect {
   background-color: rgba(255,128,16,0.4);
-  box-shadow: 0 0 8px 0 rgba(128,128,16,0.8),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
+  box-shadow: 0 0 2px 0 rgba(128,128,16,0.8),
+              0 0 1px 0 rgba(255,255,255,1.0) inset;
 }
 
-.requests-menu-timings-box.send,
-.requests-menu-timings-cap.send {
+/* Use custom colors for dark and light theme on remaining timing types. */
+.theme-dark .requests-menu-timings-box.send,
+.theme-dark .requests-menu-timings-cap.send {
   background-color: rgba(255,255,128,0.4);
-  box-shadow: 0 0 8px 0 rgba(128,255,128,0.8),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
+  box-shadow: 0 0 2px 0 rgba(128,255,128,0.8),
+              0 0 1px 0 rgba(255,255,255,1.0) inset;
 }
 
-.requests-menu-timings-box.wait,
-.requests-menu-timings-cap.wait {
+.theme-light .requests-menu-timings-box.send,
+.theme-light .requests-menu-timings-cap.send {
+  background-color: rgba(255,255,128,0.4);
+  box-shadow: 0 0 2px 0 rgba(128,255,128,0.8),
+              0 0 1px 0 rgba(255,255,255,1.0) inset;
+}
+
+.theme-dark .requests-menu-timings-box.wait,
+.theme-dark .requests-menu-timings-cap.wait {
   background-color: rgba(255,255,255,0.2);
-  box-shadow: 0 0 8px 0 rgba(128,255,255,0.4),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
+  box-shadow: 0 0 2px 0 rgba(128,255,255,0.4),
+              0 0 1px 0 rgba(255,255,255,1.0) inset;
 }
 
-.requests-menu-timings-box.receive,
-.requests-menu-timings-cap.receive {
+.theme-light .requests-menu-timings-box.wait,
+.theme-light .requests-menu-timings-cap.wait {
+  background-color: rgba(200, 200, 200, 0.8);
+  box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.4),
+              0 0 1px 0 rgba(255,255,255,1.0) inset;
+}
+
+.theme-dark .requests-menu-timings-box.receive,
+.theme-dark .requests-menu-timings-cap.receive {
   background-color: rgba(255,255,255,1.0);
-  box-shadow: 0 0 8px 0 rgba(128,255,255,1.0),
-              0 0 4px 0 rgba(255,255,255,1.0) inset;
+  box-shadow: 0 0 2px 0 rgba(128,255,255,1.0),
+              0 0 1px 0 rgba(255,255,255,1.0) inset;
+}
+
+.theme-light .requests-menu-timings-box.receive,
+.theme-light .requests-menu-timings-cap.receive {
+  background-color: rgba(0, 0, 0, 0.6);
+  box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.8),
+              0 0 1px 0 rgba(0,0,0,1.0) inset;
 }
 
 /* SideMenuWidget */
@@ -338,31 +442,17 @@ box.requests-menu-status[code^="5"] {
   padding: 0px;
 }
 
-.side-menu-widget-item:not(.selected)[odd] {
+.theme-dark .side-menu-widget-item:not(.selected)[odd] {
   background: rgba(255,255,255,0.05);
 }
 
-/* The network monitor table is temporarily always dark.
-   The redesign will be taken care of in bug 909251. */
-
-.theme-light .side-menu-widget-container {
-  background: url(background-noise-toolbar.png), #343c45; /* Toolbars */
-}
-
-.theme-light .side-menu-widget-item {
-  border-top: 1px solid @tableBorderLight@;
-  border-bottom: 1px solid @tableBorderDark@;
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .side-menu-widget-item:last-of-type {
-  box-shadow: inset 0 -1px 0 @tableBorderLight@;
+.theme-light .side-menu-widget-item:not(.selected)[odd] {
+  background: rgba(128,128,128,0.05);
 }
 
 /* Network request details */
 
 #details-pane {
-  background: #343c45; /* Dark toolbars */
   max-width: 500px;
 }
 
@@ -384,11 +474,14 @@ box.requests-menu-status[code^="5"] {
 
 /* Network request details tabpanels */
 
-.tabpanel-content {
-  background: url(background-noise-toolbar.png), #343c45; /* Dark toolbars */
+.theme-dark .tabpanel-content {
   color: #f5f7fa; /* Light foreground text */
 }
 
+.theme-dark .tabpanel-summary-label {
+  color: #f5f7fa; /* Dark foreground text */
+}
+
 .tabpanel-summary-container {
   padding: 1px;
 }
@@ -397,7 +490,6 @@ box.requests-menu-status[code^="5"] {
   -moz-padding-start: 4px;
   -moz-padding-end: 3px;
   font-weight: 600;
-  color: #f5f7fa; /* Dark foreground text */
 }
 
 .tabpanel-summary-value {
@@ -449,6 +541,7 @@ box.requests-menu-status[code^="5"] {
 
 #timings-tabpanel .requests-menu-timings-box {
   transition: transform 0.2s ease-out;
+  border: none;
   min-width: 1px;
 }
 
@@ -477,7 +570,7 @@ box.requests-menu-status[code^="5"] {
 /* Footer */
 
 #requests-menu-footer {
-  box-shadow: inset 0 1px 16px hsla(210,5%,5%,.3);
+  border-top: solid 1px hsla(210,5%,5%,.3);
 }
 
 .requests-menu-footer-button,
@@ -486,17 +579,32 @@ box.requests-menu-status[code^="5"] {
   margin: 0;
   border: none;
   padding: 2px 1.5vw;
+}
+
+.theme-dark .requests-menu-footer-button,
+.theme-dark .requests-menu-footer-label {
   color: #f5f7fa; /* Light foreground text */
 }
 
+.theme-light .requests-menu-footer-button,
+.theme-light .requests-menu-footer-label {
+  color: #18191a; /* Dark foreground text */
+}
+
 .requests-menu-footer-spacer {
   min-width: 2px;
 }
 
-.requests-menu-footer-spacer:not(:first-of-type),
-.requests-menu-footer-button:not(:first-of-type) {
-  -moz-border-start: 1px solid @tableBorderDark@;
-  box-shadow: -1px 0 0 @tableBorderLight@;
+.theme-dark .requests-menu-footer-spacer:not(:first-of-type),
+.theme-dark .requests-menu-footer-button:not(:first-of-type) {
+  -moz-border-start: 1px solid @table_itemDarkStartBorder@;
+  box-shadow: -1px 0 0 @table_itemDarkEndBorder@;
+}
+
+.theme-light .requests-menu-footer-spacer:not(:first-of-type),
+.theme-light .requests-menu-footer-button:not(:first-of-type) {
+  -moz-border-start: 1px solid @table_itemLightStartBorder@;
+  box-shadow: -1px 0 0 @table_itemLightEndBorder@;
 }
 
 .requests-menu-footer-button {
diff --git a/browser/themes/shared/devtools/profiler.inc.css b/browser/themes/shared/devtools/profiler.inc.css
index 4ae838de4ce5..550d501fdf2c 100644
--- a/browser/themes/shared/devtools/profiler.inc.css
+++ b/browser/themes/shared/devtools/profiler.inc.css
@@ -20,6 +20,19 @@
   border-color: transparent;
 }
 
+.profiler-sidebar .devtools-toolbar {
+  -moz-border-end: 1px solid;
+}
+
+.theme-dark .profiler-sidebar .devtools-toolbar {
+  -moz-border-end-color: black; /* Match the splitter. */
+}
+
+.theme-light .profiler-sidebar .devtools-toolbar {
+  -moz-border-end-color: #aaa; /* Match the splitter color. */
+}
+
+
 .profiler-sidebar-item {
   padding: 3px 5px;
 }
@@ -36,7 +49,6 @@
 
 .profiler-sidebar-item > hbox {
   margin-top: 2px;
-  color: rgb(140, 152, 165);
 }
 
 .profiler-sidebar-item > hbox > a {
@@ -49,8 +61,12 @@
   display: block;
 }
 
-.selected .profiler-sidebar-item > hbox {
-  color: rgb(128, 195, 228);
+.theme-dark .selected .profiler-sidebar-item > hbox {
+  color: #b6babf;
+}
+
+.theme-light .selected .profiler-sidebar-item > hbox {
+  color: #ebeced;
 }
 
 #profiler-controls > toolbarbutton {
diff --git a/browser/themes/shared/devtools/shadereditor.inc.css b/browser/themes/shared/devtools/shadereditor.inc.css
index ad8767b7e3d8..965b4e51cb0d 100644
--- a/browser/themes/shared/devtools/shadereditor.inc.css
+++ b/browser/themes/shared/devtools/shadereditor.inc.css
@@ -2,16 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#body {
-  background: url(background-noise-toolbar.png), #343c45; /* Dark toolbars */
-}
-
 /* Reload and waiting notices */
 
 .notice-container {
-  background: transparent;
   margin-top: -50vh;
-  color: #fff;
+}
+
+.theme-dark .notice-container {
+  background: url(background-noise-toolbar.png), #343c45; /* Toolbars */
+  color: #f5f7fa; /* Light foreground text */
+}
+
+.theme-light .notice-container {
+  background: url(background-noise-toolbar.png), #f0f1f2; /* Toolbars */
+  color: #585959; /* Grey foreground text */
 }
 
 #reload-notice {
@@ -80,21 +84,33 @@
   background-position: 0 0;
 }
 
-.side-menu-widget-item-checkbox:not([checked]) ~ .side-menu-widget-item-contents {
-  color: rgba(255,255,255,0.4);
-}
-
 /* Shader source editors */
 
 .editor-label {
-  background: url(background-noise-toolbar.png), #343c45; /* Dark toolbars */
-  border-top: 1px solid #222426;
   padding: 1px 12px;
-  color: #fff;
+  border-top: 1px solid;
 }
 
-.editor-label[selected] {
-  background: linear-gradient(hsl(206,59%,39%), hsl(206,59%,29%)) repeat-x top left;
+.theme-dark .editor-label {
+  background: #343c45; /* Dark toolbars */
+  border-color: #222426; /* Match the splitter color. */
+  color: #f5f7fa; /* Light foreground text */
+}
+
+.theme-light .editor-label {
+  background: #f0f1f2; /* Light toolbars */
+  border-color: #aaa; /* Match the splitter color. */
+  color: #585959; /* Grey foreground text */
+}
+
+.theme-dark .editor-label[selected] {
+  background-color: #1d4f73; /* Select Highlight Blue */
+  color: #f5f7fa; /* Light foreground text */
+}
+
+.theme-light .editor-label[selected] {
+  background-color: #4c9ed9; /* Select Highlight Blue */
+  color: #f5f7fa; /* Light foreground text */
 }
 
 /* Responsive sidebar */
@@ -104,6 +120,10 @@
     max-height: 60vh;
   }
 
+  #editors-splitter {
+    border-color: transparent;
+  }
+
   .side-menu-widget-container {
     box-shadow: none !important;
   }
@@ -114,5 +134,6 @@
 
   .editor-label {
     -moz-box-ordinal-group: 0;
+    border-bottom: 1px solid;
   }
 }
diff --git a/browser/themes/linux/devtools/splitview.css b/browser/themes/shared/devtools/splitview.css
similarity index 60%
rename from browser/themes/linux/devtools/splitview.css
rename to browser/themes/shared/devtools/splitview.css
index 0eb870c9fb10..8dd6b434ee7b 100644
--- a/browser/themes/linux/devtools/splitview.css
+++ b/browser/themes/shared/devtools/splitview.css
@@ -3,25 +3,30 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-.splitview-nav-container {
-  background-color: hsl(208,11%,27%);
-  color: white;
-}
-
 .loading .splitview-nav-container {
   background-image: url(chrome://global/skin/icons/loading_16.png);
   background-repeat: no-repeat;
   background-position: center center;
 }
 
+.theme-dark .splitview-nav-container {
+  background: url(background-noise-toolbar.png), #343c45;
+}
+
 .splitview-nav {
   -moz-appearance: none;
   margin: 0;
-  box-shadow: inset -1px 0 0 #222426;
+}
+
+.theme-dark .splitview-nav {
+  box-shadow: inset -1px 0 0 black; /* Match the splitter. */
+}
+
+.theme-light .splitview-nav {
+  box-shadow: inset -1px 0 0 #aaa; /* Match the splitter color. */
 }
 
 .splitview-nav > li {
-  color: white;
   background-clip: padding-box;
   border-bottom: 1px solid hsla(210,16%,76%,.1);
   box-shadow: inset 0 -1px 0 hsla(210,8%,5%,.25);
@@ -47,23 +52,31 @@
 }
 
 .splitview-nav > li.splitview-active {
-  background-image: url(itemArrow-ltr.png),
-                    linear-gradient(to right, black, black),
-                    linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%));
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center right, top right, top left;
-  background-size: auto, 1px 100%, auto;
+  background-image: url(itemArrow-dark-ltr.png),
+                    linear-gradient(#1d4f73, #1d4f73);
+  background-repeat: no-repeat, repeat-x;
+  background-position: center right, top left;
+  background-size: auto, auto;
   border-bottom: 1px solid hsla(210,8%,5%,.25);
   box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15),
               inset 0 -1px 0 hsla(210,40%,83%,.05);
 }
 
 .splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
+  background-image: url(itemArrow-dark-rtl.png),
+                    linear-gradient(#1d4f73, #1d4f73);
+  background-repeat: no-repeat, repeat-x;
+  background-position: center left, top right;
+}
+
+.theme-light .splitview-nav > li.splitview-active {
+  background-image: url(itemArrow-ltr.svg),
+                    linear-gradient(#4c9ed9, #4c9ed9);
+}
+
+.theme-light .splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
   background-image: url(itemArrow-rtl.png),
-                    linear-gradient(to right, black, black),
-                    linear-gradient(hsl(206,61%,40%), hsl(206,61%,31%));
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center left, top left, top right;
+                    linear-gradient(#4c9ed9, #4c9ed9);
 }
 
 /* Toolbars */
@@ -71,15 +84,16 @@
 .splitview-main > .devtools-toolbar {
   background-origin: border-box;
   background-clip: border-box;
-  border-bottom: 1px solid hsla(210,8%,5%,.65);
 }
 
-.splitview-main > toolbar:-moz-locale-dir(ltr) {
-  border-right: 1px solid hsla(210,8%,5%,.5);
+.theme-dark .splitview-main > toolbar,
+.theme-dark .loading .splitview-nav-container {
+  -moz-border-end: 1px solid black; /* Match the splitter. */
 }
 
-.splitview-main > toolbar:-moz-locale-dir(rtl) {
-  border-left: 1px solid hsla(210,8%,5%,.5);
+.theme-light .splitview-main > toolbar,
+.theme-light .loading .splitview-nav-container {
+  -moz-border-end: 1px solid #aaa; /* Match the splitter. */
 }
 
 .splitview-main > .devtools-toolbarbutton {
@@ -93,10 +107,6 @@
 
 /* Resizers */
 
-.splitview-landscape-splitter {
-  -moz-border-start-color: transparent;
-}
-
 .splitview-portrait-resizer {
   -moz-appearance: none;
   background: linear-gradient(black 1px, rgba(255,255,255,0.2) 1px),
diff --git a/browser/themes/osx/devtools/styleeditor.css b/browser/themes/shared/devtools/styleeditor.css
similarity index 77%
rename from browser/themes/osx/devtools/styleeditor.css
rename to browser/themes/shared/devtools/styleeditor.css
index 4df8ea8e6520..a8121c74a61e 100644
--- a/browser/themes/osx/devtools/styleeditor.css
+++ b/browser/themes/shared/devtools/styleeditor.css
@@ -3,23 +3,33 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#style-editor-chrome {
-  background-color: hsl(208,11%,27%);
-}
-
 .stylesheet-title,
 .stylesheet-name {
   text-decoration: none;
-  color: hsl(207,17%,88%);
 }
 
 .stylesheet-name {
   font-size: 13px;
 }
 
-.stylesheet-rule-count,
-.stylesheet-saveButton {
-  color: hsl(211,12%,60%);
+.theme-dark .stylesheet-title,
+.theme-dark .stylesheet-name {
+  color: #f5f7fa;
+}
+
+.theme-dark .stylesheet-rule-count,
+.theme-dark .stylesheet-saveButton {
+  color: #b6babf;
+}
+
+.theme-light .stylesheet-title,
+.theme-light .stylesheet-name {
+  color: #585959;
+}
+
+.theme-light .stylesheet-rule-count,
+.theme-light .stylesheet-saveButton {
+  color: #18191a;
 }
 
 .stylesheet-saveButton {
@@ -28,13 +38,10 @@
 }
 
 .splitview-active .stylesheet-title,
-.splitview-active .stylesheet-name {
-  color: hsl(0,0%,100%);
-}
-
-.splitview-active .stylesheet-rule-count,
-.splitview-active .stylesheet-saveButton {
-  color: hsl(200,66%,70%);
+.splitview-active .stylesheet-name,
+.theme-light .splitview-active .stylesheet-rule-count,
+.theme-light .splitview-active .stylesheet-saveButton {
+  color: #f5f7fa;
 }
 
 .splitview-nav:focus {
@@ -65,6 +72,10 @@
   height: 40px;
 }
 
+.theme-light .stylesheet-enabled {
+  background-image: url(itemToggle-light.png);
+}
+
 .disabled > .stylesheet-enabled {
   background-position: -24px 8px;
 }
@@ -88,10 +99,6 @@
   font-size: 11px;
 }
 
-.placeholder {
-  color: white;
-}
-
 .placeholder a {
   text-decoration: underline;
 }
@@ -128,4 +135,4 @@ h3 {
   .splitview-nav > li > hgroup.stylesheet-info {
     -moz-box-align: baseline;
   }
-}
+}
\ No newline at end of file
diff --git a/browser/themes/shared/devtools/toolbars.inc.css b/browser/themes/shared/devtools/toolbars.inc.css
index 79cb234536a5..bed1ebd80ba9 100644
--- a/browser/themes/shared/devtools/toolbars.inc.css
+++ b/browser/themes/shared/devtools/toolbars.inc.css
@@ -20,13 +20,46 @@
   -moz-box-align: center;
   min-width: 78px;
   min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  text-shadow: none;
   border: 1px solid hsla(210,8%,5%,.45);
   border-radius: 3px;
-  background: linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
   margin: 0 3px;
+}
+
+.theme-dark .devtools-menulist,
+.theme-dark .devtools-toolbarbutton {
+  background: linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
   color: inherit;
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+.theme-light .devtools-menulist,
+.theme-light .devtools-toolbarbutton {
+  background: #f7f7f7;
+  color: #18191a;
+  border-color: #bbb;
+}
+
+.theme-light .devtools-menulist[open=true],
+.theme-light .devtools-toolbarbutton[open=true],
+.theme-light .devtools-toolbarbutton[open=true]:hover,
+.theme-light .devtools-toolbarbutton[open=true]:hover:active,
+.theme-light .devtools-toolbarbutton[checked=true],
+.theme-light .devtools-toolbarbutton[checked=true]:hover,
+.theme-light .devtools-toolbarbutton[checked=true]:hover:active  {
+  background: #ddd;
+}
+
+.theme-light .devtools-toolbarbutton:hover {
+  background: #eee;
+}
+
+.theme-light .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
+  color: #667380;
+}
+
+.theme-light .devtools-toolbarbutton[type=menu-button][checked=true] > .toolbarbutton-menubutton-button {
+  color: #18191a;
 }
 
 .devtools-toolbarbutton > .toolbarbutton-menubutton-button {
@@ -51,15 +84,15 @@
   display: none;
 }
 
-.devtools-toolbarbutton:not([checked]):hover:active {
+.theme-dark .devtools-toolbarbutton:not([checked]):hover:active {
   border-color: hsla(210,8%,5%,.6);
   background: linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
   box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
 }
 
-.devtools-menulist[open=true],
-.devtools-toolbarbutton[open=true],
-.devtools-toolbarbutton[checked=true] {
+.theme-dark .devtools-menulist[open=true],
+.theme-dark .devtools-toolbarbutton[open=true],
+.theme-dark .devtools-toolbarbutton[checked=true] {
   border-color: hsla(210,8%,5%,.6) !important;
   background: linear-gradient(hsla(220,6%,10%,.6), hsla(210,11%,18%,.45) 75%, hsla(210,11%,30%,.4));
   box-shadow: 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
@@ -105,14 +138,21 @@
   -moz-appearance: none;
   color: inherit;
   border-width: 0;
+}
+
+.theme-dark .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
   -moz-border-end: 1px solid hsla(210,8%,5%,.45);
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15) inset, 1px 0 0 hsla(210,16%,76%,.15);
 }
 
-.devtools-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
+.theme-dark .devtools-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15) inset, -1px 0 0 hsla(210,16%,76%,.15);
 }
 
+.theme-light .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
+  -moz-border-end: 1px solid #bbb;
+}
+
 .devtools-toolbarbutton[type=menu-button] {
   padding: 0 1px;
   -moz-box-align: stretch;
@@ -138,9 +178,7 @@
 %else
   border-radius: 2px;
 %endif
-  background-color: rgba(24, 29, 32, 1);
   padding: 4px 6px;
-  color: rgba(184, 200, 217, 1);
 }
 
 .devtools-searchinput {
@@ -219,20 +257,23 @@
   border: 0;
 }
 
+.theme-light .devtools-sidebar-tabs > tabpanels {
+  background: #f7f7f7;
+  color: #18191a;
+}
+
 .devtools-sidebar-tabs > tabs {
   -moz-appearance: none;
   position: static;
   font: inherit;
-  color: #b6babf;
   margin-bottom: 0;
   padding: 0;
-  background-color: #343c45;
   border-width: 0 0 1px 0;
-  border-color: hsla(210,8%,5%,.6);
   border-style: solid;
   overflow: hidden;
 }
 
+
 .devtools-sidebar-tabs > tabs > .tabs-right,
 .devtools-sidebar-tabs > tabs > .tabs-left {
   display: none;
@@ -252,7 +293,6 @@
    * -1px because the parent element (<tabs>) comes with a 1px bottom border.
    */
   min-height: 32px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
   text-align: center;
   color: inherit;
   -moz-box-flex: 1;
@@ -284,39 +324,61 @@
   background-image: linear-gradient(transparent, transparent), @smallSeparator@;
 }
 
-.devtools-sidebar-tabs > tabs > tab:hover {
+.theme-dark .devtools-sidebar-tabs > tabs > tab:hover {
   background-image: linear-gradient(hsla(206,37%,4%,.2), hsla(206,37%,4%,.2)), @smallSeparator@;
 }
 
-.devtools-sidebar-tabs > tabs > tab:hover:active {
+.theme-dark .devtools-sidebar-tabs > tabs > tab:hover:active {
   background-image: linear-gradient(hsla(206,37%,4%,.4), hsla(206,37%,4%,.4)), @smallSeparator@;
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] + tab {
+.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab {
   background-image: linear-gradient(transparent, transparent), @solidSeparator@;
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover {
+.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover {
   background-image: linear-gradient(hsla(206,37%,4%,.2), hsla(206,37%,4%,.2)), @solidSeparator@;
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active {
+.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active {
   background-image: linear-gradient(hsla(206,37%,4%,.4), hsla(206,37%,4%,.4)), @solidSeparator@;
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] {
+.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] {
   color: #f5f7fa;
   background-image: linear-gradient(#1d4f73, #1d4f73), @solidSeparator@;
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected]:hover {
+.theme-dark .devtools-sidebar-tabs > tabs > tab[selected]:hover {
   background-image: linear-gradient(#274f64, #274f64), @solidSeparator@;
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected]:hover:active {
+.theme-dark .devtools-sidebar-tabs > tabs > tab[selected]:hover:active {
   background-image: linear-gradient(#1f3e4f, #1f3e4f), @solidSeparator@;
 }
 
+.theme-light .devtools-sidebar-tabs > tabs > tab:hover {
+  background-image: linear-gradient(#ddd, #ddd), @smallSeparator@;
+}
+
+.theme-light .devtools-sidebar-tabs > tabs > tab:hover:active {
+  background-image: linear-gradient(#ddd, #ddd), @smallSeparator@;
+}
+
+.theme-light .devtools-sidebar-tabs > tabs > tab[selected] + tab {
+  background-image: linear-gradient(transparent, transparent), @solidSeparator@;
+}
+
+.theme-light .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover {
+  background-image: linear-gradient(#ddd, #ddd), @solidSeparator@;
+}
+
+.theme-light .devtools-sidebar-tabs > tabs > tab[selected],
+.theme-light .devtools-sidebar-tabs > tabs > tab[selected]:hover:active {
+  color: #f5f7fa;
+  background-image: linear-gradient(#4c9ed9, #4c9ed9), @solidSeparator@;
+}
+
 /* Toolbox - moved from toolbox.css.
  * Rules that apply to the global toolbox like command buttons,
  * devtools tabs, docking buttons, etc. */
@@ -505,6 +567,30 @@
   -moz-box-align: center;
 }
 
+.theme-light .devtools-tabbar {
+  background: #ebeced;
+  border-bottom-color: #aaa;
+}
+
+.theme-light .devtools-tab,
+.theme-light .devtools-tab:hover {
+  color: #18191a;
+  border-color: #aaa;
+}
+
+.theme-light .devtools-tab:hover {
+  background-color: #ddd;
+  box-shadow: 0 -2px 0 rgba(0,0,0,.1) inset;
+}
+
+.theme-light .devtools-tab:not([selected])[highlighted] {
+  background-color: rgba(44, 187, 15, .2);
+}
+
+.theme-light .devtools-tab:last-child {
+  -moz-border-end: 1px solid #aaa;
+}
+
 .devtools-tab:first-child {
   -moz-border-start-width: 0;
 }
@@ -557,6 +643,10 @@
               0 -2px 0 rgba(0,0,0,.2) inset;
 }
 
+.theme-light #toolbox-tabs .devtools-tab[selected] {
+  background-color: #4c9ed9;
+}
+
 .devtools-tab[selected]:not(:first-child),
 .devtools-tab[highlighted]:not(:first-child) {
   border-width: 0;
@@ -574,19 +664,62 @@
   -moz-padding-start: 1px;
 }
 
-.devtools-tab:not([selected])[highlighted] {
-  color: #f5f7fa;
+.theme-dark .devtools-tab:not([selected])[highlighted] {
   background-color: hsla(99,100%,14%,.2);
   box-shadow: 0 2px 0 #7bc107 inset;
 }
 
+.theme-dark #toolbox-tabs .devtools-tab[selected] {
+  color: #f5f7fa;
+}
+
 .devtools-tab:not([highlighted]) > .highlighted-icon,
 .devtools-tab[selected] > .highlighted-icon,
 .devtools-tab:not([selected])[highlighted] > .default-icon {
   visibility: collapse;
 }
 
+/* Invert the colors of certain dark theme images for displaying
+ * inside of the light theme.
+ */
+.theme-light .devtools-tab > image,
+.theme-light #toolbox-dock-buttons > toolbarbutton > image,
+.theme-light .command-button > image,
+.theme-light .command-button:active > image,
+.theme-light .devtools-closebutton > image,
+.theme-light .devtools-toolbarbutton > image,
+.theme-light .devtools-option-toolbarbutton > image,
+.theme-light #breadcrumb-separator-normal,
+.theme-light .scrollbutton-up > .toolbarbutton-icon,
+.theme-light .scrollbutton-down > .toolbarbutton-icon,
+.theme-light #black-boxed-message-button .button-icon {
+  filter: url(filters.svg#invert);
+}
+
+/* Since selected backgrounds are blue, we want to use the normal
+ * (light) icons. */
+.theme-light .command-button[checked=true]:not(:active) > image,
+.theme-light .devtools-tab[selected] > image,
+.theme-light .devtools-tab[highlighted] > image,
+.theme-light .devtools-option-toolbarbutton[open] > image,
+.theme-light #resume[checked] > image {
+  filter: none !important;
+}
+
+.theme-light .command-button:hover {
+  background-color: inherit;
+}
+
+.theme-light .command-button:hover:active,
+.theme-light .command-button[checked=true]:not(:hover) {
+  background-color: inherit;
+}
+
 .hidden-labels-box:not(.visible) > label,
 .hidden-labels-box.visible ~ .hidden-labels-box > label:last-child {
   display: none;
 }
+
+.devtools-invisible-splitter {
+  border-color: transparent;
+}
diff --git a/browser/themes/shared/devtools/webconsole.inc.css b/browser/themes/shared/devtools/webconsole.inc.css
index f7e05143aa6e..c3ff7c043d28 100644
--- a/browser/themes/shared/devtools/webconsole.inc.css
+++ b/browser/themes/shared/devtools/webconsole.inc.css
@@ -303,6 +303,10 @@ a {
   border: none;
 }
 
+.devtools-side-splitter ~ #webconsole-sidebar[hidden] {
+  display: none;
+}
+
 /* Security styles */
 
 .message[category=security] > .icon {
diff --git a/browser/themes/shared/devtools/widgets.inc.css b/browser/themes/shared/devtools/widgets.inc.css
index 676c4913d2fe..5c5517d850b4 100644
--- a/browser/themes/shared/devtools/widgets.inc.css
+++ b/browser/themes/shared/devtools/widgets.inc.css
@@ -20,6 +20,8 @@
 
 .breadcrumbs-widget-container {
   -moz-margin-end: 3px;
+  max-height: 25px; /* Set max-height for proper sizing on linux */
+  height: 25px; /* Set height to prevent starting small waiting for content */
   /* A fake 1px-shadow is included in the border-images of the
      breadcrumbs-widget-items, to match toolbar-buttons style.
      This negative margin compensates the extra row of pixels created
@@ -27,77 +29,41 @@
   margin-bottom: -1px;
 }
 
-/* Preloading hack, LTR */
-
-.breadcrumbs-widget-container:-moz-locale-dir(ltr)::after {
-  content: '';
-  display: block;
-  background-image:
-    url(breadcrumbs/ltr-start.png),
-    url(breadcrumbs/ltr-start-selected.png),
-    url(breadcrumbs/ltr-start-pressed.png),
-    url(breadcrumbs/ltr-start-selected-pressed.png),
-    url(breadcrumbs/ltr-middle.png),
-    url(breadcrumbs/ltr-middle-selected.png),
-    url(breadcrumbs/ltr-middle-pressed.png),
-    url(breadcrumbs/ltr-middle-selected-pressed.png),
-    url(breadcrumbs/ltr-end.png),
-    url(breadcrumbs/ltr-end-selected.png),
-    url(breadcrumbs/ltr-end-pressed.png),
-    url(breadcrumbs/ltr-end-selected-pressed.png);
-}
-
-/* Preloading hack, RTL */
-
-.breadcrumbs-widget-container:-moz-locale-dir(rtl)::after {
-  content: '';
-  display: block;
-  background-image:
-    url(breadcrumbs/rtl-start.png),
-    url(breadcrumbs/rtl-start-selected.png),
-    url(breadcrumbs/rtl-start-pressed.png),
-    url(breadcrumbs/rtl-start-selected-pressed.png),
-    url(breadcrumbs/rtl-middle.png),
-    url(breadcrumbs/rtl-middle-selected.png),
-    url(breadcrumbs/rtl-middle-pressed.png),
-    url(breadcrumbs/rtl-middle-selected-pressed.png),
-    url(breadcrumbs/rtl-end.png),
-    url(breadcrumbs/rtl-end-selected.png),
-    url(breadcrumbs/rtl-end-pressed.png),
-    url(breadcrumbs/rtl-end-selected-pressed.png);
-}
-
 .scrollbutton-up,
 .scrollbutton-down {
   -moz-appearance: none;
-  background: linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset,
-              0 0 0 1px hsla(210,16%,76%,.15) inset,
-              0 1px 0 hsla(210,16%,76%,.15);
-  border: 1px solid hsla(210,8%,5%,.45);
-  margin: 0 0 1px;
-}
-
-.scrollbutton-up:not([disabled]):active:hover,
-.scrollbutton-down:not([disabled]):active:hover {
-  background: linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset,
-              0 1px 3px hsla(210,8%,5%,.25) inset,
-              0 1px 0 hsla(210,16%,76%,.15);
-  border-color: hsla(210,8%,5%,.6);
+  background: transparent;
+  box-shadow: none;
+  border: none;
+  list-style-image: none;
+  margin: 0;
+  padding: 0;
 }
 
 .scrollbutton-up > .toolbarbutton-icon,
 .scrollbutton-down > .toolbarbutton-icon {
   -moz-appearance: none;
-  list-style-image: url("breadcrumbs-scrollbutton.png");
-  -moz-image-region: rect(0px,7px,16px,0px);
-  margin: 0 5px;
+  width: 7px;
+  height: 16px;
+  background-size: 14px 16px;
+  background-position: 0 center;
+  background-repeat: no-repeat;
+  background-image: url("breadcrumbs-scrollbutton.png");
+  list-style-image: none;
+  margin: 0 8px;
+  padding: 0;
+}
+
+@media (min-resolution: 2dppx) {
+  .scrollbutton-up > .toolbarbutton-icon,
+  .scrollbutton-down > .toolbarbutton-icon {
+    background-image: url("breadcrumbs-scrollbutton@2x.png");
+  }
 }
 
 .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
 .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  -moz-image-region: rect(0px,14px,16px,7px);
+  background-position: -7px center;
 }
 
 .scrollbutton-up[disabled] > .toolbarbutton-icon,
@@ -105,165 +71,185 @@
   opacity: 0.5;
 }
 
+
+/* Draw shadows to indicate there is more content 'behind' scrollbuttons. */
+.scrollbutton-up:-moz-locale-dir(ltr),
+.scrollbutton-down:-moz-locale-dir(rtl) {
+  border-right: solid 1px rgba(255, 255, 255, .1);
+  border-left: solid 1px transparent;
+  box-shadow: 3px 0px 3px -3px #181d20;
+}
+
+.scrollbutton-down:-moz-locale-dir(ltr),
+.scrollbutton-up:-moz-locale-dir(rtl) {
+  border-right: solid 1px transparent;
+  border-left: solid 1px rgba(255, 255, 255, .1);
+  box-shadow: -3px 0px 3px -3px #181d20;
+}
+
+.scrollbutton-up[disabled],
+.scrollbutton-down[disabled] {
+  box-shadow: none;
+  border-color: transparent;
+}
+
 .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
 .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
   transform: scaleX(-1);
 }
 
+/* The breadcrumb separator elements are used as background images with
+ * -moz-element, so we position them offscreen since we don't care about
+ * seeing the original elements.
+ */
+.breadcrumb-separator-container {
+  position: fixed;
+  top: -1000px;
+  left: -1000px;
+}
+
+#breadcrumb-separator-before,
+#breadcrumb-separator-after,
+#breadcrumb-separator-normal {
+  width: 12px;
+  height: 25px;
+  overflow: hidden;
+}
+
+#breadcrumb-separator-before,
+#breadcrumb-separator-after:after {
+  background: #1d4f73; /* Select Highlight Blue */
+}
+
+#breadcrumb-separator-after,
+#breadcrumb-separator-before:after {
+  background: #343c45; /* Toolbars */
+}
+
+/* This chevron arrow cannot be replicated easily in CSS, so we are using
+ * a background image for it (still keeping it in a separate element so
+ * we can handle RTL support with a CSS transform).
+ */
+#breadcrumb-separator-normal {
+  background: url(breadcrumbs-divider@2x.png) no-repeat center right;
+  background-size: 12px 24px;
+}
+
+/* Fake a triangle by rotating a rectangle inside the elements */
+#breadcrumb-separator-before:after,
+#breadcrumb-separator-after:after {
+  content: "";
+  display: block;
+  width: 25px;
+  height: 25px;
+  transform: translateX(-18px) rotate(45deg);
+  -moz-box-sizing: border-box;
+}
+
 .breadcrumbs-widget-item {
   background-color: transparent;
   -moz-appearance: none;
-  overflow: hidden;
-  min-width: 85px;
-  max-width: 250px;
   min-height: 25px;
-  border-style: solid;
-  border-width: 1px 13px 2px 13px;
-  margin: 0 -11px 0 0;
-  padding: 0 9px;
+  min-width: 65px;
+  margin: 0;
+  padding: 0 8px 0 20px;
+  border: none;
   outline: none;
   color: hsl(210,30%,85%);
 }
 
-.breadcrumbs-widget-item:-moz-focusring > label {
-  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+.breadcrumbs-widget-item:not([checked]) {
+  background: -moz-element(#breadcrumb-separator-normal) no-repeat center left;
 }
 
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-tag {
-  color: hsl(208,100%,60%);
+.breadcrumbs-widget-item[checked] + .breadcrumbs-widget-item {
+  background: -moz-element(#breadcrumb-separator-after) no-repeat 0 0;
 }
 
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-id {
-  color: hsl(205,100%,70%);
+.breadcrumbs-widget-item[checked] {
+  background: -moz-element(#breadcrumb-separator-before) no-repeat 0 0;
+  background-color: #1d4f73; /* Select Highlight Blue */
 }
 
-.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-pseudo-classes {
-  color: hsl(20,100%,70%);
+.breadcrumbs-widget-item:first-child {
+  background-image: none;
 }
 
-.breadcrumbs-widget-item-id,
-.breadcrumbs-widget-item-classes {
-  color: #8d99a6;
-}
-
-.breadcrumbs-widget-item-pseudo-classes {
-  color: hsl(20,100%,85%);
-}
-
-/* Breadcrumbs LTR */
-
-.breadcrumbs-widget-item:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:not([checked]):hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item[checked]:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item[checked]:hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type:not([checked]):hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type[checked]:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:first-of-type[checked]:hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type:not([checked]):hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type[checked]:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-item:last-of-type[checked]:hover:active:-moz-locale-dir(ltr) {
-  border-image: url("breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:first-of-type:-moz-locale-dir(ltr) {
-  border-left-width: 0;
-}
-
-.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:last-of-type:-moz-locale-dir(ltr) {
-  border-right-width: 0;
-}
-
-/* Breadcrumbs RTL */
-
+/* RTL support: move the images that were on the left to the right,
+ * and move images that were on the right to the left.
+ */
 .breadcrumbs-widget-item:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
+  padding: 0 20px 0 8px;
 }
 
-.breadcrumbs-widget-item:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
+.breadcrumbs-widget-item:-moz-locale-dir(rtl),
+.breadcrumbs-widget-item[checked] + .breadcrumbs-widget-item:-moz-locale-dir(rtl) {
+  background-position: center right;
 }
 
-.breadcrumbs-widget-item[checked]:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
+#breadcrumb-separator-before:-moz-locale-dir(rtl),
+#breadcrumb-separator-after:-moz-locale-dir(rtl),
+#breadcrumb-separator-normal:-moz-locale-dir(rtl) {
+  transform:  scaleX(-1);
 }
 
-.breadcrumbs-widget-item[checked]:hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+#breadcrumb-separator-before:-moz-locale-dir(rtl):after,
+#breadcrumb-separator-after:-moz-locale-dir(rtl):after {
+  transform: translateX(-5px) rotate(45deg);
 }
 
-.breadcrumbs-widget-item:first-of-type:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
+.breadcrumbs-widget-item:not([checked]):hover label {
+  color: white;
 }
 
-.breadcrumbs-widget-item:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
+.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-tag,
+.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-id,
+.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-pseudo-classes,
+.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-classes {
+  color: #f5f7fa; /* Foreground (Text) - Light */
 }
 
-.breadcrumbs-widget-item:first-of-type[checked]:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
+.theme-dark .breadcrumbs-widget-item-id,
+.theme-dark .breadcrumbs-widget-item-classes,
+.theme-dark .breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-classes {
+  color: #b6babf; /* Foreground (Text) - Grey */
 }
 
-.breadcrumbs-widget-item:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
+.theme-dark .breadcrumbs-widget-item-pseudo-classes {
+  color: #d99b28; /* Light Orange */
 }
 
-.breadcrumbs-widget-item:last-of-type:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
+.theme-light .breadcrumbs-widget-item[checked] {
+  background: -moz-element(#breadcrumb-separator-before) no-repeat 0 0;
+  background-color: #4c9ed9; /* Select Highlight Blue */
 }
 
-.breadcrumbs-widget-item:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
+.theme-light .breadcrumbs-widget-item:first-child {
+  background-image: none;
 }
 
-.breadcrumbs-widget-item:last-of-type[checked]:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
+.theme-light #breadcrumb-separator-before,
+.theme-light #breadcrumb-separator-after:after {
+  background: #4c9ed9; /* Select Highlight Blue */
 }
 
-.breadcrumbs-widget-item:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  border-image: url("breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
+.theme-light #breadcrumb-separator-after,
+.theme-light #breadcrumb-separator-before:after {
+  background: #f0f1f2; /*  Toolbars */
 }
 
-.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:first-of-type:-moz-locale-dir(rtl) {
-  border-right-width: 0;
+.theme-light .breadcrumbs-widget-item,
+.theme-light .breadcrumbs-widget-item-id,
+.theme-light .breadcrumbs-widget-item-classes {
+  color: #585959; /* Foreground (Text) - Grey */
 }
 
-.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:last-of-type:-moz-locale-dir(rtl) {
-  border-left-width: 0;
+.theme-light .breadcrumbs-widget-item-pseudo-classes {
+  color: #585959; /* Foreground (Text) - Grey */
+}
+
+.theme-light .breadcrumbs-widget-item:not([checked]):hover label {
+  color: #18191a; /* Foreground (Text) - Dark */
 }
 
 /* SimpleListWidget */
@@ -327,9 +313,9 @@
 /* SideMenuWidget */
 
 %filter substitution
-%define smw_selectionGradient linear-gradient(hsl(206,59%,39%), hsl(206,59%,29%))
-%define smw_selectionTextColor #fff
-%define smw_margin #222426
+%define smw_selectionTextColor #f5f7fa
+%define smw_marginDark #222426
+%define smw_marginLight #aaa
 %define smw_itemDarkTopBorder rgba(0,0,0,0.2)
 %define smw_itemDarkBottomBorder rgba(128,128,128,0.15)
 %define smw_itemLightTopBorder rgba(128,128,128,0.15)
@@ -340,21 +326,31 @@
   transform: translateZ(1px);
 }
 
+/* SideMenuWidget container */
+
 .theme-dark .side-menu-widget-container,
 .theme-dark .side-menu-widget-empty-text {
   background: url(background-noise-toolbar.png), #343c45; /* Toolbars */
 }
 
-/* SideMenuWidget container */
+.theme-dark .side-menu-widget-container:-moz-locale-dir(ltr),
+.theme-dark .side-menu-widget-empty-text:-moz-locale-dir(ltr) {
+  box-shadow: inset -1px 0 0 @smw_marginDark@;
+}
+
+.theme-dark .side-menu-widget-container:-moz-locale-dir(rtl),
+.theme-dark .side-menu-widget-empty-text:-moz-locale-dir(rtl) {
+  box-shadow: inset 1px 0 0 @smw_marginDark@;
+}
 
 .side-menu-widget-container:-moz-locale-dir(ltr),
 .side-menu-widget-empty-text:-moz-locale-dir(ltr) {
-  box-shadow: inset -1px 0 0 @smw_margin@;
+  box-shadow: inset -1px 0 0 @smw_marginLight@;
 }
 
 .side-menu-widget-container:-moz-locale-dir(rtl),
 .side-menu-widget-empty-text:-moz-locale-dir(rtl) {
-  box-shadow: inset 1px 0 0 @smw_margin@;
+  box-shadow: inset 1px 0 0 @smw_marginLight@;
 }
 
 .side-menu-widget-group {
@@ -389,6 +385,7 @@
   /* To compensate for the top and bottom borders */
   margin-top: -1px;
   margin-bottom: -1px;
+  background-clip: padding-box;
 }
 
 .theme-dark .side-menu-widget-item {
@@ -411,14 +408,22 @@
   box-shadow: inset 0 -1px 0 @smw_itemLightTopBorder@;
 }
 
-.side-menu-widget-item.selected {
-  background: @smw_selectionGradient@ repeat-x top left;
+.theme-dark .side-menu-widget-item.selected {
+  background-color: #1d4f73; /* Select Highlight Blue */
+  color: @smw_selectionTextColor@;
+}
+
+.theme-light .side-menu-widget-item.selected {
+  background-color: #4c9ed9; /* Select Highlight Blue */
   color: @smw_selectionTextColor@;
 }
 
 .side-menu-widget-item-arrow {
   -moz-margin-start: -7px;
   width: 7px; /* The image's width is 7 pixels */
+  /* Cover the border of the side-menu-widget-item */
+  margin-top: -1px;
+  margin-bottom: -1px;
 }
 
 .side-menu-widget-item.selected > .side-menu-widget-item-arrow {
@@ -435,19 +440,19 @@
 }
 
 .theme-dark .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
-  background-image: url(itemArrow-dark-ltr.png), linear-gradient(to right, @smw_margin@, @smw_margin@);
+  background-image: url(itemArrow-dark-ltr.png), linear-gradient(to right, @smw_marginDark@, @smw_marginDark@);
 }
 
 .theme-dark .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-dark-rtl.png), linear-gradient(to right, @smw_margin@, @smw_margin@);
+  background-image: url(itemArrow-dark-rtl.png), linear-gradient(to right, @smw_marginDark@, @smw_marginDark@);
 }
 
 .theme-light .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
-  background-image: url(itemArrow-ltr.png), linear-gradient(to right, @smw_margin@, @smw_margin@);
+  background-image: url(itemArrow-ltr.svg), linear-gradient(to right, @smw_marginLight@, @smw_marginLight@);
 }
 
 .theme-light .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-rtl.png), linear-gradient(to right, @smw_margin@, @smw_margin@);
+  background-image: url(itemArrow-rtl.svg), linear-gradient(to right, @smw_marginLight@, @smw_marginLight@);
 }
 
 /* SideMenuWidget items contents */
@@ -521,7 +526,7 @@
 }
 
 .theme-dark .side-menu-widget-empty-text {
-  color: #b6babf; /* Light foreground text */
+  color: #b6babf; /* Foreground (Text) - Grey */
 }
 
 .theme-light .side-menu-widget-empty-text {
@@ -540,7 +545,7 @@
 }
 
 .theme-dark .variables-view-empty-notice {
-  color: #b6babf; /* Light foreground text */
+  color: #b6babf; /* Foreground (Text) - Grey */
 }
 
 .theme-light .variables-view-empty-notice {
@@ -548,7 +553,9 @@
 }
 
 .variables-view-scope > .title {
-  color: #fff;
+  border-top-width: 1px;
+  border-top-style: solid;
+  margin-top: -1px;
 }
 
 /* Generic variables traits */
diff --git a/browser/themes/shared/menupanel.inc.css b/browser/themes/shared/menupanel.inc.css
index 8ae453053d75..9853c0ab0408 100644
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -64,10 +64,9 @@ toolbarpaletteitem[place="palette"] > #email-link-button {
   -moz-image-region: rect(0, 448px, 32px, 416px);
 }
 
-/* This is temporary until we have an email-link icon (Bug 932235) */
 #email-link-button[cui-areatype="menu-panel"] > image,
 toolbarpaletteitem[place="palette"] > #email-link-button > image {
-  transform: scale(-1, -1);
+  -moz-image-region: rect(0, 800px, 32px, 768px);
 }
 
 #characterencoding-button[cui-areatype="menu-panel"],
diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/browser/themes/shared/toolbarbuttons.inc.css
index a038a98b8dea..73c3e633ce76 100644
--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -65,9 +65,7 @@
 }
 
 #email-link-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 306px, 18px, 288px);
-  /* This is temporary until we have an email-link icon (Bug 932235) */
-  transform: scale(-1, -1);
+  -moz-image-region: rect(0, 666px, 18px, 648px);
 }
 
 #characterencoding-button[cui-areatype="toolbar"]{
diff --git a/browser/themes/windows/Toolbar-aero.png b/browser/themes/windows/Toolbar-aero.png
index d5b00482d8cb..52fc5535bcea 100644
Binary files a/browser/themes/windows/Toolbar-aero.png and b/browser/themes/windows/Toolbar-aero.png differ
diff --git a/browser/themes/windows/Toolbar-inverted.png b/browser/themes/windows/Toolbar-inverted.png
index d63ac8cf69ea..0ffa8f286b85 100644
Binary files a/browser/themes/windows/Toolbar-inverted.png and b/browser/themes/windows/Toolbar-inverted.png differ
diff --git a/browser/themes/windows/Toolbar-lunaSilver.png b/browser/themes/windows/Toolbar-lunaSilver.png
index 320c4cd12728..41cd28940050 100644
Binary files a/browser/themes/windows/Toolbar-lunaSilver.png and b/browser/themes/windows/Toolbar-lunaSilver.png differ
diff --git a/browser/themes/windows/Toolbar.png b/browser/themes/windows/Toolbar.png
index c05a0a5ff759..dce0b0a7d994 100644
Binary files a/browser/themes/windows/Toolbar.png and b/browser/themes/windows/Toolbar.png differ
diff --git a/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png b/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png
deleted file mode 100644
index 722438060a89..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png
deleted file mode 100644
index 80c1f3a26da4..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png
deleted file mode 100644
index 87808778c6e4..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png
deleted file mode 100644
index dbb728411333..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end.png
deleted file mode 100644
index ee96024f1a81..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-end.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png
deleted file mode 100644
index 57abb3ffbe78..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png
deleted file mode 100644
index 3898ba3ac10b..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png
deleted file mode 100644
index c0d13e3efd4f..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png
deleted file mode 100644
index eb65fffd55e0..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png
deleted file mode 100644
index c1a946525817..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png
deleted file mode 100644
index 77d63d1b1196..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png
deleted file mode 100644
index 6529b71abd92..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start.png
deleted file mode 100644
index a4ca858603ef..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-start.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png
deleted file mode 100644
index 1077cfb7b7d6..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png
deleted file mode 100644
index ab1040ba8cde..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png
deleted file mode 100644
index 8b0905d0f094..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end.png
deleted file mode 100644
index 88cc61b0bcf0..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-end.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png
deleted file mode 100644
index f4a3a5beef55..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png
deleted file mode 100644
index d66acb42eb2e..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png
deleted file mode 100644
index 9b77579e94d3..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png
deleted file mode 100644
index 63b620154179..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png
deleted file mode 100644
index bfff8e95d8f1..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png
deleted file mode 100644
index 2ce094819032..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png
deleted file mode 100644
index e7c848ac3cbc..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start.png
deleted file mode 100644
index b8f67974c6ba..000000000000
Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-start.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-blackbox.png b/browser/themes/windows/devtools/debugger-blackbox.png
deleted file mode 100644
index 11a45b5d0378..000000000000
Binary files a/browser/themes/windows/devtools/debugger-blackbox.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-blackboxMessageEye.png b/browser/themes/windows/devtools/debugger-blackboxMessageEye.png
deleted file mode 100644
index dbd7a3e5ec9f..000000000000
Binary files a/browser/themes/windows/devtools/debugger-blackboxMessageEye.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-collapse.png b/browser/themes/windows/devtools/debugger-collapse.png
deleted file mode 100644
index 242e19c560d6..000000000000
Binary files a/browser/themes/windows/devtools/debugger-collapse.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-expand.png b/browser/themes/windows/devtools/debugger-expand.png
deleted file mode 100644
index af453e3168a6..000000000000
Binary files a/browser/themes/windows/devtools/debugger-expand.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-pause.png b/browser/themes/windows/devtools/debugger-pause.png
deleted file mode 100644
index 7f908bf8b404..000000000000
Binary files a/browser/themes/windows/devtools/debugger-pause.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-play.png b/browser/themes/windows/devtools/debugger-play.png
deleted file mode 100644
index 91719826a4a6..000000000000
Binary files a/browser/themes/windows/devtools/debugger-play.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-step-in.png b/browser/themes/windows/devtools/debugger-step-in.png
deleted file mode 100644
index c80ee72a285e..000000000000
Binary files a/browser/themes/windows/devtools/debugger-step-in.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-step-out.png b/browser/themes/windows/devtools/debugger-step-out.png
deleted file mode 100644
index 1a7145a983b3..000000000000
Binary files a/browser/themes/windows/devtools/debugger-step-out.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-step-over.png b/browser/themes/windows/devtools/debugger-step-over.png
deleted file mode 100644
index 7c9b82ad48f6..000000000000
Binary files a/browser/themes/windows/devtools/debugger-step-over.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/debugger-toggleBreakpoints.png b/browser/themes/windows/devtools/debugger-toggleBreakpoints.png
deleted file mode 100644
index c4b7dcbfe574..000000000000
Binary files a/browser/themes/windows/devtools/debugger-toggleBreakpoints.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/itemToggle.png b/browser/themes/windows/devtools/itemToggle.png
deleted file mode 100644
index cf70394e6a1c..000000000000
Binary files a/browser/themes/windows/devtools/itemToggle.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/splitview.css b/browser/themes/windows/devtools/splitview.css
deleted file mode 100644
index 2688558b189f..000000000000
--- a/browser/themes/windows/devtools/splitview.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.splitview-nav-container {
-  background-color: hsl(211,21%,26%);
-  color: white;
-}
-
-.loading .splitview-nav-container {
-  background-image: url(chrome://global/skin/icons/loading_16.png);
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-
-.splitview-nav {
-  -moz-appearance: none;
-  margin: 0;
-  box-shadow: inset -1px 0 0 #222426;
-}
-
-.splitview-nav > li {
-  color: white;
-  background-clip: padding-box;
-  border-bottom: 1px solid hsla(210,40%,83%,.1);
-  box-shadow: inset 0 -1px 0 hsla(211,68%,6%,.3);
-  -moz-padding-end: 8px;
-  -moz-box-align: center;
-}
-
-.splitview-nav {
-  list-style-image: none;
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.splitview-nav > li {
-  outline: 0;
-  vertical-align: bottom;
-}
-
-.placeholder {
-  -moz-box-flex: 1;
-  text-align: center;
-}
-
-.splitview-nav > li.splitview-active {
-  background-image: url(itemArrow-ltr.png),
-                    linear-gradient(to right, black, black),
-                    linear-gradient(hsl(200,100%,33%), hsl(200,100%,25%));
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center right, top right, top left;
-  background-size: auto, 1px 100%, auto;
-  border-bottom: 1px solid hsla(210,8%,5%,.25);
-  box-shadow: inset 0 1px 0 hsla(210,40%,83%,.15),
-              inset 0 -1px 0 hsla(210,40%,83%,.05);
-}
-
-.splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
-  background-image: url(itemArrow-rtl.png),
-                    linear-gradient(to right, black, black),
-                    linear-gradient(hsl(200,100%,33%), hsl(200,100%,25%));
-  background-repeat: no-repeat, no-repeat, repeat-x;
-  background-position: center left, top left, top right;
-}
-
-/* Toolbars */
-
-.splitview-main > .devtools-toolbar {
-  background-origin: border-box;
-  background-clip: border-box;
-  border-bottom: 1px solid hsla(210,8%,5%,.65);
-}
-
-.splitview-main > toolbar:-moz-locale-dir(ltr) {
-  border-right: 1px solid hsla(210,8%,5%,.5);
-}
-
-.splitview-main > toolbar:-moz-locale-dir(rtl) {
-  border-left: 1px solid hsla(210,8%,5%,.5);
-}
-
-.splitview-main > .devtools-toolbarbutton {
-  font-size: 11px;
-  padding: 0 8px;
-  width: auto;
-  min-width: 48px;
-  min-height: 0;
-}
-
-
-/* Resizers */
-
-.splitview-landscape-splitter {
-  -moz-border-start-color: transparent;
-}
-
-.splitview-portrait-resizer {
-  -moz-appearance: none;
-  background: linear-gradient(black 1px, rgba(255,255,255,0.2) 1px),
-              linear-gradient(hsl(209,18%,34%), hsl(210,24%,16%));
-  height: 12px;
-  background-size: 10px 2px, 100% 12px;
-  background-clip: content-box, border-box;
-  background-repeat: repeat-y, no-repeat;
-  background-position: center center;
-  padding: 2px 0;
-  border-top: 1px solid hsla(210,8%,5%,.5);
-  border-bottom: 1px solid hsla(210,8%,5%,.5);
-}
diff --git a/browser/themes/windows/devtools/styleeditor.css b/browser/themes/windows/devtools/styleeditor.css
deleted file mode 100644
index 8b10c25f98e5..000000000000
--- a/browser/themes/windows/devtools/styleeditor.css
+++ /dev/null
@@ -1,131 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#style-editor-chrome {
-  background-color: hsl(211,21%,26%);
-}
-
-.stylesheet-title,
-.stylesheet-name {
-  text-decoration: none;
-  color: hsl(210,30%,85%);
-}
-
-.stylesheet-name {
-  font-size: 13px;
-}
-
-.stylesheet-rule-count,
-.stylesheet-saveButton {
-  color: hsl(210,16%,53%);
-}
-
-.stylesheet-saveButton {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.splitview-active .stylesheet-title,
-.splitview-active .stylesheet-name {
-  color: hsl(0,0%,100%);
-}
-
-.splitview-active .stylesheet-rule-count,
-.splitview-active .stylesheet-saveButton {
-  color: hsl(205,50%,70%);
-}
-
-.splitview-nav:focus {
-  outline: 0; /* focus ring is on the stylesheet name */
-}
-
-.splitview-nav > li.unsaved > hgroup .stylesheet-name {
-  font-style: italic;
-}
-
-.splitview-nav:-moz-locale-dir(ltr) > li.unsaved > hgroup .stylesheet-name:before,
-.splitview-nav:-moz-locale-dir(rtl) > li.unsaved > hgroup .stylesheet-name:after {
-  font-style: italic;
-}
-
-.splitview-nav.empty > p {
-  padding: 0 10px;
-}
-
-.stylesheet-enabled {
-  padding: 8px 0;
-  margin: 0 8px;
-  background-image: url(itemToggle.png);
-  background-repeat: no-repeat;
-  background-clip: content-box;
-  background-position: 0 8px;
-  width: 24px;
-  height: 40px;
-}
-
-.disabled > .stylesheet-enabled {
-  background-position: -24px 8px;
-}
-
-.splitview-nav > li > .stylesheet-enabled:focus,
-.splitview-nav > li:hover > .stylesheet-enabled {
-  outline: 0;
-}
-
-.stylesheet-error-message {
-  color: red;
-}
-
-.stylesheet-more > h3 {
-  font-size: 11px;
-  -moz-margin-end: 2px;
-}
-
-.devtools-searchinput {
-  max-width: 25ex;
-  font-size: 11px;
-}
-
-.placeholder {
-  color: white;
-}
-
-.placeholder a {
-  text-decoration: underline;
-}
-
-h1,
-h2,
-h3 {
-  font-size: inherit;
-  font-weight: normal;
-  margin: 0;
-  padding: 0;
-}
-
-/* portrait mode */
-@media (max-width: 550px) {
-  .splitview-nav {
-    box-shadow: none;
-  }
-
-  .splitview-nav > li.splitview-active {
-    background-size: 0 0, 0 0, auto;
-  }
-
-  .stylesheet-enabled {
-    padding: 0;
-    background-position: 0 0;
-    height: 24px;
-  }
-
-  .disabled > .stylesheet-enabled {
-    background-position: -24px 0;
-  }
-
-  .splitview-nav > li > hgroup.stylesheet-info {
-    -moz-box-align: baseline;
-  }
-}
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index dfbd4e95a84d..7a9494f9682d 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -182,6 +182,7 @@ browser.jar:
 *       skin/classic/browser/devtools/common.css                    (../shared/devtools/common.css)
 *       skin/classic/browser/devtools/dark-theme.css                (../shared/devtools/dark-theme.css)
 *       skin/classic/browser/devtools/light-theme.css               (../shared/devtools/light-theme.css)
+        skin/classic/browser/devtools/filters.svg                   (../shared/devtools/filters.svg)
         skin/classic/browser/devtools/controls.png                  (../shared/devtools/controls.png)
 *       skin/classic/browser/devtools/widgets.css                   (devtools/widgets.css)
         skin/classic/browser/devtools/commandline-icon.png          (devtools/commandline-icon.png)
@@ -207,61 +208,40 @@ browser.jar:
 *       skin/classic/browser/devtools/webconsole.css                (devtools/webconsole.css)
         skin/classic/browser/devtools/webconsole_networkpanel.css   (devtools/webconsole_networkpanel.css)
         skin/classic/browser/devtools/webconsole.png                (devtools/webconsole.png)
-        skin/classic/browser/devtools/breadcrumbs-scrollbutton.png                 (devtools/breadcrumbs-scrollbutton.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png     (devtools/breadcrumbs/ltr-end-selected-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png             (devtools/breadcrumbs/ltr-end-selected.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-end.png                      (devtools/breadcrumbs/ltr-end.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png           (devtools/breadcrumbs/ltr-middle-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png  (devtools/breadcrumbs/ltr-middle-selected-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png          (devtools/breadcrumbs/ltr-middle-selected.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-middle.png                   (devtools/breadcrumbs/ltr-middle.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png            (devtools/breadcrumbs/ltr-start-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png   (devtools/breadcrumbs/ltr-start-selected-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-start.png                    (devtools/breadcrumbs/ltr-start.png)
-        skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png           (devtools/breadcrumbs/ltr-start-selected.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png              (devtools/breadcrumbs/rtl-end-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png     (devtools/breadcrumbs/rtl-end-selected-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png             (devtools/breadcrumbs/rtl-end-selected.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-end.png                      (devtools/breadcrumbs/rtl-end.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png           (devtools/breadcrumbs/rtl-middle-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png  (devtools/breadcrumbs/rtl-middle-selected-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png          (devtools/breadcrumbs/rtl-middle-selected.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-middle.png                   (devtools/breadcrumbs/rtl-middle.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png            (devtools/breadcrumbs/rtl-start-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png   (devtools/breadcrumbs/rtl-start-selected-pressed.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-start.png                    (devtools/breadcrumbs/rtl-start.png)
-        skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png           (devtools/breadcrumbs/rtl-start-selected.png)
-        skin/classic/browser/devtools/splitview.css                 (devtools/splitview.css)
-        skin/classic/browser/devtools/styleeditor.css               (devtools/styleeditor.css)
+        skin/classic/browser/devtools/breadcrumbs-divider@2x.png    (../shared/devtools/images/breadcrumbs-divider@2x.png)
+        skin/classic/browser/devtools/breadcrumbs-scrollbutton.png  (../shared/devtools/images/breadcrumbs-scrollbutton.png)
+        skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
+        skin/classic/browser/devtools/splitview.css                 (../shared/devtools/splitview.css)
+        skin/classic/browser/devtools/styleeditor.css               (../shared/devtools/styleeditor.css)
 *       skin/classic/browser/devtools/shadereditor.css              (devtools/shadereditor.css)
 *       skin/classic/browser/devtools/debugger.css                  (devtools/debugger.css)
 *       skin/classic/browser/devtools/profiler.css                  (devtools/profiler.css)
 *       skin/classic/browser/devtools/netmonitor.css                (devtools/netmonitor.css)
 *       skin/classic/browser/devtools/scratchpad.css                (devtools/scratchpad.css)
         skin/classic/browser/devtools/magnifying-glass.png          (devtools/magnifying-glass.png)
-        skin/classic/browser/devtools/option-icon.png               (devtools/option-icon.png)
-        skin/classic/browser/devtools/itemToggle.png                (devtools/itemToggle.png)
+        skin/classic/browser/devtools/option-icon.png               (../shared/devtools/images/option-icon.png)
+        skin/classic/browser/devtools/itemToggle.png                (../shared/devtools/images/itemToggle.png)
+        skin/classic/browser/devtools/itemToggle-light.png          (../shared/devtools/images/itemToggle-light.png)
         skin/classic/browser/devtools/itemArrow-dark-rtl.png        (../shared/devtools/images/itemArrow-dark-rtl.png)
         skin/classic/browser/devtools/itemArrow-dark-ltr.png        (../shared/devtools/images/itemArrow-dark-ltr.png)
-        skin/classic/browser/devtools/itemArrow-rtl.png             (../shared/devtools/images/itemArrow-rtl.png)
-        skin/classic/browser/devtools/itemArrow-ltr.png             (../shared/devtools/images/itemArrow-ltr.png)
+        skin/classic/browser/devtools/itemArrow-rtl.png             (../shared/devtools/images/itemArrow-rtl.svg)
+        skin/classic/browser/devtools/itemArrow-ltr.png             (../shared/devtools/images/itemArrow-ltr.svg)
         skin/classic/browser/devtools/background-noise-toolbar.png  (devtools/background-noise-toolbar.png)
         skin/classic/browser/devtools/noise.png                     (devtools/noise.png)
         skin/classic/browser/devtools/inspect-button.png            (devtools/inspect-button.png)
         skin/classic/browser/devtools/dropmarker.png                (devtools/dropmarker.png)
         skin/classic/browser/devtools/layout-background-grid.png    (devtools/layout-background-grid.png)
         skin/classic/browser/devtools/layoutview.css                (devtools/layoutview.css)
-        skin/classic/browser/devtools/debugger-collapse.png         (devtools/debugger-collapse.png)
-        skin/classic/browser/devtools/debugger-expand.png           (devtools/debugger-expand.png)
-        skin/classic/browser/devtools/debugger-pause.png            (devtools/debugger-pause.png)
-        skin/classic/browser/devtools/debugger-play.png             (devtools/debugger-play.png)
-        skin/classic/browser/devtools/debugger-step-in.png          (devtools/debugger-step-in.png)
-        skin/classic/browser/devtools/debugger-step-out.png         (devtools/debugger-step-out.png)
-        skin/classic/browser/devtools/debugger-step-over.png        (devtools/debugger-step-over.png)
-        skin/classic/browser/devtools/debugger-blackbox.png         (devtools/debugger-blackbox.png)
-        skin/classic/browser/devtools/debugger-blackboxMessageEye.png (devtools/debugger-blackboxMessageEye.png)
-        skin/classic/browser/devtools/debugger-toggleBreakpoints.png (devtools/debugger-toggleBreakpoints.png)
+        skin/classic/browser/devtools/debugger-collapse.png         (../shared/devtools/images/debugger-collapse.png)
+        skin/classic/browser/devtools/debugger-expand.png           (../shared/devtools/images/debugger-expand.png)
+        skin/classic/browser/devtools/debugger-pause.png            (../shared/devtools/images/debugger-pause.png)
+        skin/classic/browser/devtools/debugger-play.png             (../shared/devtools/images/debugger-play.png)
+        skin/classic/browser/devtools/debugger-step-in.png          (../shared/devtools/images/debugger-step-in.png)
+        skin/classic/browser/devtools/debugger-step-out.png         (../shared/devtools/images/debugger-step-out.png)
+        skin/classic/browser/devtools/debugger-step-over.png        (../shared/devtools/images/debugger-step-over.png)
+        skin/classic/browser/devtools/debugger-blackbox.png         (../shared/devtools/images/debugger-blackbox.png)
+        skin/classic/browser/devtools/debugger-blackbox-eye.png (../shared/devtools/images/debugger-blackbox-eye.png)
+        skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
         skin/classic/browser/devtools/tracer-icon.png               (devtools/tracer-icon.png)
         skin/classic/browser/devtools/tracer-icon@2x.png            (devtools/tracer-icon@2x.png)
         skin/classic/browser/devtools/responsive-se-resizer.png     (devtools/responsive-se-resizer.png)
@@ -274,7 +254,7 @@ browser.jar:
         skin/classic/browser/devtools/floating-scrollbars.css       (devtools/floating-scrollbars.css)
         skin/classic/browser/devtools/floating-scrollbars-light.css (devtools/floating-scrollbars-light.css)
         skin/classic/browser/devtools/inspector.css                 (devtools/inspector.css)
-        skin/classic/browser/devtools/profiler-stopwatch.png        (devtools/profiler-stopwatch.png)
+        skin/classic/browser/devtools/profiler-stopwatch.png        (../shared/devtools/images/profiler-stopwatch.png)
         skin/classic/browser/devtools/tool-options.svg              (../shared/devtools/images/tool-options.svg)
         skin/classic/browser/devtools/tool-webconsole.svg           (../shared/devtools/images/tool-webconsole.svg)
         skin/classic/browser/devtools/tool-debugger.svg             (../shared/devtools/images/tool-debugger.svg)
@@ -508,6 +488,7 @@ browser.jar:
 *       skin/classic/aero/browser/devtools/common.css                (../shared/devtools/common.css)
 *       skin/classic/aero/browser/devtools/dark-theme.css            (../shared/devtools/dark-theme.css)
 *       skin/classic/aero/browser/devtools/light-theme.css           (../shared/devtools/light-theme.css)
+        skin/classic/aero/browser/devtools/filters.svg               (../shared/devtools/filters.svg)
         skin/classic/aero/browser/devtools/controls.png              (../shared/devtools/controls.png)
 *       skin/classic/aero/browser/devtools/widgets.css               (devtools/widgets.css)
         skin/classic/aero/browser/devtools/commandline-icon.png      (devtools/commandline-icon.png)
@@ -533,61 +514,40 @@ browser.jar:
 *       skin/classic/aero/browser/devtools/webconsole.css                  (devtools/webconsole.css)
         skin/classic/aero/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
         skin/classic/aero/browser/devtools/webconsole.png                  (devtools/webconsole.png)
-        skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton.png                 (devtools/breadcrumbs-scrollbutton.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png     (devtools/breadcrumbs/ltr-end-selected-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-selected.png             (devtools/breadcrumbs/ltr-end-selected.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-end.png                      (devtools/breadcrumbs/ltr-end.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-pressed.png           (devtools/breadcrumbs/ltr-middle-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png  (devtools/breadcrumbs/ltr-middle-selected-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-selected.png          (devtools/breadcrumbs/ltr-middle-selected.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle.png                   (devtools/breadcrumbs/ltr-middle.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-pressed.png            (devtools/breadcrumbs/ltr-start-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png   (devtools/breadcrumbs/ltr-start-selected-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-start.png                    (devtools/breadcrumbs/ltr-start.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-selected.png           (devtools/breadcrumbs/ltr-start-selected.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-pressed.png              (devtools/breadcrumbs/rtl-end-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png     (devtools/breadcrumbs/rtl-end-selected-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-selected.png             (devtools/breadcrumbs/rtl-end-selected.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-end.png                      (devtools/breadcrumbs/rtl-end.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-pressed.png           (devtools/breadcrumbs/rtl-middle-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png  (devtools/breadcrumbs/rtl-middle-selected-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-selected.png          (devtools/breadcrumbs/rtl-middle-selected.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle.png                   (devtools/breadcrumbs/rtl-middle.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-pressed.png            (devtools/breadcrumbs/rtl-start-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png   (devtools/breadcrumbs/rtl-start-selected-pressed.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-start.png                    (devtools/breadcrumbs/rtl-start.png)
-        skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-selected.png           (devtools/breadcrumbs/rtl-start-selected.png)
-        skin/classic/aero/browser/devtools/splitview.css             (devtools/splitview.css)
-        skin/classic/aero/browser/devtools/styleeditor.css           (devtools/styleeditor.css)
+        skin/classic/aero/browser/devtools/breadcrumbs-divider@2x.png      (../shared/devtools/images/breadcrumbs-divider@2x.png)
+        skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton.png    (../shared/devtools/images/breadcrumbs-scrollbutton.png)
+        skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
+        skin/classic/aero/browser/devtools/splitview.css             (../shared/devtools/splitview.css)
+        skin/classic/aero/browser/devtools/styleeditor.css           (../shared/devtools/styleeditor.css)
 *       skin/classic/aero/browser/devtools/shadereditor.css          (devtools/shadereditor.css)
 *       skin/classic/aero/browser/devtools/debugger.css              (devtools/debugger.css)
 *       skin/classic/aero/browser/devtools/profiler.css              (devtools/profiler.css)
 *       skin/classic/aero/browser/devtools/netmonitor.css            (devtools/netmonitor.css)
 *       skin/classic/aero/browser/devtools/scratchpad.css            (devtools/scratchpad.css)
         skin/classic/aero/browser/devtools/magnifying-glass.png      (devtools/magnifying-glass.png)
-        skin/classic/aero/browser/devtools/option-icon.png           (devtools/option-icon.png)
-        skin/classic/aero/browser/devtools/itemToggle.png            (devtools/itemToggle.png)
+        skin/classic/aero/browser/devtools/option-icon.png           (../shared/devtools/images/option-icon.png)
+        skin/classic/aero/browser/devtools/itemToggle.png            (../shared/devtools/images/itemToggle.png)
+        skin/classic/aero/browser/devtools/itemToggle-light.png      (../shared/devtools/images/itemToggle-light.png)
         skin/classic/aero/browser/devtools/itemArrow-dark-rtl.png    (../shared/devtools/images/itemArrow-dark-rtl.png)
         skin/classic/aero/browser/devtools/itemArrow-dark-ltr.png    (../shared/devtools/images/itemArrow-dark-ltr.png)
-        skin/classic/aero/browser/devtools/itemArrow-rtl.png         (../shared/devtools/images/itemArrow-rtl.png)
-        skin/classic/aero/browser/devtools/itemArrow-ltr.png         (../shared/devtools/images/itemArrow-ltr.png)
+        skin/classic/aero/browser/devtools/itemArrow-rtl.png         (../shared/devtools/images/itemArrow-rtl.svg)
+        skin/classic/aero/browser/devtools/itemArrow-ltr.png         (../shared/devtools/images/itemArrow-ltr.svg)
         skin/classic/aero/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
         skin/classic/aero/browser/devtools/noise.png                 (devtools/noise.png)
         skin/classic/aero/browser/devtools/inspect-button.png        (devtools/inspect-button.png)
         skin/classic/aero/browser/devtools/dropmarker.png            (devtools/dropmarker.png)
         skin/classic/aero/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
         skin/classic/aero/browser/devtools/layoutview.css            (devtools/layoutview.css)
-        skin/classic/aero/browser/devtools/debugger-collapse.png     (devtools/debugger-collapse.png)
-        skin/classic/aero/browser/devtools/debugger-expand.png       (devtools/debugger-expand.png)
-        skin/classic/aero/browser/devtools/debugger-pause.png        (devtools/debugger-pause.png)
-        skin/classic/aero/browser/devtools/debugger-play.png         (devtools/debugger-play.png)
-        skin/classic/aero/browser/devtools/debugger-step-in.png      (devtools/debugger-step-in.png)
-        skin/classic/aero/browser/devtools/debugger-step-out.png     (devtools/debugger-step-out.png)
-        skin/classic/aero/browser/devtools/debugger-step-over.png    (devtools/debugger-step-over.png)
-        skin/classic/aero/browser/devtools/debugger-blackbox.png     (devtools/debugger-blackbox.png)
-        skin/classic/aero/browser/devtools/debugger-blackboxMessageEye.png (devtools/debugger-blackboxMessageEye.png)
-        skin/classic/aero/browser/devtools/debugger-toggleBreakpoints.png (devtools/debugger-toggleBreakpoints.png)
+        skin/classic/aero/browser/devtools/debugger-collapse.png     (../shared/devtools/images/debugger-collapse.png)
+        skin/classic/aero/browser/devtools/debugger-expand.png       (../shared/devtools/images/debugger-expand.png)
+        skin/classic/aero/browser/devtools/debugger-pause.png        (../shared/devtools/images/debugger-pause.png)
+        skin/classic/aero/browser/devtools/debugger-play.png         (../shared/devtools/images/debugger-play.png)
+        skin/classic/aero/browser/devtools/debugger-step-in.png      (../shared/devtools/images/debugger-step-in.png)
+        skin/classic/aero/browser/devtools/debugger-step-out.png     (../shared/devtools/images/debugger-step-out.png)
+        skin/classic/aero/browser/devtools/debugger-step-over.png    (../shared/devtools/images/debugger-step-over.png)
+        skin/classic/aero/browser/devtools/debugger-blackbox.png     (../shared/devtools/images/debugger-blackbox.png)
+        skin/classic/aero/browser/devtools/debugger-blackbox-eye.png (../shared/devtools/images/debugger-blackbox-eye.png)
+        skin/classic/aero/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
         skin/classic/aero/browser/devtools/tracer-icon.png           (devtools/tracer-icon.png)
         skin/classic/aero/browser/devtools/tracer-icon@2x.png        (devtools/tracer-icon@2x.png)
         skin/classic/aero/browser/devtools/responsive-se-resizer.png (devtools/responsive-se-resizer.png)
@@ -600,7 +560,7 @@ browser.jar:
         skin/classic/aero/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
         skin/classic/aero/browser/devtools/floating-scrollbars-light.css (devtools/floating-scrollbars-light.css)
         skin/classic/aero/browser/devtools/inspector.css             (devtools/inspector.css)
-        skin/classic/aero/browser/devtools/profiler-stopwatch.png    (devtools/profiler-stopwatch.png)
+        skin/classic/aero/browser/devtools/profiler-stopwatch.png    (../shared/devtools/images/profiler-stopwatch.png)
         skin/classic/aero/browser/devtools/tool-options.svg          (../shared/devtools/images/tool-options.svg)
         skin/classic/aero/browser/devtools/tool-webconsole.svg       (../shared/devtools/images/tool-webconsole.svg)
         skin/classic/aero/browser/devtools/tool-debugger.svg         (../shared/devtools/images/tool-debugger.svg)
diff --git a/browser/themes/windows/menuPanel-aero.png b/browser/themes/windows/menuPanel-aero.png
index 59061ec0aaa3..eeeca15ac80e 100644
Binary files a/browser/themes/windows/menuPanel-aero.png and b/browser/themes/windows/menuPanel-aero.png differ
diff --git a/browser/themes/windows/menuPanel.png b/browser/themes/windows/menuPanel.png
index 31d8d282579e..5821f40bd938 100644
Binary files a/browser/themes/windows/menuPanel.png and b/browser/themes/windows/menuPanel.png differ
diff --git a/dom/events/test/window_wheel_default_action.html b/dom/events/test/window_wheel_default_action.html
index ca3d2f6ee12e..b2fcaa72feca 100644
--- a/dom/events/test/window_wheel_default_action.html
+++ b/dom/events/test/window_wheel_default_action.html
@@ -78,6 +78,14 @@ function hitEventLoop(aFunc, aTimes)
   }
 }
 
+function onZoomReset(aCallback) {
+  var topic = "browser-fullZoom:reset";
+  SpecialPowers.addObserver(function observe() {
+    SpecialPowers.removeObserver(observe, topic);
+    SimpleTest.executeSoon(aCallback);
+  }, topic, false);
+}
+
 function setDeltaMultiplierSettings(aSettings)
 {
   SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", aSettings.deltaMultiplierX * 100);
@@ -1129,7 +1137,9 @@ function doTestZoom(aSettings, aCallback)
       }
 
       synthesizeKey("0", { accelKey: true });
-      hitEventLoop(doNextTest, 20);
+      onZoomReset(function () {
+        hitEventLoop(doNextTest, 20);
+      });
     }, 20);
   }
   doNextTest();
@@ -1137,10 +1147,15 @@ function doTestZoom(aSettings, aCallback)
 
 function doTestZoomedScroll(aCallback)
 {
-  function testZoomedPixelScroll()
+  function prepareTestZoomedPixelScroll()
   {
     // Reset zoom and store the scroll amount into the data.
     synthesizeKey("0", { accelKey: true });
+    onZoomReset(testZoomedPixelScroll);
+  }
+
+  function testZoomedPixelScroll()
+  {
     gScrollableElement.scrollTop = 1000;
     gScrollableElement.scrollLeft = 1000;
     // Ensure not to be in reflow.
@@ -1190,17 +1205,21 @@ function doTestZoomedScroll(aCallback)
             window.removeEventListener("MozMousePixelScroll", handler, true);
 
             synthesizeKey("0", { accelKey: true });
-            testZoomedLineScroll();
+            onZoomReset(prepareTestZoomedLineScroll);
           }, 20);
         }, 20);
       }, 20);
     }, 20);
   }
 
-  function testZoomedLineScroll()
+  function prepareTestZoomedLineScroll()
   {
     // Reset zoom and store the scroll amount into the data.
     synthesizeKey("0", { accelKey: true });
+    onZoomReset(testZoomedLineScroll);
+  }
+  function testZoomedLineScroll()
+  {
     gScrollableElement.scrollTop = 1000;
     gScrollableElement.scrollLeft = 1000;
     // Ensure not to be in reflow.
@@ -1262,8 +1281,7 @@ function doTestZoomedScroll(aCallback)
             window.removeEventListener("MozMousePixelScroll", handler, true);
 
             synthesizeKey("0", { accelKey: true });
-
-            SimpleTest.executeSoon(aCallback);
+            onZoomReset(aCallback);
           }, 20);
         }, 20);
       }, 20);
@@ -1273,7 +1291,7 @@ function doTestZoomedScroll(aCallback)
   // XXX It's too difficult to test page scroll because the page scroll amount
   //     is computed by complex logic.
 
-  testZoomedPixelScroll();
+  prepareTestZoomedPixelScroll();
 }
 
 function doTestWholeScroll(aCallback)
diff --git a/mobile/android/base/widget/ActivityChooserModel.java b/mobile/android/base/widget/ActivityChooserModel.java
index 182ee2e35489..88e081f66a02 100644
--- a/mobile/android/base/widget/ActivityChooserModel.java
+++ b/mobile/android/base/widget/ActivityChooserModel.java
@@ -20,9 +20,11 @@
 //package android.widget;
 package org.mozilla.gecko.widget;
 
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ResolveInfo;
 import android.database.DataSetObservable;
 import android.os.AsyncTask;
@@ -47,6 +49,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -253,9 +256,9 @@ public class ActivityChooserModel extends DataSetObservable {
      * Monitor for added and removed packages.
      */
     /**
-     * Mozilla: Not needed for the application.
+     * Mozilla: Converted from a PackageMonitor to a DataModelPackageMonitor to avoid importing a new class.
      */
-    //private final PackageMonitor mPackageMonitor = new DataModelPackageMonitor();
+    private final DataModelPackageMonitor mPackageMonitor = new DataModelPackageMonitor();
 
     /**
      * Context for accessing resources.
@@ -372,9 +375,9 @@ public class ActivityChooserModel extends DataSetObservable {
         }
 
         /**
-         * Mozilla: Not needed for the application.
+         * Mozilla: Uses modified receiver
          */
-        //mPackageMonitor.register(mContext, null, true);
+        mPackageMonitor.register(mContext);
     }
 
     /**
@@ -506,7 +509,7 @@ public class ActivityChooserModel extends DataSetObservable {
 
             HistoricalRecord historicalRecord = new HistoricalRecord(chosenName,
                     System.currentTimeMillis(), DEFAULT_HISTORICAL_RECORD_WEIGHT);
-            addHisoricalRecord(historicalRecord);
+            addHistoricalRecord(historicalRecord);
 
             return choiceIntent;
         }
@@ -573,7 +576,7 @@ public class ActivityChooserModel extends DataSetObservable {
                     newDefaultActivity.resolveInfo.activityInfo.name);
             HistoricalRecord historicalRecord = new HistoricalRecord(defaultName,
                     System.currentTimeMillis(), weight);
-            addHisoricalRecord(historicalRecord);
+            addHistoricalRecord(historicalRecord);
         }
     }
 
@@ -689,7 +692,7 @@ public class ActivityChooserModel extends DataSetObservable {
         /**
          * Mozilla: Not needed for the application.
          */
-        //mPackageMonitor.unregister();
+        mPackageMonitor.unregister();
     }
 
     /**
@@ -771,7 +774,7 @@ public class ActivityChooserModel extends DataSetObservable {
      * @param historicalRecord The record to add.
      * @return True if the record was added.
      */
-    private boolean addHisoricalRecord(HistoricalRecord historicalRecord) {
+    private boolean addHistoricalRecord(HistoricalRecord historicalRecord) {
         final boolean added = mHistoricalRecords.add(historicalRecord);
         if (added) {
             mHistoricalRecordsChanged = true;
@@ -783,6 +786,33 @@ public class ActivityChooserModel extends DataSetObservable {
         return added;
     }
 
+    /**
+     * Removes all historical records for this pkg.
+     *
+     * @param historicalRecord The pkg to delete records for.
+     * @return True if the record was added.
+     */
+    private boolean removeHistoricalRecordsForPackage(final String pkg) {
+        boolean removed = false;
+
+        for (Iterator<HistoricalRecord> i = mHistoricalRecords.iterator(); i.hasNext();) {
+            final HistoricalRecord record = i.next();
+            if (record.activity.getPackageName().equals(pkg)) {
+                removed = mHistoricalRecords.remove(record);
+            }
+        }
+
+        if (removed) {
+            mHistoricalRecordsChanged = true;
+            pruneExcessiveHistoricalRecordsIfNeeded();
+            persistHistoricalDataIfNeeded();
+            sortActivitiesIfNeeded();
+            notifyChanged();
+        }
+
+        return removed;
+    }
+
     /**
      * Prunes older excessive records to guarantee maxHistorySize.
      */
@@ -1151,16 +1181,45 @@ public class ActivityChooserModel extends DataSetObservable {
      * Keeps in sync the historical records and activities with the installed applications.
      */
     /**
-     * Mozilla: Not needed for the application.
+     * Mozilla: Adapted significantly
      */
-    /*
-    private final class DataModelPackageMonitor extends PackageMonitor {
+    private static final String LOGTAG = "GeckoActivityChooserModel";
+    private final class DataModelPackageMonitor extends BroadcastReceiver {
+        private Context mContext;
+
+        public DataModelPackageMonitor() { }
+
+        public void register(Context context) {
+            mContext = context;
+
+            String[] intents = new String[] {
+                Intent.ACTION_PACKAGE_REMOVED,
+                Intent.ACTION_PACKAGE_ADDED,
+                Intent.ACTION_PACKAGE_CHANGED
+            };
+
+            for (String intent : intents) {
+                IntentFilter removeFilter = new IntentFilter(intent);
+                removeFilter.addDataScheme("package");
+                context.registerReceiver(this, removeFilter);
+            }
+        }
+
+        public void unregister() {
+            mContext.unregisterReceiver(this);
+            mContext = null;
+        }
 
         @Override
-        public void onSomePackagesChanged() {
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) {
+                String packageName = intent.getData().getSchemeSpecificPart();
+                removeHistoricalRecordsForPackage(packageName);
+            }
+
             mReloadActivities = true;
         }
     }
-    */
 }
 
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 52978c8ddaa9..90e9964929fd 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -488,6 +488,7 @@ var BrowserApp = {
       NativeWindow.contextmenus.linkOpenableNonPrivateContext,
       function(aTarget) {
         let url = NativeWindow.contextmenus._getLinkURL(aTarget);
+        ContentAreaUtils.urlSecurityCheck(url, aTarget.ownerDocument.nodePrincipal);
         BrowserApp.addTab(url, { selected: false, parentId: BrowserApp.selectedTab.id });
 
         let newtabStrings = Strings.browser.GetStringFromName("newtabpopup.opened");
@@ -499,6 +500,7 @@ var BrowserApp = {
       NativeWindow.contextmenus.linkOpenableContext,
       function(aTarget) {
         let url = NativeWindow.contextmenus._getLinkURL(aTarget);
+        ContentAreaUtils.urlSecurityCheck(url, aTarget.ownerDocument.nodePrincipal);
         BrowserApp.addTab(url, { selected: false, parentId: BrowserApp.selectedTab.id, isPrivate: true });
 
         let newtabStrings = Strings.browser.GetStringFromName("newprivatetabpopup.opened");
diff --git a/mobile/android/modules/Home.jsm b/mobile/android/modules/Home.jsm
index 58c3896e1651..ae0c685ee090 100644
--- a/mobile/android/modules/Home.jsm
+++ b/mobile/android/modules/Home.jsm
@@ -159,7 +159,8 @@ let HomePanels = {
 
   // Valid types of views for a dataset.
   View: {
-    LIST: "list"
+    LIST: "list",
+    GRID: "grid"
   },
 
   // Holds the currrent set of registered panels.
diff --git a/mobile/android/themes/core/images/reader-share-icon-hdpi.png b/mobile/android/themes/core/images/reader-share-icon-hdpi.png
index 301c532c33f4..b0de6cb06878 100644
Binary files a/mobile/android/themes/core/images/reader-share-icon-hdpi.png and b/mobile/android/themes/core/images/reader-share-icon-hdpi.png differ
diff --git a/mobile/android/themes/core/images/reader-share-icon-mdpi.png b/mobile/android/themes/core/images/reader-share-icon-mdpi.png
index 960fd5b4742f..229ab1e2f010 100644
Binary files a/mobile/android/themes/core/images/reader-share-icon-mdpi.png and b/mobile/android/themes/core/images/reader-share-icon-mdpi.png differ
diff --git a/mobile/android/themes/core/images/reader-share-icon-xhdpi.png b/mobile/android/themes/core/images/reader-share-icon-xhdpi.png
index c230078c0d57..0bcf97eb3147 100644
Binary files a/mobile/android/themes/core/images/reader-share-icon-xhdpi.png and b/mobile/android/themes/core/images/reader-share-icon-xhdpi.png differ
diff --git a/services/fxaccounts/FxAccounts.jsm b/services/fxaccounts/FxAccounts.jsm
index 24c19a2f46f2..4787f99f9df7 100644
--- a/services/fxaccounts/FxAccounts.jsm
+++ b/services/fxaccounts/FxAccounts.jsm
@@ -144,15 +144,14 @@ InternalMethods.prototype = {
       }
       if (!this.whenKeysReadyPromise) {
         this.whenKeysReadyPromise = Promise.defer();
-        return this.fetchAndUnwrapKeys(data.keyFetchToken)
-          .then((data) => {
-            if (this.whenKeysReadyPromise) {
-              this.whenKeysReadyPromise.resolve(data);
-            }
-          });
+        this.fetchAndUnwrapKeys(data.keyFetchToken).then(data => {
+          if (this.whenKeysReadyPromise) {
+            this.whenKeysReadyPromise.resolve(data);
+          }
+        });
       }
       return this.whenKeysReadyPromise.promise;
-      });
+    });
    },
 
   fetchAndUnwrapKeys: function(keyFetchToken) {
diff --git a/services/sync/modules/browserid_identity.js b/services/sync/modules/browserid_identity.js
index aed13eed409f..0bfd9b776cb1 100644
--- a/services/sync/modules/browserid_identity.js
+++ b/services/sync/modules/browserid_identity.js
@@ -34,6 +34,8 @@ XPCOMUtils.defineLazyGetter(this, 'fxAccountsCommon', function() {
   return ob;
 });
 
+const PREF_SYNC_SHOW_CUSTOMIZATION = "services.sync.ui.showCustomizationDialog";
+
 function deriveKeyBundle(kB) {
   let out = CryptoUtils.hkdf(kB, undefined,
                              "identity.mozilla.com/picl/v1/oldsync", 2*32);
@@ -74,26 +76,25 @@ this.BrowserIDManager.prototype = {
 
   get needsCustomization() {
     try {
-      return Services.prefs.getBoolPref("services.sync.needsCustomization");
+      return Services.prefs.getBoolPref(PREF_SYNC_SHOW_CUSTOMIZATION);
     } catch (e) {
       return false;
     }
   },
 
   initialize: function() {
-    Services.obs.addObserver(this, fxAccountsCommon.ONVERIFIED_NOTIFICATION, false);
+    Services.obs.addObserver(this, fxAccountsCommon.ONLOGIN_NOTIFICATION, false);
     Services.obs.addObserver(this, fxAccountsCommon.ONLOGOUT_NOTIFICATION, false);
     return this.initializeWithCurrentIdentity();
   },
 
-  initializeWithCurrentIdentity: function() {
+  initializeWithCurrentIdentity: function(isInitialSync=false) {
     this._log.trace("initializeWithCurrentIdentity");
     Components.utils.import("resource://services-sync/main.js");
 
     // Reset the world before we do anything async.
     this.whenReadyToAuthenticate = Promise.defer();
     this._shouldHaveSyncKeyBundle = false;
-    this.username = ""; // this calls resetCredentials which drops the key bundle.
 
     return fxAccounts.getSignedInUser().then(accountData => {
       if (!accountData) {
@@ -102,31 +103,43 @@ this.BrowserIDManager.prototype = {
         return;
       }
 
-      if (this.needsCustomization) {
-        // If the user chose to "Customize sync options" when signing
-        // up with Firefox Accounts, ask them to choose what to sync.
-        const url = "chrome://browser/content/sync/customize.xul";
-        const features = "centerscreen,chrome,modal,dialog,resizable=no";
-        let win = Services.wm.getMostRecentWindow("navigator:browser");
-
-        let data = {accepted: false};
-        win.openDialog(url, "_blank", features, data);
-
-        if (data.accepted) {
-          Services.prefs.clearUserPref("services.sync.needsCustomization");
-        } else {
-          // Log out if the user canceled the dialog.
-          return fxAccounts.signOut();
-        }
-      }
-
       this._account = accountData.email;
-      // We start a background keybundle fetch...
-      this._log.info("Starting background fetch for key bundle.");
-      this._fetchSyncKeyBundle().then(() => {
+      // The user must be verified before we can do anything at all; we kick
+      // this and the rest of initialization off in the background (ie, we
+      // don't return the promise)
+      this._log.info("Waiting for user to be verified.");
+      fxAccounts.whenVerified(accountData).then(accountData => {
+        // We do the background keybundle fetch...
+        this._log.info("Starting fetch for key bundle.");
+        if (this.needsCustomization) {
+          // If the user chose to "Customize sync options" when signing
+          // up with Firefox Accounts, ask them to choose what to sync.
+          const url = "chrome://browser/content/sync/customize.xul";
+          const features = "centerscreen,chrome,modal,dialog,resizable=no";
+          let win = Services.wm.getMostRecentWindow("navigator:browser");
+
+          let data = {accepted: false};
+          win.openDialog(url, "_blank", features, data);
+
+          if (data.accepted) {
+            Services.prefs.clearUserPref(PREF_SYNC_SHOW_CUSTOMIZATION);
+          } else {
+            // Log out if the user canceled the dialog.
+            return fxAccounts.signOut();
+          }
+        }
+      }).then(() => {
+        return this._fetchSyncKeyBundle();
+      }).then(() => {
         this._shouldHaveSyncKeyBundle = true; // and we should actually have one...
         this.whenReadyToAuthenticate.resolve();
         this._log.info("Background fetch for key bundle done");
+        if (isInitialSync) {
+          this._log.info("Doing initial sync actions");
+          Svc.Prefs.set("firstSync", "resetClient");
+          Services.obs.notifyObservers(null, "weave:service:setup-complete", null);
+          Weave.Utils.nextTick(Weave.Service.sync, Weave.Service);
+        }
       }).then(null, err => {
         this._shouldHaveSyncKeyBundle = true; // but we probably don't have one...
         this.whenReadyToAuthenticate.reject(err);
@@ -142,14 +155,8 @@ this.BrowserIDManager.prototype = {
 
   observe: function (subject, topic, data) {
     switch (topic) {
-    case fxAccountsCommon.ONVERIFIED_NOTIFICATION:
     case fxAccountsCommon.ONLOGIN_NOTIFICATION:
-      // For now, we just assume it's the same user logging back in.
-      // Bug 958927 exists to work out what to do if that's not true.  It might
-      // be that the :onlogout observer does a .startOver (or maybe not - TBD)
-      // But for now, do nothing, and sync will just start re-synching in its
-      // own sweet time...
-      this.initializeWithCurrentIdentity();
+      this.initializeWithCurrentIdentity(true);
       break;
 
     case fxAccountsCommon.ONLOGOUT_NOTIFICATION:
@@ -351,58 +358,25 @@ this.BrowserIDManager.prototype = {
 
   _fetchSyncKeyBundle: function() {
     // Fetch a sync token for the logged in user from the token server.
-    return this._refreshTokenForLoggedInUser(
-    ).then(token => {
-      this._token = token;
-      return this._fxaService.getKeys();
-    }).then(userData => {
+    return this._fxaService.getKeys().then(userData => {
       // unlikely, but if the logged in user somehow changed between these
       // calls we better fail.
       if (!userData || userData.email !== this.account) {
         throw new Error("The currently logged-in user has changed.");
       }
-      // Set the username to be the uid returned by the token server.
-      this.username = this._token.uid.toString();
-      // both Jelly and FxAccounts give us kA/kB as hex.
-      let kB = Utils.hexToBytes(userData.kB);
-      this._syncKeyBundle = deriveKeyBundle(kB);
+      return this._fetchTokenForUser(userData).then(token => {
+        this._token = token;
+        // Set the username to be the uid returned by the token server.
+        this.username = this._token.uid.toString();
+        // both Jelly and FxAccounts give us kA/kB as hex.
+        let kB = Utils.hexToBytes(userData.kB);
+        this._syncKeyBundle = deriveKeyBundle(kB);
+        return;
+      });
     });
   },
 
-  // Refresh the sync token for the currently logged in Firefox Accounts user.
-  // This method requires that this module has been intialized for a user.
-  _refreshTokenForLoggedInUser: function() {
-    return this._fxaService.getSignedInUser().then(function (userData) {
-      if (!userData || userData.email !== this.account) {
-        // This means the logged in user changed or the identity module
-        // wasn't properly initialized. TODO: figure out what needs to
-        // happen here.
-        this._log.error("Currently logged in FxA user differs from what was locally noted. TODO: do proper error handling.");
-        return null;
-      }
-      return this._fetchTokenForUser(userData);
-    }.bind(this));
-  },
-
-  _refreshTokenForLoggedInUserSync: function() {
-    let cb = Async.makeSpinningCallback();
-
-    this._refreshTokenForLoggedInUser().then(function (token) {
-      cb(null, token);
-    },
-    function (err) {
-      cb(err);
-    });
-
-    try {
-      return cb.wait();
-    } catch (err) {
-      this._log.info("refreshTokenForLoggedInUserSync: " + err.message);
-      return null;
-    }
-  },
-
-  // This is a helper to fetch a sync token for the given user data.
+  // Refresh the sync token for the specified Firefox Accounts user.
   _fetchTokenForUser: function(userData) {
     let tokenServerURI = Svc.Prefs.get("tokenServerURI");
     let log = this._log;
@@ -437,9 +411,31 @@ this.BrowserIDManager.prototype = {
       .then(token => {
         token.expiration = this._now() + (token.duration * 1000);
         return token;
+      })
+      .then(null, err => {
+        Cu.reportError("Failed to fetch token: " + err);
+        // XXX - TODO - work out how to set sync to an error state.
       });
   },
 
+  _fetchTokenForLoggedInUserSync: function() {
+    let cb = Async.makeSpinningCallback();
+
+    this._fxaService.getSignedInUser().then(userData => {
+      this._fetchTokenForUser(userData).then(token => {
+        cb(null, token);
+      }, err => {
+        cb(err);
+      });
+    });
+    try {
+      return cb.wait();
+    } catch (err) {
+      this._log.info("_fetchTokenForLoggedInUserSync: " + err.message);
+      return null;
+    }
+  },
+
   getResourceAuthenticator: function () {
     return this._getAuthenticationHeader.bind(this);
   },
@@ -458,7 +454,7 @@ this.BrowserIDManager.prototype = {
   _getAuthenticationHeader: function(httpObject, method) {
     if (!this.hasValidToken()) {
       // Refresh token for the currently logged in FxA user
-      this._token = this._refreshTokenForLoggedInUserSync();
+      this._token = this._fetchTokenForLoggedInUserSync();
       if (!this._token) {
         return null;
       }
@@ -502,12 +498,14 @@ BrowserIDClusterManager.prototype = {
     let promiseClusterURL = function() {
       return fxAccounts.getSignedInUser().then(userData => {
         return this.identity._fetchTokenForUser(userData).then(token => {
-          // Set the clusterURI for this user based on the endpoint in the
-          // token. This is a bit of a hack, and we should figure out a better
-          // way of distributing it to components that need it.
-          let clusterURI = Services.io.newURI(token.endpoint, null, null);
-          clusterURI.path = "/";
-          return clusterURI.spec;
+          let endpoint = token.endpoint;
+          // For Sync 1.5 storage endpoints, we use the base endpoint verbatim.
+          // However, it should end in "/" because we will extend it with
+          // well known path components. So we add a "/" if it's missing.
+          if (!endpoint.endsWith("/")) {
+            endpoint += "/";
+          }
+          return endpoint;
         });
       });
     }.bind(this);
@@ -521,4 +519,13 @@ BrowserIDClusterManager.prototype = {
     });
     return cb.wait();
   },
+
+  getUserBaseURL: function() {
+    // Legacy Sync and FxA Sync construct the userBaseURL differently. Legacy
+    // Sync appends path components onto an empty path, and in FxA Sync the
+    // token server constructs this for us in an opaque manner. Since the
+    // cluster manager already sets the clusterURL on Service and also has
+    // access to the current identity, we added this functionality here.
+    return this.service.clusterURL;
+  }
 }
diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js
index 9b20fc213d3d..311ed6a50805 100644
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@@ -651,8 +651,7 @@ SyncEngine.prototype = {
   // How many records to process in a single batch.
   applyIncomingBatchSize: DEFAULT_STORE_BATCH_SIZE,
 
-  get storageURL() Svc.Prefs.get("clusterURL") + SYNC_API_VERSION +
-    "/" + this.service.identity.username + "/storage/",
+  get storageURL() this.service.storageURL,
 
   get engineURL() this.storageURL + this.name,
 
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index c0903c9e0e8c..9e4c490664f2 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -60,7 +60,6 @@ Sync11Service.prototype = {
   _locked: false,
   _loggedIn: false,
 
-  userBaseURL: null,
   infoURL: null,
   storageURL: null,
   metaURL: null,
@@ -156,13 +155,18 @@ Sync11Service.prototype = {
     return Utils.catch.call(this, func, lockExceptions);
   },
 
+  get userBaseURL() {
+    if (!this._clusterManager) {
+      return null;
+    }
+    return this._clusterManager.getUserBaseURL();
+  },
+
   _updateCachedURLs: function _updateCachedURLs() {
     // Nothing to cache yet if we don't have the building blocks
     if (this.clusterURL == "" || this.identity.username == "")
       return;
 
-    let storageAPI = this.clusterURL + SYNC_API_VERSION + "/";
-    this.userBaseURL = storageAPI + this.identity.username + "/";
     this._log.debug("Caching URLs under storage user base: " + this.userBaseURL);
 
     // Generate and cache various URLs under the storage API for this user
diff --git a/services/sync/modules/stages/cluster.js b/services/sync/modules/stages/cluster.js
index 14ad9fd2edb7..e6ef783a222c 100644
--- a/services/sync/modules/stages/cluster.js
+++ b/services/sync/modules/stages/cluster.js
@@ -91,5 +91,21 @@ ClusterManager.prototype = {
 
     return true;
   },
+
+  getUserBaseURL: function getUserBaseURL() {
+    // Legacy Sync and FxA Sync construct the userBaseURL differently. Legacy
+    // Sync appends path components onto an empty path, and in FxA Sync, the
+    // token server constructs this for us in an opaque manner. Since the
+    // cluster manager already sets the clusterURL on Service and also has
+    // access to the current identity, we added this functionality here.
+
+    // If the clusterURL hasn't been set, the userBaseURL shouldn't be set
+    // either. Some tests expect "undefined" to be returned here.
+    if (!this.service.clusterURL) {
+      return undefined;
+    }
+    let storageAPI = this.service.clusterURL + SYNC_API_VERSION + "/";
+    return storageAPI + this.identity.username + "/";
+  }
 };
 Object.freeze(ClusterManager.prototype);
diff --git a/services/sync/tests/unit/test_service_attributes.js b/services/sync/tests/unit/test_service_attributes.js
index d8a20eb2ad28..1491e8ef539f 100644
--- a/services/sync/tests/unit/test_service_attributes.js
+++ b/services/sync/tests/unit/test_service_attributes.js
@@ -7,7 +7,7 @@ Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/fakeservices.js");
 
 function test_urls() {
-  _("URL related Service properties corresopnd to preference settings.");
+  _("URL related Service properties correspond to preference settings.");
   try {
     do_check_true(!!Service.serverURL); // actual value may change
     do_check_eq(Service.clusterURL, "");
diff --git a/services/sync/tests/unit/test_syncengine_sync.js b/services/sync/tests/unit/test_syncengine_sync.js
index 5b6169f0a7fc..b8b5f7d0ce09 100644
--- a/services/sync/tests/unit/test_syncengine_sync.js
+++ b/services/sync/tests/unit/test_syncengine_sync.js
@@ -48,6 +48,7 @@ function createServerAndConfigureClient() {
   Service.serverURL = server.baseURI;
   Service.clusterURL = server.baseURI;
   Service.identity.username = USER;
+  Service._updateCachedURLs();
 
   return [engine, server, USER];
 }
diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py
index 43ca96b3e690..80fec198d678 100644
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -627,6 +627,7 @@ def main():
         options.extraPrefs.append('browser.search.suggest.prompted=true')
         options.extraPrefs.append('layout.css.devPixelsPerPx=1.0')
         options.extraPrefs.append('browser.chrome.dynamictoolbar=false')
+        options.extraPrefs.append('browser.snippets.enabled=false')
 
         if (options.dm_trans == 'adb' and options.robocopApk):
             dm._checkCmd(["install", "-r", options.robocopApk])
diff --git a/toolkit/content/buildconfig.html b/toolkit/content/buildconfig.html
index 1fd53f618302..e91abd2d9579 100644
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -3,9 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# IMPORTANT: Do not modify this file without checking the results of 
-# build/macosx/universal/fix-buildconfig in a Mac Universal binary.
-#
 #filter substitution
 <html>
 <head>
diff --git a/widget/windows/winrt/MetroContracts.cpp b/widget/windows/winrt/MetroContracts.cpp
index de2c136de9d0..020f88fbf17d 100644
--- a/widget/windows/winrt/MetroContracts.cpp
+++ b/widget/windows/winrt/MetroContracts.cpp
@@ -104,8 +104,8 @@ FrameworkView::LaunchActivated(ComPtr<ILaunchActivatedEventArgs>& aArgs, bool aS
   int argc;
   unsigned int length;
   LPWSTR* argv = CommandLineToArgvW(data.GetRawBuffer(&length), &argc);
-  if (aStartup && argc == 3 && !wcsicmp(argv[1], L"-url")) {
-    mActivationURI = argv[2];
+  if (aStartup && argc == 2 && !wcsicmp(argv[0], L"-url")) {
+    mActivationURI = argv[1];
   } else {
     // Some other command line or this is not a startup.
     // If it is startup we process it later when XPCOM is initialilzed.
@@ -273,7 +273,11 @@ FrameworkView::PerformURILoad(HString& aURI)
   }
 
   nsAutoCString utf8data(NS_ConvertUTF16toUTF8(aURI.GetRawBuffer(&length)));
-  const char *argv[] = { "metrobrowser",
+
+  // NB: The first argument gets stripped by nsICommandLineRunner::Init,
+  //     so it doesn't matter what we pass as the first argument, but we
+  //     have to pass something.
+  const char *argv[] = { "", // This argument gets stripped
                          "-url",
                          utf8data.BeginReading() };
   nsresult rv = cmdLine->Init(ArrayLength(argv),
@@ -304,7 +308,10 @@ FrameworkView::PerformSearch(HString& aQuery)
   parameter.Append(NS_ConvertUTF16toUTF8(aQuery.GetRawBuffer(&length)));
   parameter.AppendLiteral("\"");
 
-  const char *argv[] = { "metrobrowser",
+  // NB: The first argument gets stripped by nsICommandLineRunner::Init,
+  //     so it doesn't matter what we pass as the first argument, but we
+  //     have to pass something.
+  const char *argv[] = { "", // This argument gets stripped
                          "-search",
                          parameter.BeginReading() };
   nsresult rv = cmdLine->Init(ArrayLength(argv),