diff --git a/chrome/Fx65_tabs_on_bottom.css b/chrome/Fx65_tabs_on_bottom.css
index 8b66376..168047b 100644
--- a/chrome/Fx65_tabs_on_bottom.css
+++ b/chrome/Fx65_tabs_on_bottom.css
@@ -4,11 +4,13 @@ Use Fx65_tabs_on_bottom_menubar_on_top_patch if you
 have menubar permanently enabled and want it on top
  */
 
-:root{ --uc-titlebar-padding: 0px; --uc-window-control-width: 138px }
+:root{
+  --uc-titlebar-padding: 0px;
+  --uc-window-control-width: 138px
+}
 :root[sizemode="maximized"][tabsintitlebar]{ --uc-titlebar-padding: 8px }
 :root[tabsintitlebar="true"] #nav-bar{ --window-drag-space-width: 24px; }
 
-
 .titlebar-buttonbox-container{
   position: fixed;
   top: var(--uc-titlebar-padding,0px);
diff --git a/chrome/hide_tabs_toolbar.css b/chrome/hide_tabs_toolbar.css
index ef8f670..144451d 100644
--- a/chrome/hide_tabs_toolbar.css
+++ b/chrome/hide_tabs_toolbar.css
@@ -1,12 +1,23 @@
 /* Hide tabs toolbar Fx65+ */
-:root{--uc-toolbar-height: 32px}
+:root{
+  --uc-toolbar-height: 32px;
+  --uc-window-control-width: 138px;
+}
+#navigator-toolbox{ --window-drag-space-width: 24px; }
+
 :root:not([uidensity="compact"]){--uc-toolbar-height: 38px}
 
+
 #TabsToolbar{visibility: collapse}
 
-#nav-bar{
+:root:not([inFullscreen]) #nav-bar{
   margin-top: calc(0px - var(--uc-toolbar-height));
-  padding-right: 138px;
+}
+
+/* Space to drag the window on both sides of navbar */
+:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
+  padding-right: calc(var(--uc-window-control-width) + var(--window-drag-space-width,0px));
+  padding-left: var(--window-drag-space-width,0px)
 }
 
 #toolbar-menubar{
diff --git a/chrome/hide_tabs_with_one_tab.css b/chrome/hide_tabs_with_one_tab.css
index f6edcf8..3ab64e9 100644
--- a/chrome/hide_tabs_with_one_tab.css
+++ b/chrome/hide_tabs_with_one_tab.css
@@ -3,7 +3,9 @@
 /* !!USER!! -  REMOVE ALL BUTTONS you can from the tabs toolbar */
 
 /* Configurable window drag space  */
-:root[sizemode="normal"] #nav-bar{ --window-drag-space-width: 20px }
+#navigator-toolbox{
+  --window-drag-space-width: 20px;
+}
 
 #titlebar{ -moz-appearance: none !important; }
 #tabbrowser-tabs, #tabbrowser-tabs > .tabbrowser-arrowscrollbox{ min-height: 0 !important; }
@@ -36,4 +38,5 @@
   height: calc(var(--tab-min-height) + var(--space-above-tabbar) - 1px) !important;
   -moz-appearance: initial !important;
 }
-#nav-bar{ padding: 0 var(--window-drag-space-width,0px) }
\ No newline at end of file
+
+:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar { padding: 0px var(--window-drag-space-width,0px) }
diff --git a/chrome/hide_tabs_with_one_tab_w_window_controls.css b/chrome/hide_tabs_with_one_tab_w_window_controls.css
index 84200bd..622fb7d 100644
--- a/chrome/hide_tabs_with_one_tab_w_window_controls.css
+++ b/chrome/hide_tabs_with_one_tab_w_window_controls.css
@@ -2,8 +2,10 @@
 /* Firefox 65+ only */
 /* !!USER!! -  REMOVE ALL BUTTONS you can from the tabs toolbar */
 
+:root{ --uc-window-control-width: 138px; }
+
 /* Configurable window drag space  */
-:root[sizemode="normal"] #nav-bar{ --window-drag-space-width: 20px }
+#navigator-toolbox{ --window-drag-space-width: 20px }
 
 #titlebar{ -moz-appearance: none !important; }
 /* We'll use window controls from menubar instead */
