diff --git a/src/other/firefox/Monterey/parts/toolbox-alt.css b/src/other/firefox/Monterey/parts/toolbox-alt.css
index 258676e2..a689d656 100644
--- a/src/other/firefox/Monterey/parts/toolbox-alt.css
+++ b/src/other/firefox/Monterey/parts/toolbox-alt.css
@@ -50,7 +50,7 @@
 }
 
 /* allow to drag headerbar empty space */
-:root[tabsintitlebar] #nav-bar .chromeclass-location {
+#nav-bar .chromeclass-location {
 	-moz-window-dragging: drag !important;
 }
 
diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css
index 3d4c2ba8..e826d92b 100644
--- a/src/other/firefox/Monterey/parts/toolbox.css
+++ b/src/other/firefox/Monterey/parts/toolbox.css
@@ -51,7 +51,7 @@
 }
 
 /* allow to drag headerbar empty space */
-:root[tabsintitlebar] #nav-bar .chromeclass-location {
+#nav-bar .chromeclass-location {
 	-moz-window-dragging: drag !important;
 }
 
diff --git a/src/other/firefox/common/icons/system-users-symbolic.svg b/src/other/firefox/common/icons/system-users-symbolic.svg
new file mode 100644
index 00000000..6352edb8
--- /dev/null
+++ b/src/other/firefox/common/icons/system-users-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8 4e-6a8 8 0 0 0-8 8 8 8 0 0 0 6.6621 7.8848 8 8 0 0 0 0.79297 0.0957 8 8 0 0 0 0.54492 0.01953 8 8 0 0 0 1.5898-0.16016 8 8 0 0 0 0.77344-0.19727 8 8 0 0 0 2.8574-1.584 8 8 0 0 0 0.33789-0.30664 6 6 0 0 0-0.0039-0.0078 8 8 0 0 0 2.4453-5.7441 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-1.9277 4.8105 6 6 0 0 0-5.0723-2.8105 6 6 0 0 0-5.0762 2.8145 7 7 0 0 1-1.9238-4.8145 7 7 0 0 1 7-7zm0 3a2 2 0 0 0-2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-2-2z"/>
+</svg>
diff --git a/src/other/firefox/common/parts/csd.css b/src/other/firefox/common/parts/csd.css
index 674f864e..bf761ea3 100644
--- a/src/other/firefox/common/parts/csd.css
+++ b/src/other/firefox/common/parts/csd.css
@@ -1,9 +1,9 @@
-/* GNOME CSD styles for headerbar on Firefox [tabsintitlebar] */
+/* GNOME CSD styles for headerbar on Firefox  */
 
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* Headerbar top border corners rounded */
-:root[tabsintitlebar][sizemode="normal"]:not([gtktiledwindow="true"]) {
+:root[sizemode="normal"]:not([gtktiledwindow="true"]) {
   #nav-bar {
     border-top-left-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
     border-top-right-radius: env(-moz-gtk-csd-titlebar-radius, 12px) !important;
@@ -31,7 +31,7 @@
   }
 }
 
-:root[tabsintitlebar] {
+
 	/* Always show nav bar window buttons*/
 	#nav-bar > .titlebar-buttonbox-container {
 		display: flex !important;
@@ -43,11 +43,11 @@
 			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 {
+	:root:not([inFullscreen]) #nav-bar {
 		padding-right: 60px !important;
 	}
 }
@@ -55,27 +55,26 @@
 @media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
        (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
        (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
-	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+	:root:not([inFullscreen]) #nav-bar {
 		padding-right: 70px !important;
 	}
 }
 /* Window buttons: 3 buttons */
 @media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
-	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+	:root:not([inFullscreen]) #nav-bar {
 		padding-right: 90px !important;
 	}
 }
 
 /* Fullscreen headerbar padding for 1 button */
