diff --git a/src/other/firefox/common/parts/buttons.css b/src/other/firefox/common/parts/buttons.css
index b44cdb33..b5b7ddb3 100644
--- a/src/other/firefox/common/parts/buttons.css
+++ b/src/other/firefox/common/parts/buttons.css
@@ -225,13 +225,13 @@ button.customizationmode-button[disabled] {
 	opacity: 1 !important;
 }
 
-#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] image,
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled] image,*/
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled] image,
 #context-navigation menuitem[disabled] image {
 	opacity: .4 !important;
 }
 
-#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled]:hover,
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled]:hover,*/
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled]:hover {
 	background: none !important;
 }
diff --git a/src/other/firefox/common/parts/csd.css b/src/other/firefox/common/parts/csd.css
index a74fca2f..454f9cd9 100644
--- a/src/other/firefox/common/parts/csd.css
+++ b/src/other/firefox/common/parts/csd.css
@@ -44,41 +44,46 @@
 	}
 }
 
-/* Window buttons box */
-#nav-bar .titlebar-buttonbox-container,
-#titlebar .titlebar-buttonbox-container,
-#titlebar-buttonbox-container {
-	-moz-appearance: none !important;
-	padding: 0 3px 0 4px;
-	position: absolute !important;
-	right: 8px;
-	top: 0;
-	display: block !important;
-}
-#nav-bar .titlebar-buttonbox,
-#titlebar .titlebar-buttonbox {
-	-moz-appearance: none !important;
+#nav-bar, #titlebar {
+	/* Window buttons box */
+	.titlebar-buttonbox-container,
+	#titlebar-buttonbox-container {
+		-moz-appearance: none !important;
+		padding: 0 3px 0 4px;
+		position: absolute !important;
+		right: 8px;
+		top: 0;
+		display: block !important;
+	}
+
+	.titlebar-buttonbox {
+		-moz-appearance: none !important;
+	}
+
+	/* Window buttons style */
+	.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;
+		--inactive-titlebar-opacity: 1 !important;
+	}
+
+	&, &:-moz-window-inactive {
+		.titlebar-button .toolbarbutton-icon {
+			opacity: 0 !important;
+			appearance: none !important;
+		}
+
+		.titlebar-button[disabled="true"] {
+			opacity: 0.35 !important;
+		}
+	}
 }
 
-/* Window buttons style */
-#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;
-	--inactive-titlebar-opacity: 1 !important;
-}
-
-#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;
-}
 
 /* Fullscreen headerbar */
 &:root[inFullscreen] {
diff --git a/src/other/firefox/common/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css
index ff5d3055..dee9dd20 100644
--- a/src/other/firefox/common/parts/headerbar.css
+++ b/src/other/firefox/common/parts/headerbar.css
@@ -67,6 +67,10 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 	opacity: 1 !important;
 }
 
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button)[disabled] image {
+	opacity: .4 !important;
+}
+
 /* Inactive window buttons */
 #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.titlebar-button):-moz-window-inactive {
 	background: var(--gnome-inactive-button-background) !important;
diff --git a/src/other/firefox/common/parts/titlebutton-dark.css b/src/other/firefox/common/parts/titlebutton-dark.css
index 292e6a59..74fddef1 100644
--- a/src/other/firefox/common/parts/titlebutton-dark.css
+++ b/src/other/firefox/common/parts/titlebutton-dark.css
@@ -82,22 +82,13 @@
 }
 #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;
-}
+#titlebar:-moz-window-inactive #titlebar-close,
 #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;
-}
+#titlebar:-moz-window-inactive #titlebar-max,
 #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;
-}
+#titlebar:-moz-window-inactive #titlebar-min,
 #nav-bar:-moz-window-inactive .titlebar-restore,
 #titlebar:-moz-window-inactive .titlebar-restore,
 #titlebar:-moz-window-inactive #titlebar-restore,