GTK+-3.20 Menta themes: button re-work and button state cleanup

12 files changed, 1040 insertions, 1747 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
index 81074f8c..6e1a485e 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
@@ -41,121 +41,97 @@ headerbar > box > separator.vertical,
 /* draw regular check and radio items using our SVG assets */
 
 check,
-.view.cell check,
-.check,
-.view.cell.check {
+check .view.cell {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-check:disabled,
-.check:disabled {
+check:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
 }
 
-check row:disabled,
-.check row:disabled {
+check row:disabled {
 	background-color: transparent;
 }
 
 check:active,
 check:checked,
 .view.cell check:active,
-.view.cell check:checked,
-.check:active,
-.check:checked,
-.view.cell.check:active,
-.view.cell.check:checked {
+.view.cell check:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
 }
 
 check:active:disabled,
-check:checked:disabled,
-.check:active:disabled,
-.check:checked:disabled {
+check:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
 }
 
-check:indeterminate,
-.check:indeterminate {
+check:indeterminate {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
 }
 
-check:indeterminate:disabled,
-.check:indeterminate:disabled {
+check:indeterminate:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
 }
 
 radio,
-.view.cell radio,
-.radio,
-.view.cell.radio {
+.view.cell radio {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-radio:disabled,
-.radio:disabled {
+radio:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
 }
 
-radio row:disabled,
-.radio row:disabled {
+radio row:disabled {
 	background-color: transparent;
 }
 
 radio:active,
 .view.cell radio:active,
 radio:checked,
-.view.cell radio:checked,
-.radio:active,
-.view.cell.radio:active,
-.radio:checked,
-.view.cell.radio:checked {
+.view.cell radio:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
 }
 
 radio:active:disabled,
-radio:checked:disabled,
-.radio:active:disabled,
-.radio:checked:disabled {
+radio:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
 }
 
-radio:indeterminate,
-.radio:indeterminate {
+radio:indeterminate {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
 }
 
-.radio:indeterminate:disabled,
-.radio:indeterminate:disabled {
+radio:indeterminate:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
 }
 
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
+.sidebar view radio:active,
+.sidebar view radio:active:focus,
+.sidebar view radio:active:hover,
+.sidebar view radio:checked,
+.sidebar view radio:checked:focus,
+.sidebar view radio:checked:hover {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
 }
 
-.sidebar .view.radio:hover {
+.sidebar view radio:hover {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
 }
 
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
+.sidebar view radio:active:selected,
+.sidebar view radio:active:selected:focus,
+.sidebar view radio:checked:selected,
+.sidebar view radio:checked:selected:focus {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
 }
 
-.sidebar .view.radio:selected:hover,
-.sidebar .view.radio:selected:focus {
+.sidebar view radio:selected:hover,
+.sidebar view radio:selected:focus {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected-prelight.svg"));	
 }
 
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
index 88b50edd..e1fdfbc2 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -1,8 +1,7 @@
 /* Button background */
 button,
-toolbar button.raised,
 toolbar .raised button,
-toolbar combobox button,
+toolbar combobox button.combo,
 toolbar.primary-toolbar .linked button,
 toolbar.primary-toolbar .raised button,
 .button,
@@ -15,22 +14,13 @@ toolbar.primary-toolbar .raised button,
 	background-color: transparent;
 }
 
-/* Pushed button and progressbar through background */
+/* Pushed button and progressbar through background (checked) */
 button:checked,
-button:active,
-button:active:hover,
-toolbar button:active,
-toolbar button:active:hover,
-toolbar button.raised:active,
-toolbar .raised button:active,
-toolbar button.raised:active:hover,
-toolbar .raised button:active:hover,
+button:focus:checked,
 toolbar button:checked,
-toolbar button:checked:hover,
-toolbar button.raised:checked,
+toolbar button:focus:checked,
 toolbar .raised button:checked,
-toolbar button.raised:checked:hover,
-toolbar .raised button:checked:hover,
+toolbar .raised button:focus:checked,
 .button:checked,
 .button:active,
 .button:active:hover,
@@ -64,14 +54,16 @@ row trough,
 	background-color: transparent; 
 }
 
+/* checked hover */
 button:checked:hover,
-button:active:hover,
-toolbar button:active:hover,
-toolbar button.raised:active:hover,
-toolbar .raised button:active:hover,
+button:checked:focus:hover,
+button:checked:focus:hover:active,
 toolbar button:checked:hover,
-toolbar button.raised:checked:hover,
 toolbar .raised button:checked:hover,
+toolbar button:checked:focus:hover,
+toolbar .raised button:checked:focus:hover,
+toolbar button:checked:focus:hover:active,
+toolbar .raised button:checked:focus:hover:active,
 row trough:hover,
 .button:checked:hover,
 .button:active:hover,
@@ -91,8 +83,6 @@ row trough:hover,
 /* Primary and inline toolbars pushed button background */
 toolbar.primary-toolbar button:checked,
 toolbar.inline-toolbar button:checked,
-toolbar.primary-toolbar button:active,
-toolbar.inline-toolbar button:active,
 .primary-toolbar .button:checked,
 .inline-toolbar .button:checked,
 .primary-toolbar .button:active,
@@ -105,8 +95,6 @@ toolbar.inline-toolbar button:active,
 
 toolbar.primary-toolbar button:checked:hover,
 toolbar.inline-toolbar button:checked:hover,
-toolbar.primary-toolbar button:active:hover,
-toolbar.inline-toolbar button:active:hover,
 .primary-toolbar .button:checked:hover,
 .inline-toolbar .button:checked:hover,
 .primary-toolbar .button:active:hover,
@@ -117,12 +105,11 @@ toolbar.inline-toolbar button:active:hover,
 	background-color: transparent;
 }
 
-/* Prelit button background */
+/* Hover button background */
 button:hover,
 toolbar button:hover,
-toolbar button.raised:hover,
 toolbar .raised button:hover,
-toolbar combobox button:hover,
+toolbar combobox button.combo:hover,
 .button:hover,
 .toolbar .button:hover,
 .toolbar .button.raised:hover,
@@ -145,8 +132,7 @@ toolbar.primary-toolbar button:hover,
 
 /* Insensitive button background */
 button:disabled,
-toolbar combobox button:disabled,
-toolbar button.raised:disabled,
+toolbar combobox button.combo:disabled,
 toolbar .raised button:disabled,
 .button:disabled,
 .toolbar GtkComboBox button:disabled,
@@ -157,12 +143,9 @@ toolbar .raised button:disabled,
 }
 
 /* Pushed + Insensitive button background */
-button:active:disabled,
 button:checked:disabled,
-toolbar button:active:disabled,
 toolbar button:checked:disabled,
-toolbar combobox button:active:disabled,
-toolbar combobox button:checked:disabled,
+toolbar combobox button.combo:checked:disabled,
 .button:active:disabled,
 .button:checked:disabled,
 .toolbar .button:active:disabled,
@@ -197,9 +180,7 @@ GtkComboBox.combobox-entry .button:hover,
 }
 
 /* Entry pushed button background */
-toolbar.primary-toolbar combobox entry button:active,
 toolbar.primary-toolbar combobox entry button:checked,
-combobox entry button:active,
 combobox entry button:checked,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:checked,
@@ -243,8 +224,7 @@ column-header .button:hover {
 treeview header button:focus,
 treeview header button:checked,
 treeview header button:checked:hover,
-treeview header button:active,
-treeview header button:active:hover,
+treeview header button:hover:active,
 column-header.button:focus,
 column-header .button:focus,
 column-header.button:checked,
@@ -277,7 +257,6 @@ GtkComboBox.combobox-entry .button:disabled,
 
 /* Primary and inline toolbars background */
 toolbar.primary-toolbar,
-toolbar.primary-toolbar,
 toolbar.inline-toolbar,
 .primary-toolbar .toolbar,
 .primary-toolbar.toolbar,
@@ -289,7 +268,6 @@ toolbar.inline-toolbar,
 }
 
 toolbar.primary-toolbar.vertical,
-toolbar.primary-toolbar.vertical,
 toolbar.inline-toolbar.vertical,
 .primary-toolbar .toolbar.vertical,
 .primary-toolbar.toolbar.vertical,
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
index 9d9960d3..887fbe88 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
@@ -1,12 +1,10 @@
 /* Borders */
 
-/* generic element borders */
+/* generic element borders (checked)*/
 entry,
-button:active,
 button:checked,
 combobox entry entry,
 combobox entry button,
-toolbar.inline-toolbar.vertical button:active,
 toolbar.inline-toolbar.vertical button:checked,
 .entry,
 .button:active,
@@ -30,7 +28,7 @@ trough highlight,
 }
 
 entry:disabled,
-button:active:disabled,
+button:checked:disabled,
 combobox entry entry:disabled,
 combobox entry button:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
@@ -78,14 +76,10 @@ row trough,
 
 /* focused element borders */
 entry:focus,
-button:active:focus,
 button:checked:focus,
-button.default:active,
 button.default:checked,
 combobox entry button:focus,
-toolbar.inline-toolbar.vertical button:active:focus,
-toolbar.inline-toolbar.vertical button:checked:focus
-toolbar.inline-toolbar.vertical button.default:active,
+toolbar.inline-toolbar.vertical button:focus:checked,
 toolbar.inline-toolbar.vertical button.default:checked,
 .entry:focus,
 .button:active:focus,
@@ -105,9 +99,9 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 .titlebar button:hover,
+.titlebar button:hover:active,
 .titlebar button.titlebutton:hover,
-.titlebar button.titlebutton:active,
-.titlebar button:checked:checked,
+.titlebar button.titlebutton:hover:active,
 .titlebar .button:hover,
 .titlebar .titlebutton:hover,
 .titlebar .titlebutton:active,
@@ -120,8 +114,7 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 button,
-.button
-/*.inline-toolbar.toolbar.vertical .button*/ {
+.button {
 	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -168,7 +161,6 @@ toolbar.primary-toolbar button:hover,
 	background-color: transparent;
 }
 
-toolbar.primary-toolbar button:active,
 toolbar.primary-toolbar button:checked,
 .primary-toolbar .button:active,
 .primary-toolbar .button:checked {
@@ -202,21 +194,14 @@ tooltip entry:focus,
 	border-color: transparent;
 }
 
-/* primary toolbar - generic element borders */
+/* primary toolbar - generic element borders (checked)*/
 toolbar.primary-toolbar entry,
-toolbar.primary-toolbar combobox entry .entry,
-toolbar.primary-toolbar combobox entry .button,
-toolbar.primary-toolbar button:active,
-toolbar.primary-toolbar button.raised:active,
-toolbar.primary-toolbar raised button:active,
-toolbar.inline-toolbar button:active,
+toolbar.primary-toolbar combobox entry.combo,
+toolbar.primary-toolbar combobox button.combo:checked,
 toolbar.primary-toolbar button:checked,
-toolbar.primary-toolbar button.raised:checked,
 toolbar.primary-toolbar .raised button:checked,
 toolbar.inline-toolbar .button:checked,
-toolbar.primary-toolbar switch.trough,
-toolbar.primary-toolbar combobox button:checked,
-toolbar.primary-toolbar combobox button:active,
+toolbar.primary-toolbar switch trough,
 .primary-toolbar .entry,
 .primary-toolbar GtkComboBox.combobox-entry .entry,
 .primary-toolbar GtkComboBox.combobox-entry .button,
@@ -238,12 +223,10 @@ toolbar.primary-toolbar combobox button:active,
 	border-color: transparent;
 }
 
-toolbar.primary-toolbar button.raised:disabled,
-toolbar.primary-toolbar raised .button:disabled,
-toolbar.primary-toolbar button.raised.default:disabled,
-toolbar.primary-toolbar raised .button.default:disabled,
-toolbar.primary-toolbar switch.trough:disabled,
-toolbar.primary-toolbar switch.trough:active:disabled,
+toolbar.primary-toolbar .raised button:disabled,
+toolbar.primary-toolbar .raised button.default:disabled,
+toolbar.primary-toolbar switch trough:disabled,
+toolbar.primary-toolbar switch trough:checked:disabled,
 toolbar.primary-toolbar combobox button:disabled,
 .primary-toolbar .button.raised:disabled,
 .primary-toolbar .raised .button:disabled,
@@ -260,15 +243,11 @@ toolbar.primary-toolbar combobox button:disabled,
 }
 
 /* primary toolbar - focused element borders */
-toolbar.primary-toolbar button:active:focus,
+toolbar.primary-toolbar button:focus:checked,
 toolbar.primary-toolbar entry:focus,
-toolbar.primary-toolbar combobox entry entry:focus,
-toolbar.primary-toolbar button.raised.default:checked,
+toolbar.primary-toolbar combobox entry.combo:focus,
 toolbar.primary-toolbar .raised button.default:checked,
 toolbar.inline-toolbar button.default:checked,
-toolbar.primary-toolbar button.raised.default:active,
-toolbar.primary-toolbar raised button.default:active,
-toolbar.inline-toolbar button.default:active,
 .primary-toolbar .button:active:focus,
 .primary-toolbar .entry:focus,
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus,
@@ -286,11 +265,10 @@ toolbar.inline-toolbar button.default:active,
 	border-color: transparent;
 }
 
-/* primary toolbar - generic button borders */
-toolbar.primary-toolbar button.raised,
+/* primary toolbar - generic button borders (normal state)*/
 toolbar.primary-toolbar .raised button,
 toolbar.inline-toolbar button,
-toolbar.primary-toolbar combobox button,
+toolbar.primary-toolbar combobox button.combo,
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button,
 .inline-toolbar.toolbar .button,
@@ -303,7 +281,6 @@ toolbar.primary-toolbar combobox button,
 }
 
 /* primary toolbar - focused button borders */
-toolbar.primary-toolbar button.raised.default,
 toolbar.primary-toolbar .raised button.default,
 toolbar.inline-toolbar button.default,
 .primary-toolbar .button.raised.default,
@@ -319,7 +296,7 @@ toolbar.inline-toolbar button.default,
 /* column-headers borders */
 treeview header button,
 treeview header button:active,
-treeview header button:active:hover,
+treeview header button:hover:active,
 treeview header button:checked,
 treeview header button:checked:hover,
 treeview header button:disabled,
@@ -343,7 +320,7 @@ column-header .button:disabled {
 
 treeview header button,
 treeview header button:active,
-treeview header button:active:hover,
+treeview header button:hover:active,
 treeview header button:checked,
 treeview header button:checked:hover,
 treeview header button.dnd,
@@ -386,7 +363,7 @@ column-header .button:disabled {
 
 treeview header button:last-child,
 treeview header button:active:last-child,
-treeview header button:active:hover:last-child,
+treeview header button:hover:active:last-child,
 treeview header button:checked:last-child,
 treeview header button:checked:hover:last-child,
 column-header.button:last-child,
@@ -454,43 +431,3 @@ button.destructive-action:active,
     border-color: transparent;
 }
 
-button.image-button.radio:dir(ltr) {
-    border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-    border-radius: 4px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-    border-radius: 3px;
-}
-
-button.image-button.radio.default:dir(ltr),
-button.image-button.radio:dir(ltr):focus {
-    border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-    border-radius: 4px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-}
-
-button.image-button.radio:dir(ltr):checked {
-    border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-    border-radius: 4px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-}
-
-button.image-button.radio:dir(ltr):hover,
-button.image-button.radio:dir(ltr):checked:focus,
-button.image-button.radio:dir(ltr):checked:hover,
-button.image-button.radio:dir(ltr):checked:focus:hover,
-button.image-button.radio:dir(ltr):focus:hover:active,
-button.image-button.radio:dir(ltr):checked:focus:hover:active,
-button.image-button.radio.default:dir(ltr):checked {
-    border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-    border-radius: 4px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-}
-
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 16fa9976..5e648114 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -440,14 +440,14 @@ undershoot.right {
 
 entry,
 .entry {
-	border-style: solid;
-	padding: 4px; /*4px;*/
-
-	/* border-image defined in the -assets variants */
-
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
+    border-style: solid;
+    padding: 4px; /*4px;*/
+    min-height: 20px;
+    min-width: 20px;
+    /* border-image defined in the -assets variants */
+    color: @entry_text_color;
+    background-color: @theme_base_color;
+    box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
 }
 
 entry image.left,
@@ -589,7 +589,7 @@ spinbutton button:hover {
 }
 
 spinbutton button:active,
-spinbutton button:active:hover {
+spinbutton button:hover:active {
     background-image: linear-gradient(to bottom,
                                       @button_active_gradient_color_a,
                                       @button_active_gradient_color_b);
@@ -617,7 +617,7 @@ spinbutton.horizontal entry,
 spinbutton.horizontal entry:focus,
 stack box.vertical.linked spinbutton.horizontal entry,
 stack box.vertical.linked spinbutton.horizontal entry:focus {
-    padding: 0px 10px 0px 2px;
+    padding: 5px 10px 5px 4px;
     border-image:none;
     border-style: none;
     box-shadow: inset 1px 0 @inset_dark_color;
@@ -975,9 +975,9 @@ levelbar block.empty,
 
 scale,
 .scale {
-	-GtkScale-slider-length: 16;
+/*	-GtkScale-slider-length: 16;
 	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
+	-GtkRange-trough-border: 0;*/
 }
 
 scale slider,
@@ -1163,16 +1163,34 @@ frame box.vertical scrolledwindow.frame {
 /***********
  * Buttons *
  ***********/
+
 button,
-button.menuitem.menubar,
+button menuitem menubar,
 button.color,
-combobox entry button,
+button.text-button.toggle,
+button.text-button.radio,
+button.titlebutton,
+button.image-button,
+button.flat,
+button.combo,
+button.font,
+button.file,
+button.toggle.popup,
+button.link,
+combobox,
+combobox button.combo,
 .button,
 .button.menuitem.menubar,
 GtkColorButton.button,
 GtkComboBox.combobox-entry .button {
     -gtk-icon-style: regular;
 	padding: 4px;
+    min-height: 20px;
+    min-width: 18px;
+}
+
+button.image-button.toggle.popup {
+	padding: 6px;
 }
 
 button.text-button.toggle,
@@ -1190,8 +1208,6 @@ toolbar.primary-toolbar button.image-button,
 button,
 .button {
 	transition: all 400ms ease-out;
-    min-height: 16px;
-    min-width: 16px;
 /*	-GtkButton-image-spacing: 4; deprecated, but ignored */
 /*	-GtkButton-interior-focus: true; deprecated, but ignored */
 /*	-GtkButton-default-border: 0; deprecated, but ignored */
@@ -1230,10 +1246,13 @@ button.flat:hover,
 
 button.image-button.circular-button,
 .button.image-button.circular-button {
-   border-image: none;
-   border-width: 1px;
-   border-style: solid;
-   border-color: @borders;
+    border-image: none;
+    border-width: 1px;
+    border-style: solid;
+    border-color: @borders;
+    border-radius: 50%;
+    min-height: 20px;
+    min-width: 24px;
 }
 
 /* arrows */
@@ -1250,7 +1269,6 @@ button.toggle.popup image:disabled {
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 toolbar.primary-toolbar button,
 toolbar.primary-toolbar button:disabled,
-toolbar.primary-toolbar button *:disabled,
 .primary-toolbar .button,
 .primary-toolbar .button:disabled,
 .primary-toolbar .button *:disabled {
@@ -1272,9 +1290,6 @@ toolbar.primary-toolbar button,
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-toolbar.primary-toolbar button:active,
-toolbar.inline-toolbar button:active,
-button:active,
 toolbar.primary-toolbar button:checked,
 toolbar.inline-toolbar button:checked,
 button:checked,
@@ -1289,8 +1304,7 @@ button:checked,
 }
 
 button:disabled,
-button:active *:disabled,
-button:checked *:disabled,
+button:checked:disabled,
 .button:disabled,
 .button:active *:disabled,
 .button:checked *:disabled {
@@ -1298,8 +1312,7 @@ button:checked *:disabled,
 	text-shadow: none;
 }
 
-toolbar button.raised,
-toolbar raised button,
+toolbar .raised button,
 toolbar.inline-toolbar button,
 .toolbar .button.raised,
 .toolbar .raised .button,
@@ -1308,10 +1321,6 @@ toolbar.inline-toolbar button,
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-toolbar button.raised:active,
-toolbar .raised button:active,
-toolbar.inline-toolbar button:active
-toolbar button.raised:checked,
 toolbar .raised button:checked,
 toolbar.inline-toolbar button:checked,
 .toolbar .button.raised:active,
@@ -1324,7 +1333,6 @@ toolbar.inline-toolbar button:checked,
 	text-shadow: 0 1px @button_active_text_shadow;
 }
 
-toolbar button.raised:disabled,
 toolbar .raised button:disabled,
 toolbar.inline-toolbar button:disabled,
 .toolbar .button.raised:disabled,
@@ -1372,10 +1380,10 @@ toolbar.inline-toolbar button:disabled,
 
 /* Set up shadows and hilights for button visual separation */
 .linked button,
-toolbar button.raised.linked,
+.linked combobox button.combo,
 toolbar .raised.linked button,
 toolbar.inline-toolbar button,
-toolbar.inline-toolbar GtkToolButton > button,
+toolbar.inline-toolbar toolbutton > button,
 .linked .button,
 .toolbar .button.raised.linked,
 .toolbar .raised.linked .button,
@@ -1385,10 +1393,10 @@ toolbar.inline-toolbar GtkToolButton > button,
 }
 
 .linked button:first-child,
-toolbar button.raised.linked:first-child,
+.linked combobox:first-child button.combo:first-child,
 toolbar .raised.linked button:first-child,
 toolbar.inline-toolbar button:first-child,
-toolbar.inline-toolbar GtkToolButton:first-child > button,
+toolbar.inline-toolbar toolbutton > button:first-child,
 .linked .button:first-child,
 .toolbar .button.raised.linked:first-child,
 .toolbar .raised.linked .button:first-child,
@@ -1398,10 +1406,10 @@ toolbar.inline-toolbar GtkToolButton:first-child > button,
 }
 
 .linked button:last-child,
-toolbar button.raised.linked:last-child,
+.linked combobox:last-child button.combo:last-child,
 toolbar .raised.linked button:last-child,
 toolbar.inline-toolbar button:last-child,
-toolbar.inline-toolbar GtkToolButton:last-child > button,
+toolbar.inline-toolbar toolbutton > button:last-child,
 .linked .button:last-child,
 .toolbar .button.raised.linked:last-child,
 .toolbar .raised.linked .button:last-child,
@@ -1410,16 +1418,11 @@ toolbar.inline-toolbar GtkToolButton:last-child > button,
 	box-shadow: inset 1px 0 @inset_light_color;
 }
 
-.linked button:active,
-toolbar button.raised.linked:active,
-toolbar .raised.linked button:active,
-toolbar.inline-toolbar button:active,
-toolbar.inline-toolbar GtkToolButton > button:active,
 .linked button:checked,
-toolbar button.raised.linked:checked,
+.linked combobox button.combo:checked,
 toolbar .raised.linked button:checked,
 toolbar.inline-toolbar button:checked,
-toolbar.inline-toolbar GtkToolButton > .button:checked,
+toolbar.inline-toolbar toolbutton > button:checked,
 .linked .button:active,
 .toolbar .button.raised.linked:active,
 .toolbar .raised.linked .button:active,
@@ -1434,10 +1437,10 @@ toolbar.inline-toolbar GtkToolButton > .button:checked,
 }
 
 .linked button:disabled,
-toolbar button.raised.linked:disabled,
-toolbar raised.linked button:disabled,
+.linked combobox button.combo:disabled,
+toolbar .raised.linked button:disabled,
 toolbar.inline-toolbar button:disabled,
-toolbar.inline-toolbar GtkToolButton > .button:disabled,
+toolbar.inline-toolbar toolbutton > button:disabled,
 .linked .button:disabled,
 .toolbar .button.raised.linked:disabled,
 .toolbar .raised.linked .button:disabled,
@@ -1449,12 +1452,11 @@ toolbar.inline-toolbar GtkToolButton > .button:disabled,
 /* remove box shadow from last-child and only-child */
 .linked button:disabled:last-child,
 .linked button:only-child,
-toolbar button.raised.linked:disabled:last-child,
-toolbar raised.linked button:disabled:last-child,
+toolbar .raised.linked button:disabled:last-child,
 toolbar.inline-toolbar button:disabled:last-child,
 toolbar.inline-toolbar button:only-child,
-toolbar.inline-toolbar GtkToolButton:last-child > button:disabled,
-toolbar.inline-toolbar GtkToolButton:only-child > button,
+toolbar.inline-toolbar toolbutton > button:disabled:last-child,
+toolbar.inline-toolbar toolbutton > button:only-child,
 .linked .button:disabled:last-child,
 .linked .button:only-child,
 .toolbar .button.raised.linked:disabled:last-child,
@@ -1467,26 +1469,14 @@ toolbar.inline-toolbar GtkToolButton:only-child > button,
 }
 
 /* remove inset from first-child and only-child active buttons */
-.linked button:only-child:active,
-toolbar button.raised.linked:only-child:active,
-toolbar raised.linked button:only-child:active,
-toolbar.inline-toolbar button:only-child:active,
-toolbar.inline-toolbar GtkToolButton > button:only-child:active,
-.linked button:first-child:active,
-toolbar button.raised.linked:first-child:active,
-toolbar raised.linked button:first-child:active,
-toolbar.inline-toolbar button:first-child:active,
-toolbar.inline-toolbar GtkToolButton > button:first-child:active,
 .linked button:only-child:checked,
-toolbar button.raised.linked:only-child:checked,
-toolbar raised.linked button:only-child:checked,
+toolbar .raised.linked button:only-child:checked,
 toolbar.inline-toolbar button:only-child:checked,
-toolbar.inline-toolbar GtkToolButton > button:only-child:checked,
+toolbar.inline-toolbar toolbutton > button:only-child:checked,
 .linked button:first-child:checked,
-toolbar button.raised.linked:first-child:checked,
-toolbar raised.linked button:first-child:checked,
+toolbar .raised.linked button:first-child:checked,
 toolbar.inline-toolbar button:first-child:checked,
-toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
+toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked .button:only-child:active,
 .toolbar .button.raised.linked:only-child:active,
 .toolbar .raised.linked .button:only-child:active,
@@ -1512,22 +1502,20 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 
 /* Middle button */
 .linked entry,
-.linked > combobox > button:last-child,
-.linked > combobox > button:focus:last-child,
-.linked > combobox > button:disabled:last-child,
-.linked > combobox > button:active:last-child,
-.linked > combobox > button:focus:active:last-child,
-.linked > combobox > button:checked:last-child,
-.linked > combobox > button:focus:checked:last-child,
-.linked > combobox > button:hover:last-child,
-.linked > combobox > button:active:hover:last-child,
-.linked > combobox > button:checked:hover:last-child,
+.linked > combobox > button.combo,
+.linked > combobox > button.combo:focus,
+.linked > combobox > button.combo:disabled,
+.linked > combobox > button.combo:focus:active,
+.linked > combobox > button.combo:checked,
+.linked > combobox > button.combo:focus:active,
+.linked > combobox > button.combo:hover,
+.linked > combobox > button.combo:hover:active,
+.linked > combobox > button.combo:checked:hover,
 .linked button,
-.linked button:hover, /* gtk-widget-factory middle page button */
-.linked button:active,
-.linked button:active:hover,
+.linked button:hover,
+.linked button:hover:active,
 .linked button:checked,
-.linked button:checked:checked, /* gtk-widget-factory middle page button */
+.linked button:checked:active,
 .linked button:checked:hover,
 .linked button:disabled,
 .linked .entry,
@@ -1557,19 +1545,17 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 
 /* Leftmost button */
 .linked entry:first-child,
-.linked > combobox:first-child > button:last-child,
-.linked > combobox:first-child > button:focus:last-child,
-.linked > combobox:first-child > button:disabled:last-child,
-.linked > combobox:first-child > button:active:last-child,
-.linked > combobox:first-child > button:focus:active:last-child,
-.linked > combobox:first-child > button:checked:first-child:last-child,
-.linked > combobox:first-child > button:focus:checked:first-child:last-child,
-.linked > combobox:first-child > button:hover:first-child:last-child,
-.linked > combobox:first-child > button:active:hover:last-child,
-.linked > combobox:first-child > button:checked:hover:last-child,
+.linked > combobox:first-child > button.combo:first-child,
+.linked > combobox:first-child > button.combo:focus:first-child,
+.linked > combobox:first-child > button.combo:disabled:first-child,
+.linked > combobox:first-child > button.combo:focus:active:first-child,
+.linked > combobox:first-child > button.combo:checked:first-child,
+.linked > combobox:first-child > button.combo:focus:checked:first-child,
+.linked > combobox:first-child > button.combo:hover:first-child,
+.linked > combobox:first-child > button.combo:hover:active:first-child,
+.linked > combobox:first-child > button.combo:checked:hover:first-child,
 .linked button:first-child,
-.linked button:active:first-child,
-.linked button:active:hover:first-child,
+.linked button:hover:active:first-child,
 .linked button:checked:first-child,
 .linked button:checked:hover:first-child,
 .linked button:disabled:first-child,
@@ -1599,19 +1585,17 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 
 /* Rightmost button */
 .linked entry:last-child,
-.linked > combobox:last-child > button,
-.linked > combobox:last-child > button:last-child,
-.linked > combobox:last-child > button:disabled:last-child,
-.linked > combobox:last-child > button:active:last-child,
-.linked > combobox:last-child > button:focus:active:last-child,
-.linked > combobox:last-child > button:checked:last-child,
-.linked > combobox:last-child > button:focus:checked:last-child,
-.linked > combobox:last-child > button:hover:last-child,
-.linked > combobox:last-child > button:active:hover:last-child,
-.linked > combobox:last-child > button:checked:hover:last-child,
+.linked > combobox:last-child > button.combo,
+.linked > combobox:last-child > button.combo:last-child,
+.linked > combobox:last-child > button.combo:disabled:last-child,
+.linked > combobox:last-child > button.combo:focus:active:last-child,
+.linked > combobox:last-child > button.combo:checked:last-child,
+.linked > combobox:last-child > button.combo:focus:checked:last-child,
+.linked > combobox:last-child > button.combo:hover:last-child,
+.linked > combobox:last-child > button.combo:hover:active:last-child,
+.linked > combobox:last-child > button.combo:checked:hover:last-child,
 .linked button:last-child,
-.linked button:active:last-child,
-.linked button:active:hover:last-child,
+.linked button:hover:active:last-child,
 .linked button:checked:last-child,
 .linked button:checked:hover:last-child,
 .linked button:disabled:last-child,
@@ -1641,19 +1625,17 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 
 /* Linked single button */
 .linked entry:only-child,
-.linked > combobox:only-child > button,
-.linked > combobox:only-child > button:only-child,
-.linked > combobox:only-child > button:disabled:only-child,
-.linked > combobox:only-child > button:hover:only-child,
-.linked > combobox:only-child > button:active:only-child,
-.linked > combobox:only-child > button:active:hover:only-child,
-.linked > combobox:only-child > button:focus:active:only-child,
-.linked > combobox:only-child > button:checked:only-child,
-.linked > combobox:only-child > button:checked:hover:only-child,
-.linked > combobox:only-child > button:focus:checked:only-child,
+.linked > combobox:only-child > button.combo,
+.linked > combobox:only-child > button.combo:only-child,
+.linked > combobox:only-child > button.combo:disabled:only-child,
+.linked > combobox:only-child > button.combo:hover:only-child,
+.linked > combobox:only-child > button.combo:hover:active:only-child,
+.linked > combobox:only-child > button.combo:focus:active:only-child,
+.linked > combobox:only-child > button.combo:checked:only-child,
+.linked > combobox:only-child > button.combo:checked:hover:only-child,
+.linked > combobox:only-child > button.combo:focus:checked:only-child,
 .linked button:only-child,
-.linked button:active:only-child,
-.linked button:active:hover:only-child,
+.linked button:hover:active:only-child,
 .linked button:checked:only-child,
 .linked button:checked:hover:only-child,
 .linked button:disabled:only-child,
@@ -1681,20 +1663,18 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 }
 
 /* Middle button (vertical) */
-.linked.vertical > combobox > button:last-child,
-.linked.vertical > combobox > button:focus:last-child,
-.linked.vertical > combobox > button:disabled:last-child,
-.linked.vertical > combobox > button:active:last-child,
-.linked.vertical > combobox > button:focus:active:last-child,
-.linked.vertical > combobox > button:checked:last-child,
-.linked.vertical > combobox > button:focus:checked:last-child,
-.linked.vertical > combobox > button:hover:last-child,
-.linked.vertical > combobox > button:active:hover:last-child,
-.linked.vertical > combobox > button:checked:hover:last-child,
+.linked.vertical > combobox > button.combo,
+.linked.vertical > combobox > button.combo:focus,
+.linked.vertical > combobox > button.combo:disabled,
+.linked.vertical > combobox > button.combo:focus:active,
+.linked.vertical > combobox > button.combo:checked,
+.linked.vertical > combobox > button.combo:focus:checked,
+.linked.vertical > combobox > button.combo:hover,
+.linked.vertical > combobox > button.combo:hover:active,
+.linked.vertical > combobox > button.combo:checked:hover,
 .linked.vertical entry,
 .linked.vertical button,
-.linked.vertical button:active,
-.linked.vertical button:active:hover,
+.linked.vertical button:hover:active,
 .linked.vertical button:checked,
 .linked.vertical button:checked:hover,
 .linked.vertical button:disabled,
@@ -1724,20 +1704,18 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 }
 
 /* Top button (vertical) */
-.linked.vertical > combobox:first-child > button:last-child,
-.linked.vertical > combobox:first-child > button:focus:last-child,
-.linked.vertical > combobox:first-child > button:disabled:last-child,
-.linked.vertical > combobox:first-child > button:active:last-child,
-.linked.vertical > combobox:first-child > button:focus:active:last-child,
-.linked.vertical > combobox:first-child > button:checked:first-child:last-child,
-.linked.vertical > combobox:first-child > button:focus:checked:first-child:last-child,
-.linked.vertical > combobox:first-child > button:hover:first-child:last-child,
-.linked.vertical > combobox:first-child > button:active:hover:last-child,
-.linked.vertical > combobox:first-child > button:checked:hover:last-child,
+.linked.vertical > combobox:first-child > button.combo:first-child,
+.linked.vertical > combobox:first-child > button.combo:focus:first-child,
+.linked.vertical > combobox:first-child > button.combo:disabled:first-child,
+.linked.vertical > combobox:first-child > button.combo:focus:active:first-child,
+.linked.vertical > combobox:first-child > button.combo:checked:first-child,
+.linked.vertical > combobox:first-child > button.combo:focus:checked:first-child,
+.linked.vertical > combobox:first-child > button.combo:hover:first-child:first-child,
+.linked.vertical > combobox:first-child > button.combo:hover:active:first-child,
+.linked.vertical > combobox:first-child > button.combo:checked:hover:first-child,
 .linked.vertical entry:first-child,
 .linked.vertical button:first-child,
-.linked.vertical button:active:first-child,
-.linked.vertical button:active:hover:first-child,
+.linked.vertical button:hover:active:first-child,
 .linked.vertical button:checked:first-child,
 .linked.vertical button:checked:hover:first-child,
 .linked.vertical button:disabled:first-child,
@@ -1767,20 +1745,18 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 }
 
 /* Bottom button (vertical) */
