diff --git a/theme/parts/csd.css b/theme/parts/csd.css
index 8af100b..29fc08f 100644
--- a/theme/parts/csd.css
+++ b/theme/parts/csd.css
@@ -119,7 +119,7 @@
 :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
 	-moz-appearance: none !important;
 	padding: 0 2px !important;
-    background: var(--gnome-button-close-background);
+	background: var(--gnome-button-close-background);
 }
 
 :root[tabsintitlebar] #titlebar .titlebar-button {
@@ -136,6 +136,12 @@
 	width: 34px;
 }
 
+:root[tabsintitlebar] #titlebar toolbarbutton > .toolbarbutton-icon {
+	padding: 0 !important;
+	stroke: none !important;
+	-moz-context-properties: fill, fill-opacity !important;
+}
+
 :root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
 :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
 	width: 16px;
@@ -154,7 +160,7 @@
 }
 
 :root[tabsintitlebar] #titlebar .titlebar-button:where(:hover) {
-	background: var(--gnome-button-hover-close-background);
+	background: var(--gnome-button-hover-close-background) !important;
 }
 
 /* OPTIONAL: Allow draging the window from headerbar buttons */