--- a/browser/base/content/navigator-toolbox.inc.xhtml	2021-09-28 01:17:27.000000000 +0200
+++ b/browser/base/content/navigator-toolbox.inc.xhtml	2021-10-12 00:25:27.055330998 +0200
@@ -28,83 +28,6 @@
 #include titlebar-items.inc.xhtml
     </toolbar>
 
-    <toolbar id="TabsToolbar"
-             class="browser-toolbar titlebar-color"
-             fullscreentoolbar="true"
-             customizable="true"
-             customizationtarget="TabsToolbar-customization-target"
-             mode="icons"
-             aria-label="&tabsToolbar.label;"
-             context="toolbar-context-menu"
-             flex="1">
-
-      <hbox class="titlebar-spacer" type="pre-tabs"/>
-
-      <hbox flex="1" align="end" class="toolbar-items">
-        <hbox id="TabsToolbar-customization-target" flex="1">
-          <tabs id="tabbrowser-tabs"
-                is="tabbrowser-tabs"
-                flex="1"
-                aria-multiselectable="true"
-                setfocus="false"
-                tooltip="tabbrowser-tab-tooltip"
-                stopwatchid="FX_TAB_CLICK_MS">
-            <hbox class="tab-drop-indicator" hidden="true"/>
-            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
-              <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
-              <toolbarbutton id="tabs-newtab-button"
-                             class="toolbarbutton-1"
-                             command="cmd_newNavigatorTab"
-                             onclick="checkForMiddleClick(this, event);"
-                             tooltip="dynamic-shortcut-tooltip"/>
-              <spacer class="closing-tabs-spacer" style="width: 0;"/>
-            </arrowscrollbox>
-            <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
-          </tabs>
-
-          <toolbarbutton id="new-tab-button"
-                         class="toolbarbutton-1 chromeclass-toolbar-additional"
-                         label="&tabCmd.label;"
-                         command="cmd_newNavigatorTab"
-                         onclick="checkForMiddleClick(this, event);"
-                         tooltip="dynamic-shortcut-tooltip"
-                         ondrop="newTabButtonObserver.onDrop(event)"
-                         ondragover="newTabButtonObserver.onDragOver(event)"
-                         ondragenter="newTabButtonObserver.onDragOver(event)"
-                         cui-areatype="toolbar"
-                         removable="true"/>
-
-          <toolbarbutton id="alltabs-button"
-                         class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
-                         badged="true"
-                         oncommand="gTabsPanel.showAllTabsPanel(event);"
-                         label="&listAllTabs.label;"
-                         tooltiptext="&listAllTabs.label;"
-                         removable="false"/>
-        </hbox>
-      </hbox>
-
-      <hbox class="titlebar-spacer" type="post-tabs"/>
-
-#ifndef XP_MACOSX
-      <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
-              aria-live="polite"/>
-      <hbox class="private-browsing-indicator"/>
-#endif
-
-#include titlebar-items.inc.xhtml
-
-#ifdef XP_MACOSX
-      <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
-           buttonbox from reversing order in RTL by forcing an LTR direction. -->
-      <hbox id="titlebar-secondary-buttonbox" dir="ltr">
-        <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
-        <hbox class="private-browsing-indicator"/>
-        <hbox id="titlebar-fullscreen-button"/>
-      </hbox>
-#endif
-    </toolbar>
-
   </vbox>
 
   <toolbar id="nav-bar"
@@ -137,28 +60,33 @@
                      onclick="checkForMiddleClick(this, event);"
                      tooltip="forward-button-tooltip"
                      context="backForwardMenu"/>
