diff --git a/locales/en-US/browser/browser/zen-general.ftl b/locales/en-US/browser/browser/zen-general.ftl
index f98b6469e..0b2f5641d 100644
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -77,6 +77,8 @@ zen-generic-next = Next
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Allowed
 zen-site-data-setting-block = Blocked
+zen-site-data-protections-enabled = Enabled
+zen-site-data-protections-disabled = Disabled
 zen-site-data-setting-cross-site = Cross-Site cookie
 zen-site-data-security-info-extension =
     .label = Extension
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index 50103b89d..9b39392cf 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -16,16 +16,19 @@
                 mainview-with-header="true">
       <hbox id="zen-site-data-header">
         <toolbarbutton id="zen-site-data-header-share"
-                        data-l10n-id="zen-site-data-share"
+                        data-l10n-id="zen-site-data-header-share"
                         flex="1"
                         closemenu="none" />
         <toolbarbutton id="zen-site-data-header-reader-mode"
+                        data-l10n-id="zen-site-data-header-reader-mode"
                         command="View:ReaderView"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-screenshot"
+                        data-l10n-id="zen-site-data-header-screenshot"
                         command="Browser:Screenshot"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-bookmark"
+                        data-l10n-id="zen-site-data-header-bookmark"
                         command="Browser:AddBookmarkAs"
                         flex="1" />
       </hbox>
@@ -78,9 +81,9 @@
                        closemenu="none"
                        context="zenSiteDataActions" />
       </hbox>
-      <html:div id="unified-extensions-messages-container">
-        <!-- messages will be inserted here -->
-      </html:div>
+# Messages will be inserted here.
+# Dont write anything directly here, even comments, as this may break the layout
+      <html:div id="unified-extensions-messages-container"></html:div>
     </panelview>
   </panelmultiview>
 </panel>
\ No newline at end of file
diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index fb2705959..ed6ba32f4 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -275,14 +275,12 @@ var gZenUIManager = {
   // Section: URL bar
 
   onUrlbarOpen() {
-    gURLBar.setAttribute('had-proxystate', gURLBar.getAttribute('pageproxystate'));
     gURLBar.setPageProxyState('invalid', false);
   },
 
   onUrlbarClose() {
-    if (gURLBar.hasAttribute('had-proxystate')) {
-      gURLBar.setURI();
-      gURLBar.removeAttribute('had-proxystate');
+    if (!gURLBar.valueIsTyped && gURLBar._untrimmedValue !== gURLBar.value) {
+      gURLBar.handleRevert();
     }
   },
 
diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index a456ef2b3..3cdc0cda6 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -133,7 +133,7 @@
 }
 
 :root:not([zen-single-toolbar='true']) #zen-appcontent-wrapper {
-  z-index: 2;
+  z-index: 3;
 }
 
 #nav-bar {
diff --git a/src/zen/split-view/zen-split-group.inc.css b/src/zen/split-view/zen-split-group.inc.css
index e5e5e84de..ae048f8e4 100644
--- a/src/zen/split-view/zen-split-group.inc.css
+++ b/src/zen/split-view/zen-split-group.inc.css
@@ -133,8 +133,11 @@ tab-group[split-view-group] {
     }
 
     @container browser-tab (min-width: 70px) {
-      :root[zen-sidebar-expanded='true'] &:hover > .tabbrowser-tab:not([pinned]) .tab-close-button {
+      :root[zen-sidebar-expanded='true'] &:hover > .tabbrowser-tab:not([pinned]:not([pending])) .tab-close-button {
         display: block !important;
+
+        /* This is from Firefox itself, but we need to always override it */
+        margin-inline-end: 0 !important;
       }
     }
 
diff --git a/src/zen/tabs/zen-tabs.css b/src/zen/tabs/zen-tabs.css
index a195b4e44..e82625d2f 100644
--- a/src/zen/tabs/zen-tabs.css
+++ b/src/zen/tabs/zen-tabs.css
@@ -112,5 +112,17 @@
     & #titlebar {
       padding-top: var(--zen-toolbar-height);
     }
+
+    & #nav-bar {
+      width: calc(100% + var(--zen-toolbox-max-width) - var(--zen-element-separation));
+
+      /**
+       * We only want it when the window buttons are on the left side, in other
+       * words, the first of the two selectors above.
+       */
+      :root:not([zen-window-buttons-reversed='true']) & {
+        margin-left: calc(-1 * var(--zen-toolbox-max-width) + var(--zen-element-separation));
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index 98180dca6..f3aa7f6ef 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -363,9 +363,15 @@ export class nsZenSiteDataPanel {
     switch (permission.state) {
       // There should only be these types being displayed in the panel.
       case SitePermissions.ALLOW:
+        if (permission.id === 'site-protection') {
+          return 'zen-site-data-protections-enabled';
+        }
         return 'zen-site-data-setting-allow';
       case SitePermissions.BLOCK:
       case SitePermissions.AUTOPLAY_BLOCKED_ALL:
+        if (permission.id === 'site-protection') {
+          return 'zen-site-data-protections-disabled';
+        }
         return 'zen-site-data-setting-block';
       default:
         return null;
@@ -521,12 +527,12 @@ export class nsZenSiteDataPanel {
 
     const isCrossSiteCookie = permission.id.startsWith('3rdPartyStorage');
     label.parentNode.setAttribute('state', newState == SitePermissions.ALLOW ? 'allow' : 'block');
+    label._permission.state = newState;
     if (!isCrossSiteCookie) {
       label
         .querySelector('.zen-permission-popup-permission-state-label')
-        .setAttribute('data-l10n-id', this.#getPermissionStateLabelId({ state: newState }));
+        .setAttribute('data-l10n-id', this.#getPermissionStateLabelId(label._permission));
     }
-    label._permission.state = newState;
   }
 
   #onClickEvent(event) {