diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh
index 60e396a6..bb1807c7 100644
--- a/scripts/download-language-packs.sh
+++ b/scripts/download-language-packs.sh
@@ -6,14 +6,6 @@ CURRENT_DIR=$(pwd)
 git config --global init.defaultBranch main
 git config --global fetch.prune true
 
-mkdir ~/tools
-cd ~/tools
-git clone https://github.com/glandium/git-cinnabar.git
-cd git-cinnabar
-git checkout 0.5.11
-export PATH=~/tools/git-cinnabar:$PATH
-cd ~
-git cinnabar download
 cd $CURRENT_DIR
 
 update_language() {
@@ -25,8 +17,8 @@ update_language() {
   rm -rf .git
 
   git init 
-  git remote add upstream hg://hg.mozilla.org/l10n-central/$langId
-  git remote set-url upstream hg://hg.mozilla.org/l10n-central/$langId
+  git remote add upstream https://github.com/mozilla-l10n/firefox-l10n/$langId
+  git remote set-url upstream https://github.com/mozilla-l10n/firefox-l10n/$langId
   git pull upstream branches/default/tip
 
   cd $CURRENT_DIR
diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 41d0c2d6..688fac12 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -56,8 +56,15 @@ var ZenStartup = {
     tabs.style.maxHeight = '0px'; // reset to 0
     const toolbarRect = toolbarItems.getBoundingClientRect();
     // -5 for the controls padding
-    tabs.style.maxHeight = toolbarRect.height - 5 + "px";
-    console.info("ZenThemeModifier: set tabs max-height to", toolbarRect.height + "px");
+    let totalHeight = toolbarRect.height - 15;
+    // remove the height from other elements that aren't hidden
+    const otherElements = document.querySelectorAll("#tabbrowser-tabs > *:not([hidden=\"true\"])");
+    for (let tab of otherElements) {
+      if (tabs === tab) continue;
+      totalHeight -= tab.getBoundingClientRect().height;
+    }
+    tabs.style.maxHeight = totalHeight + "px";
+    console.info("ZenThemeModifier: set tabs max-height to", totalHeight + "px");
   },
 
   openWatermark() {
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 7bbc53ee..066258a3 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
@@ -250,6 +250,8 @@
     border: none;
     height: 100%;
 
+    border-bottom: 0 !important;
+
     padding-inline-start: 0 !important;
     margin-inline-start: 0 !important;