-      <toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional"
-                   data-l10n-id="toolbar-button-stop-reload"
-                   removable="true" overflows="false">
-        <toolbarbutton id="reload-button" class="toolbarbutton-1"
-                       data-l10n-id="toolbar-button-reload"
-                       command="Browser:ReloadOrDuplicate"
-                       onclick="checkForMiddleClick(this, event);"
-                       tooltip="dynamic-shortcut-tooltip">
-          <box class="toolbarbutton-animatable-box">
-            <image class="toolbarbutton-animatable-image"/>
-          </box>
-        </toolbarbutton>
-        <toolbarbutton id="stop-button" class="toolbarbutton-1"
-                       data-l10n-id="toolbar-button-stop"
-                       command="Browser:Stop"
-                       tooltip="dynamic-shortcut-tooltip">
-          <box class="toolbarbutton-animatable-box">
-            <image class="toolbarbutton-animatable-image"/>
-          </box>
-        </toolbarbutton>
-      </toolbaritem>
-      <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
+      <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+                     removable="true"
+                     label="&homeButton.label;"
+                     ondragover="homeButtonObserver.onDragOver(event)"
+                     ondragenter="homeButtonObserver.onDragOver(event)"
+                     ondrop="homeButtonObserver.onDrop(event)"
+                     key="goHome"
+                     onclick="BrowserHome(event);"
+                     cui-areatype="toolbar"
+                     tooltiptext="&homeButton.defaultPage.tooltip;"/>
+      <toolbarbutton id="reload-button" class="toolbarbutton-1"
+                     data-l10n-id="toolbar-button-reload"
+                     command="Browser:ReloadOrDuplicate"
+                     onclick="checkForMiddleClick(this, event);"
+                     tooltip="dynamic-shortcut-tooltip">
+        <box class="toolbarbutton-animatable-box">
+          <image class="toolbarbutton-animatable-image"/>
+        </box>
+      </toolbarbutton>
+      <toolbarbutton id="stop-button" class="toolbarbutton-1"
+                     data-l10n-id="toolbar-button-stop"
+                     command="Browser:Stop"
+                     tooltip="dynamic-shortcut-tooltip">
+        <box class="toolbarbutton-animatable-box">
+          <image class="toolbarbutton-animatable-image"/>
+        </box>
+      </toolbarbutton>
       <toolbaritem id="urlbar-container" flex="400" persist="width"
                    removable="false"
                    class="chromeclass-location" overflows="false">
@@ -180,20 +108,6 @@
                  class="chromeclass-toolbar-additional"/>
             <!-- Use onclick instead of normal popup= syntax since the popup
                  code fires onmousedown, and hence eats our favicon drag events. -->
-            <box id="tracking-protection-icon-container" align="center"
-                 role="button"
-                 onclick="gProtectionsHandler.handleProtectionsButtonEvent(event);"
-                 onkeypress="gProtectionsHandler.handleProtectionsButtonEvent(event);"
-                 onmouseover="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
-                 onfocus="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
-                 tooltip="tracking-protection-icon-tooltip">
-              <box id="tracking-protection-icon-box">
-                <image id="tracking-protection-icon"/>
-              </box>
-              <tooltip id="tracking-protection-icon-tooltip">
-                <description id="tracking-protection-icon-tooltip-label" class="tooltip-label"/>
-              </tooltip>
-            </box>
             <box id="identity-box"
                  pageproxystate="invalid"
                  ondragstart="gIdentityHandler.onDragStart(event);">
@@ -380,8 +294,6 @@
         <toolbartabstop/>
       </toolbaritem>
 
-      <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
-
       <toolbarbutton id="downloads-button"
                      class="toolbarbutton-1 chromeclass-toolbar-additional"
                      badged="true"
@@ -539,6 +451,83 @@
     </toolbaritem>
   </toolbar>
 
