diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 9c8d86d6f..994d71d59 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -71,7 +71,7 @@
         totalHeight -= tab.getBoundingClientRect().height;
       }
       tabs.style.maxHeight = totalHeight + 'px';
-      console.info('ZenThemeModifier: set tabs max-height to', totalHeight + 'px');
+      //console.info('ZenThemeModifier: set tabs max-height to', totalHeight + 'px');
 
       const allTabs = document.getElementById('alltabs-button');
       allTabs.removeAttribute('hidden');
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 347309f6f..d567f87a0 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -71,7 +71,6 @@ var gZenVerticalTabsManager = {
   },
 
   _updateEvent() {
-    console.log('ZenThemeModifier: update event');
     this._updateMaxWidth();
     if (Services.prefs.getBoolPref('zen.view.sidebar-expanded')) {
       this.navigatorToolbox.setAttribute('zen-expanded', 'true');
diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index 89f28b307..4cedd84ac 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit 89f28b307d8cd45ee5416a8dafb76f298bd6c212
+Subproject commit 4cedd84ac877b4ebdf807eb2991cacfa754e8ac1
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 2314a2212..22be705fb 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
@@ -55,6 +55,10 @@
 
   #zen-sidebar-icons-wrapper {
     background: transparent;
+
+    & toolbarbutton {
+      width: fit-content;
+    }
   }
 
   #newtab-button-container {
@@ -106,8 +110,9 @@
     & #zen-sidebar-icons-wrapper {
       display: grid;
       /* Make sure the icons take most of the space, smartly */
-      grid-template-columns: repeat(auto-fit, minmax(var(--collapsed-tab-width), auto));
+      grid-template-columns: repeat(auto-fit, minmax(34px, auto));
       gap: 4px;
+      justify-content: space-between;
 
       padding-top: calc(var(--zen-toolbox-padding) * 2);
     }