diff --git a/src/other/firefox/Monterey/left_header_button_3.css b/src/other/firefox/Monterey/left_header_button_3.css
index cb14607f..e0cc6cc5 100644
--- a/src/other/firefox/Monterey/left_header_button_3.css
+++ b/src/other/firefox/Monterey/left_header_button_3.css
@@ -1,8 +1,4 @@
 #TabsToolbar {
-	margin-left: 451px !important;
-}
-
-:root[sizemode="maximized"] #TabsToolbar {
 	margin-left: 491px !important;
 }
 
@@ -11,8 +7,4 @@
 	#TabsToolbar {
 		margin-left: 534px !important;
 	}
-
-	:root[sizemode="maximized"] #TabsToolbar {
-		margin-left: 534px !important;
-	}
 }
diff --git a/src/other/firefox/Monterey/left_header_button_4.css b/src/other/firefox/Monterey/left_header_button_4.css
index 4c74f32e..042decff 100644
--- a/src/other/firefox/Monterey/left_header_button_4.css
+++ b/src/other/firefox/Monterey/left_header_button_4.css
@@ -1,8 +1,4 @@
 #TabsToolbar {
-	margin-left: 491px !important;
-}
-
-:root[sizemode="maximized"] #TabsToolbar {
 	margin-left: 531px !important;
 }
 
@@ -11,8 +7,4 @@
 	#TabsToolbar {
 		margin-left: 574px !important;
 	}
-
-	:root[sizemode="maximized"] #TabsToolbar {
-		margin-left: 574px !important;
-	}
 }
diff --git a/src/other/firefox/Monterey/left_header_button_5.css b/src/other/firefox/Monterey/left_header_button_5.css
index a342364a..5f19f597 100644
--- a/src/other/firefox/Monterey/left_header_button_5.css
+++ b/src/other/firefox/Monterey/left_header_button_5.css
@@ -1,8 +1,4 @@
 #TabsToolbar {
-	margin-left: 531px !important;
-}
-
-:root[sizemode="maximized"] #TabsToolbar {
 	margin-left: 571px !important;
 }
 
@@ -11,8 +7,4 @@
 	#TabsToolbar {
 		margin-left: 614px !important;
 	}
-
-	:root[sizemode="maximized"] #TabsToolbar {
-		margin-left: 614px !important;
-	}
 }
diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css
index a0221a63..680ab82e 100644
--- a/src/other/firefox/Monterey/parts/tabsbar.css
+++ b/src/other/firefox/Monterey/parts/tabsbar.css
@@ -2,10 +2,6 @@
 
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-:root[tabsintitlebar] #nav-bar * {
-	-moz-window-dragging: drag;
-}
-
 tab > stack {
 	margin: 0 3px !important;
 }
diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css
index f58bb954..a2d8a824 100644
--- a/src/other/firefox/Monterey/parts/toolbox.css
+++ b/src/other/firefox/Monterey/parts/toolbox.css
@@ -47,6 +47,10 @@ findbar:-moz-window-inactive,
 	max-height: 42px !important;
 }
 
+.titlebar-spacer[type="pre-tabs"], .titlebar-spacer[type="post-tabs"] {
+	width: 0 !important;
+}
+
 #TabsToolbar {
 	margin-top: -40px !important;
 	margin-bottom: 8px !important;
diff --git a/src/other/firefox/Monterey/right_header_button_3.css b/src/other/firefox/Monterey/right_header_button_3.css
index 00a1ee45..762d01ce 100644
--- a/src/other/firefox/Monterey/right_header_button_3.css
+++ b/src/other/firefox/Monterey/right_header_button_3.css
@@ -1,10 +1,10 @@
-#TabsToolbar {
+#TabsToolbar, #urlbar-container {
 	margin-right: 14vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
-	#TabsToolbar {
+	#TabsToolbar, #urlbar-container {
 		margin-right: 10vw !important;
 	}
 }
diff --git a/src/other/firefox/Monterey/right_header_button_4.css b/src/other/firefox/Monterey/right_header_button_4.css
index b1f9964b..0b182c9b 100644
--- a/src/other/firefox/Monterey/right_header_button_4.css
+++ b/src/other/firefox/Monterey/right_header_button_4.css
@@ -1,10 +1,10 @@
-#TabsToolbar {
+#TabsToolbar, #urlbar-container {
 	margin-right: 16vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
-	#TabsToolbar {
+	#TabsToolbar, #urlbar-container {
 		margin-right: 12vw !important;
 	}
 }
diff --git a/src/other/firefox/Monterey/right_header_button_5.css b/src/other/firefox/Monterey/right_header_button_5.css
index 9ce2f6d8..f69712a6 100644
--- a/src/other/firefox/Monterey/right_header_button_5.css
+++ b/src/other/firefox/Monterey/right_header_button_5.css
@@ -1,10 +1,10 @@
-#TabsToolbar {
+#TabsToolbar, #urlbar-container {
 	margin-right: 18vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
-	#TabsToolbar {
+	#TabsToolbar, #urlbar-container {
 		margin-right: 14vw !important;
 	}
 }
diff --git a/src/other/firefox/common/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css
index 85feb879..01d9bc5c 100644
--- a/src/other/firefox/common/parts/headerbar.css
+++ b/src/other/firefox/common/parts/headerbar.css
@@ -6,6 +6,10 @@
 	padding: 8px !important;
 }
 
+#nav-bar-customization-target {
+	-moz-window-dragging: drag;
+}
+
 /* Headerbar CSD colors */
 :root[tabsintitlebar] #nav-bar {
 	border: none !important;