-:root[tabsintitlebar][inFullscreen] #nav-bar {
+:root[inFullscreen] #nav-bar {
 	padding-right: 50px !important;
 }
 
 /* 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 {
+#nav-bar .titlebar-buttonbox-container,
+#titlebar .titlebar-buttonbox-container,
+#titlebar-buttonbox-container {
 	-moz-appearance: none !important;
 	padding: 0 3px 0 4px;
 	position: absolute !important;
@@ -83,73 +82,69 @@
 	top: 0;
 	display: block !important;
 }
-:root[tabsintitlebar] #nav-bar .titlebar-buttonbox,
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox {
+#nav-bar .titlebar-buttonbox,
+#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 {
+#nav-bar .titlebar-button,
+#titlebar .titlebar-button {
 	-moz-appearance: none !important;
 	border: none !important;
 	border-radius: 100px !important;
 	height: 16px;
+	width: 16px;
 	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;
-	width: 24px !important;
+:root[inFullscreen] #nav-bar .titlebar-button,
+:root[inFullscreen] #titlebar .titlebar-button {
+	height: 24px;
+	width: 24px;
 	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,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive toolbarbutton .toolbarbutton-icon {
+#nav-bar .titlebar-button .toolbarbutton-icon,
+#nav-bar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
+#titlebar .titlebar-button .toolbarbutton-icon,
+#titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon {
 	opacity: 0 !important;
 }
 
 /* Remove close and minimize buttons from fullscreen buttons */
-: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] #nav-bar .titlebar-buttonbox .titlebar-close,
-:root[tabsintitlebar][inFullscreen] #nav-bar .titlebar-buttonbox .titlebar-min {
+:root[inFullscreen] #window-controls #close-button,
+:root[inFullscreen] #window-controls #minimize-button,
+:root[inFullscreen] #titlebar .titlebar-buttonbox .titlebar-close,
+:root[inFullscreen] #titlebar .titlebar-buttonbox .titlebar-min,
+:root[inFullscreen] #nav-bar .titlebar-buttonbox .titlebar-close,
+:root[inFullscreen] #nav-bar .titlebar-buttonbox .titlebar-min {
 	display: none !important;
 }
 
 /* Left window buttons */
 @media (-moz-gtk-csd-reversed-placement) {
-	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+	:root:not([inFullscreen]) #nav-bar {
 		padding-right: 6px !important;
 	}
 
 	/* Window buttons box */
-	:root[tabsintitlebar] #nav-bar .titlebar-buttonbox-container,
-	:root[tabsintitlebar] #titlebar .titlebar-buttonbox-container {
+	#nav-bar .titlebar-buttonbox-container,
+	#titlebar .titlebar-buttonbox-container {
 		padding: 0 3px 0 4px;
 		left: 8px;
 		right: auto;
 	}
 
 	/* Fullscreen headerbar padding for 1 button */
-	:root[tabsintitlebar][inFullscreen] #nav-bar {
+	:root[inFullscreen] #nav-bar {
 		padding-left: 50px !important;
 	}
 
 	/* Window controls: 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 {
+		:root:not([inFullscreen]) #nav-bar {
 			padding-left: 60px !important;
 		}
 	}
@@ -157,35 +152,35 @@
 	@media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
 				 (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
 				 (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
-		:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+		:root:not([inFullscreen]) #nav-bar {
 			padding-left: 70px !important;
 		}
 	}
 	/* Window controls: 3 buttons */
 	@media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
-		:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
+		:root:not([inFullscreen]) #nav-bar {
 			padding-left: 90px !important;
 		}
 	}
 }
 
 /* Remove tabsbar titlebar blank spaces */
-:root[tabsintitlebar] #TabsToolbar .titlebar-placeholder {
+#TabsToolbar .titlebar-placeholder {
 	display: none !important;
 }
 
 /* Prevent menubar from breaking */
-:root[tabsintitlebar] #toolbar-menubar:not([inactive=true]) {
+#toolbar-menubar:not([inactive=true]) {
 	height: 30px !important;
 	margin-bottom: 8px;
 }
 
 /* Remove default style of titlebar */
