diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml
index 2f31e1e8b..acdd40766 100644
--- a/.github/workflows/windows-alpha-build.yml
+++ b/.github/workflows/windows-alpha-build.yml
@@ -216,4 +216,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}
-          path: engine/obj-x86_64-pc-windows-msvc/dist
\ No newline at end of file
+          path: engine/obj-x86_64-pc-windows-msvc/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 5dab0f026..b700d6f23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@ node_modules/
 .surfer/
 
 __pycache__/
-dist/
\ No newline at end of file
+dist/
+
+windsign-temp/
\ No newline at end of file
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
new file mode 100644
index 000000000..6cc1f4f86
--- /dev/null
+++ b/build/winsign/sign.ps1
@@ -0,0 +1,44 @@
+param(
+    [string]$RunID,
+    [string]$SignIdentity
+)
+
+$ErrorActionPreference = "Stop"
+
+echo "Preparing environment"
+mkdir windsign-temp -ErrorAction SilentlyContinue
+mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
+
+pnpm surfer ci --brand alpha
+
+echo "Downloading from runner with ID $RunID"
+gh run download $RunID --pattern "windows-x64-obj-*" --dir windsign-temp
+
+function SignAndPackage($name) {
+    echo "Executing on $name"
+    rmdir engine\obj-x86_64-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+    mv windsign-temp\windows-x64-obj-$name engine\obj-x86_64-pc-windows-msvc\
+    echo "Signing $name"
+    # Find all executables and dlls and sign them
+    Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Filter *.exe | % {
+        echo "Signing $_"
+        signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $_.FullName
+    }
+    Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Filter *.dll | % {
+        echo "Signing $_"
+        signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $_.FullName
+    }
+    echo "Packaging $name"
+    pnpm surfer package
+}
+
+SignAndPackage specific
+SignAndPackage generic
+
+# Cleaning up
+
+echo "All done!"
+Read-Host "Press Enter to continue"
+
+echo "Cleaning up" 
+rmdir windsign-temp -Recurse -ErrorAction SilentlyContinue
\ No newline at end of file
diff --git a/src/browser/base/content/zen-styles/zen-sidebar.css b/src/browser/base/content/zen-styles/zen-sidebar.css
index 423c9be7b..b0e2cb48a 100644
--- a/src/browser/base/content/zen-styles/zen-sidebar.css
+++ b/src/browser/base/content/zen-styles/zen-sidebar.css
@@ -224,7 +224,7 @@
 
 :root:not([inDOMFullscreen='true']) #zen-sidebar-splitter {
   display: block;
-  width: 1px;
+  width: var(--zen-tabbrowser-padding);
   opacity: 0;
 }
 
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 4ffd7c02f..645cd6b37 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
@@ -38,7 +38,6 @@
   }
 
   #navigator-toolbox {
-    --zen-tabbrowser-padding: 5px;
     margin-top: 0; /* Issue #156 */
     order: 0 !important;
   }
@@ -436,12 +435,6 @@
     }
   }
 
-  @media not (-moz-bool-pref: 'zen.view.sidebar-expanded') {
-    #navigator-toolbox {
-      width: fit-content !important;
-    }
-  }
-
   #navigator-toolbox[zen-user-hover='true'] {
     width: fit-content !important;
   }
@@ -459,10 +452,6 @@
       padding-right: 0 !important;
     }
 
-    :root:not([zen-sidebar-legacy='true']) {
-      padding: calc(var(--zen-tabbrowser-padding) * 1.5);
-    }
-
     #zen-sidebar-splitter {
       order: 7 !important;
     }
@@ -471,6 +460,20 @@
       margin-left: 0 !important;
       margin-right: 2px !important;
     }
+
+    #tabbrowser-tabs {
+      padding-right: var(--zen-tabbrowser-padding);
+    }
+  }
+
+  @media not (-moz-bool-pref: 'zen.view.sidebar-expanded') {
+    #navigator-toolbox {
+      width: fit-content !important;
+    }
+
+    #tabbrowser-tabs {
+      padding-right: 0 !important;
+    }
   }
 
   @media (-moz-bool-pref: 'zen.view.sidebar-expanded.on-hover') and (not (-moz-bool-pref: 'zen.view.compact')) {
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 6724540f2..dec76db5e 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -74,6 +74,8 @@
   --zen-button-border-radius: 7px;
   --zen-button-padding: 0.6rem 1.2rem;
 
+  --zen-tabbrowser-padding: 5px;
+
   /* Other colors */
   --urlbar-box-bgcolor: var(--zen-urlbar-background) !important;
   --toolbar-field-focus-background-color: var(--urlbar-box-bgcolor) !important;