diff --git a/.github/workflows/macos-alpha-build.yml b/.github/workflows/macos-alpha-build.yml
index 118a18608..cbc725c55 100644
--- a/.github/workflows/macos-alpha-build.yml
+++ b/.github/workflows/macos-alpha-build.yml
@@ -132,7 +132,7 @@ jobs:
           ls engine
           ls engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin
           ls engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin/dist
-          chmod +x ./build/codesign/codesign.bash
+          chmod +x ./build/codesign/sign.bash
           ./build/codesign/sign.bash \
             -a "./engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin/dist/Zen Browser.app" \
             -i "${{ secrets.macOS_AppleDeveloperId }}" \
@@ -149,6 +149,10 @@ jobs:
           mv ./dist/*.dmg "zen.macos-${{ matrix.arch }}.dmg"
           mv ./dist/output.mar macos-${{ matrix.arch }}.mar
 
+      - name: Sign to .dmg 
+        run: |
+          codesign -s "${{ secrets.macOS_AppleDeveloperId }}" zen.macos-${{ matrix.arch }}.dmg
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index 80309f153..41029737e 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -20,7 +20,7 @@ if test "$SURFER_COMPAT" = "true"; then
     export CPPFLAGS="-O3 -march=nehalem"
     export CXXFLAGS="-O3 -march=nehalem"
     export LDFLAGS="-Wl,-O3 -march=nehalem"
-    export RUSTFLAGS="-Clink-args=--icf=safe -Ctarget-cpu=nehalem -C codegen-units=1"
+    export RUSTFLAGS="-Ctarget-cpu=nehalem -C codegen-units=1"
 else
     ac_add_options --target=aarch64-apple-darwin
 
@@ -30,7 +30,7 @@ else
     export CPPFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
     export CXXFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
     export LDFLAGS="-Wl,-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
-    export RUSTFLAGS="-Clink-args=--icf=safe -C target-feature=+v8.3a -C codegen-units=1 -Ctarget-cpu=apple-m1"
+    export RUSTFLAGS="-C target-feature=+v8.3a -C codegen-units=1 -Ctarget-cpu=apple-m1"
 fi
 export VERBOSE=1
 export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
diff --git a/l10n b/l10n
index d03118f49..ce5959274 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit d03118f49579ebf5292f1644822ed7d95ee80963
+Subproject commit ce5959274243ca00611c4efb4848db1f4ae227dd
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 5a3a406f9..d26b772da 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -501,5 +501,10 @@ Preferences.addAll([
     id: "zen.keyboard.shortcuts.disable-firefox",
     type: "bool",
     default: false,
+  },
+  {
+    id: "zen.themes.tabs.legacy-location",
+    type: "bool",
+    default: false,
   }
 ]);
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index 537724b3b..f0fd75acc 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -32,6 +32,9 @@
                   data-l10n-id="zen-look-and-feel-compact-view-top-toolbar"
                   preference="zen.view.compact.hide-toolbar"/> 
       </vbox>
+      <checkbox id="zenLooksAndFeelShowLegacyToolbar"
+            data-l10n-id="zen-look-and-feel-legacy-toolbar"
+            preference="zen.themes.tabs.legacy-location"/>
 </groupbox>
 
 <hbox id="zenThemeCategory"