diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
index e57379b4..ced6279c 100644
--- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css
+++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css
@@ -45,8 +45,6 @@ toolbarspring {
 }
 
 #urlbar[breakout][breakout-extend] {
-	left: 0 !important;
-	top: 0 !important;
 	width: 360px !important;
 	z-index: 5 !important;
 	padding: 0 !important;
diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css
index c421aed9..925a2f9e 100644
--- a/src/other/firefox/Monterey/parts/tabsbar.css
+++ b/src/other/firefox/Monterey/parts/tabsbar.css
@@ -15,6 +15,12 @@ tab > stack {
 	margin: 0 3px !important;
 }
 
+/* Tabs bar height */
+#tabbrowser-tabs {
+	--tab-min-height: 32px !important;
+	--tabstrip-min-height: 32px !important;
+}
+
 .tabbrowser-tab,
 .tab-background {
 	border: none !important;
diff --git a/src/other/firefox/Monterey/right_header_button_3.css b/src/other/firefox/Monterey/right_header_button_3.css
index 762d01ce..0b182c9b 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, #urlbar-container {
-	margin-right: 14vw !important;
+	margin-right: 16vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar, #urlbar-container {
-		margin-right: 10vw !important;
+		margin-right: 12vw !important;
 	}
 }
diff --git a/src/other/firefox/Monterey/right_header_button_4.css b/src/other/firefox/Monterey/right_header_button_4.css
index 0b182c9b..f69712a6 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, #urlbar-container {
-	margin-right: 16vw !important;
+	margin-right: 18vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar, #urlbar-container {
-		margin-right: 12vw !important;
+		margin-right: 14vw !important;
 	}
 }
diff --git a/src/other/firefox/Monterey/right_header_button_5.css b/src/other/firefox/Monterey/right_header_button_5.css
index f69712a6..63ff3903 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, #urlbar-container {
-	margin-right: 18vw !important;
+	margin-right: 20vw !important;
 }
 
 /* Left window titlebuttons mode */
 @media (-moz-gtk-csd-reversed-placement) {
 	#TabsToolbar, #urlbar-container {
-		margin-right: 14vw !important;
+		margin-right: 16vw !important;
 	}
 }
diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
index de2b5181..23ddd5e7 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@@ -40,8 +40,6 @@ toolbarspring {
 }
 
 #urlbar[breakout][breakout-extend] {
-	left: 0 !important;
-	top: 0 !important;
 	width: 100% !important;
 	z-index: 5 !important;
 	padding: 0 !important;
diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css
index 116c3ac6..dd530c0e 100644
--- a/src/other/firefox/WhiteSur/parts/tabsbar.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar.css
@@ -9,6 +9,7 @@
 /* Tabs bar height */
 #tabbrowser-tabs {
 	--tab-min-height: 32px !important;
+	--tabstrip-min-height: 32px !important;
 }
 
 #tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container {
diff --git a/src/other/firefox/common/parts/csd.css b/src/other/firefox/common/parts/csd.css
index e70e2881..baa3cf6b 100644
--- a/src/other/firefox/common/parts/csd.css
+++ b/src/other/firefox/common/parts/csd.css
@@ -5,8 +5,8 @@
 /* Headerbar top border corners rounded */
 :root[tabsintitlebar][sizemode="normal"]:not([gtktiledwindow="true"]) {
   #nav-bar {
-    border-top-left-radius: 12px !important;
-    border-top-right-radius: 12px !important;
+    border-top-left-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
+    border-top-right-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
     box-shadow: var(--gnome-headerbar-box-shadow) !important;
   }
 
@@ -21,16 +21,30 @@
     body::backdrop,
     dialog::backdrop {
       /* Use an uniform clip to allow WebRender to optimize it better */
-      border-radius: 12px !important;
+      border-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
     }
 
     window[role="dialog"] {
-      border-bottom-left-radius: 12px !important;
-      border-bottom-right-radius: 12px !important;
+      border-bottom-left-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
+      border-bottom-right-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
     }
   }
 }
 
