diff --git a/src/tabbar/_tabs_on_bottom.scss b/src/tabbar/_tabs_on_bottom.scss
index e5e21f5..3a344fb 100644
--- a/src/tabbar/_tabs_on_bottom.scss
+++ b/src/tabbar/_tabs_on_bottom.scss
@@ -75,6 +75,9 @@ See the above repository for updates as well as full license text. */
 
 .titlebar-buttonbox-container > .titlebar-buttonbox {
   height: 100%;
+  @include OS($mac) {
+    margin-block: 10px;
+  }
 }
 
 /* At Full Screen */
@@ -96,7 +99,7 @@ See the above repository for updates as well as full license text. */
 }
 
 /* At Activated Menubar */
-:root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-buttonbox-container {
+:root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) #toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-buttonbox-container {
   display: block !important;
 }
 :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container {
@@ -138,7 +141,7 @@ See the above repository for updates as well as full license text. */
 /* Use this pref to check Mac OS where window controls are on left */
 /* This pref defaults to true on Mac and doesn't actually do anything on other platforms. So if your system has window controls on LEFT side you can set the pref to true */
 @include OS($mac) {
-  :root {
+  :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
     --uc-window-control-width: 72px;
   }
   :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar {
diff --git a/userChrome.css b/userChrome.css
index 9e25bc0..5e39592 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -3586,6 +3586,11 @@
   .titlebar-buttonbox-container > .titlebar-buttonbox {
     height: 100%;
   }
+  @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+    .titlebar-buttonbox-container > .titlebar-buttonbox {
+      margin-block: 10px;
+    }
+  }
 
   /* At Full Screen */
   :root[sizemode="fullscreen"] #window-controls {
@@ -3606,7 +3611,7 @@
     }
   }
   /* At Activated Menubar */
-  :root:not([chromehidden~="menubar"])
+  :root:not([chromehidden~="menubar"], [sizemode="fullscreen"])
     #toolbar-menubar:not([autohide="true"])
     + #TabsToolbar
     > .titlebar-buttonbox-container {
@@ -3657,7 +3662,7 @@
   /* Use this pref to check Mac OS where window controls are on left */
   /* This pref defaults to true on Mac and doesn't actually do anything on other platforms. So if your system has window controls on LEFT side you can set the pref to true */
   @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
-    :root {
+    :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
       --uc-window-control-width: 72px;
     }