diff --git a/README.md b/README.md
index 651694a..d5ac315 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This is a bunch of CSS code to make Firefox 57+ look closer to GNOME's default
 theme. It styles the UI and internal Firefox' pages like `about:` and
 `view-source:`. Both light and dark variants are supported.
 
-The `master` branch is currently tracking **Firefox 59**. If you need support
+The `master` branch is currently tracking **Firefox 60**. If you need support
 for older versions, they are archived under version-specific git tags. Eg. if
 you're using Firefox 57, switch to the `57` tag after cloning the repo:
 
diff --git a/ui/csd.css b/ui/csd.css
index 52e5065..2ea4ddc 100644
--- a/ui/csd.css
+++ b/ui/csd.css
@@ -21,7 +21,7 @@ window:not([width="960"]):not([height="1053"]) #titlebar-buttonbox {
 }
 
 #nav-bar {
-	margin-top: -4px !important;
+	margin-top: 5px !important;
 	padding-right: 7px !important;
 	position: relative;
 }
@@ -36,14 +36,19 @@ window:not([width="960"]):not([height="1053"]) #titlebar-buttonbox {
 	border-right: 1px solid rgba(0, 0, 0, .1);
 }
 
+#titlebar {
+	margin-bottom: -47px !important;
+}
+
 /* Move window buttons next to the header bar */
 #titlebar-buttonbox {
 	background-image: var(--gnome-headerbar-bgimage) !important;
 	border: none !important;
 	border-bottom: var(--gnome-headerbar-border-bottom) !important;
 	box-shadow: var(--gnome-headerbar-box-shadow);
+	height: unset !important;
 	margin-right: -4px;
-	margin-top: -4px !important;
+	margin-top: 0 !important;
 	padding-right: 3px;
 }
 #titlebar-buttonbox:-moz-window-inactive {
@@ -62,7 +67,7 @@ window:not([width="960"]):not([height="1053"]) #titlebar-buttonbox {
 	border-color: transparent !important;
 	border-radius: 3px !important;
 	height: 34px;
-	margin: 6px 3px !important;
+	margin: 4px 3px !important;
 	padding: 0 2px !important;
 	position: relative;
 	transition: all .3s ease-out;
@@ -90,6 +95,25 @@ window:not([width="960"]):not([height="1053"]) #titlebar-buttonbox {
 	border: var(--gnome-headerbar-button-border) !important;
 }
 
+/* TODO icons don't have proper color */
+#titlebar-close .toolbarbutton-icon {
+	filter: var(--gnome-icons-hack-filter);
+	list-style-image: url("moz-icon://stock/window-close-symbolic?size=menu") !important;
+}
+#titlebar-max .toolbarbutton-icon {
+	filter: var(--gnome-icons-hack-filter);
+	list-style-image: url("moz-icon://stock/window-maximize-symbolic?size=menu") !important;
+}
+#titlebar-min .toolbarbutton-icon {
+	filter: var(--gnome-icons-hack-filter);
+	list-style-image: url("moz-icon://stock/window-minimize-symbolic?size=menu") !important;
+}
+
+/* Fix the issue when dragging tabs */
+#TabsToolbar[movingtab] + #nav-bar {
+	margin-top: 5px !important;
+}
+
 /* Remove ugly line before tabs */
 .titlebar-placeholder[type="pre-tabs"] {
 	border-inline-end: 0px solid !important;
diff --git a/ui/experimental-ff-60-csd.css b/ui/experimental-ff-60-csd.css
deleted file mode 100644
index 6797eb3..0000000
--- a/ui/experimental-ff-60-csd.css
+++ /dev/null
@@ -1,38 +0,0 @@
-@import "csd.css";
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#titlebar {
-	margin-bottom: -47px !important;
-}
-
-#nav-bar {
-	margin-top: 5px !important;
-}
-
-#titlebar-buttonbox {
-	height: unset !important;
-	margin-top: 0 !important;
-}
-
-#titlebar toolbarbutton {
-	margin: 4px 3px !important;
-}
-
-/* Fix the issue when dragging tabs */
-#TabsToolbar[movingtab] + #nav-bar {
-	margin-top: 5px !important;
-}
-
-/* TODO icons don't have proper color */
-#titlebar-close .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/window-close-symbolic?size=menu") !important;
-}
-#titlebar-max .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/window-maximize-symbolic?size=menu") !important;
-}
-#titlebar-min .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/window-minimize-symbolic?size=menu") !important;
-}
diff --git a/userChrome.css b/userChrome.css
index f151818..f4833bb 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -31,10 +31,8 @@
 /* Client-side decorations (optional)
  */
 
-/* Enable CSD for Firefox 59 (Fedora only) and 59 beta (all distros) */
+/* Enable CSD */
 /*@import "ui/csd.css"; /**/
-/* Enable CSD for Firefox 60+ beta (experimental) */
-/*@import "ui/experimental-ff-60-csd.css"; /**/
 
 /* Window controls: just 1 button */
 /*@import "ui/csd-1-button.css"; /**/