+      <toolbar id="TabsToolbar"
+             class="browser-toolbar titlebar-color"
+             fullscreentoolbar="true"
+             customizable="true"
+             customizationtarget="TabsToolbar-customization-target"
+             mode="icons"
+             aria-label="&tabsToolbar.label;"
+             context="toolbar-context-menu"
+             flex="1">
+
+      <hbox class="titlebar-spacer" type="pre-tabs"/>
+
+      <hbox flex="1" align="end" class="toolbar-items">
+        <hbox id="TabsToolbar-customization-target" flex="1">
+          <tabs id="tabbrowser-tabs"
+                is="tabbrowser-tabs"
+                flex="1"
+                aria-multiselectable="true"
+                setfocus="false"
+                tooltip="tabbrowser-tab-tooltip"
+                stopwatchid="FX_TAB_CLICK_MS">
+            <hbox class="tab-drop-indicator" hidden="true"/>
+            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
+              <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
+              <toolbarbutton id="tabs-newtab-button"
+                             class="toolbarbutton-1"
+                             command="cmd_newNavigatorTab"
+                             onclick="checkForMiddleClick(this, event);"
+                             tooltip="dynamic-shortcut-tooltip"/>
+              <spacer class="closing-tabs-spacer" style="width: 0;"/>
+            </arrowscrollbox>
+            <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
+          </tabs>
+
+          <toolbarbutton id="new-tab-button"
+                         class="toolbarbutton-1 chromeclass-toolbar-additional"
+                         label="&tabCmd.label;"
+                         command="cmd_newNavigatorTab"
+                         onclick="checkForMiddleClick(this, event);"
+                         tooltip="dynamic-shortcut-tooltip"
+                         ondrop="newTabButtonObserver.onDrop(event)"
+                         ondragover="newTabButtonObserver.onDragOver(event)"
+                         ondragenter="newTabButtonObserver.onDragOver(event)"
+                         cui-areatype="toolbar"
+                         removable="true"/>
+
+          <toolbarbutton id="alltabs-button"
+                         class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
+                         badged="true"
+                         oncommand="gTabsPanel.showAllTabsPanel(event);"
+                         label="&listAllTabs.label;"
+                         tooltiptext="&listAllTabs.label;"
+                         removable="false"/>
+        </hbox>
+      </hbox>
+
+      <hbox class="titlebar-spacer" type="post-tabs"/>
+
+#ifndef XP_MACOSX
+      <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
+              aria-live="polite"/>
+      <hbox class="private-browsing-indicator"/>
+#endif
+
+#include titlebar-items.inc.xhtml
+
+#ifdef XP_MACOSX
+      <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
+           buttonbox from reversing order in RTL by forcing an LTR direction. -->
+      <hbox id="titlebar-secondary-buttonbox" dir="ltr">
+        <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
+        <hbox class="private-browsing-indicator"/>
+        <hbox id="titlebar-fullscreen-button"/>
+      </hbox>
+#endif
+    </toolbar>
+
   <html:template id="tab-notification-deck-template">
     <html:named-deck id="tab-notification-deck"></html:named-deck>
   </html:template>
@@ -682,17 +671,6 @@
       <toolbartabstop/>
     </toolbaritem>
 
-    <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                   removable="true"
-                   label="&homeButton.label;"
-                   ondragover="homeButtonObserver.onDragOver(event)"
-                   ondragenter="homeButtonObserver.onDragOver(event)"
-                   ondrop="homeButtonObserver.onDrop(event)"
-                   key="goHome"
-                   onclick="BrowserHome(event);"
-                   cui-areatype="toolbar"
-                   tooltiptext="&homeButton.defaultPage.tooltip;"/>
-
     <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
                    removable="true"
                    onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);"

--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -240,14 +240,10 @@ var CustomizableUIInternal = {
     let navbarPlacements = [
       "back-button",
       "forward-button",
-      "stop-reload-button",
-      Services.policies.isAllowed("removeHomeButtonByDefault")
-        ? null
-        : "home-button",
-      "spring",
+      "reload-button",
+      "stop-button",
+      "home-button",
       "urlbar-container",
-      "spring",
-      "save-to-pocket-button",
       "downloads-button",
       AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
       "fxa-toolbar-menu-button",
--- a/browser/base/content/navigator-toolbox.inc.xhtml	2021-09-28 01:17:27.000000000 +0200
+++ b/browser/base/content/navigator-toolbox.inc.xhtml	2021-10-12 12:07:57.021204838 +0200
@@ -395,7 +395,7 @@
                      removable="true"
                      overflows="false"
                      cui-areatype="toolbar"
-                     hidden="true"
+                     hidden="false"
                      tooltip="dynamic-shortcut-tooltip"
                      indicator="true">
         <box id="downloads-indicator-anchor"
@@ -438,7 +438,8 @@
     </toolbarbutton>
 
     <toolbaritem id="PanelUI-button"
-                 removable="false">
+                 removable="false"
+                 style="display: none;">
       <toolbarbutton id="ion-button"
                      class="toolbarbutton-1"
                      hidden="true"
