2 files changed, 110 insertions, 93 deletions

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 089e6397..1d8e1a94 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
@@ -51,14 +51,14 @@ GtkModelButton.button.check,
 GtkModelButton.button.check:hover,
 .check,
 .view.cell.check {
-	background-image: url("assets/check-normal.png");
+	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
 GtkModelButton.button.check:insensitive,
 .check:insensitive {
-	background-image: url("assets/check-normal-ins.png");
+	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
 }
 
 .check row:insensitive {
@@ -66,15 +66,13 @@ GtkModelButton.button.check:insensitive,
 }
 
 GtkModelButton.button.check:checked,
-GtkModelButton.button.check:active,
-GtkModelButton.button.check:active:hover,
+GtkModelButton.button.check:checked:hover,
 .check:checked,
-.check:active,
-.view.cell.check:active {
+.view.cell.check:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
 }
 
-GtkModelButton.button.check:active:insensitive,
+GtkModelButton.button.check:checked:insensitive,
 .check:active:insensitive {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
 }
@@ -91,7 +89,7 @@ GtkModelButton.button.radio,
 GtkModelButton.button.radio:hover,
 .radio,
 .view.cell.radio {
-	background-image: url("assets/radio-normal.png");
+	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
@@ -106,8 +104,7 @@ GtkModelButton.button.radio:insensitive,
 }
 
 .radio:checked,
-.radio:active,
-.view.cell.radio:active {
+.view.cell.radio:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
 }
 
@@ -123,24 +120,24 @@ GtkModelButton.button.radio:insensitive,
 	-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 {
-	background-image: url("assets/sidebar-radio-checked.svg");
+.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 {
-	background-image: url("assets/sidebar-radio-prelight.svg");
+	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
 }
 
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus {
-	background-image: url("assets/sidebar-radio-selected.svg");
+.sidebar .view.radio:checked:active,
+.sidebar .view.radio:checked:active:focus {
+	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
 }
 
-.sidebar .view.radio:selected:hover,
-.sidebar .view.radio:selected:focus {
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
+.sidebar .view.radio:active:hover,
+.sidebar .view.radio:active:focus {
+	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected-prelight.svg"));	
 }
 
 /*************
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index fc621dcd..9fd34b57 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -2115,51 +2115,50 @@ GtkModelMenuItem GtkBox GtkImage {
 	background-color: transparent;
 }
 
-.menuitem.check:active,
-.menuitem.radio:active {
+.menuitem.check:checked,
+.menuitem.radio:checked {
 	background-color: transparent;
 }
 
-.menuitem.check:active {
-	background-image: url("assets/menuitem-checkbox-checked.svg");
+.menuitem.check:checked {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked.svg"));
 }
 
-.menuitem.check:active:hover {
-	background-image: url("assets/menuitem-checkbox-checked-selected.svg");
+.menuitem.check:checked:hover {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked-selected.svg"));
 }
 
-.menuitem.check:active:insensitive {
-	background-image: url("assets/menuitem-checkbox-checked-insensitive.svg");
+.menuitem.check:checked:insensitive {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked-insensitive.svg"));
 }
 
 .menuitem.check:inconsistent,
 .menuitem.radio:inconsistent {
-	background-image: url("assets/menuitem-checkbox-mixed.svg");
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed.svg"));
 }
 
 .menuitem.check:inconsistent:insensitive,
 .menuitem.radio:inconsistent:insensitive {
-	background-image: url("assets/menuitem-checkbox-mixed-insensitive.svg");
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-insensitive.svg"));
 }
 
 .menuitem.check:inconsistent:hover,
 .menuitem.radio:inconsistent:hover {
-	background-image: url("assets/menuitem-checkbox-mixed-selected.svg");
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-selected.svg"));
 }
 
-.menuitem.radio:active {
-	background-image: url("assets/menuitem-radio-checked.svg");
+.menuitem.radio:checked {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked.svg"));
 }
 
-.menuitem.radio:active:hover {
-	background-image: url("assets/menuitem-radio-checked-selected.svg");
+.menuitem.radio:checked:hover {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-selected.svg"));
 }
 
-.menuitem.radio:active:insensitive {
-	background-image: url("assets/menuitem-radio-checked-insensitive.svg");
+.menuitem.radio:checked:insensitive {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-insensitive.svg"));
 }
 
-
 /***************
  * Menu Button *
  ***************/
@@ -2233,62 +2232,83 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   outline-offset: 0; }
 
 .check {
-  color: rgba(0, 0, 0, 0.1);
-  background-image: none;
-  -gtk-icon-source: -gtk-scaled(url("assets/check-normal.png")); }
-  .check:hover {
-    color: #7f7f7f; }
-  .check:checked, .check:active {
-    -gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-    color: #000; }
-    .check:checked:hover, .check:active:hover {
-      color: #7f7f7f; }
-    .check:checked:insensitive, .check:active:insensitive {
-    -gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
-      color: #7f7f7f; }
-      .check:checked:insensitive:backdrop, .check:active:insensitive:backdrop {
-        color: #7f7f7f; }
-    .check:checked:backdrop, .check:active:backdrop {
-      color: #000; }
-  .check:insensitive {
-    color: rgba(127, 127, 127, 0.1); }
-    .check:insensitive:backdrop {
-      color: transparent; }
-  .check:inconsistent {
-    -gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png")); }
-  .check:backdrop {
-    color: rgba(0, 0, 0, 0.1); }
-    .check:backdrop:selected {
-      color: rgba(255, 255, 255, 0.1); }
+	color: rgba(0, 0, 0, 0.1);
+	background-image: none;
+	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
+}
+
+.check:hover,
+.radio:hover {
+	color: #7f7f7f;
+}
+
+.check:checked {
+	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
+	color: #000;
+}
+
+.check:checked:hover,
+.radio:checked:hover {
+color: #7f7f7f;
+}
+
+.check:checked:insensitive {
+	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
+	color: #7f7f7f;
+}
+
+.check:checked:insensitive:backdrop,
+.radio:checked:insensitive:backdrop {
+	color: #7f7f7f;
+}
+
+.check:checked:backdrop,
+.radio:checked:backdrop {
+	color: #000;
+}
+
+.check:insensitive,
+.radio:insensitive {
+	color: rgba(127, 127, 127, 0.1);
+}
+.check:insensitive:backdrop,
+.radio:insensitive:backdrop {
+	color: transparent;
+}
+
+.check:inconsistent {
+	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
+}
+
+.check:backdrop,
+.radio:backdrop {
+	color: rgba(0, 0, 0, 0.1);
+}
+
+.check:backdrop:selected,
+.radio:backdrop:selected {
+	color: rgba(255, 255, 255, 0.1);
+}
 
 .radio {
-  color: rgba(0, 0, 0, 0.1);
-  background-image: none;
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png")); }
-  .radio:hover {
-    color: #7f7f7f; }
-  .radio:checked, .radio:active {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-    color: #000; }
-    .radio:checked:hover, .radio:active:hover {
-      color: #7f7f7f; }
-    .radio:checked:insensitive, .radio:active:insensitive {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
-      color: #7f7f7f; }
-      .radio:checked:insensitive:backdrop, .radio:active:insensitive:backdrop {
-        color: #7f7f7f; }
-    .radio:checked:backdrop, .radio:active:backdrop {
-      color: #000; }
-  .radio:insensitive {
-    color: rgba(127, 127, 127, 0.1); }
-    .radio:insensitive:backdrop {
-      color: transparent; }
-  .radio:inconsistent {
-    -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png")); }
-  .radio:backdrop {
-    color: rgba(0, 0, 0, 0.1); }
-    .radio:backdrop:selected {
-      color: rgba(255, 255, 255, 0.1); }
+	color: rgba(0, 0, 0, 0.1);
+	background-image: none;
+	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
+}
+
+.radio:checked {
+	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
+	color: #000;
+}
+
+.radio:checked:insensitive {
+	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
+	color: #7f7f7f;
+}
+
+.radio:inconsistent {
+	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
+}
 
 /************
  * Toolbars *