diff --git a/README.md b/README.md
index dde565a..44953c2 100644
--- a/README.md
+++ b/README.md
@@ -124,9 +124,7 @@ Alternatively you can run installation script with `-g` flag to auto install GNO
 	
 	*This feature is included by default for Firefox 70+*
 	
-- **rounded-title-buttons.css** *GNOMISH*
 
-	 Rounded title buttons (headerbar window controls).
 
 - **active-tab-contrast.css**
 
diff --git a/theme/parts/csd.css b/theme/parts/csd.css
index 2f7b0d8..019cb96 100644
--- a/theme/parts/csd.css
+++ b/theme/parts/csd.css
@@ -32,68 +32,8 @@
 	}
 }
 
-/* Fullscreen headerbar padding for 1 button */
-:root[tabsintitlebar][inFullscreen] #nav-bar {
-	padding-right: 50px !important;
-}
-
-/* Window buttons box */
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox-container,
-:root[tabsintitlebar] #titlebar-buttonbox-container,
-:root[tabsintitlebar][inFullscreen] #window-controls {
-	-moz-appearance: none !important;
-	padding: 6px 3px;
-	position: absolute !important;	
-	right: 0;
-	top: 0;
-	display: block !important;
-}
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox {
-	-moz-appearance: none !important;
-}
-
-/* Window buttons style */
-: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;
-	height: 34px;
-	margin: 0 3px !important;
-	padding: 0 2px !important;
-	width: 34px;
-}
-:root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
-	width: 16px;
-}
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
-:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive toolbarbutton .toolbarbutton-icon {
-	opacity: .3 !important;
-}
-: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);
-}
-: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-background);
-	box-shadow: var(--gnome-button-active-box-shadow);
-	border-color: var(--gnome-button-active-border-color) !important;
-}
-
-/* Remove close and minimize buttons from fullscreen buttons */
-:root[tabsintitlebar][inFullscreen] #window-controls #close-button,
-:root[tabsintitlebar][inFullscreen] #window-controls #minimize-button {
-	display: none;
-}
-
-/* Left window buttons */	
-@media (-moz-gtk-csd-reversed-placement) {	
+/* Left window buttons */
+@media (-moz-gtk-csd-reversed-placement) {
 	:root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
 		padding-right: 3px !important;
 	}
@@ -126,6 +66,18 @@
 	} 
 }
 
+/* Fullscreen headerbar padding for 1 button */
+:root[tabsintitlebar][inFullscreen] #nav-bar {
+	padding-right: 50px !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-container {
+	display: none !important;
+}
+
 /* Remove tabsbar titlebar blank spaces */
 :root[tabsintitlebar] #TabsToolbar .titlebar-placeholder {
 	display: none !important;
@@ -147,21 +99,66 @@
 	padding-bottom: 0 !important;
 }
 
-/* FF 60 fixes */
-:root[tabsintitlebar] #titlebar[style="margin-bottom: -1px;"] {
-	margin-bottom: -38px !important;
-}
-:root[tabsintitlebar] #titlebar-content {
+/* Window buttons box */
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox-container,
+:root[tabsintitlebar] #titlebar-buttonbox-container,
+:root[tabsintitlebar][inFullscreen] #window-controls {
+	-moz-appearance: none !important;
+	padding: 6px 3px;
+	position: absolute !important;	
+	right: 0;
+	top: 0;
 	display: block !important;
-	position: absolute;
-	height: 38px !important;
-	top: 0 !important;
 }
-:root[tabsintitlebar] #titlebar-buttonbox {
-	height: auto !important;
-	padding: 0 !important;
-	margin: 0 !important;
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox {
+	-moz-appearance: none !important;
 }
-:root[tabsintitlebar] #titlebar-content .titlebar-button {	
-	padding: 0 7px !important;
+
+/* Window buttons style */
+: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;
+}
+
+:root[tabsintitlebar] #titlebar .titlebar-button {
+	border-radius: 100% !important;
+	height: 30px !important;
+	margin: 2px 5px !important;
+	width: 30px;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button {
+	border-color: var(--gnome-inactive-button-border-color) !important;
+}
+
+:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
+	border-radius: 5px !important;
+	height: 34px;
+	margin: 0 3px !important;
+	width: 34px;
+}
+
+:root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
+:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
+	width: 16px;
+}
+:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
+:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive toolbarbutton .toolbarbutton-icon {
+	opacity: .3 !important;
+}
+: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);
+}
+: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-background);
+	box-shadow: var(--gnome-button-active-box-shadow);
+	border-color: var(--gnome-button-active-border-color) !important;
 }
diff --git a/theme/rounded-title-buttons.css b/theme/rounded-title-buttons.css
deleted file mode 100644
index 14619dd..0000000
--- a/theme/rounded-title-buttons.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Rounded title buttons (headerbar window controls) */
-
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-:root[tabsintitlebar] #titlebar .titlebar-button {
-	border-radius: 100% !important;
-	height: 30px !important;
-	width: 30px !important;
-	margin: 2px 5px !important;
-}
-
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button {
-	border-color: var(--gnome-inactive-button-border-color) !important;
-}
diff --git a/userChrome.css b/userChrome.css
index b851db0..bbb33fb 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -17,8 +17,6 @@
  * This feature is included by default for Firefox 70+ */
 /*@import "theme/matching-autocomplete-width.css"; /**/
 
-/* Rounded title buttons (headerbar window controls) (GNOMISH) */
-/*@import "theme/rounded-title-buttons.css"; /**/
 
 /* Active tab high contrast */
 /*@import "theme/active-tab-contrast.css"; /**/