diff --git a/theme/parts/csd.css b/theme/parts/csd.css
index b4093a0..06a02b2 100755
--- a/theme/parts/csd.css
+++ b/theme/parts/csd.css
@@ -39,12 +39,13 @@
 
 /* Window buttons box */
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox-container,
+:root[tabsintitlebar] #titlebar-buttonbox-container,
 :root[tabsintitlebar][inFullscreen] #window-controls {
+	-moz-appearance: none !important;
 	padding: 0 3px 0 4px;
 	position: absolute !important;	
 	right: 0;
-	top: 0;
-	-moz-appearance: none !important;
+	top: 0;	
 }
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox {
 	-moz-appearance: none !important;
@@ -80,25 +81,22 @@
 }
 :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-image: var(--gnome-button-active-background);
+	background: var(--gnome-button-active-background);
 	box-shadow: var(--gnome-button-active-box-shadow);
-	border: var(--gnome-button-border) !important;
-}
-:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button[disabled],
-:root[tabsintitlebar][inFullscreen] #window-controls:not(:-moz-window-inactive) toolbarbutton[disabled] {
-	background-color: var(--gnome-button-disabled-background);
-	box-shadow: var(--gnome-button-disabled-box-shadow);
-	border: var(--gnome-button-border) !important;
+	border-color: var(--gnome-button-active-border-color) !important;
 }
 
 /* Use stack icons for window buttons */
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon {
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
+:root[tabsintitlebar] #titlebar #titlebar-close .toolbarbutton-icon {
 	list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important;
 }
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon {
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon,
+:root[tabsintitlebar] #titlebar #titlebar-max .toolbarbutton-icon {
 	list-style-image: url("moz-icon://stock/window-maximize-symbolic?size=dialog") !important;
 }
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon {
+:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon,
+:root[tabsintitlebar] #titlebar #titlebar-min .toolbarbutton-icon {
 	list-style-image: url("moz-icon://stock/window-minimize-symbolic?size=dialog") !important;
 }
 :root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon {
@@ -146,6 +144,11 @@
 	} 
 }
 
+/* Remove tabsbar titlebar blank spaces */
+:root[tabsintitlebar] #TabsToolbar .titlebar-placeholder {
+	display: none !important;
+}
+
 /* Prevent menubar from breaking */
 :root[tabsintitlebar] #toolbar-menubar:not([inactive=true]) {
 	height: 30px !important;
@@ -175,3 +178,22 @@
 #forward-button{
 	-moz-window-dragging: no-drag !important;
 }
+
+/* FF 60 fixes */
+:root[tabsintitlebar] #titlebar[style="margin-bottom: -1px;"] {
+    margin-bottom: -38px !important;
+}
+:root[tabsintitlebar] #titlebar-content {
+	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-content .titlebar-button {	
+	padding: 0 7px !important;
+}