diff --git a/l10n b/l10n
index d2850eaf5..b379e854c 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit d2850eaf59b97f806b124b723863b4e74e8dc0d9
+Subproject commit b379e854c7811c918f88b63bb401d22782851122
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 09f8c2569..693acb09c 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -631,7 +631,7 @@
       align-items: center;
 
       #nav-bar:has(&) & {
-        padding-inline-start: calc(var(--zen-toolbox-padding) + var(--toolbarbutton-outer-padding));
+        padding-inline-start: var(--toolbarbutton-outer-padding);
       }
 
       #browser:has(#navigator-toolbox[zen-right-side='true']) & {
diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch
index e7d59450c..c48ff533c 100644
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/src/browser/components/preferences/preferences-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..56b42e2d025e4a47ea0983cf33ae69ffafa0d576 100644
+index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..39637cc8aea988c77e5a6c66a85ec66acd4ca4bc 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -196,6 +196,10 @@ function init_all() {
@@ -7,7 +7,7 @@ index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..56b42e2d025e4a47ea0983cf33ae69ff
    Preferences.queueUpdateOfAllElements();
    Services.telemetry.setEventRecordingEnabled("aboutpreferences", true);
 +  register_module("paneZenLooks", gZenLooksAndFeel);
-+  register_module("paneZenWorkspaces", gZenWorkspacesSettings);
++  register_module("paneZenTabManagement", gZenWorkspacesSettings);
 +  register_module("paneZenCKS", gZenCKSSettings);
 +  register_module("paneZenMarketplace", gZenMarketplaceManager);
  
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch
index 7691d5362..d95516c19 100644
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050a8415bab 100644
+index 53bdc9c912a6cd0c787dbcf41f2a82b7169d5aa7..e47c4b36b6e469b0cc8b95bde0508dc6cb0b49ae 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -43,6 +43,8 @@
@@ -39,15 +39,15 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050
 +          <label class="category-name" flex="1" data-l10n-id="pane-zen-looks-title"></label>
 +        </richlistitem>
 +
-+        <richlistitem id="category-zen-workspaces"
++        <richlistitem id="category-zen-tabs-management"
 +                      class="category"
-+                      value="paneZenWorkspaces"
++                      value="paneZenTabManagement"
 +                      helpTopic="prefs-main"
 +                      data-l10n-id="category-zen-workspaces"
 +                      data-l10n-attrs="tooltiptext"
 +                      align="center">
 +          <image class="category-icon"/>
-+          <label class="category-name" flex="1" data-l10n-id="pane-zen-workspaces-title"></label>
++          <label class="category-name" flex="1" data-l10n-id="pane-zen-tabs-title"></label>
 +        </richlistitem>
 +
 +        <richlistitem id="category-zen-CKS"
@@ -95,7 +95,7 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050
  #include moreFromMozilla.inc.xhtml
 +#include zenLooksAndFeel.inc.xhtml
 +#include zenKeyboardShortcuts.inc.xhtml
-+#include zenWorkspaces.inc.xhtml
++#include zenTabsManagement.inc.xhtml
 +#include zenMarketplace.inc.xhtml
          </vbox>
        </vbox>
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index f1507f579..763937ed0 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -940,4 +940,9 @@ Preferences.addAll([
     type: 'bool',
     default: true,
   },
+  {
+    id: 'zen.tab-unloader.enabled',
+    type: 'bool',
+    default: true,
+  },
 ]);
diff --git a/src/browser/components/preferences/zenWorkspaces.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
similarity index 54%
rename from src/browser/components/preferences/zenWorkspaces.inc.xhtml
rename to src/browser/components/preferences/zenTabsManagement.inc.xhtml
index 68f573131..d94988592 100644
--- a/src/browser/components/preferences/zenWorkspaces.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -1,19 +1,19 @@
-<html:template id="template-paneZenWorkspaces">
+<html:template id="template-paneZenTabManagement">
 <hbox id="ZenWorkspacesCategory"
       class="subcategory"
       hidden="true"
-      data-category="paneZenWorkspaces">
+      data-category="paneZenTabManagement">
 <html:h1 data-l10n-id="pane-workspaces-title"/>
 </hbox>
 
 <hbox id="zenSidePanelsCategory"
       class="subcategory"
       hidden="true"
-      data-category="paneZenWorkspaces">
+      data-category="paneZenTabManagement">
 <html:h1 data-l10n-id="pane-settings-workspaces-title"/>
 </hbox>
 
-<groupbox id="zenSidePanelsGroup" data-category="paneZenWorkspaces" hidden="true" class="highlighting-group">
+<groupbox id="zenWorkspacesGroup" data-category="paneZenTabManagement" hidden="true" class="highlighting-group">
       <label><html:h2 data-l10n-id="zen-settings-workspaces-header"/></label>
       <description class="description-deemphasized" data-l10n-id="zen-settings-workspaces-description" />
 
@@ -33,4 +33,26 @@
       </vbox>
 </groupbox>
 
+<hbox id="zenTabsUnloadCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenTabManagement">
+<html:h1 data-l10n-id="pane-zen-tabs-unloader-title"/>
+</hbox>
+
+<groupbox id="zenTabsUnloadGroup" data-category="paneZenTabManagement" hidden="true" class="highlighting-group">
+      <label><html:h2 data-l10n-id="zen-tabs-unloader-header"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-description" />
+
+      <checkbox id="zenTabsUnloadActivate"
+            data-l10n-id="zen-tabs-unloader-enabled"
+            preference="zen.tab-unloader.enabled"/>
+
+      <label><html:h2 data-l10n-id="zen-tabs-unloader-unload-delay"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-unload-delay-description" />
+      <!-- TODO: Input type should be number -->
+</groupbox>
+
 </html:template>
+
+
diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index 52a4f27ea..72eb05769 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -305,7 +305,7 @@ groupbox h2 {
 
 /* Workspace */
 
-#category-zen-workspaces > .category-icon {
+#category-zen-tabs-management > .category-icon {
   list-style-image: url('chrome://browser/skin/window.svg');
 }