diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
index 87e55dd51..0511b9f94 100644
--- a/.github/workflows/alpha.yml
+++ b/.github/workflows/alpha.yml
@@ -179,7 +179,7 @@ jobs:
 
       - name: Rename artifacts
         run: |
-          mv dist/zen-browser-*.tar.bz2 "zen-browser.linux.tar.bz2"
+          mv dist/zen-*.tar.bz2 "zen-browser.linux.tar.bz2"
           mv dist/output.mar linux.mar
 
       - name: Upload binary
diff --git a/.gitignore b/.gitignore
index 69c26ce63..957c92528 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ firefox-*/
 node_modules/
 .gluon/
 
-__pycache__/
\ No newline at end of file
+__pycache__/
+dist/
\ No newline at end of file
diff --git a/gluon.json b/gluon.json
index 6732557d8..d9e90ff08 100644
--- a/gluon.json
+++ b/gluon.json
@@ -34,6 +34,8 @@
           "repo": "zen-browser/desktop"
         },
         "x86": {
+          "windowsMar": "windows.mar",
+          "macosMar": "macosIntel.mar",
           "linuxMar": "linux.mar"
         }
       }
diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 42cccf508..49f7c558f 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -141,4 +141,4 @@ pref('dom.security.sanitizer.enabled', true);
 // Zen Sidebar
 pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n   \"url\":\"https://web.whatsapp.com/\"\n  },\n\"p2\":{\n   \"url\":\"https://open.spotify.com/\",\n\"ua\": true\n  },\n\"p3\": {\n   \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\"]\n}");
 pref('zen.sidebar.enabled', true);
-pref('zen.sidebar.pinned', true);
+pref('zen.sidebar.pinned', false);
diff --git a/src/browser/base/content/ZenSidebarManager.mjs b/src/browser/base/content/ZenSidebarManager.mjs
index 547b2c012..dbdf9d958 100644
--- a/src/browser/base/content/ZenSidebarManager.mjs
+++ b/src/browser/base/content/ZenSidebarManager.mjs
@@ -101,11 +101,18 @@ var gZenBrowserManagerSidebar = {
         addPanelButton.setAttribute("animate", "true");
       this.sidebarElement.appendChild(addPanelButton);
     }
+    this._updateArrowScrollMaxHeight(data.index.length + 1);
     // We rerender multiple times for some reason, so we need to avoid the animation
     if (this._firstRun < this.MAX_RUNS)
       this._firstRun++;
   },
 
+  _updateArrowScrollMaxHeight(num) {
+    let content = document.querySelector("#tabbrowser-arrowscrollbox::part(scrollbox-clip)");
+    let height = (this.MAX_SIDEBAR_PANELS - num) * 81;
+    content.style.maxHeight = `${height}px`;
+  },
+
   async _openAddPanelDialog() {
     let dialogURL = "chrome://browser/content/places/zenNewWebPanel.xhtml";
     let features = "centerscreen,chrome,modal,resizable=no";
diff --git a/src/browser/components/zen-welcome/welcome.css b/src/browser/components/zen-welcome/welcome.css
index 27f5b7ed4..5d382a3bc 100644
--- a/src/browser/components/zen-welcome/welcome.css
+++ b/src/browser/components/zen-welcome/welcome.css
@@ -16,25 +16,11 @@ body {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  background: var(--zen-characteristic-gradient) !important;
+  background: var(--zen-main-browser-background) !important;
   transition: .1s;
   -moz-transform: scale(1.1); /* zoom */
 }
 
-button {
-  background: #000 !important;
-  color: #fff !important;
-  font-size: 17px !important;
-  padding: 10px 25px !important;
-  font-weight: 600;
-  border-radius: 100px !important;
-  cursor: pointer !important;
-}
-
-* {
-  color: white;
-}
-
 .page {
   display: none;
 
@@ -197,11 +183,11 @@ input[type='checkbox'] {
   width: 7px;
   height: 7px;
   border-radius: 50%;
-  background: white;
+  background: var(--in-content-primary-button-background);
   transition: all .1s;
   cursor: pointer;
 }
 
 .dot.active {
-  background: #000;
+  background: var(--in-content-primary-button-background-hover);
 }
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 281746b03..e3e7fbc48 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -132,6 +132,14 @@
 }
 
 toolbar .toolbarbutton-1 {
+  & > .toolbarbutton-icon,
+  & > .toolbarbutton-badge-stack {
+    width: calc(2 * var(--toolbarbutton-inner-padding) + 18px) !important;
+    height: calc(2 * var(--toolbarbutton-inner-padding) + 18px) !important;
+  }
+}
+
+toolbar .zen-sidebar-panel-button {
   & > .toolbarbutton-icon,
   & > .toolbarbutton-badge-stack {
     width: calc(2 * var(--toolbarbutton-inner-padding) + 20px) !important;
diff --git a/src/browser/themes/shared/zen-sidebar.css b/src/browser/themes/shared/zen-sidebar.css
index 3143739c0..68a063ab8 100644
--- a/src/browser/themes/shared/zen-sidebar.css
+++ b/src/browser/themes/shared/zen-sidebar.css
@@ -71,6 +71,10 @@
   border-radius: 100px !important;
 }
 
+:root[customizing] #navigator-toolbox {
+  display: none;
+}
+
 #TabsToolbar .toolbarbutton-1:hover > :is(.toolbarbutton-icon, .toolbarbutton-badge-stack),
 #TabsToolbar .toolbarbutton-1[open="true"] > :is(.toolbarbutton-icon, .toolbarbutton-badge-stack),
 .zen-sidebar-action-button:hover,
@@ -165,5 +169,6 @@
   background: transparent !important;
   align-items: center;
   justify-content: end;
+  min-height: fit-content;
 }