@@ -45,4 +47,8 @@
 
 :root:not([customizing]) #toolbar-menubar[autohide][inactive] > #menubar-items{ pointer-events: none; opacity: 0 }
 
-#nav-bar{ padding-right: calc(3 * 46px + var(--window-drag-space-width,0px)); padding-left: var(--window-drag-space-width,0px)}
\ No newline at end of file
+/* Space to drag the window on both sides of navbar */
+:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
+  padding-right: calc(var(--uc-window-control-width) + var(--window-drag-space-width,0px));
+  padding-left: var(--window-drag-space-width,0px)
+}
\ No newline at end of file
diff --git a/chrome/navbar_tabs_oneliner.css b/chrome/navbar_tabs_oneliner.css
index 8625a97..f2e6a3d 100644
--- a/chrome/navbar_tabs_oneliner.css
+++ b/chrome/navbar_tabs_oneliner.css
@@ -18,8 +18,14 @@
 #nav-bar{
 	margin-right:calc(100vw - var(--uc-navigationbar-width));
   margin-top: calc(0px - var(--uc-toolbar-height));
-	padding-left: var(--window-drag-space-width);
 }
+
+/* Space to drag the window on both sides of navbar */
+:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
+  padding-right: 0px !important;
+  padding-left: var(--window-drag-space-width,0px)
+}
+
 /* 1px margin on touch density causes tabs to be too high */
 .tab-close-button{ margin-top: 0 !important }
 
diff --git a/chrome/tabs_below_content.css b/chrome/tabs_below_content.css
index 48993fd..24b2be8 100644
--- a/chrome/tabs_below_content.css
+++ b/chrome/tabs_below_content.css
@@ -1,5 +1,10 @@
 /* Modify this to change window drag space width */
-#nav-bar{ --window-drag-space-width: 24px }
+
+:root{
+  --uc-window-control-width: 138px;
+}
+
+#navigator-toolbox{ --window-drag-space-width: 24px }
 
 .titlebar-buttonbox-container{
   position: fixed;
@@ -11,15 +16,15 @@
   display: -moz-box !important;
 }
 
-:root[sizemode="fullscreen"] > #navigator-toolbox:not(:hover) .titlebar-buttonbox-container{ display: none !important; }
+:root[inFullscreen] > #navigator-toolbox:not(:hover) .titlebar-buttonbox-container{ display: none !important; }
 
 :root[uidensity="compact"] .titlebar-buttonbox-container{ height: 32px }
 .titlebar-buttonbox-container > .titlebar-buttonbox{ height: 100%; }
 
 /* Re-adjust window cotrols if menubar is permanently enabled  */
-:root[tabsintitlebar="true"]:not([sizemode="fullscreen"]) #toolbar-menubar[autohide="false"]{ transform: translateX(0px); }
-:root[tabsintitlebar="true"]:not([sizemode="fullscreen"]) #toolbar-menubar[autohide="false"] .titlebar-buttonbox-container{ height: 100%; }
-:root[tabsintitlebar="true"]:not([sizemode="fullscreen"]) #toolbar-menubar[autohide="false"] .titlebar-button{ padding: 2px 17px !important; }
+:root[tabsintitlebar="true"]:not([inFullscreen]) #toolbar-menubar[autohide="false"]{ transform: translateX(0px); }
+:root[tabsintitlebar="true"]:not([inFullscreen]) #toolbar-menubar[autohide="false"] .titlebar-buttonbox-container{ height: 100%; }
+:root[tabsintitlebar="true"]:not([inFullscreen]) #toolbar-menubar[autohide="false"] .titlebar-button{ padding: 2px 17px !important; }
 
 #titlebar{ -moz-appearance: none !important; }
 /* Counteract -moz-appearance when maximized */
@@ -27,8 +32,8 @@
 :root[sizemode="maximized"] #toolbar-menubar:not([autohide="false"]) .titlebar-buttonbox-container{ top: 8px }
 
 /* Space to drag the window on both sides of navbar */
-:root[tabsintitlebar="true"] #nav-bar{
-  padding-right: calc(138px + var(--window-drag-space-width,0px));
+:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
+  padding-right: calc(var(--uc-window-control-width) + var(--window-drag-space-width,0px));
   padding-left: var(--window-drag-space-width,0px)
 }