diff --git a/theme/colors/dark.css b/theme/colors/dark.css
index 2c5f50e..93fdc5a 100644
--- a/theme/colors/dark.css
+++ b/theme/colors/dark.css
@@ -66,9 +66,10 @@
 		--gnome-button-destructive-action-active-background: #3D3E3D;
 		--gnome-button-destructive-action-active-border-color: none;
 		--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-		--gnome-button-close-background: #444444;
-		--gnome-button-active-close-background: #6F6F6F;
-		--gnome-button-hover-close-background: #4f4f4f;
+
+		--gnome-button-close-background: var(--gnome-button-flat-hover-background);
+		--gnome-button-hover-close-background:var(--gnome-button-hover-background);
+		--gnome-button-active-close-background: var(--gnome-button-active-background);
 
 		/* Entries */
 		--gnome-entry-background: rgba(255, 255, 255, .1);
diff --git a/theme/colors/light.css b/theme/colors/light.css
index da1a2b4..eba04d1 100644
--- a/theme/colors/light.css
+++ b/theme/colors/light.css
@@ -66,9 +66,11 @@
 	--gnome-button-destructive-action-active-background: #E4E2E0;
 	--gnome-button-destructive-action-active-border-color: none;
 	--gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-	--gnome-button-close-background: #D9D9D9;
-	--gnome-button-active-close-background: #B3B3B3;
-	--gnome-button-hover-close-background: #CECECE;
+	
+	--gnome-button-close-background: var(--gnome-button-flat-hover-background);
+	--gnome-button-hover-close-background:var(--gnome-button-hover-background);
+	--gnome-button-active-close-background: var(--gnome-button-active-background);
+	
 
 	/* Entries */
 	--gnome-entry-background: rgba(0, 0, 0, .08);
diff --git a/theme/parts/csd.css b/theme/parts/csd.css
index da80d30..8af100b 100644
--- a/theme/parts/csd.css
+++ b/theme/parts/csd.css
@@ -118,9 +118,6 @@
 :root[tabsintitlebar] #titlebar .titlebar-button,
 :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
 	-moz-appearance: none !important;
-	border: 1px solid var(--gnome-button-border-color) !important;
-	border-color: transparent !important;
-	border-radius: 5px !important;	
 	padding: 0 2px !important;
     background: var(--gnome-button-close-background);
 }
@@ -133,7 +130,7 @@
 }
 
 :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
-	border-radius: 5px !important;
+	border-radius: 6px !important;
 	height: 34px;
 	margin: 0 3px !important;
 	width: 34px;
@@ -149,16 +146,11 @@
 }
 :root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):hover,
 :root[tabsintitlebar][inFullscreen] #window-controls:not(:-moz-window-inactive) toolbarbutton:not([disabled]):hover {
-	background-image: var(--gnome-button-hover-background);
-	border-color: var(--gnome-button-border-color) !important;
-	border-bottom-color: var(--gnome-button-border-accent-color) !important;
-	box-shadow: var(--gnome-button-box-shadow);
+	background: var(--gnome-button-hover-background);
 }
 :root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):active,
 :root[tabsintitlebar][inFullscreen] #window-controls:not(:-moz-window-inactive) toolbarbutton:not([disabled]):active {
 	background: var(--gnome-button-active-close-background);
-	box-shadow: var(--gnome-button-active-box-shadow);
-	border-color: var(--gnome-button-active-border-color) !important;
 }
 
 :root[tabsintitlebar] #titlebar .titlebar-button:where(:hover) {