diff --git a/README.md b/README.md
index 1761b9107..3cbf46c84 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
 
 Zen is currently built using firefox version `134.0.2`! 🚀
 
-- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using firefox version `RC 134.0.2`!
+- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using firefox version `RC 135.0`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!
 - Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
 
diff --git a/src/browser/base/content/browser-sets-js.patch b/src/browser/base/content/browser-sets-js.patch
index be4f74496..78d0fb929 100644
--- a/src/browser/base/content/browser-sets-js.patch
+++ b/src/browser/base/content/browser-sets-js.patch
@@ -1,13 +1,13 @@
 diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js
-index 3031278749317d153624c6ccfbcc9d47aaf4089f..e67a8c3b56c01334627350c494b0139638ebf19a 100644
+index 61aef2d420a78fb1910f556b71f6db75a16180ed..a3a1e70bedb760c165c338c28de6f2ee924df8de 100644
 --- a/browser/base/content/browser-sets.js
 +++ b/browser/base/content/browser-sets.js
-@@ -245,7 +245,7 @@ document.addEventListener(
+@@ -250,7 +250,7 @@ document.addEventListener(
          }
        });
  
 -    document.getElementById("mainKeyset").addEventListener("command", event => {
 +    document.getElementById("zenKeyset").addEventListener("command", event => {
-       switch (event.target.id) {
-         case "goHome":
-           BrowserCommands.home();
+       const SIDEBAR_REVAMP_PREF = "sidebar.revamp";
+       const SIDEBAR_REVAMP_ENABLED = Services.prefs.getBoolPref(
+         SIDEBAR_REVAMP_PREF,
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index de5a5be77..f55a99295 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index ca8953f3604f4f70de76576964af5f3c733f17a0..a2731ef6d4392301217cd05f6583e4814f1118e2 100644
+index 891c067d6ad718061c410c04743bed25744504b5..560abfe817b94f535919ed29c21a912b09d63ac5 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -101,6 +101,8 @@
+@@ -99,6 +99,8 @@
  
-   <title data-l10n-id="browser-main-window-title"></title>
+   <title data-l10n-id="browser-main-window-default-title"></title>
  
 +#include zen-preloaded.inc.xhtml
 +
  # All JS files which are needed by browser.xhtml and other top level windows to
  # support MacOS specific features *must* go into the global-scripts.inc file so
  # that they can be shared with macWindow.inc.xhtml.
-@@ -145,6 +147,7 @@
+@@ -143,6 +145,7 @@
    window.addEventListener("DOMContentLoaded",
      gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
  </script>
@@ -19,7 +19,7 @@ index ca8953f3604f4f70de76576964af5f3c733f17a0..a2731ef6d4392301217cd05f6583e481
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -166,9 +169,12 @@
+@@ -164,9 +167,12 @@
      </vbox>
    </html:template>
  
diff --git a/src/browser/base/content/main-popupset-inc-xhtml.patch b/src/browser/base/content/main-popupset-inc-xhtml.patch
index b1423139c..1ebbd1437 100644
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 1fb595272a184f9a40f56f87d86232e3324f7750..8dd0f0ff856be524a5fa27fb8c6180c1fe058134 100644
+index e5f3424eaeeec0ba552537f167dd99e912216d94..4bdfcdb23fe9c44ad3d4de273c64f4cc31cb4034 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -144,6 +144,10 @@
+@@ -181,6 +181,10 @@
             hidden="true"
             tabspecific="true"
             aria-labelledby="editBookmarkPanelTitle">
@@ -13,17 +13,17 @@ index 1fb595272a184f9a40f56f87d86232e3324f7750..8dd0f0ff856be524a5fa27fb8c6180c1
        <box class="panel-header">
          <html:h1>
            <html:span id="editBookmarkPanelTitle"/>
-@@ -169,6 +173,7 @@
+@@ -206,6 +210,7 @@
                    class="footer-button"/>
          </html:moz-button-group>
        </vbox>
-+      </vbox>
++    </vbox>
      </panel>
    </html:template>
  
-@@ -454,6 +459,8 @@
+@@ -535,6 +540,8 @@
  
- #include popup-notifications.inc
+ #include popup-notifications.inc.xhtml
  
 +#include zen-popupset.inc.xhtml
 +
diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 13738aed2..255a9228f 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -28,7 +28,7 @@
 
 #browser {
   width: 100%;
-  background: var(--zen-main-browser-background);
+  background: var(--zen-main-browser-background) !important;
 
   will-change: background-color;
 
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index f21fc6c15..35657acbd 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a2191a5f15dc 100644
+index e6b9b7dcfab179e7552c146eb1551b45ad042266..d9d838a7a51f67b52b69f419024cc3174ae5260b 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -19,8 +19,8 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
  
  const kSpecialWidgetPfx = "customizableui-special-";
  
-@@ -307,13 +308,11 @@ var CustomizableUIInternal = {
-       "spring",
+@@ -317,13 +318,11 @@ var CustomizableUIInternal = {
+       "vertical-spacer",
        "urlbar-container",
        "spring",
 -      "save-to-pocket-button",
@@ -35,7 +35,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
      this.registerArea(
        CustomizableUI.AREA_NAVBAR,
        {
-@@ -321,7 +320,6 @@ var CustomizableUIInternal = {
+@@ -331,7 +330,6 @@ var CustomizableUIInternal = {
          overflowable: true,
          defaultPlacements: navbarPlacements,
          verticalTabsDefaultPlacements: [
@@ -43,7 +43,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
            "alltabs-button",
          ],
          defaultCollapsed: false,
-@@ -346,10 +344,7 @@ var CustomizableUIInternal = {
+@@ -356,10 +354,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -54,7 +54,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
          ],
          verticalTabsDefaultPlacements: [],
          defaultCollapsed: null,
-@@ -412,6 +407,7 @@ var CustomizableUIInternal = {
+@@ -422,6 +417,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -62,7 +62,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1127,6 +1123,9 @@ var CustomizableUIInternal = {
+@@ -1151,6 +1147,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -72,7 +72,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -1540,7 +1539,7 @@ var CustomizableUIInternal = {
+@@ -1564,7 +1563,7 @@ var CustomizableUIInternal = {
          lazy.log.info(
            "Widget " + aWidgetId + " not found, unable to remove from " + aArea
          );
@@ -81,7 +81,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
        }
  
        this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1550,7 +1549,7 @@ var CustomizableUIInternal = {
+@@ -1574,7 +1573,7 @@ var CustomizableUIInternal = {
          // We also need to remove the panel context menu if it's there:
          this.ensureButtonContextMenu(widgetNode);
          if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
@@ -90,7 +90,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
          } else {
            window.gNavToolbox.palette.appendChild(widgetNode);
          }
-@@ -2654,7 +2653,6 @@ var CustomizableUIInternal = {
+@@ -2678,7 +2677,6 @@ var CustomizableUIInternal = {
      if (!this.isWidgetRemovable(aWidgetId)) {
        return;
      }
@@ -98,7 +98,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
      let placements = gPlacements.get(oldPlacement.area);
      let position = placements.indexOf(aWidgetId);
      if (position != -1) {
-@@ -3609,7 +3607,7 @@ var CustomizableUIInternal = {
+@@ -3669,7 +3667,7 @@ var CustomizableUIInternal = {
      }
    },
  
@@ -107,7 +107,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -3620,7 +3618,7 @@ var CustomizableUIInternal = {
+@@ -3680,7 +3678,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -116,7 +116,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -4583,6 +4581,7 @@ export var CustomizableUI = {
+@@ -4658,6 +4656,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -124,7 +124,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
-@@ -6408,11 +6407,11 @@ class OverflowableToolbar {
+@@ -6483,11 +6482,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -138,7 +138,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
      });
  
      lazy.log.debug(
-@@ -6422,7 +6421,8 @@ class OverflowableToolbar {
+@@ -6497,7 +6496,8 @@ class OverflowableToolbar {
      // If the target has min-width: 0, their children might actually overflow
      // it, so check for both cases explicitly.
      let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
@@ -148,7 +148,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -6516,7 +6516,7 @@ class OverflowableToolbar {
+@@ -6591,7 +6591,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -157,7 +157,7 @@ index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..67dbc54de5704be8fe09ec9982e3a219
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -6678,6 +6678,9 @@ class OverflowableToolbar {
+@@ -6753,6 +6753,9 @@ class OverflowableToolbar {
     * @param {MouseEvent} aEvent the click event.
     */
    #onClickDefaultListButton(aEvent) {
diff --git a/src/browser/components/places/content/editBookmarkPanel-inc-xhtml.patch b/src/browser/components/places/content/editBookmarkPanel-inc-xhtml.patch
index fd1ec981e..87cd3f11f 100644
--- a/src/browser/components/places/content/editBookmarkPanel-inc-xhtml.patch
+++ b/src/browser/components/places/content/editBookmarkPanel-inc-xhtml.patch
@@ -1,58 +1,50 @@
 diff --git a/browser/components/places/content/editBookmarkPanel.inc.xhtml b/browser/components/places/content/editBookmarkPanel.inc.xhtml
-index 3ec3f094831c2143a818b43d1761a571f0ffa63d..98704f399089f2a33776c6ae9565b8ff9b8ddd34 100644
+index 40366677b60123c66bf0739d1b2374b423d3061c..3e722dce6b21ab62535369f20afe5f0acd43838f 100644
 --- a/browser/components/places/content/editBookmarkPanel.inc.xhtml
 +++ b/browser/components/places/content/editBookmarkPanel.inc.xhtml
-@@ -5,7 +5,7 @@
- <div id="editBookmarkPanelContent">
-   <label id="editBMPanel_itemsCountText"
-          class="editBMPanel_selectionCount"/>
+@@ -12,14 +12,15 @@
+   <html:input id="editBMPanel_namePicker"
+               class="editBMPanel_nameRow hideable"
+               type="text"/>
 -
 +<hbox flex="1" class="zenEditBMPanel_fieldContainer">
-   <label data-l10n-id="bookmark-overlay-name-2"
-          class="editBMPanel_nameRow hideable"
-          control="editBMPanel_namePicker"/>
-@@ -13,7 +13,7 @@
-               class="editBMPanel_nameRow hideable"
-               type="text"
-               onchange="gEditItemOverlay.onNamePickerChange().catch(Cu.reportError);"/>
--
-+</hbox>
    <label data-l10n-id="bookmark-overlay-url"
           class="editBMPanel_locationRow hideable"
           control="editBMPanel_locationField"/>
-@@ -21,7 +21,7 @@
+   <html:input id="editBMPanel_locationField"
                class="editBMPanel_locationRow uri-element hideable"
-               type="text"
-               onchange="gEditItemOverlay.onLocationFieldChange();"/>
+               type="text"/>
 -
++</hbox>
 +<hbox flex="1" class="zenEditBMPanel_fieldContainer">
    <label data-l10n-id="bookmark-overlay-location-2"
           class="editBMPanel_folderRow hideable"
           control="editBMPanel_folderMenuList"/>
-@@ -51,6 +51,26 @@
-             data-l10n-id="bookmark-overlay-folders-expander2"
-             oncommand="gEditItemOverlay.toggleFolderTreeVisibility();"/>
+@@ -47,7 +48,26 @@
+             class="expander-down panel-button"
+             data-l10n-id="bookmark-overlay-folders-expander2"/>
    </hbox>
-+</hbox>
-+  <hbox flex="1" class="zenEditBMPanel_fieldContainer">
-+    <label data-l10n-id="zen-bookmark-edit-panel-workspace-selector"
-+           class="hideable"
-+           control="editBMPanel_workspacesSelectorExpander"/>
-+    <div id="editBMPanel_workspaceDropdown"
-+         class="editBMPanel_workspaceRow hideable workspace-dropdown">
-+      <div
-+              id="editBMPanel_workspaceSummary"
-+              class="workspace-trigger">-</div>
-+      <button id="editBMPanel_workspacesSelectorExpander"
-+              class="expander-down panel-button"
-+              data-l10n-id="bookmark-overlay-tags-expander2"
-+              oncommand="gEditItemOverlay.onWorkspaceDropdownToggle();"/>
-+
-+    </div>
+-
 +  </hbox>
-+
-+  <ul id="editBMPanel_workspaceList" class="workspace-list hideable" hidden="true">
-+  </ul>
- 
++    <hbox flex="1" class="zenEditBMPanel_fieldContainer">
++      <label data-l10n-id="zen-bookmark-edit-panel-workspace-selector"
++             class="hideable"
++             control="editBMPanel_workspacesSelectorExpander"/>
++      <div id="editBMPanel_workspaceDropdown"
++           class="editBMPanel_workspaceRow hideable workspace-dropdown">
++        <div
++                id="editBMPanel_workspaceSummary"
++                class="workspace-trigger">-</div>
++        <button id="editBMPanel_workspacesSelectorExpander"
++                class="expander-down panel-button"
++                data-l10n-id="bookmark-overlay-tags-expander2"
++                oncommand="gEditItemOverlay.onWorkspaceDropdownToggle();"/>
++  
++      </div>
++    </hbox>
++  
++    <ul id="editBMPanel_workspaceList" class="workspace-list hideable" hidden="true">
++    </ul>
    <vbox id="editBMPanel_folderTreeRow"
          class="hideable"
+         hidden="true">
diff --git a/src/browser/components/sidebar/browser-sidebar-js.patch b/src/browser/components/sidebar/browser-sidebar-js.patch
deleted file mode 100644
index c17d4f10e..000000000
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index 4a124003976684e014435854aef69ce29da541d2..61ce44751c36eea3e5ae2ddcc62e42c01459629b 100644
---- a/browser/components/sidebar/browser-sidebar.js
-+++ b/browser/components/sidebar/browser-sidebar.js
-@@ -578,7 +578,7 @@ var SidebarController = {
-    */
-   setPosition() {
-     // First reset all ordinals to match DOM ordering.
--    let browser = document.getElementById("browser");
-+    let browser = document.getElementById("tabbrowser-tabbox");
-     [...browser.children].forEach((node, i) => {
-       node.style.order = i + 1;
-     });
-@@ -592,9 +592,10 @@ var SidebarController = {
-       let boxOrdinal = this._box.style.order;
-       this._box.style.order = tabbox.style.order;
- 
--      tabbox.style.order = boxOrdinal;
-       // the launcher should be on the right of the sidebar-box
--      sidebarContainer.style.order = parseInt(this._box.style.order) + 1;
-+      this._box.style.order = browser.children.length + 2;
-+      this._splitter.style.order = browser.children.length + 1;
-+      this._splitter.style.marginRight = 0;
-       // Indicate we've switched ordering to the box
-       this._box.toggleAttribute("positionend", true);
-       sidebarMain.toggleAttribute("positionend", true);
-@@ -603,6 +604,9 @@ var SidebarController = {
-       this._box.toggleAttribute("positionend", false);
-       sidebarMain.toggleAttribute("positionend", false);
-       sidebarContainer.toggleAttribute("positionend", false);
-+      this._box.style.order = 1;
-+      this._splitter.style.order = 2;
-+      this._splitter.style.removeProperty("margin-right");
-       this.toolbarButton &&
-         this.toolbarButton.toggleAttribute("positionend", false);
-     }
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index fe4056e6f..038ea3dc4 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,9 +1,9 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb5581606e12 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c58f6765cc 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -409,11 +409,39 @@
-       return count;
+@@ -406,11 +406,39 @@
+       return this.tabContainer.visibleTabs;
      }
  
 +    get _numVisiblePinTabs() {
@@ -44,7 +44,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        }
        return i;
      }
-@@ -806,7 +834,7 @@
+@@ -807,7 +835,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
@@ -52,8 +52,8 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
 +          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab)
          );
        } else {
-         this.moveTabTo(aTab, this.pinnedTabCount);
-@@ -1052,6 +1080,8 @@
+         this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
+@@ -1055,6 +1083,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -62,7 +62,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1062,6 +1092,9 @@
+@@ -1065,6 +1095,9 @@
          );
          return;
        }
@@ -72,7 +72,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1291,6 +1324,7 @@
+@@ -1310,6 +1343,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -80,7 +80,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -2374,7 +2408,7 @@
+@@ -2387,7 +2421,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -89,7 +89,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2434,7 +2468,7 @@
+@@ -2447,7 +2481,7 @@
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
          this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
@@ -98,7 +98,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2666,6 +2700,12 @@
+@@ -2679,6 +2713,12 @@
          );
        }
  
@@ -111,7 +111,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2735,6 +2775,12 @@
+@@ -2742,6 +2782,12 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -124,7 +124,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2878,6 +2924,10 @@
+@@ -2885,6 +2931,13 @@
          }
        }
  
@@ -135,7 +135,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3389,6 +3439,23 @@
+@@ -3403,6 +3456,23 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -159,7 +159,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3402,6 +3469,9 @@
+@@ -3416,6 +3486,9 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -169,7 +169,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3438,6 +3508,21 @@
+@@ -3452,6 +3525,21 @@
              preferredRemoteType,
            });
  
@@ -191,7 +191,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
            if (select) {
              tabToSelect = tab;
            }
-@@ -3491,7 +3576,6 @@
+@@ -3505,7 +3593,6 @@
              this.tabContainer._invalidateCachedTabs();
            }
          }
@@ -219,7 +219,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        this.removeTabs(selectedTabs);
      }
  
-@@ -4389,6 +4477,13 @@
+@@ -4443,6 +4534,13 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -233,7 +233,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4417,7 +4512,10 @@
+@@ -4471,7 +4569,10 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -245,7 +245,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4556,14 +4654,14 @@
+@@ -4610,14 +4711,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -262,7 +262,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5411,10 +5509,10 @@
+@@ -5465,10 +5566,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -275,7 +275,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -7384,6 +7482,7 @@
+@@ -7443,6 +7544,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -283,7 +283,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8344,7 +8443,7 @@ var TabContextMenu = {
+@@ -8411,7 +8513,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -292,7 +292,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8378,7 +8477,7 @@ var TabContextMenu = {
+@@ -8444,7 +8546,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -301,7 +301,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..751dfb93d39b9e066b8c2c0aabdebb55
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8607,6 +8706,7 @@ var TabContextMenu = {
+@@ -8677,6 +8779,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 5a0650259..512df10ff 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,17 +1,17 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c08b06e884 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..94b6a5ee6b89965fc63a8e8d1075bd0de37c4d15 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
-         return this.hasAttribute("positionpinnedtabs");
        };
-       this.arrowScrollbox._canScrollToElement = tab => {
--        return (!tab.pinned || !arePositioningPinnedTabs()) && tab.visible;
-+        return (!tab.hasAttribute("zen-essential") || !arePositioningPinnedTabs()) && tab.visible;
+       this.arrowScrollbox._canScrollToElement = element => {
+         if (isTab(element)) {
+-          return !element.pinned || !this.hasAttribute("positionpinnedtabs");
++          return !element.hasAttribute("zen-essential") || !this.hasAttribute("positionpinnedtabs");
+         }
+         return true;
        };
- 
-       // Override for performance reasons. This is the size of a single element
-@@ -352,7 +352,7 @@
+@@ -362,7 +362,7 @@
        // and we're not hitting the scroll buttons.
        if (
          event.button != 0 ||
@@ -20,7 +20,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;
-@@ -649,7 +649,7 @@
+@@ -659,7 +659,7 @@
        if (this.#isContainerVerticalPinnedExpanded(tab)) {
          // In expanded vertical mode, the max number of pinned tabs per row is dynamic
          // Set this before adjusting dragged tab's position
@@ -29,7 +29,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          let tabsPerRow = 0;
          let position = 0;
          for (let pinnedTab of pinnedTabs) {
-@@ -997,7 +997,7 @@
+@@ -1010,7 +1010,7 @@
            }
          } else {
            let pinned = draggedTab.pinned;
@@ -38,7 +38,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
            let tabs = this.visibleTabs.slice(
              pinned ? 0 : numPinned,
              pinned ? numPinned : undefined
-@@ -1076,7 +1076,7 @@
+@@ -1090,7 +1090,7 @@
                let postTransitionCleanup = () => {
                  tab.removeAttribute("tabdrop-samewindow");
  
@@ -46,8 +46,8 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
 +              this._finishAnimateTabMove(true);
                  if (dropIndex !== false) {
                    gBrowser.moveTabTo(tab, dropIndex);
-                   if (incrementDropIndex) {
-@@ -1086,7 +1086,7 @@
+                   if (!directionForward) {
+@@ -1100,7 +1100,7 @@
  
                  gBrowser.syncThrobberAnimations(tab);
                };
@@ -56,7 +56,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
                  postTransitionCleanup();
                } else {
                  let onTransitionEnd = transitionendEvent => {
-@@ -1238,7 +1238,8 @@
+@@ -1263,7 +1263,8 @@
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
@@ -66,7 +66,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1487,7 +1488,7 @@
+@@ -1512,7 +1513,7 @@
        }
  
        this.#allTabs = [
@@ -75,7 +75,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          ...children,
        ];
        return this.#allTabs;
-@@ -1556,6 +1557,7 @@
+@@ -1593,6 +1594,7 @@
        }
  
        this.#focusableItems = [
@@ -83,7 +83,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          ...verticalPinnedTabsContainer.children,
          ...focusableItems,
        ];
-@@ -1579,8 +1581,8 @@
+@@ -1617,8 +1619,8 @@
      #isContainerVerticalPinnedExpanded(tab) {
        return (
          this.verticalMode &&
@@ -94,7 +94,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        );
      }
  
-@@ -1778,7 +1780,7 @@
+@@ -1816,7 +1818,7 @@
            let rect = ele => {
              return window.windowUtils.getBoundsWithoutFlushing(ele);
            };
@@ -103,7 +103,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1794,6 +1796,7 @@
+@@ -1832,6 +1834,7 @@
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -111,7 +111,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1841,7 +1844,7 @@
+@@ -1879,7 +1882,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -120,7 +120,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1856,7 +1859,7 @@
+@@ -1894,7 +1897,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -129,7 +129,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1922,13 +1925,13 @@
+@@ -1963,13 +1966,13 @@
        let verticalTabsContainer = document.getElementById(
          "vertical-pinned-tabs-container"
        );
@@ -146,7 +146,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          }
        }
  
-@@ -1952,7 +1955,7 @@
+@@ -1993,7 +1996,7 @@
  
      _positionPinnedTabs() {
        let tabs = this.visibleTabs;
@@ -155,7 +155,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2033,7 +2036,7 @@
+@@ -2074,7 +2077,7 @@
          return;
        }
  
@@ -164,7 +164,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2221,9 +2224,9 @@
+@@ -2257,9 +2260,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -176,7 +176,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          pinned ? numPinned : undefined
        );
  
-@@ -2456,8 +2459,8 @@
+@@ -2502,8 +2505,8 @@
        );
      }
  
@@ -187,7 +187,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          return;
        }
  
-@@ -2622,9 +2625,9 @@
+@@ -2668,9 +2671,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -199,7 +199,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
        }
      }
  
-@@ -2708,7 +2711,7 @@
+@@ -2754,7 +2757,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -208,7 +208,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
          return;
        }
  
-@@ -2726,12 +2729,14 @@
+@@ -2772,12 +2775,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -224,7 +224,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
                selectedTab,
              ];
            })
-@@ -2748,8 +2753,11 @@
+@@ -2794,8 +2799,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -238,7 +238,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
              ) {
                return;
              }
-@@ -2757,21 +2765,29 @@
+@@ -2803,21 +2811,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (
diff --git a/src/browser/themes/shared/customizableui/panelUI-shared-css.patch b/src/browser/themes/shared/customizableui/panelUI-shared-css.patch
index 36027abfb..9cc719a2d 100644
--- a/src/browser/themes/shared/customizableui/panelUI-shared-css.patch
+++ b/src/browser/themes/shared/customizableui/panelUI-shared-css.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/customizableui/panelUI-shared.css b/browser/themes/shared/customizableui/panelUI-shared.css
-index e4409ac75f6ee794d400559b0b01ae30904d01bc..4c10051d6bbc77440195b08397743c03a11d1fb0 100644
+index bdbfd3521b4921f7d6d44623181019a8263b5825..d4c4bab98197b2e5948a34daa1e435b74880a700 100644
 --- a/browser/themes/shared/customizableui/panelUI-shared.css
 +++ b/browser/themes/shared/customizableui/panelUI-shared.css
-@@ -16,7 +16,7 @@
+@@ -18,7 +18,7 @@
    --menu-panel-width-wide: 29em;
  
    --arrowpanel-menuitem-margin-block: 0;
@@ -11,7 +11,7 @@ index e4409ac75f6ee794d400559b0b01ae30904d01bc..4c10051d6bbc77440195b08397743c03
    --arrowpanel-menuitem-margin: var(--arrowpanel-menuitem-margin-block) var(--arrowpanel-menuitem-margin-inline);
    --arrowpanel-menuitem-padding-block: 8px;
    --arrowpanel-menuitem-padding-inline: 8px;
-@@ -720,15 +720,15 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
+@@ -819,15 +819,15 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
  /* Firefox Account Toolbar Panel */
  
  #fxa-avatar-image {
@@ -29,4 +29,4 @@ index e4409ac75f6ee794d400559b0b01ae30904d01bc..4c10051d6bbc77440195b08397743c03
 +    --avatar-image-url: var(--zen-avatar-image-url);
    }
  
-   &:not([fxatoolbarmenu]) #fxa-toolbar-menu-button {
+   /**
diff --git a/src/browser/themes/windows/browser-css.patch b/src/browser/themes/windows/browser-css.patch
index 1bf29c49f..9c49c2201 100644
--- a/src/browser/themes/windows/browser-css.patch
+++ b/src/browser/themes/windows/browser-css.patch
@@ -1,24 +1,8 @@
 diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index 95b571aca107a6b3e0e5a7e5eb8672c66be9bf61..9ed448c2142b6a5dbb6132ffe5e65a1771a4a525 100644
+index f49604e53780763b9aa19897458c45f0be6cbc9b..aa9da99641ba4a3b7f67a27acbbf6c75c1346ced 100644
 --- a/browser/themes/windows/browser.css
 +++ b/browser/themes/windows/browser.css
-@@ -31,15 +31,6 @@
-       &:not([lwtheme]) {
-         background-color: transparent;
- 
--        /* Accent color in titlebar overrides Mica. */
--        @media not (-moz-windows-accent-color-in-titlebar) {
--          /* Hide the Firefox buttons since Windows draws their own.
--           * FIXME(emilio): Find a way of hiding the native buttons, or make them
--           * taller, this is very hacky. */
--          .titlebar-buttonbox {
--            opacity: 0;
--          }
--        }
-       }
-     }
- 
-@@ -57,7 +48,7 @@
+@@ -47,7 +47,7 @@
      }
  
      &[sizemode="normal"] #navigator-toolbox {
diff --git a/src/widget/windows/nsWindow-cpp.patch b/src/widget/windows/nsWindow-cpp.patch
deleted file mode 100644
index 2a51fb835..000000000
--- a/src/widget/windows/nsWindow-cpp.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index 00681c216c838efedbbcded9d6b843dbd8b5b0b6..f07e6e723596d84fb53a8a72b06e02cd4ace6bc1 100644
---- a/widget/windows/nsWindow.cpp
-+++ b/widget/windows/nsWindow.cpp
-@@ -2729,12 +2729,37 @@ nsresult nsWindow::SetNonClientMargins(const LayoutDeviceIntMargin& margins) {
-   mCustomNonClient = margins != LayoutDeviceIntMargin(-1, -1, -1, -1);
-   mNonClientMargins = margins;
- 
-+  const LONG_PTR style = GetWindowLongPtrW(mWnd, GWL_STYLE);
-   // Force a reflow of content based on the new client dimensions.
-   if (mCustomNonClient) {
--    UpdateNonClientMargins();
--  } else {
--    ResetLayout();
--  }
-+    if (style & WS_SYSMENU) {
-+      // Remove the WS_SYSMENU style, so that DWM doesn't draw the caption
-+      // buttons. Note that we still need WS_MAXIMIZEBOX at least to
-+      // support Snap Layouts / Aero Snap.
-+      //
-+      // This behavior is not documented: per MSDN, WS_MAXIMIZEBOX simply
-+      // requires WS_SYSMENU, and is not valid without it. However, omitting it
-+      // doesn't seem to have negative side-effects on any version of Windows
-+      // tested (other than losing the default system menu handling, which we
-+      // implement ourselves in DisplaySystemMenu()).
-+      //
-+      // Since the system menu is lazily initialized (see [1]), we have to call
-+      // GetSystemMenu() here in order to get it created before it is too late.
-+      // An alternative would be to play with window styles later to force it
-+      // to be created, but that seems a bit more finicky.
-+      //
-+      // [1]: https://devblogs.microsoft.com/oldnewthing/20100528-00/?p=13893
-+      ::GetSystemMenu(mWnd, FALSE);
-+      ::SetWindowLongPtrW(mWnd, GWL_STYLE, style & ~WS_SYSMENU);
-+    }
-+     UpdateNonClientMargins();
-+   } else {
-+    if (WindowStyle() & WS_SYSMENU) {
-+      // Restore the WS_SYSMENU style if appropriate.
-+      ::SetWindowLongPtrW(mWnd, GWL_STYLE, style | WS_SYSMENU);
-+    }
-+     ResetLayout();
-+   }
- 
-   return NS_OK;
- }
-@@ -4560,53 +4585,55 @@ void nsWindow::IPCWindowProcHandler(UINT& msg, WPARAM& wParam, LPARAM& lParam) {
- static bool DisplaySystemMenu(HWND hWnd, nsSizeMode sizeMode, bool isRtl,
-                               int32_t x, int32_t y) {
-   HMENU hMenu = GetSystemMenu(hWnd, FALSE);
--  if (hMenu) {
--    MENUITEMINFO mii;
--    mii.cbSize = sizeof(MENUITEMINFO);
--    mii.fMask = MIIM_STATE;
--    mii.fType = 0;
--
--    // update the options
--    mii.fState = MF_ENABLED;
--    SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
--    SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
--    SetMenuItemInfo(hMenu, SC_MOVE, FALSE, &mii);
--    SetMenuItemInfo(hMenu, SC_MAXIMIZE, FALSE, &mii);
--    SetMenuItemInfo(hMenu, SC_MINIMIZE, FALSE, &mii);
--
--    mii.fState = MF_GRAYED;
--    switch (sizeMode) {
--      case nsSizeMode_Fullscreen:
--        // intentional fall through
--      case nsSizeMode_Maximized:
--        SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
--        SetMenuItemInfo(hMenu, SC_MOVE, FALSE, &mii);
--        SetMenuItemInfo(hMenu, SC_MAXIMIZE, FALSE, &mii);
--        break;
--      case nsSizeMode_Minimized:
--        SetMenuItemInfo(hMenu, SC_MINIMIZE, FALSE, &mii);
--        break;
--      case nsSizeMode_Normal:
--        SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
--        break;
--      case nsSizeMode_Invalid:
--        NS_ASSERTION(false, "Did the argument come from invalid IPC?");
--        break;
--      default:
--        MOZ_ASSERT_UNREACHABLE("Unhnalded nsSizeMode value detected");
--        break;
--    }
--    LPARAM cmd = TrackPopupMenu(
--        hMenu,
--        (TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_TOPALIGN |
--         (isRtl ? TPM_RIGHTALIGN : TPM_LEFTALIGN)),
--        x, y, 0, hWnd, nullptr);
--    if (cmd) {
--      PostMessage(hWnd, WM_SYSCOMMAND, cmd, 0);
--      return true;
--    }
-+  if (NS_WARN_IF(!hMenu)) {
-+    return false;
-   }
--  return false;
-+
-+  MENUITEMINFO mii;
-+  mii.cbSize = sizeof(MENUITEMINFO);
-+  mii.fMask = MIIM_STATE;
-+  mii.fType = 0;
-+
-+  // update the options
-+  mii.fState = MF_ENABLED;
-+  SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
-+  SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
-+  SetMenuItemInfo(hMenu, SC_MOVE, FALSE, &mii);
-+  SetMenuItemInfo(hMenu, SC_MAXIMIZE, FALSE, &mii);
-+  SetMenuItemInfo(hMenu, SC_MINIMIZE, FALSE, &mii);
-+
-+  mii.fState = MF_GRAYED;
-+  switch (sizeMode) {
-+    case nsSizeMode_Fullscreen:
-+      // intentional fall through
-+    case nsSizeMode_Maximized:
-+      SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
-+      SetMenuItemInfo(hMenu, SC_MOVE, FALSE, &mii);
-+      SetMenuItemInfo(hMenu, SC_MAXIMIZE, FALSE, &mii);
-+      break;
-+    case nsSizeMode_Minimized:
-+      SetMenuItemInfo(hMenu, SC_MINIMIZE, FALSE, &mii);
-+      break;
-+    case nsSizeMode_Normal:
-+      SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
-+      break;
-+    case nsSizeMode_Invalid:
-+      NS_ASSERTION(false, "Did the argument come from invalid IPC?");
-+      break;
-+    default:
-+      MOZ_ASSERT_UNREACHABLE("Unhnalded nsSizeMode value detected");
-+      break;
-+  }
-+  LPARAM cmd = TrackPopupMenu(hMenu,
-+                              TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD |
-+                                  TPM_TOPALIGN |
-+                                  (isRtl ? TPM_RIGHTALIGN : TPM_LEFTALIGN),
-+                              x, y, 0, hWnd, nullptr);
-+  if (!cmd) {
-+    return false;
-+  }
-+  PostMessage(hWnd, WM_SYSCOMMAND, cmd, 0);
-+  return true;
- }
- 
- // The WndProc procedure for all nsWindows in this toolkit. This merely catches
-@@ -5768,13 +5795,20 @@ bool nsWindow::ProcessMessageInternal(UINT msg, WPARAM& wParam, LPARAM& lParam,
-         result = true;
-       }
- 
--      // Handle the system menu manually when we're in full screen mode
--      // so we can set the appropriate options.
--      if (filteredWParam == SC_KEYMENU && lParam == VK_SPACE &&
--          mFrameState->GetSizeMode() == nsSizeMode_Fullscreen) {
--        DisplaySystemMenu(mWnd, mFrameState->GetSizeMode(), mIsRTL,
--                          MOZ_SYSCONTEXT_X_POS, MOZ_SYSCONTEXT_Y_POS);
--        result = true;
-+      if (filteredWParam == SC_KEYMENU && lParam == VK_SPACE) {
-+        const auto sizeMode = mFrameState->GetSizeMode();
-+        // Handle the system menu manually when we're in full screen mode or
-+        // with custom titlebar so we can set the appropriate options.
-+        if (sizeMode == nsSizeMode_Fullscreen || mCustomNonClient) {
-+          // Historically on fullscreen windows we've used this offset from the
-+          // top left as our context menu position. Note that if the point we
-+          // supply is offscreen, Windows will still try to put our menu in the
-+          // right place.
-+          constexpr LayoutDeviceIntPoint offset(20, 20);
-+          auto pos = GetScreenBounds().TopLeft() + offset;
-+          DisplaySystemMenu(mWnd, sizeMode, mIsRTL, pos.x, pos.y);
-+          result = true;
-+        }
-       }
-     } break;
- 
diff --git a/surfer.json b/surfer.json
index 989933104..db7cd7020 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "134.0.2",
-    "candidate": "134.0.2"
+    "candidate": "135.0"
   },
   "buildOptions": {
     "generateBranding": true