diff --git a/src/browser/themes/shared/identity-block/identity-block-css.patch b/src/browser/themes/shared/identity-block/identity-block-css.patch
index 2c5c54f64..6f4941ae0 100644
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -1,7 +1,16 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index d542e962d42b17140888e299ed43a838047ee48c..5e0b72f147687924c48dfed0318f53b765a4d497 100644
+index d542e962d42b17140888e299ed43a838047ee48c..806bc4f9d7b7557abf316a84858046e04c4f7ff5 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
+@@ -7,7 +7,7 @@
+ #identity-box {
+   margin-inline-end: var(--identity-box-margin-inline);
+ 
+-  &[pageproxystate="invalid"] {
++  :root[zen-has-empty-tab='true'] & {
+     pointer-events: none;
+     -moz-user-focus: ignore;
+   }
 @@ -81,13 +81,6 @@
    }
  }
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 71416c647..258f007f3 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -504,13 +504,17 @@
 }
 
 #identity-permission-box,
-#identity-box:not([pageproxystate='invalid']) #identity-icon-box:not([open]),
-#identity-box[pageproxystate='invalid'] #zen-site-data-icon-button {
+:root:not([zen-has-empty-tab='true'])
+  #urlbar:not([breakout-extend='true'])
+  #identity-icon-box:not([open]),
+:root[zen-has-empty-tab='true'] #zen-site-data-icon-button,
+#urlbar[breakout-extend='true'] #zen-site-data-icon-button {
   display: none !important;
 }
 
 #zen-site-data-icon-button {
-  padding: 0 6px;
+  padding: 0 6px !important;
+  border-radius: var(--urlbar-icon-border-radius) !important;
 
   & image {
     list-style-image: url('permissions.svg');
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 96c204d19..94838947e 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -152,16 +152,16 @@
     #navigator-toolbox[zen-has-implicit-hover='true'] &,
     &[open],
     #urlbar[has-popup-open='true'] &,
-    #identity-box[pageproxystate='invalid'] & {
+    :root[zen-has-empty-tab='true'] & {
       opacity: 1;
       visibility: visible;
     }
   }
 }
 
-:root:not([zen-single-toolbar='true'])
+:root:not([zen-single-toolbar='true']):not([zen-has-empty-tab='true'])
   #urlbar:not([breakout-extend='true'])
-  .urlbar-input-container:not([pageproxystate='invalid']) {
+  .urlbar-input-container {
   padding: 2px 3px;
   gap: 2px;
 
@@ -184,8 +184,7 @@
   background: transparent !important;
 }
 
-:root[zen-single-toolbar='true'],
-#urlbar[pageproxystate='invalid'] {
+:root:is([zen-single-toolbar='true'], [zen-has-empty-tab='true']) {
   #zen-copy-url-button[disabled] {
     display: none !important;
   }
@@ -313,6 +312,7 @@
 
 :root[zen-single-toolbar='true'] {
   --urlbar-icon-border-radius: 8px !important;
+  --urlbar-inner-border-radius: var(--toolbarbutton-border-radius) !important;
 
   #identity-permission-box > *:not(#zen-site-data-icon-button) {
     visibility: collapse;
@@ -322,10 +322,8 @@
     display: none;
   }
 
-  #urlbar:not([breakout-extend='true']) {
-    #identity-box:not([pageproxystate='invalid']) {
-      order: 2;
-    }
+  &:not([zen-has-empty-tab='true']) #urlbar:not([breakout-extend='true']) #identity-box {
+    order: 2;
   }
 
   #notification-popup-box:not([open]) {
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 21694d525..2cedddc4d 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -514,10 +514,8 @@
   & #nav-bar {
     padding-right: 0;
 
-    :root[zen-single-toolbar='true'] & {
-      &
-        #urlbar:not([breakout-extend='true']):not([pageproxystate='invalid'])
-        .urlbar-input-container {
+    :root[zen-single-toolbar='true']:not([zen-has-empty-tab='true']) & {
+      & #urlbar:not([breakout-extend='true']) .urlbar-input-container {
         padding-left: 8px;
         padding-right: 4px;
       }
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index e2228a209..9966f7f57 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -2655,6 +2655,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
   #changeToEmptyTab() {
     const isEmpty = gBrowser.selectedTab.hasAttribute('zen-empty-tab');
     gZenCompactModeManager.sidebar.toggleAttribute('zen-has-empty-tab', isEmpty);
+    document.documentElement.setAttribute('zen-has-empty-tab', isEmpty);
   }
 
   async onLocationChange(event) {