-.linked.vertical > combobox:last-child > button,
-.linked.vertical > combobox:last-child > button:last-child,
-.linked.vertical > combobox:last-child > button:disabled:last-child,
-.linked.vertical > combobox:last-child > button:active:last-child,
-.linked.vertical > combobox:last-child > button:focus:active:last-child,
-.linked.vertical > combobox:last-child > button:checked:last-child,
-.linked.vertical > combobox:last-child > button:focus:checked:last-child,
-.linked.vertical > combobox:last-child > button:hover:last-child,
-.linked.vertical > combobox:last-child > button:active:hover:last-child,
-.linked.vertical > combobox:last-child > button:checked:hover:last-child,
+.linked.vertical > combobox:last-child > button.combo,
+.linked.vertical > combobox:last-child > button.combo:last-child,
+.linked.vertical > combobox:last-child > button.combo:disabled:last-child,
+.linked.vertical > combobox:last-child > button.combo:focus:active:last-child,
+.linked.vertical > combobox:last-child > button.combo:checked:last-child,
+.linked.vertical > combobox:last-child > button.combo:focus:checked:last-child,
+.linked.vertical > combobox:last-child > button.combo:hover:last-child,
+.linked.vertical > combobox:last-child > button.combo:hover:active:last-child,
+.linked.vertical > combobox:last-child > button.combo:checked:hover:last-child,
 .linked.vertical entry:last-child,
 .linked.vertical button:last-child,
-.linked.vertical button:active:last-child,
-.linked.vertical button:active:hover:last-child,
+.linked.vertical button:hover:active:last-child,
 .linked.vertical button:checked:last-child,
 .linked.vertical button:checked:hover:last-child,
 .linked.vertical button:disabled:last-child,
@@ -1810,20 +1786,18 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 }
 
 /* Linked single button (vertical) */
-.linked.vertical > combobox:only-child > button,
-.linked.vertical > combobox:only-child > button:only-child,
-.linked.vertical > combobox:only-child > button:disabled:only-child,
-.linked.vertical > combobox:only-child > button:hover:only-child,
-.linked.vertical > combobox:only-child > button:active:only-child,
-.linked.vertical > combobox:only-child > button:active:hover:only-child,
-.linked.vertical > combobox:only-child > button:focus:active:only-child,
-.linked.vertical > combobox:only-child > button:checked:only-child,
-.linked.vertical > combobox:only-child > button:checked:hover:only-child,
-.linked.vertical > combobox:only-child > button:focus:checked:only-child,
+.linked.vertical > combobox:only-child > button.combo,
+.linked.vertical > combobox:only-child > button.combo:only-child,
+.linked.vertical > combobox:only-child > button.combo:disabled:only-child,
+.linked.vertical > combobox:only-child > button.combo:hover:only-child,
+.linked.vertical > combobox:only-child > button.combo:hover:active:only-child,
+.linked.vertical > combobox:only-child > button.combo:focus:active:only-child,
+.linked.vertical > combobox:only-child > button.combo:checked:only-child,
+.linked.vertical > combobox:only-child > button.combo:checked:hover:only-child,
+.linked.vertical > combobox:only-child > button.combo:focus:checked:only-child,
 .linked.vertical entry:only-child,
 .linked.vertical button:only-child,
-.linked.vertical button:active:only-child,
-.linked.vertical button:active:hover:only-child,
+.linked.vertical button:hover:active:only-child,
 .linked.vertical button:checked:only-child,
 .linked.vertical button:checked:hover:only-child,
 .linked.vertical button:disabled:only-child,
@@ -1852,7 +1826,7 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 /* Linked button shadows (vertical) */
 .linked.vertical button,
 toolbar.inline-toolbar.vertical button,
-toolbar.inline-toolbar.vertical GtkToolButton > button,
+toolbar.inline-toolbar.vertical toolbutton > button,
 .linked.vertical .button,
 .inline-toolbar.toolbar.vertical .button,
 .inline-toolbar.toolbar.vertical GtkToolButton > .button {
@@ -1861,7 +1835,7 @@ toolbar.inline-toolbar.vertical GtkToolButton > button,
 
 .linked.vertical button:first-child,
 toolbar.inline-toolbar.vertical button:first-child,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button,
+toolbar.inline-toolbar.vertical toolbutton > button:first-child,
 .linked.vertical .button:first-child,
 .inline-toolbar.toolbar.vertical .button:first-child,
 .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
@@ -1870,19 +1844,16 @@ toolbar.inline-toolbar.vertical GtkToolButton:first-child > button,
 
 .linked.vertical button:last-child,
 toolbar.inline-toolbar.vertical button:last-child,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button,
+toolbar.inline-toolbar.vertical toolbutton > button:last-child,
 .linked.vertical .button:last-child,
 .inline-toolbar.toolbar.vertical .button:last-child,
 .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
 	box-shadow: inset 0 -1px @inset_light_color;
 }
 
-.linked.vertical button:active,
 .linked.vertical button:checked,
-toolbar.inline-toolbar.vertical button:active,
 toolbar.inline-toolbar.vertical button:checked,
-toolbar.inline-toolbar.vertical GtkToolButton > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton > button:checked,
+toolbar.inline-toolbar.vertical toolbutton > button:checked,
 .linked.vertical .button:active,
 .linked.vertical .button:checked,
 .inline-toolbar.toolbar.vertical .button:active,
@@ -1894,7 +1865,7 @@ toolbar.inline-toolbar.vertical GtkToolButton > button:checked,
 
 .linked.vertical button:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
-toolbar.inline-toolbar.vertical GtkToolButton > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled,
 .linked.vertical .button:disabled,
 .inline-toolbar.toolbar.vertical .button:disabled,
 .inline-toolbar.toolbar.vertical GtkToolButton > .button:disabled {
@@ -1905,8 +1876,8 @@ toolbar.inline-toolbar.vertical GtkToolButton > button:disabled,
 .linked.vertical button:disabled:last-child,
 toolbar.inline-toolbar.vertical button:disabled:last-child,
 toolbar.inline-toolbar.vertical button:only-child,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:disabled,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled:last-child,
+toolbar.inline-toolbar.vertical toolbutton > button:only-child,
 .linked.vertical .button:only-child,
 .linked.vertical .button:disabled:last-child,
 .inline-toolbar.toolbar.vertical .button:disabled:last-child,
@@ -1917,11 +1888,10 @@ toolbar.inline-toolbar.vertical GtkToolButton:only-child > button,
 }
 
 /* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-toolbar GtkMenuButton.menu-button.raised.linked:active,
-toolbar .raised.linked GtkMenuButton.menu-button:active,
-toolbar.inline-toolbar GtkMenuButton.menu-button:active,
-toolbar.inline-toolbar GtkToolButton > GtkMenuButton.menu-button:active,
+.linked .menuitem.button:checked,
+toolbar .raised.linked .menuitem.button:checked,
+toolbar.inline-toolbar .menuitem.button:checked,
+toolbar.inline-toolbar toolbutton > .menuitem.button:checked,
 .linked GtkMenuButton.menu-button:active,
 .toolbar GtkMenuButton.menu-button.raised.linked:active,
 .toolbar .raised.linked GtkMenuButton.menu-button:active,
@@ -1933,23 +1903,19 @@ toolbar.inline-toolbar GtkToolButton > GtkMenuButton.menu-button:active,
 /* Linked buttons on primary toolbars */
 
 /* Middle button */
-toolbar.primary-toolbar button.raised.linked,
-toolbar.primary-toolbar button.raised.linked:active,
-toolbar.primary-toolbar button.raised.linked:checked,
-toolbar.primary-toolbar button.raised.linked:disabled,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:checked,
+toolbar.primary-toolbar .raised.linked button:disabled,
 toolbar.primary-toolbar .linked entry,
 toolbar.primary-toolbar .linked button,
-toolbar.primary-toolbar .linked button:active,
 toolbar.primary-toolbar .linked button:checked,
 toolbar.primary-toolbar .linked button:disabled,
 toolbar.inline-toolbar button,
-toolbar.inline-toolbar button:active,
 toolbar.inline-toolbar button:checked,
 toolbar.inline-toolbar button:disabled,
-toolbar.inline-toolbar GtkToolButton > button,
-toolbar.inline-toolbar GtkToolButton > button:active,
-toolbar.inline-toolbar GtkToolButton > button:checked,
-toolbar.inline-toolbar GtkToolButton > button:disabled,
+toolbar.inline-toolbar toolbutton > button,
+toolbar.inline-toolbar toolbutton > button:checked,
+toolbar.inline-toolbar toolbutton > button:disabled,
 .primary-toolbar .button.raised.linked,
 .primary-toolbar .button.raised.linked:active,
 .primary-toolbar .button.raised.linked:checked,
@@ -1974,23 +1940,19 @@ toolbar.inline-toolbar GtkToolButton > button:disabled,
 }
 
 /* Leftmost button */
-toolbar.primary-toolbar button.raised.linked:first-child,
-toolbar.primary-toolbar button.raised.linked:active:first-child,
-toolbar.primary-toolbar button.raised.linked:checked:first-child,
-toolbar.primary-toolbar button.raised.linked:disabled:first-child,
+toolbar.primary-toolbar .raised.linked button:first-child,
+toolbar.primary-toolbar .raised.linked button:checked:first-child,
+toolbar.primary-toolbar .raised.linked button:disabled:first-child,
 toolbar.primary-toolbar .linked entry:first-child,
 toolbar.primary-toolbar .linked button:first-child,
-toolbar.primary-toolbar .linked button:active:first-child,
 toolbar.primary-toolbar .linked button:checked:first-child,
 toolbar.primary-toolbar .linked button:disabled:first-child,
 toolbar.inline-toolbar button:first-child,
-toolbar.inline-toolbar button:active:first-child,
 toolbar.inline-toolbar button:checked:first-child,
 toolbar.inline-toolbar button:disabled:first-child,
-toolbar.inline-toolbar GtkToolButton:first-child > button,
-toolbar.inline-toolbar GtkToolButton:first-child > button:active,
-toolbar.inline-toolbar GtkToolButton:first-child > button:checked,
-toolbar.inline-toolbar GtkToolButton:first-child > button:disabled,
+toolbar.inline-toolbar toolbutton > button:first-child,
+toolbar.inline-toolbar toolbutton > button:checked:first-child,
+toolbar.inline-toolbar toolbutton > button:disabled:first-child,
 .primary-toolbar .button.raised.linked:first-child,
 .primary-toolbar .button.raised.linked:active:first-child,
 .primary-toolbar .button.raised.linked:checked:first-child,
@@ -2016,23 +1978,19 @@ toolbar.inline-toolbar GtkToolButton:first-child > button:disabled,
 }
 
 /* Rightmost button */
-toolbar.primary-toolbar button.raised.linked:last-child,
-toolbar.primary-toolbar button.raised.linked:active:last-child,
-toolbar.primary-toolbar button.raised.linked:checked:last-child,
-toolbar.primary-toolbar button.raised.linked:disabled:last-child,
+toolbar.primary-toolbar .raised.linked button:last-child,
+toolbar.primary-toolbar .raised.linked button:checked:last-child,
+toolbar.primary-toolbar .raised.linked button:disabled:last-child,
 toolbar.primary-toolbar .linked entry:last-child,
 toolbar.primary-toolbar .linked button:last-child,
-toolbar.primary-toolbar .linked button:active:last-child,
 toolbar.primary-toolbar .linked button:checked:last-child,
 toolbar.primary-toolbar .linked button:disabled:last-child,
 toolbar.inline-toolbar button:last-child,
-toolbar.inline-toolbar button:active:last-child,
 toolbar.inline-toolbar button:checked:last-child,
 toolbar.inline-toolbar button:disabled:last-child,
-toolbar.inline-toolbar GtkToolButton:last-child > button,
-toolbar.inline-toolbar GtkToolButton:last-child > button:active,
-toolbar.inline-toolbar GtkToolButton:last-child > button:checked,
-toolbar.inline-toolbar GtkToolButton:last-child > button:disabled,
+toolbar.inline-toolbar toolbutton > button:last-child,
+toolbar.inline-toolbar toolbutton > button:checked:last-child,
+toolbar.inline-toolbar toolbutton > button:disabled:last-child,
 .primary-toolbar .button.raised.linked:last-child,
 .primary-toolbar .button.raised.linked:active:last-child,
 .primary-toolbar .button.raised.linked:checked:last-child,
@@ -2060,13 +2018,11 @@ toolbar.inline-toolbar GtkToolButton:last-child > button:disabled,
 
 /* Single button */
 toolbar.inline-toolbar button:only-child,
-toolbar.inline-toolbar button:active:only-child,
 toolbar.inline-toolbar button:checked:only-child,
 toolbar.inline-toolbar button:disabled:only-child,
-toolbar.inline-toolbar GtkToolButton:only-child > button,
-toolbar.inline-toolbar GtkToolButton:only-child > button:active,
-toolbar.inline-toolbar GtkToolButton:only-child > button:checked,
-toolbar.inline-toolbar GtkToolButton:only-child > button:disabled,
+toolbar.inline-toolbar toolbutton > button:only-child,
+toolbar.inline-toolbar toolbutton > button:checked:only-child,
+toolbar.inline-toolbar toolbutton > button:disabled:only-child,
 .inline-toolbar.toolbar .button:only-child,
 .inline-toolbar.toolbar .button:active:only-child,
 .inline-toolbar.toolbar .button:checked:only-child,
@@ -2084,7 +2040,6 @@ toolbar.inline-toolbar GtkToolButton:only-child > button:disabled,
 /* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
  * has a box inside to pack the button and the actual menu */
 toolbar.inline-toolbar GtkMenuToolButton button:first-child,
-toolbar.inline-toolbar GtkMenuToolButton button:active:first-child,
 toolbar.inline-toolbar GtkMenuToolButton button:checked:first-child,
 toolbar.inline-toolbar GtkMenuToolButton button:disabled:first-child,
 toolbar.inline-toolbar GtkMenuToolButton button:last-child,
@@ -2106,7 +2061,6 @@ toolbar.inline-toolbar.toolbar GtkMenuToolButton button:disabled:last-child,
 }
 
 toolbar.inline-toolbar GtkMenuToolButton:first-child button:first-child,
-toolbar.inline-toolbar GtkMenuToolButton:first-child button:active:first-child,
 toolbar.inline-toolbar GtkMenuToolButton:first-child button:checked:first-child,
 toolbar.inline-toolbar GtkMenuToolButton:first-child button:disabled:first-child,
 .inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
@@ -2121,7 +2075,6 @@ toolbar.inline-toolbar GtkMenuToolButton:first-child button:disabled:first-child
 }
 
 toolbar.inline-toolbar GtkMenuToolButton:last-child button:last-child,
-toolbar.inline-toolbar GtkMenuToolButton:last-child button:active:last-child,
 toolbar.inline-toolbar GtkMenuToolButton:last-child button:checked:last-child,
 toolbar.inline-toolbar GtkMenuToolButton:last-child button:disabled:last-child,
 .inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
@@ -2139,13 +2092,11 @@ toolbar.inline-toolbar GtkMenuToolButton:last-child button:disabled:last-child,
 
 /* Middle button */
 toolbar.inline-toolbar.vertical button,
-toolbar.inline-toolbar.vertical button:active,
 toolbar.inline-toolbar.vertical button:checked,
 toolbar.inline-toolbar.vertical button:disabled,
-toolbar.inline-toolbar.vertical GtkToolButton > button,
-toolbar.inline-toolbar.vertical GtkToolButton > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton > button:checked,
-toolbar.inline-toolbar.toolbar.vertical GtkToolButton > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button,
+toolbar.inline-toolbar.vertical toolbutton > button:checked,
+toolbar.inline-toolbar.toolbar.vertical toolbutton > button:disabled,
 .inline-toolbar.toolbar.vertical .button,
 .inline-toolbar.toolbar.vertical .button:active,
 .inline-toolbar.toolbar.vertical .button:checked,
@@ -2162,13 +2113,11 @@ toolbar.inline-toolbar.toolbar.vertical GtkToolButton > button:disabled,
 
 /* Topmost button */
 toolbar.inline-toolbar.vertical button:first-child,
-toolbar.inline-toolbar.vertical button:active:first-child,
 toolbar.inline-toolbar.vertical button:checked:first-child,
 toolbar.inline-toolbar.vertical button:disabled:first-child,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:checked,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button:first-child,
+toolbar.inline-toolbar.vertical toolbutton > button:checked:first-child,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled:first-child,
 .inline-toolbar.toolbar.vertical .button:first-child,
 .inline-toolbar.toolbar.vertical .button:active:first-child,
 .inline-toolbar.toolbar.vertical .button:checked:first-child,
@@ -2185,13 +2134,11 @@ toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:disabled,
 
 /* Bottommost button */
 toolbar.inline-toolbar.vertical button:last-child,
-toolbar.inline-toolbar.vertical button:active:last-child,
 toolbar.inline-toolbar.vertical button:checked:last-child,
 toolbar.inline-toolbar.vertical button:disabled:last-child,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:checked,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button:last-child,
+toolbar.inline-toolbar.vertical toolbutton > button:checked:last-child,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled:last-child,
 .inline-toolbar.toolbar.vertical .button:last-child,
 .inline-toolbar.toolbar.vertical .button:active:last-child,
 .inline-toolbar.toolbar.vertical .button:checked:last-child,