+:root[tabsintitlebar] {
+	/* Always show nav bar window buttons*/
+	#nav-bar > .titlebar-buttonbox-container {
+		display: flex !important;
+	}
+
+	#toolbar-menubar, #TabsToolbar {
+		/* Always hide menu bar window buttons*/
+		& > .titlebar-buttonbox-container {
+			display: none !important;
+		}
+	}
+}
+
 /* Window buttons: at least 1 button */
 @media (-moz-gtk-csd-minimize-button), (-moz-gtk-csd-maximize-button), (-moz-gtk-csd-close-button) {
 	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
@@ -58,6 +72,7 @@
 }
 
 /* Window buttons box */
+:root[tabsintitlebar] #nav-bar .titlebar-buttonbox-container,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox-container,
 :root[tabsintitlebar] #titlebar-buttonbox-container,
 :root[tabsintitlebar][inFullscreen] #window-controls {
@@ -68,11 +83,13 @@
 	top: 0;
 	display: block !important;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-buttonbox,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox {
 	-moz-appearance: none !important;
 }
 
 /* Window buttons style */
+:root[tabsintitlebar] #nav-bar .titlebar-button,
 :root[tabsintitlebar] #titlebar .titlebar-button,
 :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
 	-moz-appearance: none !important;
@@ -82,7 +99,9 @@
 	margin: 16px 4px !important;
 	padding: 2px 0 !important;
 	width: 16px;
+	--inactive-titlebar-opacity: 1 !important;
 }
+:root[tabsintitlebar][inFullscreen] #nav-bar .titlebar-button,
 :root[tabsintitlebar][inFullscreen] #titlebar .titlebar-button,
 :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
 	height: 24px !important;
@@ -90,10 +109,10 @@
 	margin: 12px 4px !important;
 	padding: 0 !important;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-button .toolbarbutton-icon,
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
 :root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
-	opacity: 0 !important;
-}
+:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
 :root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive toolbarbutton .toolbarbutton-icon {
 	opacity: 0 !important;
@@ -103,7 +122,9 @@
 :root[tabsintitlebar][inFullscreen] #window-controls #close-button,
 :root[tabsintitlebar][inFullscreen] #window-controls #minimize-button,
 :root[tabsintitlebar][inFullscreen] #titlebar .titlebar-buttonbox .titlebar-close,
-:root[tabsintitlebar][inFullscreen] #titlebar .titlebar-buttonbox .titlebar-min {
+:root[tabsintitlebar][inFullscreen] #titlebar .titlebar-buttonbox .titlebar-min,
+:root[tabsintitlebar][inFullscreen] #nav-bar .titlebar-buttonbox .titlebar-close,
+:root[tabsintitlebar][inFullscreen] #nav-bar .titlebar-buttonbox .titlebar-min {
 	display: none !important;
 }
 
diff --git a/src/other/firefox/common/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css
index 55669c29..c3e64569 100644
--- a/src/other/firefox/common/parts/headerbar.css
+++ b/src/other/firefox/common/parts/headerbar.css
@@ -12,7 +12,7 @@
 }
 
 /* Headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton),
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.titlebar-button),
 toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	border: none !important;
 	box-shadow: none !important;
@@ -27,7 +27,7 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	transition: background 200ms;
 }
 
-:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button) {
+:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button) {
 	background: none !important;
 }
 
@@ -43,7 +43,7 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 }
 
 /* Hover headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled]):not([checked]):hover,
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([open]):not([disabled]):not([checked]):hover,
 #TabsToolbar .toolbarbutton-1:hover,
 #tabs-newtab-button:hover, #TabsToolbar #new-tab-button:hover {
 	outline: 0 !important;
@@ -51,16 +51,16 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 }
 
 /* Active headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active,
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open],
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[checked],
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled]):not(#hack):active,
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled])[open],
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):not([disabled])[checked],
 #TabsToolbar .toolbarbutton-1:active, #TabsToolbar .toolbarbutton-1[open],
 #tabs-newtab-button:active, #TabsToolbar #new-tab-button:active {
 	background: var(--gnome-headerbar-button-active-background) !important;
 }
 
 /* Disabled headerbar buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] {
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled] {
 	background: transparent !important;
 	border-color: var(--gnome-button-disabled-border-color) !important;
 	box-shadow: none !important;
@@ -68,7 +68,7 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 }
 
 /* Inactive window buttons */
