diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs
index 782a13df7..31e55623c 100644
--- a/src/browser/base/content/ZenCustomizableUI.sys.mjs
+++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs
@@ -71,7 +71,7 @@ export var ZenCustomizableUI = new (class {
   _moveWindowButtons(window) {
     const windowControls = window.document.getElementsByClassName('titlebar-buttonbox-container');
     const toolboxIcons = window.document.getElementById('zen-sidebar-top-buttons-customization-target');
-    if (window.AppConstants.platform === 'macosx') {
+    if (window.AppConstants.platform === 'macosx'|| matchMedia('(-moz-gtk-csd-reversed-placement)').matches) {
       for (let i = 0; i < windowControls.length; i++) {
         if (i === 0) {
           toolboxIcons.prepend(windowControls[i]);
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index bb9fff21d..3394e1b09 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -5,7 +5,7 @@
 }
 
 #urlbar {
-  --toolbarbutton-border-radius: 6px;
+  --toolbarbutton-border-radius: 10px;
   --urlbarView-separator-color: var(--zen-colors-border);
   --urlbarView-hover-background: var(--toolbarbutton-hover-background);
   --urlbarView-highlight-background: var(--toolbarbutton-hover-background);
@@ -195,28 +195,28 @@ button.popup-notification-dropmarker {
  */
 
 #notification-popup-box {
-  border-radius: 6px !important;
+  border-radius: 10px !important;
 }
 
 /* Border radius on hover */
 #urlbar .urlbar-page-action,
 #urlbar #tracking-protection-icon-container,
 #urlbar:not([breakout-extend='true']) #identity-box:is(:not(.chromeUI), [pageproxystate='invalid']) #identity-icon-box {
-  border-radius: 6px !important;
+  border-radius: 10px !important;
 }
 
 /* Border radius of boxes on the left */
 #identity-box:has(#identity-permission-box:is([hasPermissions], [hasSharingIcon])):not([pageproxystate='invalid'])
   #identity-icon-box {
-  border-top-left-radius: 6px !important;
-  border-bottom-left-radius: 6px !important;
+  border-top-left-radius: 10px !important;
+  border-bottom-left-radius: 10px !important;
   border-top-right-radius: 0 !important;
   border-bottom-right-radius: 0 !important;
 }
 
 /* Extensions or similar */
 #urlbar:not([breakout-extend='true']) #identity-box.chromeUI:not([pageproxystate='invalid']) #identity-icon-box {
-  border-radius: 6px 6px 6px 6px !important;
+  border-radius: 10px !important;
 }
 
 /* Notification Stack */
@@ -275,6 +275,6 @@ button.popup-notification-dropmarker {
 }*/
 
 #PersonalToolbar:not([collapsed='true']) {
-  padding-bottom: 6px;
+  padding-bottom: 10px;
   padding-left: 0 !important;
 }
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 35e164fc2..a0bfae125 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -68,9 +68,9 @@
       return this._enabled;
     }
 
-    async _refreshPinnedTabs() {
+    async _refreshPinnedTabs({ init = false } = {}) {
       await this._initializePinsCache();
-      this._initializePinnedTabs();
+      this._initializePinnedTabs(init);
     }
 
     async _initializePinsCache() {
@@ -109,7 +109,7 @@
       return this._pinsCache;
     }
 
-    _initializePinnedTabs() {
+    _initializePinnedTabs(init = false) {
       const pins = this._pinsCache;
       if (!pins?.length) {
         return;
@@ -130,6 +130,10 @@
           // This is a valid pinned tab that matches a pin
           pinnedTabsByUUID.set(pinId, tab);
           pinsToCreate.delete(pinId);
+
+          if(lazy.zenPinnedTabRestorePinnedTabsToPinnedUrl && init) {
+            this._resetTabToStoredState(tab);
+          }
         } else {
           // This is a pinned tab that no longer has a corresponding pin
           gBrowser.removeTab(tab);
diff --git a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
index 92e8fe99e..9283cdd7a 100644
--- a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
@@ -48,7 +48,7 @@ var ZenPinnedTabsStorage = {
         CREATE INDEX IF NOT EXISTS idx_zen_pins_changes_uuid ON zen_pins_changes(uuid)
       `);
 
-      await gZenPinnedTabManager._refreshPinnedTabs();
+      await gZenPinnedTabManager._refreshPinnedTabs({init: true});
     });
   },