@@ -2208,13 +2155,11 @@ toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:disabled,
 
 /* Single button */
 toolbar.inline-toolbar.vertical button:only-child,
-toolbar.inline-toolbar.vertical button:active:only-child,
 toolbar.inline-toolbar.vertical button:checked:only-child,
 toolbar.inline-toolbar.vertical button:disabled:only-child,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:checked,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button:only-child,
+toolbar.inline-toolbar.vertical toolbutton > button:checked:only-child,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled:only-child,
 .inline-toolbar.toolbar.vertical .button:only-child,
 .inline-toolbar.toolbar.vertical .button:active:only-child,
 .inline-toolbar.toolbar.vertical .button:checked:only-child,
@@ -2235,10 +2180,9 @@ toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:disabled,
 }
 
 button.flat.link.text-button,
-GtkLinkButton.button,
-GtkLinkButton.button:hover,
-GtkLinkButton.button:active,
-GtkLinkButton.button:active:hover {
+button.link,
+button.link:hover,
+button.link:hover:active {
     transition: all 400ms ease-in;
     text-shadow: none;
 }
@@ -2331,7 +2275,6 @@ stackswitcher > button.needs-attention:checked > image,
 stackswitcher  > button:dir(ltr).text-button.radio,
 stackswitcher  > button:dir(ltr).text-button.radio:hover,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:active,
-stackswitcher  > button:dir(ltr).text-button.radio:active,
 stackswitcher  > button:dir(ltr).text-button.radio:checked,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active  {
@@ -2346,7 +2289,6 @@ stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active  {
 stackswitcher  > button:dir(ltr).text-button.radio:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:active:first-child,
-stackswitcher  > button:dir(ltr).text-button.radio:active:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:first-child {
@@ -2358,7 +2300,6 @@ stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:first-ch
 stackswitcher  > button:dir(ltr).text-button.radio:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:active:last-child,
-stackswitcher  > button:dir(ltr).text-button.radio:active:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:last-child {
@@ -2367,6 +2308,28 @@ stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:last-chi
     border-radius: 0px 3px 3px 0px;
 }
 
+/* stack */
+stack > box.linked.vertical > combobox:first-child > button.combo:first-child,
+stack > box.linked.vertical > combobox:first-child > button.combo:checked:first-child,
+stack > box.linked.vertical > combobox:first-child > button.combo:focus:first-child,
+stack > box.linked.vertical > combobox:first-child > button.combo:focus:hover:first-child {
+    border-image: none;
+    border-style: solid;
+    border-color: @borders;
+    border-width: 1px;
+}
+
+stack > box.linked.vertical > button.text-button:last-child {
+    border-image: none;
+    border-style: solid;
+    border-color: @borders;
+    border-width: 0px 1px 1px 1px;
+}
+
+stack box.vertical.linked spinbutton.horizontal {
+    border-width: 0px 1px 1px 1px;
+}
+
 /*****************
  * Notebooks and *
  * tabs          *
@@ -2511,13 +2474,13 @@ notebook.frame header.bottom tab,
 }
 
 /* workaround for wtf */
-.notebook tab.bottom:active {
+.notebook tab.bottom:checked {
     padding: 3px 21px 7px 21px;
 }
 
-notebook header.top tab:active,
-notebook header.top tab:active:hover,
-.notebook tab.top:active,
+notebook header.top tab:checked,
+notebook header.top tab:hover:active,
+.notebook tab.top:checked,
 .notebook tab.top:active:hover {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.18),
@@ -2540,8 +2503,8 @@ notebook header.top tab:hover,
     border-color: @borders;
 }
 
-notebook header.bottom tab:active,
-notebook header.bottom tab:active:hover,
+notebook header.bottom tab:checked,
+notebook header.bottom tab:hover:active,
 .notebook tab.bottom:active,
 .notebook tab.bottom:active:hover {
     background-image: linear-gradient(to top,
@@ -2584,8 +2547,8 @@ notebook header.right tab {
     border-width: 1px 1px 1px 0px;
 }
 
-notebook header.left tab:active,
-notebook header.left tab:active:hover,
+notebook header.left tab:checked,
+notebook header.left tab:hover:active,
 .notebook tab.left:active,
 .notebook tab.left:active:hover {
     background-image: linear-gradient(to right,
@@ -2606,8 +2569,8 @@ notebook header.left tab:hover,
     border-color: @borders;
 }
 
-notebook header.right tab:active,
-notebook header.right tab:active:hover,
+notebook header.right tab:checked,
+notebook header.right tab:hover:active,
 .notebook tab.right:active,
 .notebook tab.right:active:hover {
     background-image: linear-gradient(to left,
@@ -2638,7 +2601,7 @@ notebook tab.reorderable-page:hover,
     border-style: none;
 }
 
-notebook tab.reorderable-page:active,
+notebook tab.reorderable-page:checked,
 .notebook tab.reorderable-page:active {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.18),
@@ -2684,10 +2647,10 @@ notebook button.flat.small-button:hover,
     background-color: transparent;
 }
 
-notebook button.flat:active,
-notebook button.flat:active:hover,
-notebook button.flat.small-button:active,
-notebook button.flat.small-button:active:hover,
+notebook button.flat:checked,
+notebook button.flat:hover:checked,
+notebook button.flat.small-button:checked,
+notebook button.flat.small-button:hover:active,
 .notebook tab .button:active,
 .notebook tab .button:active:hover {
     color:  @button_active_text;
@@ -2833,8 +2796,8 @@ GtkComboBox.combobox-entry .entry:focus:last-child {
 }
 
 combobox entry button:last-child,
-combobox entry  button:hover:last-child,
-combobox entry button:active:last-child,
+combobox entry button:hover:last-child,
+combobox entry button:checked:last-child,
 combobox entry button:hover:active:last-child,
 GtkComboBox.combobox-entry .button:last-child,
 GtkComboBox.combobox-entry .button:hover:last-child,
@@ -2847,7 +2810,7 @@ GtkComboBox.combobox-entry .button:hover:active:last-child {
 
 combobox entry button:first-child,
 combobox entry button:hover:first-child,
-combobox entry button:active:first-child,
+combobox entry button:checked:first-child,
 combobox entry button:hover:active:first-child,
 GtkComboBox.combobox-entry .button:first-child,
 GtkComboBox.combobox-entry .button:hover:first-child,
@@ -2869,8 +2832,8 @@ GtkComboBox.combobox-entry .button:disabled:last-child {
 }
 
 combobox entry button:hover,
-combobox entry button:active,
-combobox entry button:active:hover,
+combobox entry button:checked,
+combobox entry button:hover:active,
 GtkComboBox.combobox-entry .button:hover,
 GtkComboBox.combobox-entry .button:active,
 GtkComboBox.combobox-entry .button:active:hover {
@@ -2878,7 +2841,7 @@ GtkComboBox.combobox-entry .button:active:hover {
     transition: all 200ms ease-in;
 }
 
-combobox button,
+combobox button.combo,
 GtkComboBox .button {
     color: @theme_fg_color;
 }
@@ -3179,6 +3142,7 @@ scrolledwindow junction,
 /*********
  * Menus *
  *********/
+
 /* combobox menus */
 treemenu menu,
 GtkTreeMenu.menu {
@@ -3205,7 +3169,6 @@ GtkTreeMenu .menuitem,
 	text-shadow: none;
 }
 
-context-menu,
 .context-menu {
 	font: initial;
 	text-shadow: none;
@@ -3258,6 +3221,7 @@ menubar,
 
 menubar menuitem,
 .menubar .menuitem {
+    min-height: 22px;
 	transition: all 200ms ease-out;
 	-gtk-icon-style: regular;
 	border-style: none;
@@ -3279,6 +3243,7 @@ menubar menuitem:hover,
 
 menu menuitem,
 .menu .menuitem {
+    min-height: 22px;
     background-color: transparent;
 /*    -GtkMenuItem-arrow-scaling: 0.6; deprecated */
     transition: all 150ms ease-out;
@@ -3450,12 +3415,12 @@ menuitem radio:checked:disabled,
 /***************
  * Menu Button *
  ***************/
-toolbar GtkMenuButton menu-button:active,
-toolbar GtkMenuButton menu-button.raised:active,
-menu-button:active,
-.linked menu-button:active,
-toolbar .linked.raised menu-button:active,
-toolbar menu-button.linked.raised:active,
+
+toolbar .menuitem.button:selected,
+toolbar .raised .menuitem.button:selected,
+.menuitem.button:selected,
+.linked .menuitem.button:selected,
+toolbar .linked.raised .menuitem.button:selected,
 .toolbar GtkMenuButton.menu-button:active,
 .toolbar GtkMenuButton.menu-button.raised:active,
 GtkMenuButton.menu-button:active,
@@ -3470,10 +3435,9 @@ GtkMenuButton.menu-button:active,
 	color: @theme_text_color;*/
 }
 
-menu-button:active,
-.linked menu-button:active,
-.toolbar .linked.raised menu-button:active,
-toolbar menu-button.linked.raised:active,
+.menuitem.button:selected,
+.linked .menuitem.button:selected,
+toolbar .linked.raised .menuitem.button:selected,
 GtkMenuButton.menu-button:active,
 .linked GtkMenuButton.menu-button:active,
 .toolbar .linked.raised GtkMenuButton.menu-button:active,
@@ -3483,25 +3447,23 @@ GtkMenuButton.menu-button:active,
 	box-shadow: none;
 }
 
-.linked menu-button:active:last-child,
-toolbar .linked.raised menu-button:active:last-child,
-toolbar menu-button.linked.raised:active:last-child,
+.linked .menuitem.button:selected:last-child,
+toolbar .linked.raised .menuitem.button:selected:last-child,
 .linked GtkMenuButton.menu-button:active:last-child,
 .toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
 .toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
 	border-top-left-radius: 0;
 }
 
-.linked menu-button:active:first-child,
-toolbar .linked.raised menu-button:active:first-child,
-toolbar menu-button.linked.raised:active:first-child,
+.linked .menuitem.button:selected:first-child,
+toolbar .linked.raised .menuitem.button:selected:first-child,
 .linked GtkMenuButton.menu-button:active:first-child,
 .toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
 .toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
 	border-top-right-radius: 0;
 }
 
-button menuitem menubar:active,
+menubar menuitem button:selected,
 .button.menuitem.menubar:active {
 	background-image: none;
 	background-color: @menu_bg_color;
@@ -3513,16 +3475,16 @@ button menuitem menubar:active,
 	border-style: solid;
 }
 
-button menuitem menubar:active,
-menu-button:active,
-toolbar menu-button:active,
+menubar menuitem button:selected,
+.menuitem.button:selected,
+toolbar .menuitem.button:selected,
 .button.menuitem.menubar:active,
 GtkMenuButton.menu-button:active,
 .toolbar GtkMenuButton.menu-button:active {
 	color: @theme_text_color;
 }
 
-menu-button menu,
+menu .menuitem.button,
 GtkMenuButton .menu {
 	text-shadow: none;
 }
@@ -3534,11 +3496,7 @@ GtkMenuButton .menu {
 check,
 radio,
 check:disabled,
-radio:disabled,
-.check,
-.radio,
-.check:disabled,
-.radio:disabled {
+radio:disabled {
 	background-color: transparent;
 	border-style: none;
 }
@@ -3549,22 +3507,15 @@ radio {
 }
 
 checkbutton:hover,
-checkbutton:active:hover,
+checkbutton:hover:active,
 checkbutton:selected,
 checkbutton:selected:focus,
-checkbutton:disabled,
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:disabled {
+checkbutton:disabled {
 	background-color: transparent;
 }
 
 checkbutton.text-button,
-radiobutton.text-button,
-GtkCheckButton.text-button,
-GtkRadioButton.text-button {
+radiobutton.text-button {
 	padding: 1px 2px 4px;
 	outline-offset: 0; 
 }
@@ -3657,6 +3608,7 @@ headerbar .subtitle,
 /***************
  * Action bars *
  ***************/
+
 actionbar,
 .action-bar {
 	border-width: 1px 0 0;
@@ -3671,12 +3623,12 @@ actionbar,
 	padding: 6px 6px 5px 6px;
 }
 
-actionbar .button.text-button,
+actionbar button.text-button,
 .action-bar .button.text-button {
 	padding: 2px 16px;
 }
 
-actionbar .button.image-button,
+actionbar button.image-button,
 .action-bar .button.image-button {
 	padding: 5px 5px 4px 5px;
 }
@@ -3708,7 +3660,7 @@ GtkMessageDialog {
 }
 
 /* ie. mate-keyboard-properties option window */
-GtkDialog scrolledwindow,
+dialog scrolledwindow,
 GtkDialog GtkScrolledWindow.frame {
     border-color: @borders;
     border-style: solid;
@@ -3716,13 +3668,13 @@ GtkDialog GtkScrolledWindow.frame {
     border-radius: 2px;
 }
 
-GtkDialog scrolledwindow viewport .vertical,
+dialog scrolledwindow viewport .vertical,
 GtkDialog GtkScrolledWindow.frame GtkViewport .vertical {
     background-color: shade (@theme_bg_color, 1.07);
 }
 
-GtkDialog scrolledwindow viewport .vertical, GtkExpander .vertical.
-GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
+dialog scrolledwindow viewport .vertical expander .vertical.
+GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
     background-color: @theme_base_color;
     border-radius: 3px;
     border-color: @borders;
@@ -3732,8 +3684,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 
 /* middle buttons */
 .dialog-action-area.linked button,
-.dialog-action-area.linked button:active,
-.dialog-action-area.linked button:active:hover,
+.dialog-action-area.linked button:hover:active,
 .dialog-action-area.linked button:checked,
 .dialog-action-area.linked button:checked:hover,
 .dialog-action-area.linked button:disabled,
@@ -3746,14 +3697,12 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 	border-style: solid;
 	border-radius: 0;
     border-width: 1px;
-/*    border-right-width: 0px;
-    border-left-width:  0px;*/
+    border-left-width:  0px;
 	border-color: @borders;
 	border-image: none;
 }
 
 .dialog-action-area.linked button.default,
-.dialog-action-area.linked button.default:active,
 .dialog-action-area.linked button.default:checked,
 .dialog-action-area.linked button.default:disabled,
 .dialog-action-area.linked button:focus,
@@ -3765,16 +3714,13 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 	border-style: solid;
 	border-radius: 0;
     border-width: 1px;
-/*    border-right-width: 0px;
-    border-left-width:  0px;*/
+    border-left-width:  0px;
 	border-color: @theme_selected_bg_color;
-/*	-GtkWidget-focus-line-width: 0; */
 }
 
 /* left button */
 .dialog-action-area.linked button:first-child,
-.dialog-action-area.linked button:active:first-child,
-.dialog-action-area.linked button:active:hover:first-child,
+.dialog-action-area.linked button:hover:active:first-child,
 .dialog-action-area.linked button:checked:first-child,
 .dialog-action-area.linked button:checked:hover:first-child,
 .dialog-action-area.linked button:disabled:first-child,
@@ -3786,14 +3732,12 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 .dialog-action-area.linked .button:disabled:first-child {
 	border-style: solid;
     border-width: 1px;
-/*    border-right-width: 0;*/
 	border-radius: 3px 0 0px 3px;
 	border-color: @borders;
 	border-image: none;
 }
 
 .dialog-action-area.linked button.default:first-child,
-.dialog-action-area.linked button.default:active:first-child,
 .dialog-action-area.linked button.default:checked:first-child,
 .dialog-action-area.linked button.default:disabled:first-child,
 .dialog-action-area.linked button:focus:first-child,
@@ -3804,16 +3748,13 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 .dialog-action-area.linked .button:focus:first-child {
 	border-style: solid;
     border-width: 1px;
-/*    border-right-width: 0;*/
 	border-radius: 3px 0 0px 3px;
 	border-color: @theme_selected_bg_color;
-/*	-GtkWidget-focus-line-width: 0; deprecated */
 }
 
 /* right button */
 .dialog-action-area.linked button:last-child,
-.dialog-action-area.linked button:active:last-child,
-.dialog-action-area.linked button:active:hover:last-child,
+.dialog-action-area.linked button:hover:active:last-child,
 .dialog-action-area.linked button:checked:last-child,
 .dialog-action-area.linked button:checked:hover:last-child,
 .dialog-action-area.linked button:disabled:last-child,
@@ -3825,14 +3766,13 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 .dialog-action-area.linked .button:disabled:last-child {
 	border-style: solid;
     border-width: 1px;
-/*    border-left-width: 0;*/
+    border-left-width: 0;
 	border-radius: 0 3px 3px 0;
 	border-color: @borders;
 	border-image: none;
 }
 
 .dialog-action-area.linked button.default:last-child,
-.dialog-action-area.linked button.default:active:last-child,
 .dialog-action-area.linked button.default:checked:last-child,
 .dialog-action-area.linked button.default:disabled:last-child,
 .dialog-action-area.linked button:focus:last-child,
@@ -3843,16 +3783,14 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 .dialog-action-area.linked .button:focus:last-child {
 	border-style: solid;
     border-width: 1px;
-/*    border-left-width: 0;*/
+    border-left-width: 0px;
 	border-radius: 0 3px 3px 0;
 	border-color: @theme_selected_bg_color;
-/*	-GtkWidget-focus-line-width: 0; */
 }
 
 /* single button */
 .dialog-action-area.linked button:only-child,
-.dialog-action-area.linked button:active:only-child,
-.dialog-action-area.linked button:active:hover:only-child,
+.dialog-action-area.linked button:hover:active:only-child,
 .dialog-action-area.linked button:checked:only-child,
 .dialog-action-area.linked button:checked:hover:only-child,
 .dialog-action-area.linked button:disabled:only-child,
@@ -3871,7 +3809,6 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 }
 
 .dialog-action-area.linked button.default:only-child,
-.dialog-action-area.linked button.default:active:only-child,
 .dialog-action-area.linked button.default:checked:only-child,
 .dialog-action-area.linked button.default:disabled:only-child,
 .dialog-action-area.linked button:focus:only-child,
@@ -3885,11 +3822,9 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
     border-width: 1px;
     border-radius: 3px;
 	border-color: @theme_selected_bg_color;
-/*	-GtkWidget-focus-line-width: 0; */
 }
 
 .dialog-action-area.linked button.suggested-action,
-.dialog-action-area.linked button.suggested-action:active,
 .dialog-action-area.linked button.suggested-action:checked,
 .dialog-action-area.linked button.suggested-action:disabled,
 .dialog-action-area.linked .button.suggested-action,
@@ -4066,35 +4001,6 @@ GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r
 	color: shade (@theme_selected_bg_color, 0.35);
 }
 
-.sidebar scrollbar trough,
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar scrollbar trough,
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar scrollbar slider,
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar scrollbar slider:hover,
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar scrollbar slider:hover:active,
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
 .sidebar radio,
 .sidebar radio:focus,
 .sidebar radio:selected,
@@ -4108,6 +4014,7 @@ GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r
 /*******
  * OSD *
  *******/
+
 .background.osd {
 	color: @osd_fg;
 	background-color: @osd_bg;
@@ -4123,7 +4030,6 @@ GtkOverlay.osd {
 }
 
 .osd button,
-.osd button:active,
 .osd button:checked,
 .osd.button,
 .osd.button:active,
@@ -4147,7 +4053,6 @@ GtkOverlay.osd {
 	border-color: alpha(@osd_button_border,0.5);
 }
 
-.osd button:active,
 .osd button:checked,
 .osd .button:active,
 .osd .button:checked {
@@ -4190,7 +4095,6 @@ GtkOverlay.osd {
 
 .osd button,
 .osd button:hover,
-.osd button:active,
 .osd button:checked,
 .osd .button,
 .osd .button:hover,
@@ -4222,10 +4126,8 @@ GtkOverlay.osd {
 	color: @osd_button_fg_hover;
 }
 
-.osd button:active,
 .osd button:hover:active,
 .osd button:checked,
-.osd button:hover:checked
 .osd.button:active,
 .osd.button:hover:active,
 .osd .button:active,
@@ -4238,8 +4140,7 @@ GtkOverlay.osd {
 }
 
 .osd button:disabled,
-.osd button:active *:disabled,
-.osd button:checked *:disabled,
+.osd button:checked:disabled,
 .osd.button:disabled,
 .osd.button:active *:disabled,
 .osd.button:checked *:disabled,
@@ -4263,13 +4164,12 @@ GtkOverlay.osd {
 
 .osd button:checked,
 .osd button:checked:hover,
-.osd button:active,
-.osd button:active:hover,
+.osd button:hover:active,
 .osd.button:active,
 .osd.button:active:hover,
 .osd .button:active,
 .osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
+.osd .menuitem.button:selected,
 .osd.button:checked,
 .osd.button:checked:hover,
 .osd .button:checked,
@@ -4307,13 +4207,13 @@ toolbar.osd button.image-button,
     box-shadow: none;
 }
 
-.osd button.menu-button:active,
+.osd .menuitem.button:selected,
 .osd GtkMenuButton.menu-button:active {
 	background-color: transparent;
 	border-color: @osd_button_border;
 }
 
-.osd button.menu-button:active,
+.osd .menuitem.button:selected,
 .osd GtkMenuButton.menu-button:active {
 	color: @osd_button_fg_active;
 	text-shadow: 0 -1px @osd_button_shadow;
@@ -4358,10 +4258,10 @@ toolbar.osd button:last-child,
 }
 
 toolbar.osd button:only-child,
-toolbar.osd GtkToolButton button,
-toolbar.osd GtkToolButton:only-child button,
-toolbar.osd GtkToolButton:last-child button,
-toolbar.osd GtkToolButton:first-child button,
+toolbar.osd toolbutton button,
+toolbar.osd toolbutton button:only-child,
+toolbar.osd toolbutton button:last-child,
+toolbar.osd toolbutton button:first-child,
 .osd.toolbar .button:only-child,
 .osd.toolbar GtkToolButton .button,
 .osd.toolbar GtkToolButton:only-child .button,
@@ -4531,6 +4431,7 @@ GtkProgressBar.osd.progressbar {
 /****************************
  * Suggested action buttons *
  ****************************/
+
 toolbar button.suggested-action,
 button.suggested-action,
 .toolbar .suggested-action.button,
@@ -4551,14 +4452,10 @@ button.suggested-action:hover,
 		shade(@suggested_action_button_b, 1.05));
 }
 
-toolbar button.suggested-action:active,
 toolbar button.suggested-action:hover:active,
-button.suggested-action:active,
 button.suggested-action:hover:active,
 toolbar button.suggested-action:checked,
-toolbar button.suggested-action:hover:checked,
 button.suggested-action:checked,
-button.suggested-action:hover:checked,
 .toolbar .suggested-action.button:active,
 .toolbar .suggested-action.button:hover:active,
 .suggested-action.button:active,
@@ -4582,14 +4479,10 @@ button.suggested-action,
 	-gtk-icon-shadow: 0 1px @suggested_action_button_shadow;
 }
 
-toolbar button.suggested-action:active,
 toolbar button.suggested-action:hover:active,
-button.suggested-action:active,
 button.suggested-action:hover:active,
 toolbar button.suggested-action:checked,
-toolbar button.suggested-action:checked,
 button.suggested-action:checked,
-button.suggested-action:hover:checked,
 .toolbar .suggested-action.button:active,
 .toolbar .suggested-action.button:hover:active,
 .suggested-action.button:active,
@@ -4603,8 +4496,7 @@ button.suggested-action:hover:checked,
 }
 
 button.suggested-action:disabled,
-button.suggested-action:active *:disabled,
-button.suggested-action:checked *:disabled,
+button.suggested-action:checked:disabled,
 .suggested-action.button:disabled,
 .suggested-action.button:active *:disabled,
 .suggested-action.button:checked *:disabled {
@@ -4623,6 +4515,7 @@ button.suggested-action label:disabled,
 /******************************
  * Destructive action buttons *
  ******************************/
+
 button.destructive-action,
 .destructive-action.button {
 	background-image: linear-gradient(to bottom,
@@ -4639,10 +4532,8 @@ button.destructive-action:hover,
 		shade(@destructive_action_button_b, 1.05));
 }
 
-button.destructive-action:active,
 button.destructive-action:hover:active,
 button.destructive-action:checked,
-button.destructive-action:hover:checked,
 .destructive-action.button:active,
 .destructive-action.button:hover:active,
 .destructive-action.button:checked,
@@ -4660,10 +4551,8 @@ button.destructive-action,
 	-gtk-icon-shadow: 0 1px @destructive_action_button_shadow;
 }
 
-button.destructive-action:active,
 button.destructive-action:hover:active,
 button.destructive-action:checked,
-button.destructive-action:hover:checked,
 .destructive-action.button:active,
 .destructive-action.button:hover:active,
 .destructive-action.button:checked,
@@ -4675,6 +4564,7 @@ button.destructive-action:hover:checked,
 /**************************
  * Selection Mode classes *
  **************************/
+
 headerbar.selection-mode,
 toolbar.selection-mode,
 .selection-mode.header-bar,
@@ -4708,7 +4598,7 @@ toolbar.selection-mode,
 /* regular button */
 headerbar.selection-mode button,
 toolbar.selection-mode button,
-toolbar.selection-mode GtkToolButton button,
+toolbar.selection-mode toolbutton button,
 .selection-mode.header-bar .button,
 .selection-mode.toolbar .button,
 .selection-mode.toolbar GtkToolButton .button {
@@ -4727,7 +4617,7 @@ toolbar.selection-mode GtkToolButton button,
 
 headerbar.selection-mode button:hover,
 toolbar.selection-mode button:hover,
-toolbar.selection-mode GtkToolButton button:hover,
+toolbar.selection-mode toolbutton button:hover,
 .selection-mode.header-bar .button:hover,
 .selection-mode.toolbar .button:hover,
 .selection-mode.toolbar GtkToolButton .button:hover {
@@ -4736,18 +4626,12 @@ toolbar.selection-mode GtkToolButton button:hover,
 		shade(@selection_toolbar_button_b, 1.02));
 }
 
-headerbar.selection-mode button:active,
 headerbar.selection-mode button:hover:active,
-toolbar.selection-mode button:active,
 toolbar.selection-mode button:hover:active,
-toolbar.selection-mode GtkToolButton button:active,
-toolbar.selection-mode GtkToolButton button:hover:active,
+toolbar.selection-mode toolbutton button:hover:active,
 headerbar.selection-mode button:checked,
-headerbar.selection-mode button:hover:checked,
 toolbar.selection-mode button:checked,
-toolbar.selection-mode button:hover:checked,
-toolbar.selection-mode GtkToolButton button:checked,
-toolbar.selection-mode GtkToolButton button:hover:checked,
+toolbar.selection-mode toolbutton button:checked,
 .selection-mode.header-bar .button:active,
 .selection-mode.header-bar .button:hover:active,
 .selection-mode.toolbar .button:active,
@@ -4766,12 +4650,9 @@ toolbar.selection-mode GtkToolButton button:hover:checked,
 	box-shadow: none;
 }
 
-headerbar.selection-mode button:active,
-toolbar.selection-mode button:active,
-toolbar.selection-mode GtkToolButton button:active,
 headerbar.selection-mode button:checked,
 toolbar.selection-mode button:checked,
-toolbar.selection-mode GtkToolButton button:checked,
+toolbar.selection-mode toolbutton button:checked,
 .selection-mode.header-bar .button:active,
 .selection-mode.toolbar .button:active,
 .selection-mode.toolbar GtkToolButton .button:active,
@@ -4782,14 +4663,11 @@ toolbar.selection-mode GtkToolButton button:checked,
 }
 
 headerbar.selection-mode button,
-headerbar.selection-mode button:active,
 headerbar.selection-mode button:checked,
 toolbar.selection-mode button,
-toolbar.selection-mode button:active,
 toolbar.selection-mode button:checked,
-toolbar.selection-mode GtkToolButton button,
-toolbar.selection-mode GtkToolButton button:active,
-toolbar.selection-mode GtkToolButton button:checked,
+toolbar.selection-mode toolbutton button,
+toolbar.selection-mode toolbutton button:checked,
 .selection-mode.header-bar .button,
 .selection-mode.header-bar .button:active,
 .selection-mode.header-bar .button:checked,
@@ -4806,7 +4684,7 @@ toolbar.selection-mode GtkToolButton button:checked,
 /* suggested button */
 headerbar.selection-mode button.suggested-action,
 toolbar.selection-mode button.suggested-action,
-toolbar.selection-mode GtkToolButton button.suggested-action,
+toolbar.selection-mode toolbutton button.suggested-action,
 .selection-mode.header-bar .suggested-action.button,
 .selection-mode.toolbar .suggested-action.button,
 .selection-mode.toolbar GtkToolButton.suggested-action .button {
@@ -4824,30 +4702,24 @@ toolbar.selection-mode GtkToolButton button.suggested-action,
 	color: @theme_text_color;
 }
 
-headerbar.selection-mode .suggested-action.button:hover,
-toolbar.selection-mode .suggested-action.button:hover,
-toolbar.selection-mode GtkToolButton.suggested-action .button:hover,
+headerbar.selection-mode button.suggested-action:hover,
+toolbar.selection-mode button.suggested-action:hover,
+toolbar.selection-mode toolbutton button.suggested-action:hover,
 .selection-mode.header-bar button.suggested-action:hover,
 .selection-mode.toolbar button.suggested-action:hover,
-.selection-mode.toolbar GtkToolButton button.suggested-action:hover {
+.selection-mode.toolbar toolbutton button.suggested-action:hover {
 	background-image: linear-gradient(to bottom,
 		shade(@selection_toolbar_suggested_button_a, 1.15),
 		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
 		@selection_toolbar_suggested_button_c);
 }
 
-headerbar.selection-mode button.suggested-action:active,
 headerbar.selection-mode button.suggested-action:hover:active,
-toolbar.selection-mode button.suggested-action:active,
 toolbar.selection-mode button.suggested-action:hover:active,
-toolbar.selection-mode GtkToolButton button.suggested-action button:active,
-toolbar.selection-mode GtkToolButton button.suggested-action button:hover:active,
+toolbar.selection-mode toolbutton button.suggested-action button:hover:active,
 headerbar.selection-mode button.suggested-action:checked,
-headerbar.selection-mode button.suggested-action:hover:checked,
 toolbar.selection-mode button.suggested-action:checked,
-toolbar.selection-mode button.suggested-action:hover:checked,
-toolbar.selection-mode GtkToolButton button.suggested-action button:checked,
-toolbar.selection-mode GtkToolButton button.suggested-action button:hover:checked,
+toolbar.selection-mode toolbutton button.suggested-action button:checked,
 .selection-mode.header-bar .suggested-action.button:active,
 .selection-mode.header-bar .suggested-action.button:hover:active,
 .selection-mode.toolbar .suggested-action.button:active,
@@ -4867,12 +4739,10 @@ toolbar.selection-mode GtkToolButton button.suggested-action button:hover:checke
 	box-shadow: none;
 }
 
-headerbar.selection-mode button.suggested-action:active,
-toolbar.selection-mode button.suggested-action:active,
-toolbar.selection-mode GtkToolButton button.suggested-action:active,
+
 headerbar.selection-mode button.suggested-action:checked,
 toolbar.selection-mode button.suggested-action:checked,
-toolbar.selection-mode GtkToolButton button.suggested-action:checked,
+toolbar.selection-mode toolbutton button.suggested-action:checked,
 .selection-mode.header-bar .suggested-action.button:active,
 .selection-mode.toolbar .suggested-action.button:active,
 .selection-mode.toolbar GtkToolButton.suggested-action:active,
@@ -4883,14 +4753,11 @@ toolbar.selection-mode GtkToolButton button.suggested-action:checked,
 }
 
 headerbar.selection-mode button.suggested-action,
-headerbar.selection-mode button.suggested-action:active,
 headerbar.selection-mode button.suggested-action:checked,
 toolbar.selection-mode button.suggested-action,
-toolbar.selection-mode button.suggested-action:active,
 toolbar.selection-mode button.suggested-action:checked,
-toolbar.selection-mode GtkToolButton button.suggested-action button,
-toolbar.selection-mode GtkToolButton button.suggested-action:active,
-toolbar.selection-mode GtkToolButton button.suggested-action:checked,
+toolbar.selection-mode toolbutton button.suggested-action button,
+toolbar.selection-mode toolbutton button.suggested-action:checked,
 .selection-mode.header-bar .suggested-action.button,
 .selection-mode.header-bar .suggested-action.button:active,
 .selection-mode.header-bar .suggested-action.button:checked,
@@ -4937,8 +4804,6 @@ toolbar.selection-mode button.selection-menu .dim-label:hover,
 	color: @selection_menu_hover;
 }
 
-headerbar.selection-mode button.selection-menu:active,
-toolbar.selection-mode button.selection-menu:active,
 headerbar.selection-mode button.selection-menu:checked,
 toolbar.selection-mode button.selection-menu:checked,
 .selection-mode.header-bar .selection-menu.button:active,
@@ -4951,8 +4816,6 @@ toolbar.selection-mode button.selection-menu:checked,
 	background-color: transparent;
 }
 
-headerbar.selection-mode button.selection-menu:active,
-toolbar.selection-mode button.selection-menu:active,
 headerbar.selection-mode button.selection-menu:checked,
 toolbar.selection-mode button.selection-menu:checked,
 .selection-mode.header-bar .selection-menu.button:active,
@@ -4971,7 +4834,6 @@ toolbar.selection-mode button.selection-menu.button,
 
 headerbar.selection-mode button.selection-menu menuitem,
 toolbar.selection-mode button.selection-menu menuitem,
-
 .selection-mode.header-bar .selection-menu.button .menuitem,
 .selection-mode.toolbar .selection-menu.button .menuitem {
 	text-shadow: none;
@@ -5151,13 +5013,9 @@ viewport {
 
 GtkIconView.cell:selected,
 GtkIconView.cell:selected:focus,
-iconview cell:selected,
-iconview cell:selected:focus {
+iconview .cell:selected,
+iconview .cell:selected:focus {
 	border-radius: 4px;
-
-	/* FIXME: this probably needs to be better;
-	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-	 */
 	outline-color: @treeview_focus_border;
 	outline-style: solid;
 	outline-offset: 3px;
@@ -5165,8 +5023,8 @@ iconview cell:selected:focus {
 
 GtkIconView.cell:hover,
 GtkIconView.cell:hover:focus,
-iconview cell:hover,
-iconview cell:hover:focus {
+iconview .cell:hover,
+iconview .cell:hover:focus {
 	border-radius: 4px;
 }
 
@@ -5290,10 +5148,10 @@ GtkTreeView row:nth-child(even):backdrop:hover {
 	color: shade (@theme_selected_bg_color, 0.35);
 }
 
-.sidebar treeview row:active:hover,
+.sidebar treeview row:hover:active,
 .sidebar treeview row:checked:hover,
 .sidebar treeview row:selected:hover,
-.sidebar GtkTreeView row:active:hover,
+.sidebar GtkTreeView row:hover:active,
 .sidebar GtkTreeView row:checked:hover,
 .sidebar GtkTreeView row:selected:hover {
 	color: shade (@theme_selected_fg_color, 1.00);
@@ -5329,16 +5187,15 @@ column-header .button:disabled {
 }
 
 treeview header button:hover,
-treeview header button:active,
-treeview header button:active:hover,
+treeview header button:hover:active,
 treeview header button:checked,
 treeview header button:checked:hover,
 column-header.button:hover,
 column-header .button:hover,
 column-header.button:active,
 column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
+column-header.button:hover:active,
+column-header .button:hover:active,
 column-header.button:checked,
 column-header .button:checked,
 column-header.button:checked:hover,
@@ -5458,13 +5315,9 @@ GtkCalendar.header .app-notification.frame .titlebutton.button {
     border-radius: 3px;
 }
 
-.app-notification button:active,
 .app-notification button:checked,
-.app-notification button:backdrop:active,
 .app-notification button:backdrop:checked,
-.app-notification.frame button:active,
 .app-notification.frame button:checked,
-.app-notification.frame button:backdrop:active,
 .app-notification.frame button:backdrop:checked,
 .app-notification .button:active,
 .app-notification .button:checked,
@@ -5696,9 +5549,8 @@ list row button,
 
 list row button:selected,
 list row button:selected:hover,
-list row button:active,
 list row button:checked,
-list row button:active:hover,
+list row button:hover:active,
 list row button:checked:hover,
 .list-row.button:selected,
 .list-row.button:selected:hover,
@@ -5830,10 +5682,10 @@ GtkInfoBar {
 		alpha(black, 0.02));
 }
 
-.info button.close:active,
-.warning button.close:active,
-.question button.close:active,
-.error button.close:active,
+.info button.close:checked,
+.warning button.close:checked,
+.question button.close:checked,
+.error button.close:checked,
 .info .button.close:active,
 .warning .button.close:active,
 .question .button.close:active,
@@ -5848,25 +5700,21 @@ entry.info,
 entry.info:focus,
 .info button,
 .info button:disabled,
-.info button:active,
 .info button:checked,
 entry.warning,
 entry.warning:focus,
 .warning button,
 .warning button:disabled,
-.warning button:active,
 .warning button:checked,
 entry.error,
 entry.error:focus,
 .error button,
 .error button:disabled,
-.error button:active,
 .error button:checked,
 entry.question,
 entry.question:focus,
 .question button,
 .question button:disabled,
-.question button:active,
 .question button:checked.
 .info .entry,
 .info .entry:focus,
@@ -5999,7 +5847,6 @@ popover.osd button,
 	-gtk-icon-shadow: 0 -1px @osd_text_shadow;
 }
 
-popover.osd button:active,
 popover button:checked,
 .popover.osd .button:active,
 .popover.osd .button:checked {
@@ -6022,23 +5869,18 @@ GtkModelButton.button {
 }
 
 modelbutton:checked,
-modelbutton:active,
 modelbutton:disabled,
-modelbutton:active:disabled,
 modelbutton:checked:disabled,
 modelbutton,
 modelbutton:focus,
-modelbutton:active:focus,
-modelbutton:checked:focus,
+modelbutton:focus:active,
 modelbutton.flat:checked,
-modelbutton.flat:active,
 modelbutton.flat:disabled,
-modelbutton.flat:active:disabled,
 modelbutton.flat:checked:disabled,
 modelbutton.flat,
 modelbutton.flat:focus,
-modelbutton.flat:active:focus,
-modelbutton.flat:checked:focus,
+modelbutton.flat:focus:active,
+modelbutton.flat:focus:checked,
 GtkModelButton.button:checked,
 GtkModelButton.button:active,
 GtkModelButton.button:disabled,
@@ -6067,11 +5909,11 @@ GtkModelButton.button.flat:checked:focus {
 }
 
 modelbutton:checked:hover,
-modelbutton:active:hover,
+modelbutton:hover:active,
 modelbutton:hover,
 modelbutton:selected,
 modelbutton.flat:checked:hover,
-modelbutton.flat:active:hover,
+modelbutton.flat:hover:active,
 modelbutton.flat:hover,
 modelbutton.flat:selected,
 GtkModelButton.button:checked:hover,
@@ -6094,7 +5936,7 @@ GtkModelButton.button.flat:selected {
 
 /* middle button*/
 .linked modelbutton:hover,
-.linked modelbutton:active:hover,
+.linked modelbutton:hover:active,
 .linked modelbutton:checked:hover,
 .linked GtkModelButton.button:hover,
 .linked GtkModelButton.button:active:hover,
@@ -6106,7 +5948,7 @@ GtkModelButton.button.flat:selected {
 
 /* left button*/
 .linked modelbutton:hover:first-child,
-.linked modelbutton:active:hover:first-child,
+.linked modelbutton:hover:active:first-child,
 .linked modelbutton:checked:hover:first-child,
 .linked GtkModelButton.button:hover:first-child,
 .linked GtkModelButton.button:active:hover:first-child,
@@ -6117,7 +5959,7 @@ GtkModelButton.button.flat:selected {
 
 /* right button*/
 .linked modelbutton:hover:last-child,
-.linked modelbutton:active:hover:last-child,
+.linked modelbutton:hover:active:last-child,
 .linked modelbutton:checked:hover:last-child,
 .linked GtkModelButton.button:hover:last-child,
 .linked GtkModelButton.button:active:hover:last-child,
@@ -6211,34 +6053,31 @@ cursor-handle.bottom,
 .titlebar button.titlebutton,
 .titlebar .titlebutton {
     color: @wm_title;
-    padding: 2px 6px 3px 3px;
-    border: none;
-    border-image: none;
-    /* fake request for hardcoded icons,
-     to avoid usage of regular window-close button*/
-    -gtk-icon-style: requested;
 }
 
-.titlebar button.titlebutton:hover,
-.titlebar .titlebutton:hover {
-    border: none;
-    border-image: none;
+.titlebar button.titlebutton:backdrop,
+.titlebar .titlebutton:backdrop {
+    color: @wm_unfocused_title;
+    -gtk-icon-shadow: none;
 }
 
-.titlebar button.titlebutton:active,
-.titlebar button.titlebutton:checked,
-.titlebar button.titlebutton:checked:checked,
-.titlebar .titlebutton:active,
-.titlebar .titlebutton:checked,
-.titlebar .titlebutton:checked:checked {
-    border: none;
+/* use icons from window-crontrols */
+.titlebar button.close.titlebutton,
+.titlebar button.close.titlebutton:hover,
+.titlebar button.close.titlebutton:hover:active,
+.titlebar button.maximize.titlebutton,
+.titlebar button.maximize.titlebutton:hover,
+.titlebar button.maximize.titlebutton:hover:active,
+.titlebar button.minimize.titlebutton,
+.titlebar button.minimize.titlebutton:hover,
+.titlebar button.minimize.titlebutton:hover:active {
+    padding: 0px;
+    border-style: none;
     border-image: none;
 }
 
-.titlebar button.titlebutton:backdrop,
-.titlebar .titlebutton:backdrop {
-    color: @wm_unfocused_title;
-    -gtk-icon-shadow: none;
+.titlebar button.image-button.toggle.popup {
+	padding: 4px;
 }
 
 /* workaround to avoid unwanted black frames if switching compositor on/off */
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index ac957221..085249b9 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -781,7 +781,7 @@ EvWindow .toolbar .button.flat {
 }
 
 /* atril and eom */
-dialog.background>box.vertical.dialog-vbox>box.vertical>scrolledwindow>viewport.frame,
+EggToolbarEditor.vertical scrolledwindow viewport.frame,
 EggToolbarEditor.vertical GtkScrolledWindow .frame {
     background-color: shade (@theme_base_color, 1.0);
     border-color: @borders;
diff --git a/desktop-themes/BlueMenta/gtk-3.0/window-controls.css b/desktop-themes/BlueMenta/gtk-3.0/window-controls.css
index fd975c4c..f1693f76 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/window-controls.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/window-controls.css
@@ -1,15 +1,16 @@
-headerbar.titlebar .right .titlebutton:nth-last-child(3),
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-headerbar.titlebar .left .titlebutton:nth-child(3),
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-headerbar.titlebar .right .titlebutton:nth-last-child(2),
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-headerbar.titlebar .left .titlebutton:nth-child(2),
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-headerbar.titlebar .right .titlebutton:last-child,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-headerbar.titlebar .left .titlebutton:first-child,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child {
+
+headerbar.titlebar .right button.minimize.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton,
+headerbar.titlebar .left button.minimize.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton,
+headerbar.titlebar .right button.maximize.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton,
+headerbar.titlebar .left button.maximize.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton,
+headerbar.titlebar .right button.close.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton,
+headerbar.titlebar .left button.close.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton {
 	color: transparent;
 	background-position: center;
 	background-repeat: no-repeat;
@@ -24,128 +25,133 @@ headerbar.titlebar .left:dir(rtl) .titlebutton:last-child {
 
 /* minimize */
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3),
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-headerbar.titlebar .left .titlebutton:nth-child(3),
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
+headerbar.titlebar .right button.minimize.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton,
+headerbar.titlebar .left button.minimize.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton {
 	background-image: url('window-controls/minimize_focused_normal.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3):hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-headerbar.titlebar .left .titlebutton:nth-child(3):hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
+headerbar.titlebar .right button.minimize.titlebutton:hover,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:hover,
+headerbar.titlebar .left button.minimize.titlebutton:hover,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:hover {
 	background-image: url('window-controls/minimize_focused_prelight.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3):active,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-headerbar.titlebar .left .titlebutton:nth-child(3):active,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active,
-headerbar.titlebar .right .titlebutton:nth-last-child(3):checked,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):checked,
-headerbar.titlebar .left .titlebutton:nth-child(3):checked,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):checked {
+headerbar.titlebar .right button.minimize.titlebutton:active,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:active,
+headerbar.titlebar .left button.minimize.titlebutton:active,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:active,
+headerbar.titlebar .right button.minimize.titlebutton:checked,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:checked,
+headerbar.titlebar .left button.minimize.titlebutton:checked,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:checked {
 	background-image: url('window-controls/minimize_focused_pressed.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-headerbar.titlebar .left .titlebutton:nth-child(3):backdrop,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
+headerbar.titlebar .right button.minimize.titlebutton:backdrop,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:backdrop,
+headerbar.titlebar .left button.minimize.titlebutton:backdrop,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:backdrop {
 	background-image: url('window-controls/minimize_unfocused.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-headerbar.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
+headerbar.titlebar .right button.minimize.titlebutton:backdrop:hover,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover,
+headerbar.titlebar .left button.minimize.titlebutton:backdrop:hover,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/minimize_unfocused_prelight.png');
 }
 
 /* maximize */
-headerbar.titlebar .right .titlebutton:nth-last-child(2),
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-headerbar.titlebar .left .titlebutton:nth-child(2),
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
+headerbar.titlebar .right button.maximize.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton,
+headerbar.titlebar .left button.maximize.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton {
 	background-image: url('window-controls/maximize_focused_normal.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(2):hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-headerbar.titlebar .left .titlebutton:nth-child(2):hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
+headerbar.titlebar .right button.maximize.titlebutton:hover,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:hover,
+headerbar.titlebar .left button.maximize.titlebutton:hover,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:hover {
 	background-image: url('window-controls/maximize_focused_prelight.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(2):active,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-headerbar.titlebar .left .titlebutton:nth-child(2):active,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active,
-headerbar.titlebar .right .titlebutton:nth-last-child(2):checked,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):checked,
-headerbar.titlebar .left .titlebutton:nth-child(2):checked,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):checked {
+headerbar.titlebar .right button.maximize.titlebutton:active,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:active,
+headerbar.titlebar .left button.maximize.titlebutton:active,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:active,
+headerbar.titlebar .right button.maximize.titlebutton:checked,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:checked,
+headerbar.titlebar .left button.maximize.titlebutton:checked,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:checked {
 	background-image: url('window-controls/maximize_focused_pressed.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-headerbar.titlebar .left .titlebutton:nth-child(2):backdrop,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
+headerbar.titlebar .right button.maximize.titlebutton:backdrop,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:backdrop,
+headerbar.titlebar .left button.maximize.titlebutton:backdrop,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:backdrop {
 	background-image: url('window-controls/maximize_unfocused.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-headerbar.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
+headerbar.titlebar .right button.maximize.titlebutton:backdrop:hover,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover,
+headerbar.titlebar .left button.maximize.titlebutton:backdrop:hover,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/maximize_unfocused_prelight.png');
 }
 
 /* close */
-headerbar.titlebar .right .titlebutton:last-child,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-headerbar.titlebar .left .titlebutton:first-child,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child {
+headerbar.titlebar .right button.close.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton,
+headerbar.titlebar .left button.close.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton {
 	background-image: url('window-controls/close_focused_normal.png');
 	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
 }
 
-headerbar.titlebar .right .titlebutton:last-child:hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-headerbar.titlebar .left .titlebutton:first-child:hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
+headerbar.titlebar .right button.close.titlebutton:hover,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:hover,
+headerbar.titlebar .left button.close.titlebutton:hover,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:hover {
 	background-image: url('window-controls/close_focused_prelight.png');
 }
 
-headerbar.titlebar .right .titlebutton:last-child:active,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-headerbar.titlebar .left .titlebutton:first-child:active,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:active,
-headerbar.titlebar .right .titlebutton:last-child:checked,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-headerbar.titlebar .left .titlebutton:first-child:checked,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:checked {
+headerbar.titlebar .right button.close.titlebutton:active,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:active,
+headerbar.titlebar .left button.close.titlebutton:active,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:active,
+headerbar.titlebar .right button.close.titlebutton:checked,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:checked,
+headerbar.titlebar .left button.close.titlebutton:checked,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:checked {
 	background-image: url('window-controls/close_focused_pressed.png');
 }
 
-headerbar.titlebar .right .titlebutton:last-child:backdrop,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-headerbar.titlebar .left .titlebutton:first-child:backdrop,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
+headerbar.titlebar .right button.close.titlebutton:backdrop,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:backdrop,
+headerbar.titlebar .left button.close.titlebutton:backdrop,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:backdrop {
 	background-image: url('window-controls/close_unfocused.png');
 }
 
-headerbar.titlebar .right .titlebutton:last-child:backdrop:hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
+headerbar.titlebar .right button.close.titlebutton:backdrop:hover,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:backdrop:hover,
+headerbar.titlebar .left button.close.titlebutton:backdrop:hover,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 	background-image: url('window-controls/close_unfocused_prelight.png');
 }
 
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
+.titlebar button.close.titlebutton {
+    /* fake request     to avoid usage of regular window-close button*/
+    -gtk-icon-style: requested;
+}
 
+/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
+/*
 headerbar.titlebar .button.menu-button.titlebutton {
 	background-image: url('window-controls/menu.png');
 }
@@ -157,126 +163,19 @@ headerbar.titlebar .button.menu-button.titlebutton:hover {
 headerbar.titlebar .button.menu-button.titlebutton:active {
 	background-image: url('window-controls/menu.png');
 }
+*/
 
-/* application adjustments *//*
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:active,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:active,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-MathWindow headerbar.titlebar .left .titlebutton:first-child,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:active,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-EogWindow headerbar.titlebar .left .titlebutton:first-child,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:active,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-EvWindow headerbar.titlebar .left .titlebutton:first-child,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:active,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:active,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:hover,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:active,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:checked,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:backdrop,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:active,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:active,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover {
+/* application adjustments gtk+-3.20 *//*
+headerbar.titlebar button.titlebutton.toggle.popup,
+headerbar.titlebar button.titlebutton.toggle.popup:hover,
+headerbar.titlebar button.titlebutton.toggle.popup:checked {
 	background-image: none;
 }
 */
-/* application adjustments gtk+-3.20 */
-headerbar.titlebar button.titlebutton.toggle.popup {
-	background-image: none;
-}
-
 /* gtk+-3.20 */
-headerbar.titlebar button image {
+.titlebar button.close.titlebutton image,
+.titlebar button.minimize.titlebutton image,
+.titlebar button.maximize.titlebutton image {
         color: transparent;
 }
 
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
index 81074f8c..6e1a485e 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
@@ -41,121 +41,97 @@ headerbar > box > separator.vertical,
 /* draw regular check and radio items using our SVG assets */
 
 check,
-.view.cell check,
-.check,
-.view.cell.check {
+check .view.cell {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-check:disabled,
-.check:disabled {
+check:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
 }
 
-check row:disabled,
-.check row:disabled {
+check row:disabled {
 	background-color: transparent;
 }
 
 check:active,
 check:checked,
 .view.cell check:active,
-.view.cell check:checked,
-.check:active,
-.check:checked,
-.view.cell.check:active,
-.view.cell.check:checked {
+.view.cell check:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
 }
 
 check:active:disabled,
-check:checked:disabled,
-.check:active:disabled,
-.check:checked:disabled {
+check:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
 }
 
-check:indeterminate,
-.check:indeterminate {
+check:indeterminate {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
 }
 
-check:indeterminate:disabled,
-.check:indeterminate:disabled {
+check:indeterminate:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
 }
 
 radio,
-.view.cell radio,
-.radio,
-.view.cell.radio {
+.view.cell radio {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-radio:disabled,
-.radio:disabled {
+radio:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
 }
 
-radio row:disabled,
-.radio row:disabled {
+radio row:disabled {
 	background-color: transparent;
 }
 
 radio:active,
 .view.cell radio:active,
 radio:checked,
-.view.cell radio:checked,
-.radio:active,
-.view.cell.radio:active,
-.radio:checked,
-.view.cell.radio:checked {
+.view.cell radio:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
 }
 
 radio:active:disabled,
-radio:checked:disabled,
-.radio:active:disabled,
-.radio:checked:disabled {
+radio:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
 }
 
-radio:indeterminate,
-.radio:indeterminate {
+radio:indeterminate {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
 }
 
-.radio:indeterminate:disabled,
-.radio:indeterminate:disabled {
+radio:indeterminate:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
 }
 
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
+.sidebar view radio:active,
+.sidebar view radio:active:focus,
+.sidebar view radio:active:hover,
+.sidebar view radio:checked,
+.sidebar view radio:checked:focus,
+.sidebar view radio:checked:hover {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
 }
 
-.sidebar .view.radio:hover {
+.sidebar view radio:hover {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
 }
 
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
+.sidebar view radio:active:selected,
+.sidebar view radio:active:selected:focus,
+.sidebar view radio:checked:selected,
+.sidebar view radio:checked:selected:focus {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
 }
 
-.sidebar .view.radio:selected:hover,
-.sidebar .view.radio:selected:focus {
+.sidebar view radio:selected:hover,
+.sidebar view radio:selected:focus {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected-prelight.svg"));	
 }
 
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
index 88b50edd..e1fdfbc2 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -1,8 +1,7 @@
 /* Button background */
 button,
-toolbar button.raised,
 toolbar .raised button,
-toolbar combobox button,
+toolbar combobox button.combo,
 toolbar.primary-toolbar .linked button,
 toolbar.primary-toolbar .raised button,
 .button,
@@ -15,22 +14,13 @@ toolbar.primary-toolbar .raised button,
 	background-color: transparent;
 }
 
-/* Pushed button and progressbar through background */
+/* Pushed button and progressbar through background (checked) */
 button:checked,
-button:active,
-button:active:hover,
-toolbar button:active,
-toolbar button:active:hover,
-toolbar button.raised:active,
-toolbar .raised button:active,
-toolbar button.raised:active:hover,
-toolbar .raised button:active:hover,
+button:focus:checked,
 toolbar button:checked,
-toolbar button:checked:hover,
-toolbar button.raised:checked,
+toolbar button:focus:checked,
 toolbar .raised button:checked,
-toolbar button.raised:checked:hover,
-toolbar .raised button:checked:hover,
+toolbar .raised button:focus:checked,
 .button:checked,
 .button:active,
 .button:active:hover,
@@ -64,14 +54,16 @@ row trough,
 	background-color: transparent; 
 }
 
+/* checked hover */
 button:checked:hover,
-button:active:hover,
-toolbar button:active:hover,
-toolbar button.raised:active:hover,
-toolbar .raised button:active:hover,
+button:checked:focus:hover,
+button:checked:focus:hover:active,
 toolbar button:checked:hover,
-toolbar button.raised:checked:hover,
 toolbar .raised button:checked:hover,
+toolbar button:checked:focus:hover,
+toolbar .raised button:checked:focus:hover,
+toolbar button:checked:focus:hover:active,
+toolbar .raised button:checked:focus:hover:active,
 row trough:hover,
 .button:checked:hover,
 .button:active:hover,
@@ -91,8 +83,6 @@ row trough:hover,
 /* Primary and inline toolbars pushed button background */
 toolbar.primary-toolbar button:checked,
 toolbar.inline-toolbar button:checked,
-toolbar.primary-toolbar button:active,
-toolbar.inline-toolbar button:active,
 .primary-toolbar .button:checked,
 .inline-toolbar .button:checked,
 .primary-toolbar .button:active,
@@ -105,8 +95,6 @@ toolbar.inline-toolbar button:active,
 
 toolbar.primary-toolbar button:checked:hover,
 toolbar.inline-toolbar button:checked:hover,
-toolbar.primary-toolbar button:active:hover,
-toolbar.inline-toolbar button:active:hover,
 .primary-toolbar .button:checked:hover,
 .inline-toolbar .button:checked:hover,
 .primary-toolbar .button:active:hover,
@@ -117,12 +105,11 @@ toolbar.inline-toolbar button:active:hover,
 	background-color: transparent;
 }
 
-/* Prelit button background */
+/* Hover button background */
 button:hover,
 toolbar button:hover,
-toolbar button.raised:hover,
 toolbar .raised button:hover,
-toolbar combobox button:hover,
+toolbar combobox button.combo:hover,
 .button:hover,
 .toolbar .button:hover,
 .toolbar .button.raised:hover,
@@ -145,8 +132,7 @@ toolbar.primary-toolbar button:hover,
 
 /* Insensitive button background */
 button:disabled,
-toolbar combobox button:disabled,
-toolbar button.raised:disabled,
+toolbar combobox button.combo:disabled,
 toolbar .raised button:disabled,
 .button:disabled,
 .toolbar GtkComboBox button:disabled,
@@ -157,12 +143,9 @@ toolbar .raised button:disabled,
 }
 
 /* Pushed + Insensitive button background */
-button:active:disabled,
 button:checked:disabled,
-toolbar button:active:disabled,
 toolbar button:checked:disabled,
-toolbar combobox button:active:disabled,
-toolbar combobox button:checked:disabled,
+toolbar combobox button.combo:checked:disabled,
 .button:active:disabled,
 .button:checked:disabled,
 .toolbar .button:active:disabled,
@@ -197,9 +180,7 @@ GtkComboBox.combobox-entry .button:hover,
 }
 
 /* Entry pushed button background */
-toolbar.primary-toolbar combobox entry button:active,
 toolbar.primary-toolbar combobox entry button:checked,
-combobox entry button:active,
 combobox entry button:checked,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:checked,
@@ -243,8 +224,7 @@ column-header .button:hover {
 treeview header button:focus,
 treeview header button:checked,
 treeview header button:checked:hover,
-treeview header button:active,
-treeview header button:active:hover,
+treeview header button:hover:active,
 column-header.button:focus,
 column-header .button:focus,
 column-header.button:checked,
@@ -277,7 +257,6 @@ GtkComboBox.combobox-entry .button:disabled,
 
 /* Primary and inline toolbars background */
 toolbar.primary-toolbar,
-toolbar.primary-toolbar,
 toolbar.inline-toolbar,
 .primary-toolbar .toolbar,
 .primary-toolbar.toolbar,
@@ -289,7 +268,6 @@ toolbar.inline-toolbar,
 }
 
 toolbar.primary-toolbar.vertical,
-toolbar.primary-toolbar.vertical,
 toolbar.inline-toolbar.vertical,
 .primary-toolbar .toolbar.vertical,
 .primary-toolbar.toolbar.vertical,
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
index 9d9960d3..887fbe88 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -1,12 +1,10 @@
 /* Borders */
 
-/* generic element borders */
+/* generic element borders (checked)*/
 entry,
-button:active,
 button:checked,
 combobox entry entry,
 combobox entry button,
-toolbar.inline-toolbar.vertical button:active,
 toolbar.inline-toolbar.vertical button:checked,
 .entry,
 .button:active,
@@ -30,7 +28,7 @@ trough highlight,
 }
 
 entry:disabled,
-button:active:disabled,
+button:checked:disabled,
 combobox entry entry:disabled,
 combobox entry button:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
@@ -78,14 +76,10 @@ row trough,
 
 /* focused element borders */
 entry:focus,
-button:active:focus,
 button:checked:focus,
-button.default:active,
 button.default:checked,
 combobox entry button:focus,
-toolbar.inline-toolbar.vertical button:active:focus,
-toolbar.inline-toolbar.vertical button:checked:focus
-toolbar.inline-toolbar.vertical button.default:active,
+toolbar.inline-toolbar.vertical button:focus:checked,
 toolbar.inline-toolbar.vertical button.default:checked,
 .entry:focus,
 .button:active:focus,
@@ -105,9 +99,9 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 .titlebar button:hover,
+.titlebar button:hover:active,
 .titlebar button.titlebutton:hover,
-.titlebar button.titlebutton:active,
-.titlebar button:checked:checked,
+.titlebar button.titlebutton:hover:active,
 .titlebar .button:hover,
 .titlebar .titlebutton:hover,
 .titlebar .titlebutton:active,
@@ -120,8 +114,7 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 button,
-.button
-/*.inline-toolbar.toolbar.vertical .button*/ {
+.button {
 	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -168,7 +161,6 @@ toolbar.primary-toolbar button:hover,
 	background-color: transparent;
 }
 
-toolbar.primary-toolbar button:active,
 toolbar.primary-toolbar button:checked,
 .primary-toolbar .button:active,
 .primary-toolbar .button:checked {
@@ -202,21 +194,14 @@ tooltip entry:focus,
 	border-color: transparent;
 }
 
-/* primary toolbar - generic element borders */
+/* primary toolbar - generic element borders (checked)*/
 toolbar.primary-toolbar entry,
-toolbar.primary-toolbar combobox entry .entry,
-toolbar.primary-toolbar combobox entry .button,
-toolbar.primary-toolbar button:active,
-toolbar.primary-toolbar button.raised:active,
-toolbar.primary-toolbar raised button:active,
-toolbar.inline-toolbar button:active,
+toolbar.primary-toolbar combobox entry.combo,
+toolbar.primary-toolbar combobox button.combo:checked,
 toolbar.primary-toolbar button:checked,
-toolbar.primary-toolbar button.raised:checked,
 toolbar.primary-toolbar .raised button:checked,
 toolbar.inline-toolbar .button:checked,
-toolbar.primary-toolbar switch.trough,
-toolbar.primary-toolbar combobox button:checked,
-toolbar.primary-toolbar combobox button:active,
+toolbar.primary-toolbar switch trough,
 .primary-toolbar .entry,
 .primary-toolbar GtkComboBox.combobox-entry .entry,
 .primary-toolbar GtkComboBox.combobox-entry .button,
@@ -238,12 +223,10 @@ toolbar.primary-toolbar combobox button:active,
 	border-color: transparent;
 }
 
-toolbar.primary-toolbar button.raised:disabled,
-toolbar.primary-toolbar raised .button:disabled,
-toolbar.primary-toolbar button.raised.default:disabled,
-toolbar.primary-toolbar raised .button.default:disabled,
-toolbar.primary-toolbar switch.trough:disabled,
-toolbar.primary-toolbar switch.trough:active:disabled,
+toolbar.primary-toolbar .raised button:disabled,
+toolbar.primary-toolbar .raised button.default:disabled,
+toolbar.primary-toolbar switch trough:disabled,
+toolbar.primary-toolbar switch trough:checked:disabled,
 toolbar.primary-toolbar combobox button:disabled,
 .primary-toolbar .button.raised:disabled,
 .primary-toolbar .raised .button:disabled,
@@ -260,15 +243,11 @@ toolbar.primary-toolbar combobox button:disabled,
 }
 
 /* primary toolbar - focused element borders */
-toolbar.primary-toolbar button:active:focus,
+toolbar.primary-toolbar button:focus:checked,
 toolbar.primary-toolbar entry:focus,
-toolbar.primary-toolbar combobox entry entry:focus,
-toolbar.primary-toolbar button.raised.default:checked,
+toolbar.primary-toolbar combobox entry.combo:focus,
 toolbar.primary-toolbar .raised button.default:checked,
 toolbar.inline-toolbar button.default:checked,
-toolbar.primary-toolbar button.raised.default:active,
-toolbar.primary-toolbar raised button.default:active,
-toolbar.inline-toolbar button.default:active,
 .primary-toolbar .button:active:focus,
 .primary-toolbar .entry:focus,
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus,
@@ -286,11 +265,10 @@ toolbar.inline-toolbar button.default:active,
 	border-color: transparent;
 }
 
-/* primary toolbar - generic button borders */
-toolbar.primary-toolbar button.raised,
+/* primary toolbar - generic button borders (normal state)*/
 toolbar.primary-toolbar .raised button,
 toolbar.inline-toolbar button,
-toolbar.primary-toolbar combobox button,
+toolbar.primary-toolbar combobox button.combo,
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button,
 .inline-toolbar.toolbar .button,
@@ -303,7 +281,6 @@ toolbar.primary-toolbar combobox button,
 }
 
 /* primary toolbar - focused button borders */
-toolbar.primary-toolbar button.raised.default,
 toolbar.primary-toolbar .raised button.default,
 toolbar.inline-toolbar button.default,
 .primary-toolbar .button.raised.default,
@@ -319,7 +296,7 @@ toolbar.inline-toolbar button.default,
 /* column-headers borders */
 treeview header button,
 treeview header button:active,
-treeview header button:active:hover,
+treeview header button:hover:active,
 treeview header button:checked,
 treeview header button:checked:hover,
 treeview header button:disabled,
@@ -343,7 +320,7 @@ column-header .button:disabled {
 
 treeview header button,
 treeview header button:active,
-treeview header button:active:hover,
+treeview header button:hover:active,
 treeview header button:checked,
 treeview header button:checked:hover,
 treeview header button.dnd,
@@ -386,7 +363,7 @@ column-header .button:disabled {
 
 treeview header button:last-child,
 treeview header button:active:last-child,
-treeview header button:active:hover:last-child,
+treeview header button:hover:active:last-child,
 treeview header button:checked:last-child,
 treeview header button:checked:hover:last-child,
 column-header.button:last-child,
@@ -454,43 +431,3 @@ button.destructive-action:active,
     border-color: transparent;
 }
 
-button.image-button.radio:dir(ltr) {
-    border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-    border-radius: 4px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-    border-radius: 3px;
-}
-
-button.image-button.radio.default:dir(ltr),
-button.image-button.radio:dir(ltr):focus {
-    border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-    border-radius: 4px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-}
-
-button.image-button.radio:dir(ltr):checked {
-    border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-    border-radius: 4px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-}
-
-button.image-button.radio:dir(ltr):hover,
-button.image-button.radio:dir(ltr):checked:focus,
-button.image-button.radio:dir(ltr):checked:hover,
-button.image-button.radio:dir(ltr):checked:focus:hover,
-button.image-button.radio:dir(ltr):focus:hover:active,
-button.image-button.radio:dir(ltr):checked:focus:hover:active,
-button.image-button.radio.default:dir(ltr):checked {
-    border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-    border-radius: 4px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: transparent;
-}
-
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index ec244a11..11eb6047 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -424,12 +424,14 @@ undershoot.right {
 
 entry,
 .entry {
-	border-style: solid;
-	padding: 4px;
-	/* border-image defined in the -assets variants */
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
+    border-style: solid;
+    padding: 4px; /*4px;*/
+    min-height: 20px;
+    min-width: 20px;
+    /* border-image defined in the -assets variants */
+    color: @entry_text_color;
+    background-color: @theme_base_color;
+    box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
 }
 
 entry image.left,
@@ -571,7 +573,7 @@ spinbutton button:hover {
 }
 
 spinbutton button:active,
-spinbutton button:active:hover {
+spinbutton button:hover:active {
     background-image: linear-gradient(to bottom,
                                       @button_active_gradient_color_a,
                                       @button_active_gradient_color_b);
@@ -599,7 +601,7 @@ spinbutton.horizontal entry,
 spinbutton.horizontal entry:focus,
 stack box.vertical.linked spinbutton.horizontal entry,
 stack box.vertical.linked spinbutton.horizontal entry:focus {
-    padding: 0px 10px 0px 2px;
+    padding: 5px 10px 5px 4px;
     border-image:none;
     border-style: none;
     box-shadow: inset 1px 0 @inset_dark_color;
@@ -952,9 +954,9 @@ levelbar block.empty,
 
 scale,
 .scale {
-	-GtkScale-slider-length: 16;
+/*	-GtkScale-slider-length: 16;
 	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
+	-GtkRange-trough-border: 0;*/
 }
 
 scale slider,
@@ -1140,16 +1142,34 @@ frame box.vertical scrolledwindow.frame {
 /***********
  * Buttons *
  ***********/
+
 button,
-button.menuitem.menubar,
+button menuitem menubar,
 button.color,
-combobox entry button,
+button.text-button.toggle,
+button.text-button.radio,
+button.titlebutton,
+button.image-button,
+button.flat,
+button.combo,
+button.font,
+button.file,
+button.toggle.popup,
+button.link,
+combobox,
+combobox button.combo,
 .button,
 .button.menuitem.menubar,
 GtkColorButton.button,
 GtkComboBox.combobox-entry .button {
     -gtk-icon-style: regular;
 	padding: 4px;
+    min-height: 20px;
+    min-width: 18px;
+}
+
+button.image-button.toggle.popup {
+	padding: 6px;
 }
 
 button.text-button.toggle,
@@ -1167,8 +1187,11 @@ toolbar.primary-toolbar button.image-button,
 button,
 .button {
 	transition: all 400ms ease-out;
-    min-height: 16px;
-    min-width: 16px;
+/*	-GtkButton-image-spacing: 4; deprecated, but ignored */
+/*	-GtkButton-interior-focus: true; deprecated, but ignored */
+/*	-GtkButton-default-border: 0; deprecated, but ignored */
+/*	-GtkButton-inner-border: 3; deprecated, but ignored */
+/*	-GtkArrow-arrow-scaling: 0.5; deprecated, but ignored */
 	border-style: solid;
 	border-color: transparent;
 	text-shadow: 0 1px @button_text_shadow;
@@ -1202,10 +1225,13 @@ button.flat:hover,
 
 button.image-button.circular-button,
 .button.image-button.circular-button {
-   border-image: none;
-   border-width: 1px;
-   border-style: solid;
-   border-color: @borders;
+    border-image: none;
+    border-width: 1px;
+    border-style: solid;
+    border-color: @borders;
+    border-radius: 50%;
+    min-height: 20px;
+    min-width: 24px;
 }
 
 /* arrows */
@@ -1222,7 +1248,6 @@ button.toggle.popup image:disabled {
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 toolbar.primary-toolbar button,
 toolbar.primary-toolbar button:disabled,
-toolbar.primary-toolbar button *:disabled,
 .primary-toolbar .button,
 .primary-toolbar .button:disabled,
 .primary-toolbar .button *:disabled {
@@ -1234,6 +1259,7 @@ toolbar.primary-toolbar button *:disabled,
 toolbar.primary-toolbar button,
 .primary-toolbar .button {
 	border-image: none;
+
 	/* setting border-style: none; here would override the border-width values 
 	 * we set in gtk-widget-borders.css to zero.
 	 */
@@ -1243,9 +1269,6 @@ toolbar.primary-toolbar button,
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-toolbar.primary-toolbar button:active,
-toolbar.inline-toolbar button:active,
-button:active,
 toolbar.primary-toolbar button:checked,
 toolbar.inline-toolbar button:checked,
 button:checked,
@@ -1260,8 +1283,7 @@ button:checked,
 }
 
 button:disabled,
-button:active *:disabled,
-button:checked *:disabled,
+button:checked:disabled,
 .button:disabled,
 .button:active *:disabled,
 .button:checked *:disabled {
@@ -1269,8 +1291,7 @@ button:checked *:disabled,
 	text-shadow: none;
 }
 
-toolbar button.raised,
-toolbar raised button,
+toolbar .raised button,
 toolbar.inline-toolbar button,
 .toolbar .button.raised,
 .toolbar .raised .button,
@@ -1279,10 +1300,6 @@ toolbar.inline-toolbar button,
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-toolbar button.raised:active,
-toolbar .raised button:active,
-toolbar.inline-toolbar button:active
-toolbar button.raised:checked,
 toolbar .raised button:checked,
 toolbar.inline-toolbar button:checked,
 .toolbar .button.raised:active,
@@ -1295,7 +1312,6 @@ toolbar.inline-toolbar button:checked,
 	text-shadow: 0 1px @button_active_text_shadow;
 }
 
-toolbar button.raised:disabled,
 toolbar .raised button:disabled,
 toolbar.inline-toolbar button:disabled,
 .toolbar .button.raised:disabled,
@@ -1343,10 +1359,10 @@ toolbar.inline-toolbar button:disabled,
 
 /* Set up shadows and hilights for button visual separation */
 .linked button,
-toolbar button.raised.linked,
+.linked combobox button.combo,
 toolbar .raised.linked button,
 toolbar.inline-toolbar button,
-toolbar.inline-toolbar GtkToolButton > button,
+toolbar.inline-toolbar toolbutton > button,
 .linked .button,
 .toolbar .button.raised.linked,
 .toolbar .raised.linked .button,
@@ -1356,10 +1372,10 @@ toolbar.inline-toolbar GtkToolButton > button,
 }
 
 .linked button:first-child,
-toolbar button.raised.linked:first-child,
+.linked combobox:first-child button.combo:first-child,
 toolbar .raised.linked button:first-child,
 toolbar.inline-toolbar button:first-child,
-toolbar.inline-toolbar GtkToolButton:first-child > button,
+toolbar.inline-toolbar toolbutton > button:first-child,
 .linked .button:first-child,
 .toolbar .button.raised.linked:first-child,
 .toolbar .raised.linked .button:first-child,
@@ -1369,10 +1385,10 @@ toolbar.inline-toolbar GtkToolButton:first-child > button,
 }
 
 .linked button:last-child,
-toolbar button.raised.linked:last-child,
+.linked combobox:last-child button.combo:last-child,
 toolbar .raised.linked button:last-child,
 toolbar.inline-toolbar button:last-child,
-toolbar.inline-toolbar GtkToolButton:last-child > button,
+toolbar.inline-toolbar toolbutton > button:last-child,
 .linked .button:last-child,
 .toolbar .button.raised.linked:last-child,
 .toolbar .raised.linked .button:last-child,
@@ -1381,16 +1397,11 @@ toolbar.inline-toolbar GtkToolButton:last-child > button,
 	box-shadow: inset 1px 0 @inset_light_color;
 }
 
-.linked button:active,
-toolbar button.raised.linked:active,
-toolbar .raised.linked button:active,
-toolbar.inline-toolbar button:active,
-toolbar.inline-toolbar GtkToolButton > button:active,
 .linked button:checked,
-toolbar button.raised.linked:checked,
+.linked combobox button.combo:checked,
 toolbar .raised.linked button:checked,
 toolbar.inline-toolbar button:checked,
-toolbar.inline-toolbar GtkToolButton > .button:checked,
+toolbar.inline-toolbar toolbutton > button:checked,
 .linked .button:active,
 .toolbar .button.raised.linked:active,
 .toolbar .raised.linked .button:active,
@@ -1405,10 +1416,10 @@ toolbar.inline-toolbar GtkToolButton > .button:checked,
 }
 
 .linked button:disabled,
-toolbar button.raised.linked:disabled,
-toolbar raised.linked button:disabled,
+.linked combobox button.combo:disabled,
+toolbar .raised.linked button:disabled,
 toolbar.inline-toolbar button:disabled,
-toolbar.inline-toolbar GtkToolButton > .button:disabled,
+toolbar.inline-toolbar toolbutton > button:disabled,
 .linked .button:disabled,
 .toolbar .button.raised.linked:disabled,
 .toolbar .raised.linked .button:disabled,
@@ -1420,12 +1431,11 @@ toolbar.inline-toolbar GtkToolButton > .button:disabled,
 /* remove box shadow from last-child and only-child */
 .linked button:disabled:last-child,
 .linked button:only-child,
-toolbar button.raised.linked:disabled:last-child,
-toolbar raised.linked button:disabled:last-child,
+toolbar .raised.linked button:disabled:last-child,
 toolbar.inline-toolbar button:disabled:last-child,
 toolbar.inline-toolbar button:only-child,
-toolbar.inline-toolbar GtkToolButton:last-child > button:disabled,
-toolbar.inline-toolbar GtkToolButton:only-child > button,
+toolbar.inline-toolbar toolbutton > button:disabled:last-child,
+toolbar.inline-toolbar toolbutton > button:only-child,
 .linked .button:disabled:last-child,
 .linked .button:only-child,
 .toolbar .button.raised.linked:disabled:last-child,
@@ -1438,26 +1448,14 @@ toolbar.inline-toolbar GtkToolButton:only-child > button,
 }
 
 /* remove inset from first-child and only-child active buttons */
-.linked button:only-child:active,
-toolbar button.raised.linked:only-child:active,
-toolbar raised.linked button:only-child:active,
-toolbar.inline-toolbar button:only-child:active,
-toolbar.inline-toolbar GtkToolButton > button:only-child:active,
-.linked button:first-child:active,
-toolbar button.raised.linked:first-child:active,
-toolbar raised.linked button:first-child:active,
-toolbar.inline-toolbar button:first-child:active,
-toolbar.inline-toolbar GtkToolButton > button:first-child:active,
 .linked button:only-child:checked,
-toolbar button.raised.linked:only-child:checked,
-toolbar raised.linked button:only-child:checked,
+toolbar .raised.linked button:only-child:checked,
 toolbar.inline-toolbar button:only-child:checked,
-toolbar.inline-toolbar GtkToolButton > button:only-child:checked,
+toolbar.inline-toolbar toolbutton > button:only-child:checked,
 .linked button:first-child:checked,
-toolbar button.raised.linked:first-child:checked,
-toolbar raised.linked button:first-child:checked,
+toolbar .raised.linked button:first-child:checked,
 toolbar.inline-toolbar button:first-child:checked,
-toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
+toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked .button:only-child:active,
 .toolbar .button.raised.linked:only-child:active,
 .toolbar .raised.linked .button:only-child:active,
@@ -1483,22 +1481,20 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 
 /* Middle button */
 .linked entry,
-.linked > combobox > button:last-child,
-.linked > combobox > button:focus:last-child,
-.linked > combobox > button:disabled:last-child,
-.linked > combobox > button:active:last-child,
-.linked > combobox > button:focus:active:last-child,
-.linked > combobox > button:checked:last-child,
-.linked > combobox > button:focus:checked:last-child,
-.linked > combobox > button:hover:last-child,
-.linked > combobox > button:active:hover:last-child,
-.linked > combobox > button:checked:hover:last-child,
+.linked > combobox > button.combo,
+.linked > combobox > button.combo:focus,
+.linked > combobox > button.combo:disabled,
+.linked > combobox > button.combo:focus:active,
+.linked > combobox > button.combo:checked,
+.linked > combobox > button.combo:focus:active,
+.linked > combobox > button.combo:hover,
+.linked > combobox > button.combo:hover:active,
+.linked > combobox > button.combo:checked:hover,
 .linked button,
-.linked button:hover, /* gtk-widget-factory middle page button */
-.linked button:active,
-.linked button:active:hover,
+.linked button:hover,
+.linked button:hover:active,
 .linked button:checked,
-.linked button:checked:checked, /* gtk-widget-factory middle page button */
+.linked button:checked:active,
 .linked button:checked:hover,
 .linked button:disabled,
 .linked .entry,
@@ -1528,19 +1524,17 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 
 /* Leftmost button */
 .linked entry:first-child,
-.linked > combobox:first-child > button:last-child,
-.linked > combobox:first-child > button:focus:last-child,
-.linked > combobox:first-child > button:disabled:last-child,
-.linked > combobox:first-child > button:active:last-child,
-.linked > combobox:first-child > button:focus:active:last-child,
-.linked > combobox:first-child > button:checked:first-child:last-child,
-.linked > combobox:first-child > button:focus:checked:first-child:last-child,
-.linked > combobox:first-child > button:hover:first-child:last-child,
-.linked > combobox:first-child > button:active:hover:last-child,
-.linked > combobox:first-child > button:checked:hover:last-child,
+.linked > combobox:first-child > button.combo:first-child,
+.linked > combobox:first-child > button.combo:focus:first-child,
+.linked > combobox:first-child > button.combo:disabled:first-child,
+.linked > combobox:first-child > button.combo:focus:active:first-child,
+.linked > combobox:first-child > button.combo:checked:first-child,
+.linked > combobox:first-child > button.combo:focus:checked:first-child,
+.linked > combobox:first-child > button.combo:hover:first-child,
+.linked > combobox:first-child > button.combo:hover:active:first-child,
+.linked > combobox:first-child > button.combo:checked:hover:first-child,
 .linked button:first-child,
-.linked button:active:first-child,
-.linked button:active:hover:first-child,
+.linked button:hover:active:first-child,
 .linked button:checked:first-child,
 .linked button:checked:hover:first-child,
 .linked button:disabled:first-child,
@@ -1570,19 +1564,17 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 
 /* Rightmost button */
 .linked entry:last-child,
-.linked > combobox:last-child > button,
-.linked > combobox:last-child > button:last-child,
-.linked > combobox:last-child > button:disabled:last-child,
-.linked > combobox:last-child > button:active:last-child,
-.linked > combobox:last-child > button:focus:active:last-child,
-.linked > combobox:last-child > button:checked:last-child,
-.linked > combobox:last-child > button:focus:checked:last-child,
-.linked > combobox:last-child > button:hover:last-child,
-.linked > combobox:last-child > button:active:hover:last-child,
-.linked > combobox:last-child > button:checked:hover:last-child,
+.linked > combobox:last-child > button.combo,
+.linked > combobox:last-child > button.combo:last-child,
+.linked > combobox:last-child > button.combo:disabled:last-child,
+.linked > combobox:last-child > button.combo:focus:active:last-child,
+.linked > combobox:last-child > button.combo:checked:last-child,
+.linked > combobox:last-child > button.combo:focus:checked:last-child,
+.linked > combobox:last-child > button.combo:hover:last-child,
+.linked > combobox:last-child > button.combo:hover:active:last-child,
+.linked > combobox:last-child > button.combo:checked:hover:last-child,
 .linked button:last-child,
-.linked button:active:last-child,
-.linked button:active:hover:last-child,
+.linked button:hover:active:last-child,
 .linked button:checked:last-child,
 .linked button:checked:hover:last-child,
 .linked button:disabled:last-child,
@@ -1612,19 +1604,17 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 
 /* Linked single button */
 .linked entry:only-child,
-.linked > combobox:only-child > button,
-.linked > combobox:only-child > button:only-child,
-.linked > combobox:only-child > button:disabled:only-child,
-.linked > combobox:only-child > button:hover:only-child,
-.linked > combobox:only-child > button:active:only-child,
-.linked > combobox:only-child > button:active:hover:only-child,
-.linked > combobox:only-child > button:focus:active:only-child,
-.linked > combobox:only-child > button:checked:only-child,
-.linked > combobox:only-child > button:checked:hover:only-child,
-.linked > combobox:only-child > button:focus:checked:only-child,
+.linked > combobox:only-child > button.combo,
+.linked > combobox:only-child > button.combo:only-child,
+.linked > combobox:only-child > button.combo:disabled:only-child,
+.linked > combobox:only-child > button.combo:hover:only-child,
+.linked > combobox:only-child > button.combo:hover:active:only-child,
+.linked > combobox:only-child > button.combo:focus:active:only-child,
+.linked > combobox:only-child > button.combo:checked:only-child,
+.linked > combobox:only-child > button.combo:checked:hover:only-child,
+.linked > combobox:only-child > button.combo:focus:checked:only-child,
 .linked button:only-child,
-.linked button:active:only-child,
-.linked button:active:hover:only-child,
+.linked button:hover:active:only-child,
 .linked button:checked:only-child,
 .linked button:checked:hover:only-child,
 .linked button:disabled:only-child,
@@ -1652,20 +1642,18 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 }
 
 /* Middle button (vertical) */
-.linked.vertical > combobox > button:last-child,
-.linked.vertical > combobox > button:focus:last-child,
-.linked.vertical > combobox > button:disabled:last-child,
-.linked.vertical > combobox > button:active:last-child,
-.linked.vertical > combobox > button:focus:active:last-child,
-.linked.vertical > combobox > button:checked:last-child,
-.linked.vertical > combobox > button:focus:checked:last-child,
-.linked.vertical > combobox > button:hover:last-child,
-.linked.vertical > combobox > button:active:hover:last-child,
-.linked.vertical > combobox > button:checked:hover:last-child,
+.linked.vertical > combobox > button.combo,
+.linked.vertical > combobox > button.combo:focus,
+.linked.vertical > combobox > button.combo:disabled,
+.linked.vertical > combobox > button.combo:focus:active,
+.linked.vertical > combobox > button.combo:checked,
+.linked.vertical > combobox > button.combo:focus:checked,
+.linked.vertical > combobox > button.combo:hover,
+.linked.vertical > combobox > button.combo:hover:active,
+.linked.vertical > combobox > button.combo:checked:hover,
 .linked.vertical entry,
 .linked.vertical button,
-.linked.vertical button:active,
-.linked.vertical button:active:hover,
+.linked.vertical button:hover:active,
 .linked.vertical button:checked,
 .linked.vertical button:checked:hover,
 .linked.vertical button:disabled,
@@ -1695,20 +1683,18 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 }
 
 /* Top button (vertical) */
-.linked.vertical > combobox:first-child > button:last-child,
-.linked.vertical > combobox:first-child > button:focus:last-child,
-.linked.vertical > combobox:first-child > button:disabled:last-child,
-.linked.vertical > combobox:first-child > button:active:last-child,
-.linked.vertical > combobox:first-child > button:focus:active:last-child,
-.linked.vertical > combobox:first-child > button:checked:first-child:last-child,
-.linked.vertical > combobox:first-child > button:focus:checked:first-child:last-child,
-.linked.vertical > combobox:first-child > button:hover:first-child:last-child,
-.linked.vertical > combobox:first-child > button:active:hover:last-child,
-.linked.vertical > combobox:first-child > button:checked:hover:last-child,
+.linked.vertical > combobox:first-child > button.combo:first-child,
+.linked.vertical > combobox:first-child > button.combo:focus:first-child,
+.linked.vertical > combobox:first-child > button.combo:disabled:first-child,
+.linked.vertical > combobox:first-child > button.combo:focus:active:first-child,
+.linked.vertical > combobox:first-child > button.combo:checked:first-child,
+.linked.vertical > combobox:first-child > button.combo:focus:checked:first-child,
+.linked.vertical > combobox:first-child > button.combo:hover:first-child:first-child,
+.linked.vertical > combobox:first-child > button.combo:hover:active:first-child,
+.linked.vertical > combobox:first-child > button.combo:checked:hover:first-child,
 .linked.vertical entry:first-child,
 .linked.vertical button:first-child,
-.linked.vertical button:active:first-child,
-.linked.vertical button:active:hover:first-child,
+.linked.vertical button:hover:active:first-child,
 .linked.vertical button:checked:first-child,
 .linked.vertical button:checked:hover:first-child,
 .linked.vertical button:disabled:first-child,
@@ -1738,20 +1724,18 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 }
 
 /* Bottom button (vertical) */
-.linked.vertical > combobox:last-child > button,
-.linked.vertical > combobox:last-child > button:last-child,
-.linked.vertical > combobox:last-child > button:disabled:last-child,
-.linked.vertical > combobox:last-child > button:active:last-child,
-.linked.vertical > combobox:last-child > button:focus:active:last-child,
-.linked.vertical > combobox:last-child > button:checked:last-child,
-.linked.vertical > combobox:last-child > button:focus:checked:last-child,
-.linked.vertical > combobox:last-child > button:hover:last-child,
-.linked.vertical > combobox:last-child > button:active:hover:last-child,
-.linked.vertical > combobox:last-child > button:checked:hover:last-child,
+.linked.vertical > combobox:last-child > button.combo,
+.linked.vertical > combobox:last-child > button.combo:last-child,
+.linked.vertical > combobox:last-child > button.combo:disabled:last-child,
+.linked.vertical > combobox:last-child > button.combo:focus:active:last-child,
+.linked.vertical > combobox:last-child > button.combo:checked:last-child,
+.linked.vertical > combobox:last-child > button.combo:focus:checked:last-child,
+.linked.vertical > combobox:last-child > button.combo:hover:last-child,
+.linked.vertical > combobox:last-child > button.combo:hover:active:last-child,
+.linked.vertical > combobox:last-child > button.combo:checked:hover:last-child,
 .linked.vertical entry:last-child,
 .linked.vertical button:last-child,
-.linked.vertical button:active:last-child,
-.linked.vertical button:active:hover:last-child,
+.linked.vertical button:hover:active:last-child,
 .linked.vertical button:checked:last-child,
 .linked.vertical button:checked:hover:last-child,
 .linked.vertical button:disabled:last-child,
@@ -1781,20 +1765,18 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 }
 
 /* Linked single button (vertical) */
-.linked.vertical > combobox:only-child > button,
-.linked.vertical > combobox:only-child > button:only-child,
-.linked.vertical > combobox:only-child > button:disabled:only-child,
-.linked.vertical > combobox:only-child > button:hover:only-child,
-.linked.vertical > combobox:only-child > button:active:only-child,
-.linked.vertical > combobox:only-child > button:active:hover:only-child,
-.linked.vertical > combobox:only-child > button:focus:active:only-child,
-.linked.vertical > combobox:only-child > button:checked:only-child,
-.linked.vertical > combobox:only-child > button:checked:hover:only-child,
-.linked.vertical > combobox:only-child > button:focus:checked:only-child,
+.linked.vertical > combobox:only-child > button.combo,
+.linked.vertical > combobox:only-child > button.combo:only-child,
+.linked.vertical > combobox:only-child > button.combo:disabled:only-child,
+.linked.vertical > combobox:only-child > button.combo:hover:only-child,
+.linked.vertical > combobox:only-child > button.combo:hover:active:only-child,
+.linked.vertical > combobox:only-child > button.combo:focus:active:only-child,
+.linked.vertical > combobox:only-child > button.combo:checked:only-child,
+.linked.vertical > combobox:only-child > button.combo:checked:hover:only-child,
+.linked.vertical > combobox:only-child > button.combo:focus:checked:only-child,
 .linked.vertical entry:only-child,
 .linked.vertical button:only-child,
-.linked.vertical button:active:only-child,
-.linked.vertical button:active:hover:only-child,
+.linked.vertical button:hover:active:only-child,
 .linked.vertical button:checked:only-child,
 .linked.vertical button:checked:hover:only-child,
 .linked.vertical button:disabled:only-child,
@@ -1823,7 +1805,7 @@ toolbar.inline-toolbar GtkToolButton > button:first-child:checked,
 /* Linked button shadows (vertical) */
 .linked.vertical button,
 toolbar.inline-toolbar.vertical button,
-toolbar.inline-toolbar.vertical GtkToolButton > button,
+toolbar.inline-toolbar.vertical toolbutton > button,
 .linked.vertical .button,
 .inline-toolbar.toolbar.vertical .button,
 .inline-toolbar.toolbar.vertical GtkToolButton > .button {
@@ -1832,7 +1814,7 @@ toolbar.inline-toolbar.vertical GtkToolButton > button,
 
 .linked.vertical button:first-child,
 toolbar.inline-toolbar.vertical button:first-child,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button,
+toolbar.inline-toolbar.vertical toolbutton > button:first-child,
 .linked.vertical .button:first-child,
 .inline-toolbar.toolbar.vertical .button:first-child,
 .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
@@ -1841,19 +1823,16 @@ toolbar.inline-toolbar.vertical GtkToolButton:first-child > button,
 
 .linked.vertical button:last-child,
 toolbar.inline-toolbar.vertical button:last-child,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button,
+toolbar.inline-toolbar.vertical toolbutton > button:last-child,
 .linked.vertical .button:last-child,
 .inline-toolbar.toolbar.vertical .button:last-child,
 .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
 	box-shadow: inset 0 -1px @inset_light_color;
 }
 
-.linked.vertical button:active,
 .linked.vertical button:checked,
-toolbar.inline-toolbar.vertical button:active,
 toolbar.inline-toolbar.vertical button:checked,
-toolbar.inline-toolbar.vertical GtkToolButton > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton > button:checked,
+toolbar.inline-toolbar.vertical toolbutton > button:checked,
 .linked.vertical .button:active,
 .linked.vertical .button:checked,
 .inline-toolbar.toolbar.vertical .button:active,
@@ -1865,7 +1844,7 @@ toolbar.inline-toolbar.vertical GtkToolButton > button:checked,
 
 .linked.vertical button:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
-toolbar.inline-toolbar.vertical GtkToolButton > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled,
 .linked.vertical .button:disabled,
 .inline-toolbar.toolbar.vertical .button:disabled,
 .inline-toolbar.toolbar.vertical GtkToolButton > .button:disabled {
@@ -1876,8 +1855,8 @@ toolbar.inline-toolbar.vertical GtkToolButton > button:disabled,
 .linked.vertical button:disabled:last-child,
 toolbar.inline-toolbar.vertical button:disabled:last-child,
 toolbar.inline-toolbar.vertical button:only-child,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:disabled,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled:last-child,
+toolbar.inline-toolbar.vertical toolbutton > button:only-child,
 .linked.vertical .button:only-child,
 .linked.vertical .button:disabled:last-child,
 .inline-toolbar.toolbar.vertical .button:disabled:last-child,
@@ -1888,11 +1867,10 @@ toolbar.inline-toolbar.vertical GtkToolButton:only-child > button,
 }
 
 /* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-toolbar GtkMenuButton.menu-button.raised.linked:active,
-toolbar .raised.linked GtkMenuButton.menu-button:active,
-toolbar.inline-toolbar GtkMenuButton.menu-button:active,
-toolbar.inline-toolbar GtkToolButton > GtkMenuButton.menu-button:active,
+.linked .menuitem.button:checked,
+toolbar .raised.linked .menuitem.button:checked,
+toolbar.inline-toolbar .menuitem.button:checked,
+toolbar.inline-toolbar toolbutton > .menuitem.button:checked,
 .linked GtkMenuButton.menu-button:active,
 .toolbar GtkMenuButton.menu-button.raised.linked:active,
 .toolbar .raised.linked GtkMenuButton.menu-button:active,
@@ -1904,23 +1882,19 @@ toolbar.inline-toolbar GtkToolButton > GtkMenuButton.menu-button:active,
 /* Linked buttons on primary toolbars */
 
 /* Middle button */
-toolbar.primary-toolbar button.raised.linked,
-toolbar.primary-toolbar button.raised.linked:active,
-toolbar.primary-toolbar button.raised.linked:checked,
-toolbar.primary-toolbar button.raised.linked:disabled,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:checked,
+toolbar.primary-toolbar .raised.linked button:disabled,
 toolbar.primary-toolbar .linked entry,
 toolbar.primary-toolbar .linked button,
-toolbar.primary-toolbar .linked button:active,
 toolbar.primary-toolbar .linked button:checked,
 toolbar.primary-toolbar .linked button:disabled,
 toolbar.inline-toolbar button,
-toolbar.inline-toolbar button:active,
 toolbar.inline-toolbar button:checked,
 toolbar.inline-toolbar button:disabled,
-toolbar.inline-toolbar GtkToolButton > button,
-toolbar.inline-toolbar GtkToolButton > button:active,
-toolbar.inline-toolbar GtkToolButton > button:checked,
-toolbar.inline-toolbar GtkToolButton > button:disabled,
+toolbar.inline-toolbar toolbutton > button,
+toolbar.inline-toolbar toolbutton > button:checked,
+toolbar.inline-toolbar toolbutton > button:disabled,
 .primary-toolbar .button.raised.linked,
 .primary-toolbar .button.raised.linked:active,
 .primary-toolbar .button.raised.linked:checked,
@@ -1945,23 +1919,19 @@ toolbar.inline-toolbar GtkToolButton > button:disabled,
 }
 
 /* Leftmost button */
-toolbar.primary-toolbar button.raised.linked:first-child,
-toolbar.primary-toolbar button.raised.linked:active:first-child,
-toolbar.primary-toolbar button.raised.linked:checked:first-child,
-toolbar.primary-toolbar button.raised.linked:disabled:first-child,
+toolbar.primary-toolbar .raised.linked button:first-child,
+toolbar.primary-toolbar .raised.linked button:checked:first-child,
+toolbar.primary-toolbar .raised.linked button:disabled:first-child,
 toolbar.primary-toolbar .linked entry:first-child,
 toolbar.primary-toolbar .linked button:first-child,
-toolbar.primary-toolbar .linked button:active:first-child,
 toolbar.primary-toolbar .linked button:checked:first-child,
 toolbar.primary-toolbar .linked button:disabled:first-child,
 toolbar.inline-toolbar button:first-child,
-toolbar.inline-toolbar button:active:first-child,
 toolbar.inline-toolbar button:checked:first-child,
 toolbar.inline-toolbar button:disabled:first-child,
-toolbar.inline-toolbar GtkToolButton:first-child > button,
-toolbar.inline-toolbar GtkToolButton:first-child > button:active,
-toolbar.inline-toolbar GtkToolButton:first-child > button:checked,
-toolbar.inline-toolbar GtkToolButton:first-child > button:disabled,
+toolbar.inline-toolbar toolbutton > button:first-child,
+toolbar.inline-toolbar toolbutton > button:checked:first-child,
+toolbar.inline-toolbar toolbutton > button:disabled:first-child,
 .primary-toolbar .button.raised.linked:first-child,
 .primary-toolbar .button.raised.linked:active:first-child,
 .primary-toolbar .button.raised.linked:checked:first-child,
@@ -1987,23 +1957,19 @@ toolbar.inline-toolbar GtkToolButton:first-child > button:disabled,
 }
 
 /* Rightmost button */
-toolbar.primary-toolbar button.raised.linked:last-child,
-toolbar.primary-toolbar button.raised.linked:active:last-child,
-toolbar.primary-toolbar button.raised.linked:checked:last-child,
-toolbar.primary-toolbar button.raised.linked:disabled:last-child,
+toolbar.primary-toolbar .raised.linked button:last-child,
+toolbar.primary-toolbar .raised.linked button:checked:last-child,
+toolbar.primary-toolbar .raised.linked button:disabled:last-child,
 toolbar.primary-toolbar .linked entry:last-child,
 toolbar.primary-toolbar .linked button:last-child,
-toolbar.primary-toolbar .linked button:active:last-child,
 toolbar.primary-toolbar .linked button:checked:last-child,
 toolbar.primary-toolbar .linked button:disabled:last-child,
 toolbar.inline-toolbar button:last-child,
-toolbar.inline-toolbar button:active:last-child,
 toolbar.inline-toolbar button:checked:last-child,
 toolbar.inline-toolbar button:disabled:last-child,
-toolbar.inline-toolbar GtkToolButton:last-child > button,
-toolbar.inline-toolbar GtkToolButton:last-child > button:active,
-toolbar.inline-toolbar GtkToolButton:last-child > button:checked,
-toolbar.inline-toolbar GtkToolButton:last-child > button:disabled,
+toolbar.inline-toolbar toolbutton > button:last-child,
+toolbar.inline-toolbar toolbutton > button:checked:last-child,
+toolbar.inline-toolbar toolbutton > button:disabled:last-child,
 .primary-toolbar .button.raised.linked:last-child,
 .primary-toolbar .button.raised.linked:active:last-child,
 .primary-toolbar .button.raised.linked:checked:last-child,
@@ -2031,13 +1997,11 @@ toolbar.inline-toolbar GtkToolButton:last-child > button:disabled,
 
 /* Single button */
 toolbar.inline-toolbar button:only-child,
-toolbar.inline-toolbar button:active:only-child,
 toolbar.inline-toolbar button:checked:only-child,
 toolbar.inline-toolbar button:disabled:only-child,
-toolbar.inline-toolbar GtkToolButton:only-child > button,
-toolbar.inline-toolbar GtkToolButton:only-child > button:active,
-toolbar.inline-toolbar GtkToolButton:only-child > button:checked,
-toolbar.inline-toolbar GtkToolButton:only-child > button:disabled,
+toolbar.inline-toolbar toolbutton > button:only-child,
+toolbar.inline-toolbar toolbutton > button:checked:only-child,
+toolbar.inline-toolbar toolbutton > button:disabled:only-child,
 .inline-toolbar.toolbar .button:only-child,
 .inline-toolbar.toolbar .button:active:only-child,
 .inline-toolbar.toolbar .button:checked:only-child,
@@ -2055,7 +2019,6 @@ toolbar.inline-toolbar GtkToolButton:only-child > button:disabled,
 /* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
  * has a box inside to pack the button and the actual menu */
 toolbar.inline-toolbar GtkMenuToolButton button:first-child,
-toolbar.inline-toolbar GtkMenuToolButton button:active:first-child,
 toolbar.inline-toolbar GtkMenuToolButton button:checked:first-child,
 toolbar.inline-toolbar GtkMenuToolButton button:disabled:first-child,
 toolbar.inline-toolbar GtkMenuToolButton button:last-child,
@@ -2077,7 +2040,6 @@ toolbar.inline-toolbar.toolbar GtkMenuToolButton button:disabled:last-child,
 }
 
 toolbar.inline-toolbar GtkMenuToolButton:first-child button:first-child,
-toolbar.inline-toolbar GtkMenuToolButton:first-child button:active:first-child,
 toolbar.inline-toolbar GtkMenuToolButton:first-child button:checked:first-child,
 toolbar.inline-toolbar GtkMenuToolButton:first-child button:disabled:first-child,
 .inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
@@ -2092,7 +2054,6 @@ toolbar.inline-toolbar GtkMenuToolButton:first-child button:disabled:first-child
 }
 
 toolbar.inline-toolbar GtkMenuToolButton:last-child button:last-child,
-toolbar.inline-toolbar GtkMenuToolButton:last-child button:active:last-child,
 toolbar.inline-toolbar GtkMenuToolButton:last-child button:checked:last-child,
 toolbar.inline-toolbar GtkMenuToolButton:last-child button:disabled:last-child,
 .inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
@@ -2110,13 +2071,11 @@ toolbar.inline-toolbar GtkMenuToolButton:last-child button:disabled:last-child,
 
 /* Middle button */
 toolbar.inline-toolbar.vertical button,
-toolbar.inline-toolbar.vertical button:active,
 toolbar.inline-toolbar.vertical button:checked,
 toolbar.inline-toolbar.vertical button:disabled,
-toolbar.inline-toolbar.vertical GtkToolButton > button,
-toolbar.inline-toolbar.vertical GtkToolButton > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton > button:checked,
-toolbar.inline-toolbar.toolbar.vertical GtkToolButton > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button,
+toolbar.inline-toolbar.vertical toolbutton > button:checked,
+toolbar.inline-toolbar.toolbar.vertical toolbutton > button:disabled,
 .inline-toolbar.toolbar.vertical .button,
 .inline-toolbar.toolbar.vertical .button:active,
 .inline-toolbar.toolbar.vertical .button:checked,
@@ -2133,13 +2092,11 @@ toolbar.inline-toolbar.toolbar.vertical GtkToolButton > button:disabled,
 
 /* Topmost button */
 toolbar.inline-toolbar.vertical button:first-child,
-toolbar.inline-toolbar.vertical button:active:first-child,
 toolbar.inline-toolbar.vertical button:checked:first-child,
 toolbar.inline-toolbar.vertical button:disabled:first-child,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:checked,
-toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button:first-child,
+toolbar.inline-toolbar.vertical toolbutton > button:checked:first-child,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled:first-child,
 .inline-toolbar.toolbar.vertical .button:first-child,
 .inline-toolbar.toolbar.vertical .button:active:first-child,
 .inline-toolbar.toolbar.vertical .button:checked:first-child,
@@ -2156,13 +2113,11 @@ toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:disabled,
 
 /* Bottommost button */
 toolbar.inline-toolbar.vertical button:last-child,
-toolbar.inline-toolbar.vertical button:active:last-child,
 toolbar.inline-toolbar.vertical button:checked:last-child,
 toolbar.inline-toolbar.vertical button:disabled:last-child,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:checked,
-toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button:last-child,
+toolbar.inline-toolbar.vertical toolbutton > button:checked:last-child,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled:last-child,
 .inline-toolbar.toolbar.vertical .button:last-child,
 .inline-toolbar.toolbar.vertical .button:active:last-child,
 .inline-toolbar.toolbar.vertical .button:checked:last-child,
@@ -2179,13 +2134,11 @@ toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:disabled,
 
 /* Single button */
 toolbar.inline-toolbar.vertical button:only-child,
-toolbar.inline-toolbar.vertical button:active:only-child,
 toolbar.inline-toolbar.vertical button:checked:only-child,
 toolbar.inline-toolbar.vertical button:disabled:only-child,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:active,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:checked,
-toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:disabled,
+toolbar.inline-toolbar.vertical toolbutton > button:only-child,
+toolbar.inline-toolbar.vertical toolbutton > button:checked:only-child,
+toolbar.inline-toolbar.vertical toolbutton > button:disabled:only-child,
 .inline-toolbar.toolbar.vertical .button:only-child,
 .inline-toolbar.toolbar.vertical .button:active:only-child,
 .inline-toolbar.toolbar.vertical .button:checked:only-child,
@@ -2206,10 +2159,9 @@ toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:disabled,
 }
 
 button.flat.link.text-button,
-GtkLinkButton.button,
-GtkLinkButton.button:hover,
-GtkLinkButton.button:active,
-GtkLinkButton.button:active:hover {
+button.link,
+button.link:hover,
+button.link:hover:active {
     transition: all 400ms ease-in;
     text-shadow: none;
 }
@@ -2302,7 +2254,6 @@ stackswitcher > button.needs-attention:checked > image,
 stackswitcher  > button:dir(ltr).text-button.radio,
 stackswitcher  > button:dir(ltr).text-button.radio:hover,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:active,
-stackswitcher  > button:dir(ltr).text-button.radio:active,
 stackswitcher  > button:dir(ltr).text-button.radio:checked,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active  {
@@ -2317,7 +2268,6 @@ stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active  {
 stackswitcher  > button:dir(ltr).text-button.radio:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:active:first-child,
-stackswitcher  > button:dir(ltr).text-button.radio:active:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:first-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:first-child {
@@ -2329,7 +2279,6 @@ stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:first-ch
 stackswitcher  > button:dir(ltr).text-button.radio:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:hover:active:last-child,
-stackswitcher  > button:dir(ltr).text-button.radio:active:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:last-child,
 stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:last-child {
@@ -2338,6 +2287,28 @@ stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:last-chi
     border-radius: 0px 3px 3px 0px;
 }
 
+/* stack */
+stack > box.linked.vertical > combobox:first-child > button.combo:first-child,
+stack > box.linked.vertical > combobox:first-child > button.combo:checked:first-child,
+stack > box.linked.vertical > combobox:first-child > button.combo:focus:first-child,
+stack > box.linked.vertical > combobox:first-child > button.combo:focus:hover:first-child {
+    border-image: none;
+    border-style: solid;
+    border-color: @borders;
+    border-width: 1px;
+}
+
+stack > box.linked.vertical > button.text-button:last-child {
+    border-image: none;
+    border-style: solid;
+    border-color: @borders;
+    border-width: 0px 1px 1px 1px;
+}
+
+stack box.vertical.linked spinbutton.horizontal {
+    border-width: 0px 1px 1px 1px;
+}
+
 /*****************
  * Notebooks and *
  * tabs          *
@@ -2466,6 +2437,7 @@ notebook header tab {
 notebook.frame header.top tab,
 notebook.frame header.bottom tab,
 .notebook tab.top,
+/* wtf, why this doesn't work? */
 .notebook tab.bottom {
     padding: 6px 21px 4px;
     border-style: solid;
@@ -2473,10 +2445,14 @@ notebook.frame header.bottom tab,
     border-color: transparent;
 }
 
+/* workaround for wtf */
+.notebook tab.bottom:checked {
+    padding: 3px 21px 7px 21px;
+}
 
-notebook header.top tab:active,
-notebook header.top tab:active:hover,
-.notebook tab.top:active,
+notebook header.top tab:checked,
+notebook header.top tab:hover:active,
+.notebook tab.top:checked,
 .notebook tab.top:active:hover {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.18),
@@ -2499,8 +2475,8 @@ notebook header.top tab:hover,
     border-color: @borders;
 }
 
-notebook header.bottom tab:active,
-notebook header.bottom tab:active:hover,
+notebook header.bottom tab:checked,
+notebook header.bottom tab:hover:active,
 .notebook tab.bottom:active,
 .notebook tab.bottom:active:hover {
     background-image: linear-gradient(to top,
@@ -2543,8 +2519,8 @@ notebook header.right tab {
     border-width: 1px 1px 1px 0px;
 }
 
-notebook header.left tab:active,
-notebook header.left tab:active:hover,
+notebook header.left tab:checked,
+notebook header.left tab:hover:active,
 .notebook tab.left:active,
 .notebook tab.left:active:hover {
     background-image: linear-gradient(to right,
@@ -2565,8 +2541,8 @@ notebook header.left tab:hover,
     border-color: @borders;
 }
 
-notebook header.right tab:active,
-notebook header.right tab:active:hover,
+notebook header.right tab:checked,
+notebook header.right tab:hover:active,
 .notebook tab.right:active,
 .notebook tab.right:active:hover {
     background-image: linear-gradient(to left,
@@ -2597,7 +2573,7 @@ notebook tab.reorderable-page:hover,
     border-style: none;
 }
 
-notebook tab.reorderable-page:active,
+notebook tab.reorderable-page:checked,
 .notebook tab.reorderable-page:active {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.18),
@@ -2643,10 +2619,10 @@ notebook button.flat.small-button:hover,
     background-color: transparent;
 }
 
-notebook button.flat:active,
-notebook button.flat:active:hover,
-notebook button.flat.small-button:active,
-notebook button.flat.small-button:active:hover,
+notebook button.flat:checked,
+notebook button.flat:hover:checked,
+notebook button.flat.small-button:checked,
+notebook button.flat.small-button:hover:active,
 .notebook tab .button:active,
 .notebook tab .button:active:hover {
     color:  @button_active_text;
@@ -2685,6 +2661,8 @@ notebook header.right tabs arrow.down {
 
 notebook header tabs arrow,
 .notebook.arrow {
+    /* FIXME, why this doesn't work? */
+/*    -GtkNotebook-arrow-scaling: 0.5; */
     color: shade(@theme_fg_color, 2.6);
 }
 
@@ -2720,6 +2698,8 @@ notebook header tabs arrow:disabled,
 combobox,
 GtkComboBox {
 	padding: 0;
+/*	-GtkComboBox-arrow-scaling: 0.5; deprecated */
+/*	-GtkComboBox-shadow-type: none; deprecated */
 	text-shadow: 0 1px @button_text_shadow;
 }
 
@@ -2732,6 +2712,7 @@ GtkComboBox:disabled {
 combobox separator,
 GtkComboBox .separator {
 	/* always disable separators */
+/*	-GtkWidget-wide-separators: true; deprecated */
 	-GtkWidget-horizontal-separator: 0;
 	-GtkWidget-vertical-separator: 0;
 }
@@ -2787,8 +2768,8 @@ GtkComboBox.combobox-entry .entry:focus:last-child {
 }
 
 combobox entry button:last-child,
-combobox entry  button:hover:last-child,
-combobox entry button:active:last-child,
+combobox entry button:hover:last-child,
+combobox entry button:checked:last-child,
 combobox entry button:hover:active:last-child,
 GtkComboBox.combobox-entry .button:last-child,
 GtkComboBox.combobox-entry .button:hover:last-child,
@@ -2801,7 +2782,7 @@ GtkComboBox.combobox-entry .button:hover:active:last-child {
 
 combobox entry button:first-child,
 combobox entry button:hover:first-child,
-combobox entry button:active:first-child,
+combobox entry button:checked:first-child,
 combobox entry button:hover:active:first-child,
 GtkComboBox.combobox-entry .button:first-child,
 GtkComboBox.combobox-entry .button:hover:first-child,
@@ -2823,8 +2804,8 @@ GtkComboBox.combobox-entry .button:disabled:last-child {
 }
 
 combobox entry button:hover,
-combobox entry button:active,
-combobox entry button:active:hover,
+combobox entry button:checked,
+combobox entry button:hover:active,
 GtkComboBox.combobox-entry .button:hover,
 GtkComboBox.combobox-entry .button:active,
 GtkComboBox.combobox-entry .button:active:hover {
@@ -2832,7 +2813,7 @@ GtkComboBox.combobox-entry .button:active:hover {
     transition: all 200ms ease-in;
 }
 
-combobox button,
+combobox button.combo,
 GtkComboBox .button {
     color: @theme_fg_color;
 }
@@ -3127,7 +3108,6 @@ GtkTreeMenu .menuitem,
 	text-shadow: none;
 }
 
-context-menu,
 .context-menu {
 	font: initial;
 	text-shadow: none;
@@ -3180,11 +3160,12 @@ menubar,
 
 menubar menuitem,
 .menubar .menuitem {
-	transition: all 200ms ease-out;
-	-gtk-icon-style: regular;
-	border-style: none;
-	padding: 4px 6px;
-	text-shadow: 0 1px @button_text_shadow;
+    min-height: 22px;
+    transition: all 200ms ease-out;
+    -gtk-icon-style: regular;
+    border-style: none;
+    padding: 4px 6px;
+    text-shadow: 0 1px @button_text_shadow;
 }
 
 menubar menuitem:hover,
@@ -3201,6 +3182,7 @@ menubar menuitem:hover,
 
 menu menuitem,
 .menu .menuitem {
+    min-height: 22px;
     background-color: transparent;
     transition: all 150ms ease-out;
     padding: 6px 5px;
@@ -3370,12 +3352,12 @@ menuitem radio:checked:disabled,
 /***************
  * Menu Button *
  ***************/
-toolbar GtkMenuButton menu-button:active,
-toolbar GtkMenuButton menu-button.raised:active,
-menu-button:active,
-.linked menu-button:active,
-toolbar .linked.raised menu-button:active,
-toolbar menu-button.linked.raised:active,
+
+toolbar .menuitem.button:selected,
+toolbar .raised .menuitem.button:selected,
+.menuitem.button:selected,
+.linked .menuitem.button:selected,
+toolbar .linked.raised .menuitem.button:selected,
 .toolbar GtkMenuButton.menu-button:active,
 .toolbar GtkMenuButton.menu-button.raised:active,
 GtkMenuButton.menu-button:active,
@@ -3390,10 +3372,9 @@ GtkMenuButton.menu-button:active,
 	color: @theme_text_color;*/
 }
 
-menu-button:active,
-.linked menu-button:active,
-.toolbar .linked.raised menu-button:active,
-toolbar menu-button.linked.raised:active,
+.menuitem.button:selected,
+.linked .menuitem.button:selected,
+toolbar .linked.raised .menuitem.button:selected,
 GtkMenuButton.menu-button:active,
 .linked GtkMenuButton.menu-button:active,
 .toolbar .linked.raised GtkMenuButton.menu-button:active,
@@ -3403,25 +3384,23 @@ GtkMenuButton.menu-button:active,
 	box-shadow: none;
 }
 
-.linked menu-button:active:last-child,
-toolbar .linked.raised menu-button:active:last-child,
-toolbar menu-button.linked.raised:active:last-child,
+.linked .menuitem.button:selected:last-child,
+toolbar .linked.raised .menuitem.button:selected:last-child,
 .linked GtkMenuButton.menu-button:active:last-child,
 .toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
 .toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
 	border-top-left-radius: 0;
 }
 
-.linked menu-button:active:first-child,
-toolbar .linked.raised menu-button:active:first-child,
-toolbar menu-button.linked.raised:active:first-child,
+.linked .menuitem.button:selected:first-child,
+toolbar .linked.raised .menuitem.button:selected:first-child,
 .linked GtkMenuButton.menu-button:active:first-child,
 .toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
 .toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
 	border-top-right-radius: 0;
 }
 
-button menuitem menubar:active,
+menubar menuitem button:selected,
 .button.menuitem.menubar:active {
 	background-image: none;
 	background-color: @menu_bg_color;
@@ -3433,16 +3412,16 @@ button menuitem menubar:active,
 	border-style: solid;
 }
 
-button menuitem menubar:active,
-menu-button:active,
-toolbar menu-button:active,
+menubar menuitem button:selected,
+.menuitem.button:selected,
+toolbar .menuitem.button:selected,
 .button.menuitem.menubar:active,
 GtkMenuButton.menu-button:active,
 .toolbar GtkMenuButton.menu-button:active {
 	color: @theme_text_color;
 }
 
-menu-button menu,
+menu .menuitem.button,
 GtkMenuButton .menu {
 	text-shadow: none;
 }
@@ -3454,11 +3433,7 @@ GtkMenuButton .menu {
 check,
 radio,
 check:disabled,
-radio:disabled,
-.check,
-.radio,
-.check:disabled,
-.radio:disabled {
+radio:disabled {
 	background-color: transparent;
 	border-style: none;
 }
@@ -3469,22 +3444,15 @@ radio {
 }
 
 checkbutton:hover,
-checkbutton:active:hover,
+checkbutton:hover:active,
 checkbutton:selected,
 checkbutton:selected:focus,
-checkbutton:disabled,
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:disabled {
+checkbutton:disabled {
 	background-color: transparent;
 }
 
 checkbutton.text-button,
-radiobutton.text-button,
-GtkCheckButton.text-button,
-GtkRadioButton.text-button {
+radiobutton.text-button {
 	padding: 1px 2px 4px;
 	outline-offset: 0; 
 }
@@ -3577,6 +3545,7 @@ headerbar .subtitle,
 /***************
  * Action bars *
  ***************/
+
 actionbar,
 .action-bar {
 	border-width: 1px 0 0;
@@ -3591,12 +3560,12 @@ actionbar,
 	padding: 6px 6px 5px 6px;
 }
 
-actionbar .button.text-button,
+actionbar button.text-button,
 .action-bar .button.text-button {
 	padding: 2px 16px;
 }
 
-actionbar .button.image-button,
+actionbar button.image-button,
 .action-bar .button.image-button {
 	padding: 5px 5px 4px 5px;
 }
@@ -3613,6 +3582,7 @@ actionbar .subtitle,
 	padding: 0px 12px 0px 12px;
 }
 
+
 /***************
  * Dialog	  *
  ***************/
@@ -3628,7 +3598,7 @@ GtkMessageDialog {
 }
 
 /* ie. mate-keyboard-properties option window */
-GtkDialog scrolledwindow,
+dialog scrolledwindow,
 GtkDialog GtkScrolledWindow.frame {
     border-color: @borders;
     border-style: solid;
@@ -3636,13 +3606,13 @@ GtkDialog GtkScrolledWindow.frame {
     border-radius: 2px;
 }
 
-GtkDialog scrolledwindow viewport .vertical,
+dialog scrolledwindow viewport .vertical,
 GtkDialog GtkScrolledWindow.frame GtkViewport .vertical {
     background-color: shade (@theme_bg_color, 1.07);
 }
 
-GtkDialog scrolledwindow viewport .vertical, GtkExpander .vertical.
-GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
+dialog scrolledwindow viewport .vertical expander .vertical.
+GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
     background-color: @theme_base_color;
     border-radius: 3px;
     border-color: @borders;
@@ -3652,8 +3622,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 
 /* middle buttons */
 .dialog-action-area.linked button,
-.dialog-action-area.linked button:active,
-.dialog-action-area.linked button:active:hover,
+.dialog-action-area.linked button:hover:active,
 .dialog-action-area.linked button:checked,
 .dialog-action-area.linked button:checked:hover,
 .dialog-action-area.linked button:disabled,
@@ -3666,12 +3635,12 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 	border-style: solid;
 	border-radius: 0;
     border-width: 1px;
+    border-left-width:  0px;
 	border-color: @borders;
 	border-image: none;
 }
 
 .dialog-action-area.linked button.default,
-.dialog-action-area.linked button.default:active,
 .dialog-action-area.linked button.default:checked,
 .dialog-action-area.linked button.default:disabled,
 .dialog-action-area.linked button:focus,
@@ -3683,13 +3652,13 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 	border-style: solid;
 	border-radius: 0;
     border-width: 1px;
+    border-left-width:  0px;
 	border-color: @theme_selected_bg_color;
 }
 
 /* left button */
 .dialog-action-area.linked button:first-child,
-.dialog-action-area.linked button:active:first-child,
-.dialog-action-area.linked button:active:hover:first-child,
+.dialog-action-area.linked button:hover:active:first-child,
 .dialog-action-area.linked button:checked:first-child,
 .dialog-action-area.linked button:checked:hover:first-child,
 .dialog-action-area.linked button:disabled:first-child,
@@ -3707,7 +3676,6 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 }
 
 .dialog-action-area.linked button.default:first-child,
-.dialog-action-area.linked button.default:active:first-child,
 .dialog-action-area.linked button.default:checked:first-child,
 .dialog-action-area.linked button.default:disabled:first-child,
 .dialog-action-area.linked button:focus:first-child,
@@ -3720,13 +3688,11 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
     border-width: 1px;
 	border-radius: 3px 0 0px 3px;
 	border-color: @theme_selected_bg_color;
-/*	-GtkWidget-focus-line-width: 0; deprecated */
 }
 
 /* right button */
 .dialog-action-area.linked button:last-child,
-.dialog-action-area.linked button:active:last-child,
-.dialog-action-area.linked button:active:hover:last-child,
+.dialog-action-area.linked button:hover:active:last-child,
 .dialog-action-area.linked button:checked:last-child,
 .dialog-action-area.linked button:checked:hover:last-child,
 .dialog-action-area.linked button:disabled:last-child,
@@ -3738,13 +3704,13 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 .dialog-action-area.linked .button:disabled:last-child {
 	border-style: solid;
     border-width: 1px;
+    border-left-width: 0;
 	border-radius: 0 3px 3px 0;
 	border-color: @borders;
 	border-image: none;
 }
 
 .dialog-action-area.linked button.default:last-child,
-.dialog-action-area.linked button.default:active:last-child,
 .dialog-action-area.linked button.default:checked:last-child,
 .dialog-action-area.linked button.default:disabled:last-child,
 .dialog-action-area.linked button:focus:last-child,
@@ -3755,14 +3721,14 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 .dialog-action-area.linked .button:focus:last-child {
 	border-style: solid;
     border-width: 1px;
+    border-left-width: 0px;
 	border-radius: 0 3px 3px 0;
 	border-color: @theme_selected_bg_color;
 }
 
 /* single button */
 .dialog-action-area.linked button:only-child,
-.dialog-action-area.linked button:active:only-child,
-.dialog-action-area.linked button:active:hover:only-child,
+.dialog-action-area.linked button:hover:active:only-child,
 .dialog-action-area.linked button:checked:only-child,
 .dialog-action-area.linked button:checked:hover:only-child,
 .dialog-action-area.linked button:disabled:only-child,
@@ -3781,7 +3747,6 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 }
 
 .dialog-action-area.linked button.default:only-child,
-.dialog-action-area.linked button.default:active:only-child,
 .dialog-action-area.linked button.default:checked:only-child,
 .dialog-action-area.linked button.default:disabled:only-child,
 .dialog-action-area.linked button:focus:only-child,
@@ -3798,7 +3763,6 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical {
 }
 
 .dialog-action-area.linked button.suggested-action,
-.dialog-action-area.linked button.suggested-action:active,
 .dialog-action-area.linked button.suggested-action:checked,
 .dialog-action-area.linked button.suggested-action:disabled,
 .dialog-action-area.linked .button.suggested-action,
@@ -3975,35 +3939,6 @@ GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r
 	color: shade (@theme_selected_bg_color, 0.35);
 }
 
-.sidebar scrollbar trough,
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar scrollbar trough,
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar scrollbar slider,
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar scrollbar slider:hover,
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar scrollbar slider:hover:active,
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
 .sidebar radio,
 .sidebar radio:focus,
 .sidebar radio:selected,
@@ -4017,6 +3952,7 @@ GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r
 /*******
  * OSD *
  *******/
+
 .background.osd {
 	color: @osd_fg;
 	background-color: @osd_bg;
@@ -4032,7 +3968,6 @@ GtkOverlay.osd {
 }
 
 .osd button,
-.osd button:active,
 .osd button:checked,
 .osd.button,
 .osd.button:active,
@@ -4056,7 +3991,6 @@ GtkOverlay.osd {
 	border-color: alpha(@osd_button_border,0.5);
 }
 
-.osd button:active,
 .osd button:checked,
 .osd .button:active,
 .osd .button:checked {
@@ -4099,7 +4033,6 @@ GtkOverlay.osd {
 
 .osd button,
 .osd button:hover,
-.osd button:active,
 .osd button:checked,
 .osd .button,
 .osd .button:hover,
@@ -4131,10 +4064,8 @@ GtkOverlay.osd {
 	color: @osd_button_fg_hover;
 }
 
-.osd button:active,
 .osd button:hover:active,
 .osd button:checked,
-.osd button:hover:checked
 .osd.button:active,
 .osd.button:hover:active,
 .osd .button:active,
@@ -4147,8 +4078,7 @@ GtkOverlay.osd {
 }
 
 .osd button:disabled,
-.osd button:active *:disabled,
-.osd button:checked *:disabled,
+.osd button:checked:disabled,
 .osd.button:disabled,
 .osd.button:active *:disabled,
 .osd.button:checked *:disabled,
@@ -4172,13 +4102,12 @@ GtkOverlay.osd {
 
 .osd button:checked,
 .osd button:checked:hover,
-.osd button:active,
-.osd button:active:hover,
+.osd button:hover:active,
 .osd.button:active,
 .osd.button:active:hover,
 .osd .button:active,
 .osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
+.osd .menuitem.button:selected,
 .osd.button:checked,
 .osd.button:checked:hover,
 .osd .button:checked,
@@ -4216,13 +4145,13 @@ toolbar.osd button.image-button,
     box-shadow: none;
 }
 
-.osd button.menu-button:active,
+.osd .menuitem.button:selected,
 .osd GtkMenuButton.menu-button:active {
 	background-color: transparent;
 	border-color: @osd_button_border;
 }
 
-.osd button.menu-button:active,
+.osd .menuitem.button:selected,
 .osd GtkMenuButton.menu-button:active {
 	color: @osd_button_fg_active;
 	text-shadow: 0 -1px @osd_button_shadow;
@@ -4267,10 +4196,10 @@ toolbar.osd button:last-child,
 }
 
 toolbar.osd button:only-child,
-toolbar.osd GtkToolButton button,
-toolbar.osd GtkToolButton:only-child button,
-toolbar.osd GtkToolButton:last-child button,
-toolbar.osd GtkToolButton:first-child button,
+toolbar.osd toolbutton button,
+toolbar.osd toolbutton button:only-child,
+toolbar.osd toolbutton button:last-child,
+toolbar.osd toolbutton button:first-child,
 .osd.toolbar .button:only-child,
 .osd.toolbar GtkToolButton .button,
 .osd.toolbar GtkToolButton:only-child .button,
@@ -4337,8 +4266,8 @@ toolbar.osd separator,
 .osd popover.background.scale-popup button.flat.image-button,
 .osd .scale-popup.popover.background .button.flat.image-button {
     background-image: linear-gradient(to bottom,
-	                                  alpha(shade(@theme_selected_bg_color, 1.90), 0.6),
-	                                  alpha(shade(@theme_selected_bg_color, 0.75), 0.6));
+	                                  alpha(shade(@theme_selected_bg_color, 1.1), 0.6),
+	                                  alpha(shade(@theme_selected_bg_color, 0.95), 0.6));
 	border-radius: 5px;
 	border-width: 1px;
 	padding: 2px;
@@ -4355,6 +4284,9 @@ progressbar .osd,
 .osd GtkProgressBar,
 GtkProgressBar.osd {
 	padding: 0;
+/*	-GtkProgressBar-xspacing: 0; deprecated */
+/*	-GtkProgressBar-yspacing: 3px; deprecated */
+/*	-GtkProgressBar-min-horizontal-bar-height: 3px; deprecated */
 	min-height: 3px;
 }
 
@@ -4413,7 +4345,7 @@ GtkProgressBar.osd.progressbar {
 }
 
 .osd iconview.cell:selected,
-.osd iconview.cell:selected:focus
+.osd iconview.cell:selected:focus,
 .osd GtkIconView.cell:selected,
 .osd GtkIconView.cell:selected:focus {
 	background-color: transparent;
@@ -4437,6 +4369,7 @@ GtkProgressBar.osd.progressbar {
 /****************************
  * Suggested action buttons *
  ****************************/
+
 toolbar button.suggested-action,
 button.suggested-action,
 .toolbar .suggested-action.button,
@@ -4457,14 +4390,10 @@ button.suggested-action:hover,
 		shade(@suggested_action_button_b, 1.05));
 }
 
-toolbar button.suggested-action:active,
 toolbar button.suggested-action:hover:active,
-button.suggested-action:active,
 button.suggested-action:hover:active,
 toolbar button.suggested-action:checked,
-toolbar button.suggested-action:hover:checked,
 button.suggested-action:checked,
-button.suggested-action:hover:checked,
 .toolbar .suggested-action.button:active,
 .toolbar .suggested-action.button:hover:active,
 .suggested-action.button:active,
@@ -4488,14 +4417,10 @@ button.suggested-action,
 	-gtk-icon-shadow: 0 1px @suggested_action_button_shadow;
 }
 
-toolbar button.suggested-action:active,
 toolbar button.suggested-action:hover:active,
-button.suggested-action:active,
 button.suggested-action:hover:active,
 toolbar button.suggested-action:checked,
-toolbar button.suggested-action:checked,
 button.suggested-action:checked,
-button.suggested-action:hover:checked,
 .toolbar .suggested-action.button:active,
 .toolbar .suggested-action.button:hover:active,
 .suggested-action.button:active,
@@ -4509,8 +4434,7 @@ button.suggested-action:hover:checked,
 }
 
 button.suggested-action:disabled,
-button.suggested-action:active *:disabled,
-button.suggested-action:checked *:disabled,
+button.suggested-action:checked:disabled,
 .suggested-action.button:disabled,
 .suggested-action.button:active *:disabled,
 .suggested-action.button:checked *:disabled {
@@ -4529,6 +4453,7 @@ button.suggested-action label:disabled,
 /******************************
  * Destructive action buttons *
  ******************************/
+
 button.destructive-action,
 .destructive-action.button {
 	background-image: linear-gradient(to bottom,
@@ -4545,10 +4470,8 @@ button.destructive-action:hover,
 		shade(@destructive_action_button_b, 1.05));
 }
 
-button.destructive-action:active,
 button.destructive-action:hover:active,
 button.destructive-action:checked,
-button.destructive-action:hover:checked,
 .destructive-action.button:active,
 .destructive-action.button:hover:active,
 .destructive-action.button:checked,
@@ -4566,10 +4489,8 @@ button.destructive-action,
 	-gtk-icon-shadow: 0 1px @destructive_action_button_shadow;
 }
 
-button.destructive-action:active,
 button.destructive-action:hover:active,
 button.destructive-action:checked,
-button.destructive-action:hover:checked,
 .destructive-action.button:active,
 .destructive-action.button:hover:active,
 .destructive-action.button:checked,
@@ -4581,6 +4502,7 @@ button.destructive-action:hover:checked,
 /**************************
  * Selection Mode classes *
  **************************/
+
 headerbar.selection-mode,
 toolbar.selection-mode,
 .selection-mode.header-bar,
@@ -4614,7 +4536,7 @@ toolbar.selection-mode,
 /* regular button */
 headerbar.selection-mode button,
 toolbar.selection-mode button,
-toolbar.selection-mode GtkToolButton button,
+toolbar.selection-mode toolbutton button,
 .selection-mode.header-bar .button,
 .selection-mode.toolbar .button,
 .selection-mode.toolbar GtkToolButton .button {
@@ -4633,7 +4555,7 @@ toolbar.selection-mode GtkToolButton button,
 
 headerbar.selection-mode button:hover,
 toolbar.selection-mode button:hover,
-toolbar.selection-mode GtkToolButton button:hover,
+toolbar.selection-mode toolbutton button:hover,
 .selection-mode.header-bar .button:hover,
 .selection-mode.toolbar .button:hover,
 .selection-mode.toolbar GtkToolButton .button:hover {
@@ -4642,18 +4564,12 @@ toolbar.selection-mode GtkToolButton button:hover,
 		shade(@selection_toolbar_button_b, 1.02));
 }
 
-headerbar.selection-mode button:active,
 headerbar.selection-mode button:hover:active,
-toolbar.selection-mode button:active,
 toolbar.selection-mode button:hover:active,
-toolbar.selection-mode GtkToolButton button:active,
-toolbar.selection-mode GtkToolButton button:hover:active,
+toolbar.selection-mode toolbutton button:hover:active,
 headerbar.selection-mode button:checked,
-headerbar.selection-mode button:hover:checked,
 toolbar.selection-mode button:checked,
-toolbar.selection-mode button:hover:checked,
-toolbar.selection-mode GtkToolButton button:checked,
-toolbar.selection-mode GtkToolButton button:hover:checked,
+toolbar.selection-mode toolbutton button:checked,
 .selection-mode.header-bar .button:active,
 .selection-mode.header-bar .button:hover:active,
 .selection-mode.toolbar .button:active,
@@ -4672,12 +4588,9 @@ toolbar.selection-mode GtkToolButton button:hover:checked,
 	box-shadow: none;
 }
 
-headerbar.selection-mode button:active,
-toolbar.selection-mode button:active,
-toolbar.selection-mode GtkToolButton button:active,
 headerbar.selection-mode button:checked,
 toolbar.selection-mode button:checked,
-toolbar.selection-mode GtkToolButton button:checked,
+toolbar.selection-mode toolbutton button:checked,
 .selection-mode.header-bar .button:active,
 .selection-mode.toolbar .button:active,
 .selection-mode.toolbar GtkToolButton .button:active,
@@ -4688,14 +4601,11 @@ toolbar.selection-mode GtkToolButton button:checked,
 }
 
 headerbar.selection-mode button,
-headerbar.selection-mode button:active,
 headerbar.selection-mode button:checked,
 toolbar.selection-mode button,
-toolbar.selection-mode button:active,
 toolbar.selection-mode button:checked,
-toolbar.selection-mode GtkToolButton button,
-toolbar.selection-mode GtkToolButton button:active,
-toolbar.selection-mode GtkToolButton button:checked,
+toolbar.selection-mode toolbutton button,
+toolbar.selection-mode toolbutton button:checked,
 .selection-mode.header-bar .button,
 .selection-mode.header-bar .button:active,
 .selection-mode.header-bar .button:checked,
@@ -4712,7 +4622,7 @@ toolbar.selection-mode GtkToolButton button:checked,
 /* suggested button */
 headerbar.selection-mode button.suggested-action,
 toolbar.selection-mode button.suggested-action,
-toolbar.selection-mode GtkToolButton button.suggested-action,
+toolbar.selection-mode toolbutton button.suggested-action,
 .selection-mode.header-bar .suggested-action.button,
 .selection-mode.toolbar .suggested-action.button,
 .selection-mode.toolbar GtkToolButton.suggested-action .button {
@@ -4730,30 +4640,24 @@ toolbar.selection-mode GtkToolButton button.suggested-action,
 	color: @theme_text_color;
 }
 
-headerbar.selection-mode .suggested-action.button:hover,
-toolbar.selection-mode .suggested-action.button:hover,
-toolbar.selection-mode GtkToolButton.suggested-action .button:hover,
+headerbar.selection-mode button.suggested-action:hover,
+toolbar.selection-mode button.suggested-action:hover,
+toolbar.selection-mode toolbutton button.suggested-action:hover,
 .selection-mode.header-bar button.suggested-action:hover,
 .selection-mode.toolbar button.suggested-action:hover,
-.selection-mode.toolbar GtkToolButton button.suggested-action:hover {
+.selection-mode.toolbar toolbutton button.suggested-action:hover {
 	background-image: linear-gradient(to bottom,
 		shade(@selection_toolbar_suggested_button_a, 1.15),
 		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
 		@selection_toolbar_suggested_button_c);
 }
 
-headerbar.selection-mode button.suggested-action:active,
 headerbar.selection-mode button.suggested-action:hover:active,
-toolbar.selection-mode button.suggested-action:active,
 toolbar.selection-mode button.suggested-action:hover:active,
-toolbar.selection-mode GtkToolButton button.suggested-action button:active,
-toolbar.selection-mode GtkToolButton button.suggested-action button:hover:active,
+toolbar.selection-mode toolbutton button.suggested-action button:hover:active,
 headerbar.selection-mode button.suggested-action:checked,
-headerbar.selection-mode button.suggested-action:hover:checked,
 toolbar.selection-mode button.suggested-action:checked,
-toolbar.selection-mode button.suggested-action:hover:checked,
-toolbar.selection-mode GtkToolButton button.suggested-action button:checked,
-toolbar.selection-mode GtkToolButton button.suggested-action button:hover:checked,
+toolbar.selection-mode toolbutton button.suggested-action button:checked,
 .selection-mode.header-bar .suggested-action.button:active,
 .selection-mode.header-bar .suggested-action.button:hover:active,
 .selection-mode.toolbar .suggested-action.button:active,
@@ -4773,12 +4677,10 @@ toolbar.selection-mode GtkToolButton button.suggested-action button:hover:checke
 	box-shadow: none;
 }
 
-headerbar.selection-mode button.suggested-action:active,
-toolbar.selection-mode button.suggested-action:active,
-toolbar.selection-mode GtkToolButton button.suggested-action:active,
+
 headerbar.selection-mode button.suggested-action:checked,
 toolbar.selection-mode button.suggested-action:checked,
-toolbar.selection-mode GtkToolButton button.suggested-action:checked,
+toolbar.selection-mode toolbutton button.suggested-action:checked,
 .selection-mode.header-bar .suggested-action.button:active,
 .selection-mode.toolbar .suggested-action.button:active,
 .selection-mode.toolbar GtkToolButton.suggested-action:active,
@@ -4789,14 +4691,11 @@ toolbar.selection-mode GtkToolButton button.suggested-action:checked,
 }
 
 headerbar.selection-mode button.suggested-action,
-headerbar.selection-mode button.suggested-action:active,
 headerbar.selection-mode button.suggested-action:checked,
 toolbar.selection-mode button.suggested-action,
-toolbar.selection-mode button.suggested-action:active,
 toolbar.selection-mode button.suggested-action:checked,
-toolbar.selection-mode GtkToolButton button.suggested-action button,
-toolbar.selection-mode GtkToolButton button.suggested-action:active,
-toolbar.selection-mode GtkToolButton button.suggested-action:checked,
+toolbar.selection-mode toolbutton button.suggested-action button,
+toolbar.selection-mode toolbutton button.suggested-action:checked,
 .selection-mode.header-bar .suggested-action.button,
 .selection-mode.header-bar .suggested-action.button:active,
 .selection-mode.header-bar .suggested-action.button:checked,
@@ -4843,8 +4742,6 @@ toolbar.selection-mode button.selection-menu .dim-label:hover,
 	color: @selection_menu_hover;
 }
 
-headerbar.selection-mode button.selection-menu:active,
-toolbar.selection-mode button.selection-menu:active,
 headerbar.selection-mode button.selection-menu:checked,
 toolbar.selection-mode button.selection-menu:checked,
 .selection-mode.header-bar .selection-menu.button:active,
@@ -4857,8 +4754,6 @@ toolbar.selection-mode button.selection-menu:checked,
 	background-color: transparent;
 }
 
-headerbar.selection-mode button.selection-menu:active,
-toolbar.selection-mode button.selection-menu:active,
 headerbar.selection-mode button.selection-menu:checked,
 toolbar.selection-mode button.selection-menu:checked,
 .selection-mode.header-bar .selection-menu.button:active,
@@ -4877,7 +4772,6 @@ toolbar.selection-mode button.selection-menu.button,
 
 headerbar.selection-mode button.selection-menu menuitem,
 toolbar.selection-mode button.selection-menu menuitem,
-
 .selection-mode.header-bar .selection-menu.button .menuitem,
 .selection-mode.toolbar .selection-menu.button .menuitem {
 	text-shadow: none;
@@ -5055,8 +4949,8 @@ viewport {
 
 GtkIconView.cell:selected,
 GtkIconView.cell:selected:focus,
-iconview cell:selected,
-iconview cell:selected:focus {
+iconview .cell:selected,
+iconview .cell:selected:focus {
 	border-radius: 4px;
 	outline-color: @treeview_focus_border;
 	outline-style: solid;
@@ -5065,8 +4959,8 @@ iconview cell:selected:focus {
 
 GtkIconView.cell:hover,
 GtkIconView.cell:hover:focus,
-iconview cell:hover,
-iconview cell:hover:focus {
+iconview .cell:hover,
+iconview .cell:hover:focus {
 	border-radius: 4px;
 }
 
@@ -5190,10 +5084,10 @@ GtkTreeView row:nth-child(even):backdrop:hover {
 	color: shade (@theme_selected_bg_color, 0.35);
 }
 
-.sidebar treeview row:active:hover,
+.sidebar treeview row:hover:active,
 .sidebar treeview row:checked:hover,
 .sidebar treeview row:selected:hover,
-.sidebar GtkTreeView row:active:hover,
+.sidebar GtkTreeView row:hover:active,
 .sidebar GtkTreeView row:checked:hover,
 .sidebar GtkTreeView row:selected:hover {
 	color: shade (@theme_selected_fg_color, 1.00);
@@ -5229,8 +5123,7 @@ column-header .button:disabled {
 }
 
 treeview header button:hover,
-treeview header button:active,
-treeview header button:active:hover,
+treeview header button:hover:active,
 treeview header button:checked,
 treeview header button:checked:hover,
 column-header.button:hover,
@@ -5358,13 +5251,9 @@ GtkCalendar.header .app-notification.frame .titlebutton.button {
     border-radius: 3px;
 }
 
-.app-notification button:active,
 .app-notification button:checked,
-.app-notification button:backdrop:active,
 .app-notification button:backdrop:checked,
-.app-notification.frame button:active,
 .app-notification.frame button:checked,
-.app-notification.frame button:backdrop:active,
 .app-notification.frame button:backdrop:checked,
 .app-notification .button:active,
 .app-notification .button:checked,
@@ -5596,9 +5485,8 @@ list row button,
 
 list row button:selected,
 list row button:selected:hover,
-list row button:active,
 list row button:checked,
-list row button:active:hover,
+list row button:hover:active,
 list row button:checked:hover,
 .list-row.button:selected,
 .list-row.button:selected:hover,
@@ -5730,10 +5618,10 @@ GtkInfoBar {
 		alpha(black, 0.02));
 }
 
-.info button.close:active,
-.warning button.close:active,
-.question button.close:active,
-.error button.close:active,
+.info button.close:checked,
+.warning button.close:checked,
+.question button.close:checked,
+.error button.close:checked,
 .info .button.close:active,
 .warning .button.close:active,
 .question .button.close:active,
@@ -5748,25 +5636,21 @@ entry.info,
 entry.info:focus,
 .info button,
 .info button:disabled,
-.info button:active,
 .info button:checked,
 entry.warning,
 entry.warning:focus,
 .warning button,
 .warning button:disabled,
-.warning button:active,
 .warning button:checked,
 entry.error,
 entry.error:focus,
 .error button,
 .error button:disabled,
-.error button:active,
 .error button:checked,
 entry.question,
 entry.question:focus,
 .question button,
 .question button:disabled,
-.question button:active,
 .question button:checked.
 .info .entry,
 .info .entry:focus,
@@ -5899,7 +5783,6 @@ popover.osd button,
 	-gtk-icon-shadow: 0 -1px @osd_text_shadow;
 }
 
-popover.osd button:active,
 popover button:checked,
 .popover.osd .button:active,
 .popover.osd .button:checked {
@@ -5922,23 +5805,18 @@ GtkModelButton.button {
 }
 
 modelbutton:checked,
-modelbutton:active,
 modelbutton:disabled,
-modelbutton:active:disabled,
 modelbutton:checked:disabled,
 modelbutton,
 modelbutton:focus,
-modelbutton:active:focus,
-modelbutton:checked:focus,
+modelbutton:focus:active,
 modelbutton.flat:checked,
-modelbutton.flat:active,
 modelbutton.flat:disabled,
-modelbutton.flat:active:disabled,
 modelbutton.flat:checked:disabled,
 modelbutton.flat,
 modelbutton.flat:focus,
-modelbutton.flat:active:focus,
-modelbutton.flat:checked:focus,
+modelbutton.flat:focus:active,
+modelbutton.flat:focus:checked,
 GtkModelButton.button:checked,
 GtkModelButton.button:active,
 GtkModelButton.button:disabled,
@@ -5967,11 +5845,11 @@ GtkModelButton.button.flat:checked:focus {
 }
 
 modelbutton:checked:hover,
-modelbutton:active:hover,
+modelbutton:hover:active,
 modelbutton:hover,
 modelbutton:selected,
 modelbutton.flat:checked:hover,
-modelbutton.flat:active:hover,
+modelbutton.flat:hover:active,
 modelbutton.flat:hover,
 modelbutton.flat:selected,
 GtkModelButton.button:checked:hover,
@@ -5994,7 +5872,7 @@ GtkModelButton.button.flat:selected {
 
 /* middle button*/
 .linked modelbutton:hover,
-.linked modelbutton:active:hover,
+.linked modelbutton:hover:active,
 .linked modelbutton:checked:hover,
 .linked GtkModelButton.button:hover,
 .linked GtkModelButton.button:active:hover,
@@ -6006,7 +5884,7 @@ GtkModelButton.button.flat:selected {
 
 /* left button*/
 .linked modelbutton:hover:first-child,
-.linked modelbutton:active:hover:first-child,
+.linked modelbutton:hover:active:first-child,
 .linked modelbutton:checked:hover:first-child,
 .linked GtkModelButton.button:hover:first-child,
 .linked GtkModelButton.button:active:hover:first-child,
@@ -6017,7 +5895,7 @@ GtkModelButton.button.flat:selected {
 
 /* right button*/
 .linked modelbutton:hover:last-child,
-.linked modelbutton:active:hover:last-child,
+.linked modelbutton:hover:active:last-child,
 .linked modelbutton:checked:hover:last-child,
 .linked GtkModelButton.button:hover:last-child,
 .linked GtkModelButton.button:active:hover:last-child,
@@ -6111,34 +5989,31 @@ cursor-handle.bottom,
 .titlebar button.titlebutton,
 .titlebar .titlebutton {
     color: @wm_title;
-    padding: 2px 6px 3px 3px;
-    border: none;
-    border-image: none;
-    /* fake request for hardcoded icons,
-     to avoid usage of regular window-close button*/
-    -gtk-icon-style: requested;
 }
 
-.titlebar button.titlebutton:hover,
-.titlebar .titlebutton:hover {
-    border: none;
-    border-image: none;
+.titlebar button.titlebutton:backdrop,
+.titlebar .titlebutton:backdrop {
+    color: @wm_unfocused_title;
+    -gtk-icon-shadow: none;
 }
 
-.titlebar button.titlebutton:active,
-.titlebar button.titlebutton:checked,
-.titlebar button.titlebutton:checked:checked,
-.titlebar .titlebutton:active,
-.titlebar .titlebutton:checked,
-.titlebar .titlebutton:checked:checked {
-    border: none;
+/* use icons from window-crontrols */
+.titlebar button.close.titlebutton,
+.titlebar button.close.titlebutton:hover,
+.titlebar button.close.titlebutton:hover:active,
+.titlebar button.maximize.titlebutton,
+.titlebar button.maximize.titlebutton:hover,
+.titlebar button.maximize.titlebutton:hover:active,
+.titlebar button.minimize.titlebutton,
+.titlebar button.minimize.titlebutton:hover,
+.titlebar button.minimize.titlebutton:hover:active {
+    padding: 0px;
+    border-style: none;
     border-image: none;
 }
 
-.titlebar button.titlebutton:backdrop,
-.titlebar .titlebutton:backdrop {
-    color: @wm_unfocused_title;
-    -gtk-icon-shadow: none;
+.titlebar button.image-button.toggle.popup {
+	padding: 4px;
 }
 
 /* workaround to avoid unwanted black frames if switching compositor on/off */
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index 24f77e0d..08ad27e2 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -742,8 +742,7 @@ EvWindow .toolbar .button.flat {
 }
 
 /* atril and eom */
-dialog.background>box.vertical.dialog-vbox>box.vertical>scrolledwindow>viewport.frame,
-EggToolbarEditor.vertical GtkScrolledWindow .frame {
+EggToolbarEditor.vertical scrolledwindow viewport.frame {
     background-color: shade (@theme_base_color, 1.0);
     border-color: @borders;
     border-width: 1px;
diff --git a/desktop-themes/Menta/gtk-3.0/window-controls.css b/desktop-themes/Menta/gtk-3.0/window-controls.css
index fd975c4c..f1693f76 100644
--- a/desktop-themes/Menta/gtk-3.0/window-controls.css
+++ b/desktop-themes/Menta/gtk-3.0/window-controls.css
@@ -1,15 +1,16 @@
-headerbar.titlebar .right .titlebutton:nth-last-child(3),
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-headerbar.titlebar .left .titlebutton:nth-child(3),
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-headerbar.titlebar .right .titlebutton:nth-last-child(2),
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-headerbar.titlebar .left .titlebutton:nth-child(2),
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-headerbar.titlebar .right .titlebutton:last-child,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-headerbar.titlebar .left .titlebutton:first-child,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child {
+
+headerbar.titlebar .right button.minimize.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton,
+headerbar.titlebar .left button.minimize.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton,
+headerbar.titlebar .right button.maximize.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton,
+headerbar.titlebar .left button.maximize.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton,
+headerbar.titlebar .right button.close.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton,
+headerbar.titlebar .left button.close.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton {
 	color: transparent;
 	background-position: center;
 	background-repeat: no-repeat;
@@ -24,128 +25,133 @@ headerbar.titlebar .left:dir(rtl) .titlebutton:last-child {
 
 /* minimize */
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3),
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-headerbar.titlebar .left .titlebutton:nth-child(3),
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
+headerbar.titlebar .right button.minimize.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton,
+headerbar.titlebar .left button.minimize.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton {
 	background-image: url('window-controls/minimize_focused_normal.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3):hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-headerbar.titlebar .left .titlebutton:nth-child(3):hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
+headerbar.titlebar .right button.minimize.titlebutton:hover,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:hover,
+headerbar.titlebar .left button.minimize.titlebutton:hover,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:hover {
 	background-image: url('window-controls/minimize_focused_prelight.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3):active,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-headerbar.titlebar .left .titlebutton:nth-child(3):active,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active,
-headerbar.titlebar .right .titlebutton:nth-last-child(3):checked,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):checked,
-headerbar.titlebar .left .titlebutton:nth-child(3):checked,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):checked {
+headerbar.titlebar .right button.minimize.titlebutton:active,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:active,
+headerbar.titlebar .left button.minimize.titlebutton:active,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:active,
+headerbar.titlebar .right button.minimize.titlebutton:checked,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:checked,
+headerbar.titlebar .left button.minimize.titlebutton:checked,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:checked {
 	background-image: url('window-controls/minimize_focused_pressed.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-headerbar.titlebar .left .titlebutton:nth-child(3):backdrop,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
+headerbar.titlebar .right button.minimize.titlebutton:backdrop,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:backdrop,
+headerbar.titlebar .left button.minimize.titlebutton:backdrop,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:backdrop {
 	background-image: url('window-controls/minimize_unfocused.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-headerbar.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
+headerbar.titlebar .right button.minimize.titlebutton:backdrop:hover,
+headerbar.titlebar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover,
+headerbar.titlebar .left button.minimize.titlebutton:backdrop:hover,
+headerbar.titlebar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/minimize_unfocused_prelight.png');
 }
 
 /* maximize */
-headerbar.titlebar .right .titlebutton:nth-last-child(2),
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-headerbar.titlebar .left .titlebutton:nth-child(2),
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
+headerbar.titlebar .right button.maximize.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton,
+headerbar.titlebar .left button.maximize.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton {
 	background-image: url('window-controls/maximize_focused_normal.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(2):hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-headerbar.titlebar .left .titlebutton:nth-child(2):hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
+headerbar.titlebar .right button.maximize.titlebutton:hover,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:hover,
+headerbar.titlebar .left button.maximize.titlebutton:hover,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:hover {
 	background-image: url('window-controls/maximize_focused_prelight.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(2):active,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-headerbar.titlebar .left .titlebutton:nth-child(2):active,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active,
-headerbar.titlebar .right .titlebutton:nth-last-child(2):checked,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):checked,
-headerbar.titlebar .left .titlebutton:nth-child(2):checked,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):checked {
+headerbar.titlebar .right button.maximize.titlebutton:active,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:active,
+headerbar.titlebar .left button.maximize.titlebutton:active,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:active,
+headerbar.titlebar .right button.maximize.titlebutton:checked,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:checked,
+headerbar.titlebar .left button.maximize.titlebutton:checked,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:checked {
 	background-image: url('window-controls/maximize_focused_pressed.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-headerbar.titlebar .left .titlebutton:nth-child(2):backdrop,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
+headerbar.titlebar .right button.maximize.titlebutton:backdrop,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:backdrop,
+headerbar.titlebar .left button.maximize.titlebutton:backdrop,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:backdrop {
 	background-image: url('window-controls/maximize_unfocused.png');
 }
 
-headerbar.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-headerbar.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
+headerbar.titlebar .right button.maximize.titlebutton:backdrop:hover,
+headerbar.titlebar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover,
+headerbar.titlebar .left button.maximize.titlebutton:backdrop:hover,
+headerbar.titlebar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/maximize_unfocused_prelight.png');
 }
 
 /* close */
-headerbar.titlebar .right .titlebutton:last-child,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-headerbar.titlebar .left .titlebutton:first-child,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child {
+headerbar.titlebar .right button.close.titlebutton,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton,
+headerbar.titlebar .left button.close.titlebutton,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton {
 	background-image: url('window-controls/close_focused_normal.png');
 	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
 }
 
-headerbar.titlebar .right .titlebutton:last-child:hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-headerbar.titlebar .left .titlebutton:first-child:hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
+headerbar.titlebar .right button.close.titlebutton:hover,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:hover,
+headerbar.titlebar .left button.close.titlebutton:hover,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:hover {
 	background-image: url('window-controls/close_focused_prelight.png');
 }
 
-headerbar.titlebar .right .titlebutton:last-child:active,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-headerbar.titlebar .left .titlebutton:first-child:active,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:active,
-headerbar.titlebar .right .titlebutton:last-child:checked,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-headerbar.titlebar .left .titlebutton:first-child:checked,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:checked {
+headerbar.titlebar .right button.close.titlebutton:active,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:active,
+headerbar.titlebar .left button.close.titlebutton:active,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:active,
+headerbar.titlebar .right button.close.titlebutton:checked,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:checked,
+headerbar.titlebar .left button.close.titlebutton:checked,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:checked {
 	background-image: url('window-controls/close_focused_pressed.png');
 }
 
-headerbar.titlebar .right .titlebutton:last-child:backdrop,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-headerbar.titlebar .left .titlebutton:first-child:backdrop,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
+headerbar.titlebar .right button.close.titlebutton:backdrop,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:backdrop,
+headerbar.titlebar .left button.close.titlebutton:backdrop,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:backdrop {
 	background-image: url('window-controls/close_unfocused.png');
 }
 
-headerbar.titlebar .right .titlebutton:last-child:backdrop:hover,
-headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
+headerbar.titlebar .right button.close.titlebutton:backdrop:hover,
+headerbar.titlebar .right:dir(rtl) button.close.titlebutton:backdrop:hover,
+headerbar.titlebar .left button.close.titlebutton:backdrop:hover,
+headerbar.titlebar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 	background-image: url('window-controls/close_unfocused_prelight.png');
 }
 
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
+.titlebar button.close.titlebutton {
+    /* fake request     to avoid usage of regular window-close button*/
+    -gtk-icon-style: requested;
+}
 
+/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
+/*
 headerbar.titlebar .button.menu-button.titlebutton {
 	background-image: url('window-controls/menu.png');
 }
@@ -157,126 +163,19 @@ headerbar.titlebar .button.menu-button.titlebutton:hover {
 headerbar.titlebar .button.menu-button.titlebutton:active {
 	background-image: url('window-controls/menu.png');
 }
+*/
 
-/* application adjustments *//*
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:active,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-NautilusWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:active,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-YelpWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-MathWindow headerbar.titlebar .left .titlebutton:first-child,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:active,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-MathWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-EogWindow headerbar.titlebar .left .titlebutton:first-child,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:active,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-EogWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-EvWindow headerbar.titlebar .left .titlebutton:first-child,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:active,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-EvWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:active,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-BaobabWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:hover,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:active,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:checked,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:backdrop,
-BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:active,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:hover,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:active,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:checked,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:backdrop,
-ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-ContactsWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover {
+/* application adjustments gtk+-3.20 *//*
+headerbar.titlebar button.titlebutton.toggle.popup,
+headerbar.titlebar button.titlebutton.toggle.popup:hover,
+headerbar.titlebar button.titlebutton.toggle.popup:checked {
 	background-image: none;
 }
 */
-/* application adjustments gtk+-3.20 */
-headerbar.titlebar button.titlebutton.toggle.popup {
-	background-image: none;
-}
-
 /* gtk+-3.20 */
-headerbar.titlebar button image {
+.titlebar button.close.titlebutton image,
+.titlebar button.minimize.titlebutton image,
+.titlebar button.maximize.titlebutton image {
         color: transparent;
 }