-:root[tabsintitlebar] #titlebar {
+#titlebar {
 	-moz-appearance: none !important;
 }
 
 /* Fix the issue when dragging tabs */
-:root[tabsintitlebar] #navigator-toolbox[movingtab] #TabsToolbar {
+#navigator-toolbox[movingtab] #TabsToolbar {
 	padding-bottom: 0 !important;
 }
diff --git a/src/other/firefox/common/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css
index 3a35afa5..ff5d3055 100644
--- a/src/other/firefox/common/parts/headerbar.css
+++ b/src/other/firefox/common/parts/headerbar.css
@@ -4,17 +4,13 @@
 /* Headerbar */
 #nav-bar {
 	padding: 8px !important;
+	border: none !important;
 }
 
 .titlebar-spacer[type="pre-tabs"], .titlebar-spacer[type="post-tabs"] {
 	width: 0 !important;
 }
 
-/* Headerbar CSD colors */
-:root[tabsintitlebar] #nav-bar {
-	border: none !important;
-}
-
 /* Headerbar buttons */
 #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.titlebar-button),
 toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
diff --git a/src/other/firefox/common/parts/icons.css b/src/other/firefox/common/parts/icons.css
index 9fc754fc..6aff10cc 100644
--- a/src/other/firefox/common/parts/icons.css
+++ b/src/other/firefox/common/parts/icons.css
@@ -669,6 +669,18 @@ toolbar:not([brighttext]) .webextension-browser-action:-moz-lwtheme {
 	list-style-image: url("../icons/tool-profiler.svg") !important;
 }
 
