diff --git a/theme/parts/csd.css b/theme/parts/csd.css
index 0405c30..e0c1fa2 100644
--- a/theme/parts/csd.css
+++ b/theme/parts/csd.css
@@ -73,11 +73,6 @@
 	display: inherit !important;
 }
 
-/* Hide window controls when navbar is hidden */
-:root[tabsintitlebar][inFullscreen] #navigator-toolbox[style*='margin-top:'] #titlebar .titlebar-buttonbox-container {
-  top: -999px;
-}
-
 /* Remove tabsbar titlebar blank spaces */
 :root[tabsintitlebar] #TabsToolbar .titlebar-placeholder {
 	display: none !important;
@@ -113,8 +108,7 @@
 }
 
 /* Window buttons style */
-:root[tabsintitlebar] #titlebar .titlebar-button,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
+:root[tabsintitlebar]:not([inFullscreen]) #titlebar .titlebar-button {
 	-moz-appearance: none !important;
 	padding: 0 2px !important;
 	background: var(--gnome-button-background) !important;
@@ -128,11 +122,17 @@
 	width: 24px !important;
 }
 
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
+:root[tabsintitlebar][inFullscreen] #titlebar .titlebar-buttonbox {
+  background: transparent !important;
 	border-radius: 6px !important;
-	height: 34px;
-	margin: 0 3px !important;
-	width: 34px;
+	height: 34px !important;
+	width: 34px !important;
+	transition: background .3s;
+}
+
+:root[tabsintitlebar][inFullscreen] #titlebar .titlebar-buttonbox:hover {
+  outline: 0 !important;
+  background: var(--gnome-hover-color) !important;
 }
 
 :root[tabsintitlebar] #titlebar toolbarbutton > .toolbarbutton-icon {