-#nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive {
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):-moz-window-inactive {
 	background: var(--gnome-inactive-button-background) !important;
 	box-shadow: var(--gnome-inactive-button-box-shadow) !important;
 	border-color: var(--gnome-inactive-button-border-color) !important;
diff --git a/src/other/firefox/common/parts/titlebutton-dark-alt.css b/src/other/firefox/common/parts/titlebutton-dark-alt.css
index c27c7fe1..c4baaf4a 100644
--- a/src/other/firefox/common/parts/titlebutton-dark-alt.css
+++ b/src/other/firefox/common/parts/titlebutton-dark-alt.css
@@ -1,116 +1,141 @@
 @media (prefers-color-scheme: dark) {
+:root[tabsintitlebar] #nav-bar .titlebar-close,
 :root[tabsintitlebar] #titlebar .titlebar-close,
 :root[tabsintitlebar] #titlebar #titlebar-close {
 	background: url("../titlebuttons/titlebutton-close-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max,
 :root[tabsintitlebar] #titlebar .titlebar-max,
 :root[tabsintitlebar] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min,
 :root[tabsintitlebar] #titlebar .titlebar-min,
 :root[tabsintitlebar] #titlebar #titlebar-min {
 	background: url("../titlebuttons/titlebutton-minimize-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore,
 :root[tabsintitlebar] #titlebar .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-close:active,
 :root[tabsintitlebar] #titlebar .titlebar-close:active,
 :root[tabsintitlebar] #titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max:active,
 :root[tabsintitlebar] #titlebar .titlebar-max:active,
 :root[tabsintitlebar] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min:active,
 :root[tabsintitlebar] #titlebar .titlebar-min:active,
 :root[tabsintitlebar] #titlebar #titlebar-min:active {
-	background: url("../titlebuttons/titlebutton-minimize-active-dark.svg") no-repeat;
+	background: url("../titlebuttons/titlebutton-minimize-active-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore:active,
 :root[tabsintitlebar] #titlebar .titlebar-restore:active,
 :root[tabsintitlebar] #titlebar #titlebar-restore:active,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-min,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-unmaximize-dark.svg") no-repeat;
+	background: url("../titlebuttons/titlebutton-unmaximize-dark-alt.svg") no-repeat;
 	background-size: contain;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
diff --git a/src/other/firefox/common/parts/titlebutton-dark.css b/src/other/firefox/common/parts/titlebutton-dark.css
index 6d2de623..d1295000 100644
--- a/src/other/firefox/common/parts/titlebutton-dark.css
+++ b/src/other/firefox/common/parts/titlebutton-dark.css
@@ -1,109 +1,134 @@
 @media (prefers-color-scheme: dark) {
+:root[tabsintitlebar] #nav-bar .titlebar-close,
 :root[tabsintitlebar] #titlebar .titlebar-close,
 :root[tabsintitlebar] #titlebar #titlebar-close {
 	background: url("../titlebuttons/titlebutton-close-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max,
 :root[tabsintitlebar] #titlebar .titlebar-max,
 :root[tabsintitlebar] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min,
 :root[tabsintitlebar] #titlebar .titlebar-min,
 :root[tabsintitlebar] #titlebar #titlebar-min {
 	background: url("../titlebuttons/titlebutton-minimize-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore,
 :root[tabsintitlebar] #titlebar .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-close:active,
 :root[tabsintitlebar] #titlebar .titlebar-close:active,
 :root[tabsintitlebar] #titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max:active,
 :root[tabsintitlebar] #titlebar .titlebar-max:active,
 :root[tabsintitlebar] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min:active,
 :root[tabsintitlebar] #titlebar .titlebar-min:active,
 :root[tabsintitlebar] #titlebar #titlebar-min:active {
 	background: url("../titlebuttons/titlebutton-minimize-active-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore:active,
 :root[tabsintitlebar] #titlebar .titlebar-restore:active,
 :root[tabsintitlebar] #titlebar #titlebar-restore:active,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-min,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-dark.svg") no-repeat;
diff --git a/src/other/firefox/common/parts/titlebutton-light-alt.css b/src/other/firefox/common/parts/titlebutton-light-alt.css
index ec7ceae9..e169c391 100644
--- a/src/other/firefox/common/parts/titlebutton-light-alt.css
+++ b/src/other/firefox/common/parts/titlebutton-light-alt.css
@@ -1,118 +1,140 @@
+:root[tabsintitlebar] #nav-bar .titlebar-close,
 :root[tabsintitlebar] #titlebar .titlebar-close,
 :root[tabsintitlebar] #titlebar #titlebar-close {
 	background: url("../titlebuttons/titlebutton-close.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max,
 :root[tabsintitlebar] #titlebar .titlebar-max,
 :root[tabsintitlebar] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min,
 :root[tabsintitlebar] #titlebar .titlebar-min,
 :root[tabsintitlebar] #titlebar #titlebar-min {
 	background: url("../titlebuttons/titlebutton-minimize.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore,
 :root[tabsintitlebar] #titlebar .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover-alt.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover-alt.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-close:active,
 :root[tabsintitlebar] #titlebar .titlebar-close:active,
 :root[tabsintitlebar] #titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max:active,
 :root[tabsintitlebar] #titlebar .titlebar-max:active,
 :root[tabsintitlebar] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min:active,
 :root[tabsintitlebar] #titlebar .titlebar-min:active,
 :root[tabsintitlebar] #titlebar #titlebar-min:active {
 	background: url("../titlebuttons/titlebutton-minimize-active.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore:active,
 :root[tabsintitlebar] #titlebar .titlebar-restore:active,
 :root[tabsintitlebar] #titlebar #titlebar-restore:active,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-min,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive  .titlebar-close:hover,
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-close:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop-alt.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-alt.svg") no-repeat;
 	background-size: contain;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
+	background: url("../titlebuttons/titlebutton-unmaximize-alt.svg") no-repeat;
 	background-size: contain;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
diff --git a/src/other/firefox/common/parts/titlebutton-light.css b/src/other/firefox/common/parts/titlebutton-light.css
index 8364e196..5e9f7e48 100644
--- a/src/other/firefox/common/parts/titlebutton-light.css
+++ b/src/other/firefox/common/parts/titlebutton-light.css
@@ -1,111 +1,133 @@
+:root[tabsintitlebar] #nav-bar .titlebar-close,
 :root[tabsintitlebar] #titlebar .titlebar-close,
 :root[tabsintitlebar] #titlebar #titlebar-close {
 	background: url("../titlebuttons/titlebutton-close.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max,
 :root[tabsintitlebar] #titlebar .titlebar-max,
 :root[tabsintitlebar] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min,
 :root[tabsintitlebar] #titlebar .titlebar-min,
 :root[tabsintitlebar] #titlebar #titlebar-min {
 	background: url("../titlebuttons/titlebutton-minimize.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore,
 :root[tabsintitlebar] #titlebar .titlebar-restore,
 :root[tabsintitlebar] #titlebar #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max {
 	background: url("../titlebuttons/titlebutton-maximize.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover.svg") no-repeat;
-	background-color: transparent !important;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-hover.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-close:active,
 :root[tabsintitlebar] #titlebar .titlebar-close:active,
 :root[tabsintitlebar] #titlebar #titlebar-close:active {
 	background: url("../titlebuttons/titlebutton-close-active.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-max:active,
 :root[tabsintitlebar] #titlebar .titlebar-max:active,
 :root[tabsintitlebar] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-maximize-active.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-min:active,
 :root[tabsintitlebar] #titlebar .titlebar-min:active,
 :root[tabsintitlebar] #titlebar #titlebar-min:active {
 	background: url("../titlebuttons/titlebutton-minimize-active.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar .titlebar-restore:active,
 :root[tabsintitlebar] #titlebar .titlebar-restore:active,
 :root[tabsintitlebar] #titlebar #titlebar-restore:active,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar .titlebar-max:active,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar #titlebar-max:active {
 	background: url("../titlebuttons/titlebutton-unmaximize-active.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-min,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max {
 	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar] #titlebar:-moz-window-inactive  .titlebar-close:hover,
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-close:hover,
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-min:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
+:root[tabsintitlebar] #nav-bar:-moz-window-inactive .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-restore:hover,
 :root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[tabsintitlebar][sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
 :root[tabsintitlebar][sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop.svg") no-repeat;