+/* empty user button */
+#fxa-toolbar-menu-button .toolbarbutton-icon {
+	fill: var(--gnome-toolbar-icon-fill) !important;
+	-moz-context-properties: fill;
+}
+:root[fxastatus="not_configured"] {
+	--avatar-image-url: url("../icons/system-users-symbolic.svg") !important;
+}
+:root[fxastatus="not_configured"] #fxa-toolbar-menu-button .toolbarbutton-icon {
+	list-style-image: url("../icons/system-users-symbolic.svg") !important;
+}
+
 /* containers extension */
 .urlbar-page-action > .urlbar-icon {
 	filter: none !important;
diff --git a/src/other/firefox/common/parts/titlebutton-dark-alt.css b/src/other/firefox/common/parts/titlebutton-dark-alt.css
index c4baaf4a..bfc5ab13 100644
--- a/src/other/firefox/common/parts/titlebutton-dark-alt.css
+++ b/src/other/firefox/common/parts/titlebutton-dark-alt.css
@@ -1,153 +1,137 @@
 @media (prefers-color-scheme: dark) {
-:root[tabsintitlebar] #nav-bar .titlebar-close,
-:root[tabsintitlebar] #titlebar .titlebar-close,
-:root[tabsintitlebar] #titlebar #titlebar-close {
+#nav-bar .titlebar-close,
+#titlebar .titlebar-close,
+#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 {
+#nav-bar .titlebar-max,
+#titlebar .titlebar-max,
+#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 {
+#nav-bar .titlebar-min,
+#titlebar .titlebar-min,
+#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 {
+#nav-bar .titlebar-restore,
+#titlebar .titlebar-restore,
+#titlebar #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar .titlebar-max,
+:root[sizemode="maximized"] #titlebar .titlebar-max,
+:root[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 {
+#nav-bar .titlebar-close:hover,
+#titlebar .titlebar-close:hover,
+#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 {
+#nav-bar .titlebar-max:hover,
+#titlebar .titlebar-max:hover,
+#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 {
+#nav-bar .titlebar-min:hover,
+#titlebar .titlebar-min:hover,
+#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 {
+#nav-bar .titlebar-restore:hover,
+#titlebar .titlebar-restore:hover,
+#titlebar #titlebar-restore:hover,
+:root[sizemode="maximized"] #nav-bar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[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 {
+#nav-bar .titlebar-close:active,
+#titlebar .titlebar-close:active,
+#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 {
+#nav-bar .titlebar-max:active,
+#titlebar .titlebar-max:active,
+#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 {
+#nav-bar .titlebar-min:active,
+#titlebar .titlebar-min:active,
+#titlebar #titlebar-min:active {
 	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 {
+#nav-bar .titlebar-restore:active,
+#titlebar .titlebar-restore:active,
+#titlebar #titlebar-restore:active,
+:root[sizemode="maximized"] #nav-bar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[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 {
+#nav-bar:-moz-window-inactive .titlebar-close,
+#titlebar:-moz-window-inactive .titlebar-close,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive .titlebar-max,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive .titlebar-min,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[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 {
+#nav-bar:-moz-window-inactive .titlebar-close:hover,
+#titlebar:-moz-window-inactive .titlebar-close:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive .titlebar-max:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-min:hover,
+#titlebar:-moz-window-inactive .titlebar-min:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-restore:hover,
+#titlebar:-moz-window-inactive .titlebar-restore:hover,
+#titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[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-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
-	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
-	background: url("../titlebuttons/titlebutton-unmaximize-active-dark-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
-	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
-	background-size: contain;
-}
 }
diff --git a/src/other/firefox/common/parts/titlebutton-dark.css b/src/other/firefox/common/parts/titlebutton-dark.css
index d1295000..292e6a59 100644
--- a/src/other/firefox/common/parts/titlebutton-dark.css
+++ b/src/other/firefox/common/parts/titlebutton-dark.css
@@ -1,153 +1,137 @@
 @media (prefers-color-scheme: dark) {
-:root[tabsintitlebar] #nav-bar .titlebar-close,
-:root[tabsintitlebar] #titlebar .titlebar-close,
-:root[tabsintitlebar] #titlebar #titlebar-close {
+#nav-bar .titlebar-close,
+#titlebar .titlebar-close,
+#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 {
+#nav-bar .titlebar-max,
+#titlebar .titlebar-max,
+#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 {
+#nav-bar .titlebar-min,
+#titlebar .titlebar-min,
+#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 {
+#nav-bar .titlebar-restore,
+#titlebar .titlebar-restore,
+#titlebar #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar .titlebar-max,
+:root[sizemode="maximized"] #titlebar .titlebar-max,
+:root[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 {
+#nav-bar .titlebar-close:hover,
+#titlebar .titlebar-close:hover,
+#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 {
+#nav-bar .titlebar-max:hover,
+#titlebar .titlebar-max:hover,
+#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 {
+#nav-bar .titlebar-min:hover,
+#titlebar .titlebar-min:hover,
+#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 {
+#nav-bar .titlebar-restore:hover,
+#titlebar .titlebar-restore:hover,
+#titlebar #titlebar-restore:hover,
+:root[sizemode="maximized"] #nav-bar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[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 {
+#nav-bar .titlebar-close:active,
+#titlebar .titlebar-close:active,
+#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 {
+#nav-bar .titlebar-max:active,
+#titlebar .titlebar-max:active,
+#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 {
+#nav-bar .titlebar-min:active,
+#titlebar .titlebar-min:active,
+#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 {
+#nav-bar .titlebar-restore:active,
+#titlebar .titlebar-restore:active,
+#titlebar #titlebar-restore:active,
+:root[sizemode="maximized"] #nav-bar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[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 {
+#nav-bar:-moz-window-inactive .titlebar-close,
+#titlebar:-moz-window-inactive .titlebar-close,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive .titlebar-max,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive .titlebar-min,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[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 {
+#nav-bar:-moz-window-inactive .titlebar-close:hover,
+#titlebar:-moz-window-inactive .titlebar-close:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive .titlebar-max:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-min:hover,
+#titlebar:-moz-window-inactive .titlebar-min:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-restore:hover,
+#titlebar:-moz-window-inactive .titlebar-restore:hover,
+#titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop-dark.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-unmaximize-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
-	background: url("../titlebuttons/titlebutton-unmaximize-hover-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
-	background: url("../titlebuttons/titlebutton-unmaximize-active-dark.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
-	background: url("../titlebuttons/titlebutton-backdrop-dark.svg") no-repeat;
-	background-size: contain;
-}
 }
diff --git a/src/other/firefox/common/parts/titlebutton-light-alt.css b/src/other/firefox/common/parts/titlebutton-light-alt.css
index e169c391..5efc47c1 100644
--- a/src/other/firefox/common/parts/titlebutton-light-alt.css
+++ b/src/other/firefox/common/parts/titlebutton-light-alt.css
@@ -1,151 +1,135 @@
-:root[tabsintitlebar] #nav-bar .titlebar-close,
-:root[tabsintitlebar] #titlebar .titlebar-close,
-:root[tabsintitlebar] #titlebar #titlebar-close {
+#nav-bar .titlebar-close,
+#titlebar .titlebar-close,
+#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 {
+#nav-bar .titlebar-max,
+#titlebar .titlebar-max,
+#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 {
+#nav-bar .titlebar-min,
+#titlebar .titlebar-min,
+#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 {
+#nav-bar .titlebar-restore,
+#titlebar .titlebar-restore,
+#titlebar #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar .titlebar-max,
+:root[sizemode="maximized"] #titlebar .titlebar-max,
+:root[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 {
+#nav-bar .titlebar-close:hover,
+#titlebar .titlebar-close:hover,
+#titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover-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 {
+#nav-bar .titlebar-max:hover,
+#titlebar .titlebar-max:hover,
+#titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover-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 {
+#nav-bar .titlebar-min:hover,
+#titlebar .titlebar-min:hover,
+#titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover.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 {
+#nav-bar .titlebar-restore:hover,
+#titlebar .titlebar-restore:hover,
+#titlebar #titlebar-restore:hover,
+:root[sizemode="maximized"] #nav-bar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[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 {
+#nav-bar .titlebar-close:active,
+#titlebar .titlebar-close:active,
+#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 {
+#nav-bar .titlebar-max:active,
+#titlebar .titlebar-max:active,
+#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 {
+#nav-bar .titlebar-min:active,
+#titlebar .titlebar-min:active,
+#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 {
+#nav-bar .titlebar-restore:active,
+#titlebar .titlebar-restore:active,
+#titlebar #titlebar-restore:active,
+:root[sizemode="maximized"] #nav-bar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[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 {
+#nav-bar:-moz-window-inactive .titlebar-close,
+#titlebar:-moz-window-inactive .titlebar-close,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive .titlebar-max,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive .titlebar-min,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #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-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
+#nav-bar:-moz-window-inactive .titlebar-close:hover,
+#titlebar:-moz-window-inactive .titlebar-close:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive .titlebar-max:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-min:hover,
+#titlebar:-moz-window-inactive .titlebar-min:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-restore:hover,
+#titlebar:-moz-window-inactive .titlebar-restore:hover,
+#titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[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-unmaximize-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
-	background: url("../titlebuttons/titlebutton-unmaximize-hover-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
-	background: url("../titlebuttons/titlebutton-unmaximize-active-alt.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
-	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
-	background-size: contain;
-}
diff --git a/src/other/firefox/common/parts/titlebutton-light.css b/src/other/firefox/common/parts/titlebutton-light.css
index 5e9f7e48..ac72de2b 100644
--- a/src/other/firefox/common/parts/titlebutton-light.css
+++ b/src/other/firefox/common/parts/titlebutton-light.css
@@ -1,151 +1,135 @@
-:root[tabsintitlebar] #nav-bar .titlebar-close,
-:root[tabsintitlebar] #titlebar .titlebar-close,
-:root[tabsintitlebar] #titlebar #titlebar-close {
+#nav-bar .titlebar-close,
+#titlebar .titlebar-close,
+#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 {
+#nav-bar .titlebar-max,
+#titlebar .titlebar-max,
+#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 {
+#nav-bar .titlebar-min,
+#titlebar .titlebar-min,
+#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 {
+#nav-bar .titlebar-restore,
+#titlebar .titlebar-restore,
+#titlebar #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar .titlebar-max,
+:root[sizemode="maximized"] #titlebar .titlebar-max,
+:root[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 {
+#nav-bar .titlebar-close:hover,
+#titlebar .titlebar-close:hover,
+#titlebar #titlebar-close:hover {
 	background: url("../titlebuttons/titlebutton-close-hover.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 {
+#nav-bar .titlebar-max:hover,
+#titlebar .titlebar-max:hover,
+#titlebar #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-maximize-hover.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 {
+#nav-bar .titlebar-min:hover,
+#titlebar .titlebar-min:hover,
+#titlebar #titlebar-min:hover {
 	background: url("../titlebuttons/titlebutton-minimize-hover.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 {
+#nav-bar .titlebar-restore:hover,
+#titlebar .titlebar-restore:hover,
+#titlebar #titlebar-restore:hover,
+:root[sizemode="maximized"] #nav-bar .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar .titlebar-max:hover,
+:root[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 {
+#nav-bar .titlebar-close:active,
+#titlebar .titlebar-close:active,
+#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 {
+#nav-bar .titlebar-max:active,
+#titlebar .titlebar-max:active,
+#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 {
+#nav-bar .titlebar-min:active,
+#titlebar .titlebar-min:active,
+#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 {
+#nav-bar .titlebar-restore:active,
+#titlebar .titlebar-restore:active,
+#titlebar #titlebar-restore:active,
+:root[sizemode="maximized"] #nav-bar .titlebar-max:active,
+:root[sizemode="maximized"] #titlebar .titlebar-max:active,
+:root[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 {
+#nav-bar:-moz-window-inactive .titlebar-close,
+#titlebar:-moz-window-inactive .titlebar-close,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-max,
+#titlebar:-moz-window-inactive .titlebar-max,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-min,
+#titlebar:-moz-window-inactive .titlebar-min,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive .titlebar-restore,
+#titlebar:-moz-window-inactive #titlebar-restore,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max,
+:root[sizemode="maximized"] #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-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-close:hover,
-:root[tabsintitlebar] #titlebar:-moz-window-inactive #titlebar-close:hover {
+#nav-bar:-moz-window-inactive .titlebar-close:hover,
+#titlebar:-moz-window-inactive .titlebar-close:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-max:hover,
+#titlebar:-moz-window-inactive .titlebar-max:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-min:hover,
+#titlebar:-moz-window-inactive .titlebar-min:hover,
+#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 {
+#nav-bar:-moz-window-inactive .titlebar-restore:hover,
+#titlebar:-moz-window-inactive .titlebar-restore:hover,
+#titlebar:-moz-window-inactive #titlebar-restore:hover,
+:root[sizemode="maximized"] #nav-bar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive .titlebar-max:hover,
+:root[sizemode="maximized"] #titlebar:-moz-window-inactive #titlebar-max:hover {
 	background: url("../titlebuttons/titlebutton-unmaximize-backdrop.svg") no-repeat;
 	background-size: contain;
 }
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button {
-	background: url("../titlebuttons/titlebutton-unmaximize.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:hover {
-	background: url("../titlebuttons/titlebutton-unmaximize-hover.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button:active {
-	background: url("../titlebuttons/titlebutton-unmaximize-active.svg") no-repeat;
-	background-size: contain;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive #restore-button {
-	background: url("../titlebuttons/titlebutton-backdrop.svg") no-repeat;
-	background-size: contain;
-}