diff --git a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
index ddf7c2095b..60cfdf6c3f 100644
--- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
+++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch
@@ -2,18 +2,18 @@ diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/
 index c61a424d3871d94e7086418c72ce22d5aef0a047..b6e3939b1ce67185acc3b9a66385869bd5490a39 100644
 --- a/browser/base/content/browser-fullScreenAndPointerLock.js
 +++ b/browser/base/content/browser-fullScreenAndPointerLock.js
-@@ -431,10 +431,10 @@ var FullScreen = {
+@@ -426,10 +426,10 @@ var FullScreen = {
+     shiftSize = shiftSize.toFixed(2);
      gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0);
  
-     let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
+-    let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : "";
 -    gNavToolbox.style.transform = transform;
 -    gURLBar.textbox.style.transform = gURLBar.textbox.hasAttribute("breakout")
 -      ? transform
--      : "";
-+    //gNavToolbox.style.transform = transform;
-+    //gURLBar.textbox.style.transform = gURLBar.textbox.hasAttribute("breakout")
-+    //  ? transform
-+    //  : "";
++    const padding = shiftSize > 0 ? `${shiftSize}px` : "";
++    const appContentNavbarWrapper = document.getElementById('zen-appcontent-navbar-wrapper');
++    appContentNavbarWrapper.style.paddingTop = gURLBar.textbox.hasAttribute("breakout")
++      ? padding
+       : "";
      if (shiftSize > 0) {
        // If the mouse tracking missed our fullScreenToggler, then the toolbox
-       // might not have been shown before the menubar is animated down. Make
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index 7001091593..3179f902ea 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -578,6 +578,15 @@ var gZenCompactModeManager = {
           if (event.target.matches(':hover')) {
             return;
           }
+          if (AppConstants.platform == 'macosx' && FullScreen._currentToolbarShift > 0) {
+            this.flashElement(
+              target,
+              this.hideAfterHoverDuration,
+              'has-hover' + target.id,
+              'zen-has-hover'
+            );
+            return;
+          }
 
           if (
             event.explicitOriginalTarget.closest('#urlbar[zen-floating-urlbar]') ||
@@ -624,12 +633,20 @@ var gZenCompactModeManager = {
           }
           window.cancelAnimationFrame(this._removeHoverFrames[target.id]);
 
-          this.flashElement(
-            target,
-            this.hideAfterHoverDuration,
-            'has-hover' + target.id,
-            'zen-has-hover'
-          );
+          if (
+            AppConstants.platform == 'macosx' &&
+            window.fullScreen &&
+            entry.screenEdge === 'top'
+          ) {
+            target.setAttribute('zen-has-hover', 'true');
+          } else {
+            this.flashElement(
+              target,
+              this.hideAfterHoverDuration,
+              'has-hover' + target.id,
+              'zen-has-hover'
+            );
+          }
           document.addEventListener(
             'mousemove',
             () => {
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index 52f3a7f6ae..67119a4896 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -339,7 +339,7 @@
         top: calc(-1 * var(--zen-toolbar-height) + 1px);
         left: 0;
         z-index: 20;
-        transition: all 0.15s ease;
+        transition: all 0.15s ease, padding 0s;
         width: 100%;
 
         max-height: var(--zen-toolbar-height);