diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index df1d34168bf..ff18c60c6b2 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4061,7 +4061,8 @@ var CombinedStopReload = {
     var stop = document.getElementById("stop-button");
 
     if (urlbar) {
-      if (!reload || urlbar.nextSibling != reload ||
+      if (urlbar.parentNode.getAttribute("mode") != "icons" ||
+          !reload || urlbar.nextSibling != reload ||
           !stop || reload.nextSibling != stop)
         urlbar.removeAttribute("combined");
       else {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 01abe7ad6fc..b7afb1199fd 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -532,145 +532,145 @@
              customizationtarget="nav-bar-customizationtarget"
              context="toolbar-context-menu">
 
-      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="0">
-        <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
-                     context="backForwardMenu" removable="true"
-                     forwarddisabled="true"
-                     title="&backForwardItem.title;">
-          <toolbarbutton id="back-button" class="toolbarbutton-1"
-                         label="&backCmd.label;"
-                         command="Browser:BackOrBackDuplicate"
-                         onclick="checkForMiddleClick(this, event);"
-                         tooltip="back-button-tooltip"/>
-          <toolbarbutton id="forward-button" class="toolbarbutton-1"
-                         label="&forwardCmd.label;"
-                         command="Browser:ForwardOrForwardDuplicate"
-                         onclick="checkForMiddleClick(this, event);"
-                         tooltip="forward-button-tooltip"/>
-          <dummyobservertarget hidden="true"
-                               onbroadcast="if (this.getAttribute('disabled') == 'true')
-                                              this.parentNode.setAttribute('forwarddisabled', 'true');
-                                            else
-                                              this.parentNode.removeAttribute('forwarddisabled');">
-            <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
-          </dummyobservertarget>
-        </toolbaritem>
-
-        <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
-                     title="&locationItem.title;" class="chromeclass-location" removable="true">
-          <textbox id="urlbar" flex="1"
-                   placeholder="&urlbar.placeholder2;"
-                   type="autocomplete"
-                   autocompletesearch="urlinline history"
-                   autocompletesearchparam="enable-actions"
-                   autocompletepopup="PopupAutoCompleteRichResult"
-                   completeselectedindex="true"
-                   tabscrolling="true"
-                   showcommentcolumn="true"
-                   showimagecolumn="true"
-                   enablehistory="true"
-                   maxrows="6"
-                   newlines="stripsurroundingwhitespace"
-                   oninput="gBrowser.userTypedValue = this.value;"
-                   ontextentered="this.handleCommand(param);"
-                   ontextreverted="return this.handleRevert();"
-                   pageproxystate="invalid"
-                   onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
-                   onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
-            <box id="notification-popup-box" hidden="true" align="center">
-              <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
-              <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
-            </box>
-            <!-- Use onclick instead of normal popup= syntax since the popup
-                 code fires onmousedown, and hence eats our favicon drag events.
-                 We only add the identity-box button to the tab order when the location bar
-                 has focus, otherwise pressing F6 focuses it instead of the location bar -->
-            <box id="identity-box" role="button"
-                 align="center"
-                 onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
-                 onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
-                 ondragstart="gIdentityHandler.onDragStart(event);">
-              <image id="page-proxy-favicon"
-                     onclick="PageProxyClickHandler(event);"
-                     pageproxystate="invalid"/>
-              <hbox id="identity-icon-labels">
-                <label id="identity-icon-label" class="plain" flex="1"/>
-                <label id="identity-icon-country-label" class="plain"/>
-              </hbox>
-            </box>
-            <box id="urlbar-display-box" align="center">
-              <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
-            </box>
-            <hbox id="urlbar-icons">
-              <image id="page-report-button"
-                     class="urlbar-icon"
-                     hidden="true"
-                     tooltiptext="&pageReportIcon.tooltip;"
-                     onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
-
-              <label id="share-button-status" collapsed="true" role="status"/>
-              <image id="share-button"
-                     class="urlbar-icon"
-                     hidden="true"
-                     onclick="SocialShareButton.onClick(event);"/>
-
-              <image id="go-button"
-                     class="urlbar-icon"
-                     tooltiptext="&goEndCap.tooltip;"
-                     onclick="gURLBar.handleCommand(event);"/>
-            </hbox>
-            <toolbarbutton id="urlbar-go-button"
-                           class="chromeclass-toolbar-additional"
-                           onclick="gURLBar.handleCommand(event);"
-                           tooltiptext="&goEndCap.tooltip;"/>
-            <toolbarbutton id="urlbar-reload-button"
-                           class="chromeclass-toolbar-additional"
-                           command="Browser:ReloadOrDuplicate"
-                           onclick="checkForMiddleClick(this, event);"
-                           tooltiptext="&reloadButton.tooltip;"/>
-            <toolbarbutton id="urlbar-stop-button"
-                           class="chromeclass-toolbar-additional"
-                           command="Browser:Stop"
-                           tooltiptext="&stopButton.tooltip;"/>
-          </textbox>
-        </toolbaritem>
-
-        <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                       label="&reloadCmd.label;" removable="true"
-                       command="Browser:ReloadOrDuplicate"
+      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
+                   context="backForwardMenu" removable="true"
+                   forwarddisabled="true"
+                   title="&backForwardItem.title;">
+        <toolbarbutton id="back-button" class="toolbarbutton-1"
+                       label="&backCmd.label;"
+                       command="Browser:BackOrBackDuplicate"
                        onclick="checkForMiddleClick(this, event);"
-                       tooltiptext="&reloadButton.tooltip;"/>
+                       tooltip="back-button-tooltip"/>
+        <toolbarbutton id="forward-button" class="toolbarbutton-1"
+                       label="&forwardCmd.label;"
+                       command="Browser:ForwardOrForwardDuplicate"
+                       onclick="checkForMiddleClick(this, event);"
+                       tooltip="forward-button-tooltip"/>
+        <dummyobservertarget hidden="true"
+                             onbroadcast="if (this.getAttribute('disabled') == 'true')
+                                            this.parentNode.setAttribute('forwarddisabled', 'true');
+                                          else
+                                            this.parentNode.removeAttribute('forwarddisabled');">
+          <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
+        </dummyobservertarget>
+      </toolbaritem>
 
-        <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                       label="&stopCmd.label;" removable="true"
-                       command="Browser:Stop"
-                       tooltiptext="&stopButton.tooltip;"/>
+      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
+                   title="&locationItem.title;" class="chromeclass-location" removable="true">
+        <textbox id="urlbar" flex="1"
+                 placeholder="&urlbar.placeholder2;"
+                 type="autocomplete"
+                 autocompletesearch="urlinline history"
+                 autocompletesearchparam="enable-actions"
+                 autocompletepopup="PopupAutoCompleteRichResult"
+                 completeselectedindex="true"
+                 tabscrolling="true"
+                 showcommentcolumn="true"
+                 showimagecolumn="true"
+                 enablehistory="true"
+                 maxrows="6"
+                 newlines="stripsurroundingwhitespace"
+                 oninput="gBrowser.userTypedValue = this.value;"
+                 ontextentered="this.handleCommand(param);"
+                 ontextreverted="return this.handleRevert();"
+                 pageproxystate="invalid"
+                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
+                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
+          <box id="notification-popup-box" hidden="true" align="center">
+            <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
+            <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
+          </box>
+          <!-- Use onclick instead of normal popup= syntax since the popup
+               code fires onmousedown, and hence eats our favicon drag events.
+               We only add the identity-box button to the tab order when the location bar
+               has focus, otherwise pressing F6 focuses it instead of the location bar -->
+          <box id="identity-box" role="button"
+               align="center"
+               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
+               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+               ondragstart="gIdentityHandler.onDragStart(event);">
+            <image id="page-proxy-favicon"
+                   onclick="PageProxyClickHandler(event);"
+                   pageproxystate="invalid"/>
+            <hbox id="identity-icon-labels">
+              <label id="identity-icon-label" class="plain" flex="1"/>
+              <label id="identity-icon-country-label" class="plain"/>
+            </hbox>
+          </box>
+          <box id="urlbar-display-box" align="center">
+            <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
+          </box>
+          <hbox id="urlbar-icons">
+            <image id="page-report-button"
+                   class="urlbar-icon"
+                   hidden="true"
+                   tooltiptext="&pageReportIcon.tooltip;"
+                   onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
 
-        <toolbarbutton id="webrtc-status-button"
-                       class="toolbarbutton-1 chromeclass-toolbar-additional"
-                       type="menu"
-                       hidden="true"
-                       orient="horizontal"
-                       label="&webrtcIndicatorButton.label;"
-                       tooltiptext="&webrtcIndicatorButton.tooltip;">
-          <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
-                     onpopuphiding="WebrtcIndicator.clearPopup(this);"
-                     oncommand="WebrtcIndicator.menuCommand(event.target);"/>
-        </toolbarbutton>
-      </hbox>
+            <label id="share-button-status" collapsed="true" role="status"/>
+            <image id="share-button"
+                   class="urlbar-icon"
+                   hidden="true"
+                   onclick="SocialShareButton.onClick(event);"/>
+
+            <image id="go-button"
+                   class="urlbar-icon"
+                   tooltiptext="&goEndCap.tooltip;"
+                   onclick="gURLBar.handleCommand(event);"/>
+          </hbox>
+          <toolbarbutton id="urlbar-go-button"
+                         class="chromeclass-toolbar-additional"
+                         onclick="gURLBar.handleCommand(event);"
+                         tooltiptext="&goEndCap.tooltip;"/>
+          <toolbarbutton id="urlbar-reload-button"
+                         class="chromeclass-toolbar-additional"
+                         command="Browser:ReloadOrDuplicate"
+                         onclick="checkForMiddleClick(this, event);"
+                         tooltiptext="&reloadButton.tooltip;"/>
+          <toolbarbutton id="urlbar-stop-button"
+                         class="chromeclass-toolbar-additional"
+                         command="Browser:Stop"
+                         tooltiptext="&stopButton.tooltip;"/>
+        </textbox>
+      </toolbaritem>
+
+      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     label="&reloadCmd.label;" removable="true"
+                     command="Browser:ReloadOrDuplicate"
+                     onclick="checkForMiddleClick(this, event);"
+                     tooltiptext="&reloadButton.tooltip;"/>
+
+      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     label="&stopCmd.label;" removable="true"
+                     command="Browser:Stop"
+                     tooltiptext="&stopButton.tooltip;"/>
+
+      <hbox id="nav-bar-customizationtarget" class="customization-target" flex="100"/>
+
+      <toolbarbutton id="webrtc-status-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     type="menu"
+                     hidden="true"
+                     orient="horizontal"
+                     label="&webrtcIndicatorButton.label;"
+                     tooltiptext="&webrtcIndicatorButton.tooltip;">
+        <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
+                   onpopuphiding="WebrtcIndicator.clearPopup(this);"
+                   oncommand="WebrtcIndicator.menuCommand(event.target);"/>
+      </toolbarbutton>
 
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
diff --git a/browser/components/customizableui/content/toolbar.xml b/browser/components/customizableui/content/toolbar.xml
index 2dff3f69bf3..39fef596b14 100644
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -98,17 +98,6 @@
           return this._toolbox;
         ]]></getter>
       </property>
-
-      <property name="currentSet" readonly="true">
-        <getter><![CDATA[
-          if (!this._customizationTarget)
-            return "";
-
-          return [node.id for (node of this._customizationTarget.children)].join(',');
-        ]]></getter>
-      </property>
-
-
     </implementation>
   </binding>
 
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 3119ddd9528..da5ce0f734d 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -224,16 +224,11 @@ let gFuturePlacements = new Map();
  */
 let gDefaultPlacements = new Map([
   ["nav-bar", [
-    "unified-back-forward-button",
-    "urlbar-container",
-    "reload-button",
-    "stop-button",
     "search-container",
-    "webrtc-status-button",
     "bookmarks-menu-button-container",
     "downloads-button",
-    "home-button",
     "social-toolbar-button",
+    "PanelUI-button",
     "share-page"
   ]],
   ["PanelUI-contents", [
@@ -376,7 +371,6 @@ let CustomizableUIInternal = {
 
     let placements = gPlacements.get(area);
     this.buildArea(area, placements, aToolbar);
-    aToolbar.setAttribute("currentset", placements.join(","));
 
     // We register this window to have its customization data cleaned up when
     // unloading.
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index 1578969949a..d1ee9ccd54a 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -375,15 +375,19 @@ CustomizeMode.prototype = {
   //           also want to (try) persisting with currentset as well to make it
   //           less painful to switch to older builds.
   persistCurrentSets: function()  {
-    let document = this.document;
-    let toolbars = document.querySelectorAll("toolbar");
+    //XXXjaws The toolbar bindings that are included in this changeset (/browser/base/content/toolbar.xml)
+    //        don't implement currentSet. They probably need to inherit the toolkit bindings.
+    return;
 
-    for (let toolbar of toolbars) {
-      // Calculate currentset and store it in the attribute.
-      toolbar.setAttribute("currentset", toolbar.currentSet);
-      // Persist the currentset attribute directly on hardcoded toolbars.
-      document.persist(toolbar.id, "currentset");
-    }
+    let document = this.document;
+    let toolbar = document.getElementById("nav-bar");
+
+    // Calculate currentset and store it in the attribute.
+    let currentSet = toolbar.currentSet;
+    toolbar.setAttribute("currentset", currentSet);
+
+    // Persist the currentset attribute directly on hardcoded toolbars.
+    document.persist(toolbar.id, "currentset");
   },
 
   reset: function() {
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 98d4b5d8f5b..d508482a0d8 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -15,8 +15,8 @@
 %define fgTabTexture linear-gradient(transparent 0px, transparent 1px, hsla(0,0%,100%,0.35) 1px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.65) 2px, hsla(0,0%,100%,0.65) 3px, @toolbarHighlight@)
 %define fgTabBackgroundMiddle @fgTabTexture@, linear-gradient(transparent 0px, transparent 2px, -moz-dialog 2px, -moz-dialog)
 %define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar       window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],                #nav-bar:not([currentset]))                 > #nav-bar-customizationtarget > #unified-back-forward-button
-%define conditionalForwardWithUrlbar_small window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"][iconsize=small],#nav-bar:not([currentset])[iconsize=small]) > #nav-bar-customizationtarget > #unified-back-forward-button
+%define conditionalForwardWithUrlbar       window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],                #nav-bar:not([currentset]))                 > #unified-back-forward-button
+%define conditionalForwardWithUrlbar_small window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"][iconsize=small],#nav-bar:not([currentset])[iconsize=small]) > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 32
 %define conditionalForwardWithUrlbarWidth_small 24
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 62bfec6850f..99b2166758a 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -9,7 +9,7 @@
 %define fgTabTexture linear-gradient(hsla(0,0%,100%,0.6), hsla(0,0%,100%,0.6) 0px, hsl(0,0%,99%) 1px, hsl(0,0%,92%))
 %define fgTabBackgroundMiddle linear-gradient(transparent, transparent)
 %define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
+%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 3dc64b52e58..bdc819d2e00 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -15,7 +15,7 @@
 %define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
 %define navbarLargeIcons #navigator-toolbox[iconsize=large] > #nav-bar
 %define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
+%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
 %ifdef MOZ_OFFICIAL_BRANDING