diff --git a/package.json b/package.json
index e468d499b..09926cc0b 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "build": "surfer build",
     "build:ui": "surfer build --ui",
-    "start": "cd engine && ./mach run --noprofile --marionette",
+    "start": "cd engine && ./mach run --noprofile",
     "import": "surfer import",
     "export": "surfer export",
     "init": "npm run download && npm run bootstrap && npm run import",
diff --git a/src/zen/common/styles/zen-urlbar.css b/src/zen/common/styles/zen-urlbar.css
index b1d9f2439..f48448385 100644
--- a/src/zen/common/styles/zen-urlbar.css
+++ b/src/zen/common/styles/zen-urlbar.css
@@ -139,20 +139,6 @@
   margin-bottom: auto !important;
 }
 
-#identity-box:has(#notification-popup-box:not([hidden='true'])) #identity-icon-box,
-#identity-box:has(#notification-popup-box:not([hidden='true'])) #identity-permission-box {
-  margin-right: 0px !important;
-}
-
-#identity-box:has(#identity-permission-box:is([hasPermissions], [hasSharingIcon])):not(
-    [pageproxystate='invalid']
-  )
-  #identity-icon-box {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-  margin-right: 0 !important;
-}
-
 #tracking-protection-icon-container,
 #page-action-buttons {
   order: 2 !important;
@@ -165,7 +151,7 @@
 #urlbar[breakout-extend='true'] {
   z-index: 2;
 
-  .urlbar-input-container {
+  :root:not([zen-single-toolbar='true']) & .urlbar-input-container {
     --urlbar-container-padding: 0px;
   }
 
@@ -250,7 +236,7 @@
 
   #urlbar:not([open]) {
     #identity-box:not([pageproxystate='invalid']) {
-      order: 9;
+      order: 2;
     }
   }
 
@@ -387,6 +373,7 @@ button.popup-notification-dropmarker {
   #identity-box:is(:not(.chromeUI), [pageproxystate='invalid'])
   #identity-icon-box {
   border-radius: var(--urlbar-icon-border-radius) !important;
+  min-width: 30px;
 }
 
 /* Notification Stack */