diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index 6f71263..e954aac 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -6195,23 +6195,35 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   border-radius: 2px;
 }
 
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button {
+  border: none;
+}
+
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:active,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:active:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:active, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:checked,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:checked:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:checked, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
+  background-image: none;
+  color: #242424;
+  background-color: #bfbfbf;
+  border-color: rgba(255, 255, 255, 0.12);
+}
+
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.12);
   padding: 4px;
   background-color: #2b2b2b;
 }
 
-.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button {
-  border: none;
-}
-
-.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-color: rgba(255, 255, 255, 0.12);
-}
-
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button > widget > box > image {
   padding: 0;
 }
@@ -6238,20 +6250,6 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem >
   padding: 0;
   margin-top: 8px;
   margin-bottom: 8px;
-  border: none;
-}
-
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-color: rgba(255, 255, 255, 0.12);
 }
 
 window.csd > box.vertical > box.vertical > frame,
@@ -6270,14 +6268,6 @@ window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked
   min-width: 36px;
   padding: 0;
   margin: 0;
-  border: none;
-}
-
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-color: rgba(255, 255, 255, 0.12);
 }
 
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised > widget > box > image {
@@ -6298,16 +6288,6 @@ window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked
   min-width: 28px;
   padding: 0;
   margin: 0;
-  border: none;
-}
-
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:checked,
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):active,
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-color: rgba(255, 255, 255, 0.12);
 }
 
 /********************
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index a15649d..358cbb2 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -6191,23 +6191,35 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   border-radius: 2px;
 }
 
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button {
+  border: none;
+}
+
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:active,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:active:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:active, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:checked,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:checked:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:checked, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
+  background-image: none;
+  color: #242424;
+  background-color: #bfbfbf;
+  border-color: rgba(255, 255, 255, 0.12);
+}
+
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.12);
   padding: 4px;
   background-color: #2b2b2b;
 }
 
-.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button {
-  border: none;
-}
-
-.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-color: rgba(255, 255, 255, 0.12);
-}
-
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button > widget > box > image {
   padding: 0;
 }
@@ -6234,20 +6246,6 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem >
   padding: 0;
   margin-top: 8px;
   margin-bottom: 8px;
-  border: none;
-}
-
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-color: rgba(255, 255, 255, 0.12);
 }
 
 window.csd > box.vertical > box.vertical > frame,
@@ -6266,14 +6264,6 @@ window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked
   min-width: 36px;
   padding: 0;
   margin: 0;
-  border: none;
-}
-
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-color: rgba(255, 255, 255, 0.12);
 }
 
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised > widget > box > image {
@@ -6294,16 +6284,6 @@ window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked
   min-width: 28px;
   padding: 0;
   margin: 0;
-  border: none;
-}
-
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:checked,
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):active,
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-color: rgba(255, 255, 255, 0.12);
 }
 
 /********************
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index dc5bee6..b9ca66f 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -6217,19 +6217,27 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   border-radius: 2px;
 }
 
-.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar {
-  box-shadow: inset 0 1px rgba(0, 0, 0, 0.12);
-  padding: 4px;
-  background-color: #ededed;
-}
-
-.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:active,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:active:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:active, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:checked,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:checked:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:checked, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
   border-color: rgba(0, 0, 0, 0.12);
 }
 
+.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar {
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.12);
+  padding: 4px;
+  background-color: #ededed;
+}
+
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button > widget > box > image {
   padding: 0;
 }
@@ -6258,19 +6266,6 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem >
   margin-bottom: 8px;
 }
 
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
-  border-color: rgba(0, 0, 0, 0.12);
-}
-
 window.csd > box.vertical > box.vertical > frame,
 window.solid-csd > box.vertical > box.vertical > frame {
   margin: -1px 0;
@@ -6289,13 +6284,6 @@ window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked
   margin: 0;
 }
 
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
-  border-color: rgba(0, 0, 0, 0.12);
-}
-
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised > widget > box > image {
   padding: 0;
 }
@@ -6316,15 +6304,6 @@ window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked
   margin: 0;
 }
 
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:checked,
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):active,
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
-  border-color: rgba(0, 0, 0, 0.12);
-}
-
 /********************
   * Gnome Calculator *
   ********************/
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 3208ef7..55483dd 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -6213,19 +6213,27 @@ gf-candidate-box:hover, gf-candidate-box:selected {
   border-radius: 2px;
 }
 
-.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar {
-  box-shadow: inset 0 1px rgba(0, 0, 0, 0.12);
-  padding: 4px;
-  background-color: #ededed;
-}
-
-.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:active,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:active:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:active, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:checked,
+window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:checked:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:checked, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
+window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked, .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button:checked {
   background-image: none;
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
   border-color: rgba(0, 0, 0, 0.12);
 }
 
+.sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar {
+  box-shadow: inset 0 1px rgba(0, 0, 0, 0.12);
+  padding: 4px;
+  background-color: #ededed;
+}
+
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar button.image-button > widget > box > image {
   padding: 0;
 }
@@ -6254,19 +6262,6 @@ window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem >
   margin-bottom: 8px;
 }
 
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
-window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:active,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button:checked,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:active,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
-  border-color: rgba(0, 0, 0, 0.12);
-}
-
 window.csd > box.vertical > box.vertical > frame,
 window.solid-csd > box.vertical > box.vertical > frame {
   margin: -1px 0;
@@ -6285,13 +6280,6 @@ window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked
   margin: 0;
 }
 
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised:checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
-  border-color: rgba(0, 0, 0, 0.12);
-}
-
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised > widget > box > image {
   padding: 0;
 }
@@ -6312,15 +6300,6 @@ window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked
   margin: 0;
 }
 
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:active, window.background > box.vertical > toolbar.primary-toolbar > toolitem > box.horizontal:not(.linked) > button.toggle:checked,
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):active,
-window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat):checked {
-  background-image: none;
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
-  border-color: rgba(0, 0, 0, 0.12);
-}
-
 /********************
   * Gnome Calculator *
   ********************/
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 3659699..f58769d 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -1805,6 +1805,17 @@ gf-candidate-box {
 //  * rhythmbox *
 //
 
+%toolbar_radio_button {
+  @if $variant == 'dark' { border: none; }
+
+  &:active, &:checked {
+    background-image: none;
+    color: if($variant=='light', $selected_fg_color, $base_color);
+    background-color: if($variant=='light', rgba(black, 0.5), darken(white, 25%));
+    border-color: $borders_color;
+  }
+}
+
 // add top-border to inline-toolbar
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar {
   box-shadow: inset 0 1px $borders_color;
@@ -1812,11 +1823,7 @@ gf-candidate-box {
   background-color: darken($bg_color, 3%);
 
   button.image-button {
-//    min-width: 24px;
-//    min-width: 24px;
-//    padding: 2px;
-    @if $variant == 'dark' { border: none; }
-    &:active, &:checked { @include button(flat-active); border-color: $borders_color; }
+    @extend %toolbar_radio_button;
 
     > widget > box > image { padding: 0; }
   }
@@ -1846,9 +1853,8 @@ window.solid-csd > box.vertical > box.vertical {
       padding: 0;
       margin-top: 8px;
       margin-bottom: 8px;
-      @if $variant == 'dark' { border: none; }
-      // &:hover { @include button(flat-hover); }
-      &:active, &:checked { @include button(flat-active); border-color: $borders_color; }
+
+      @extend %toolbar_radio_button;
     }
   }
 
@@ -1869,9 +1875,8 @@ window.background > box.vertical > toolbar.primary-toolbar {
       min-width: 36px;
       padding: 0;
       margin: 0;
-      @if $variant == 'dark' { border: none; }
-      // &:hover { @include button(flat-hover); }
-      &:active, &:checked { @include button(flat-active); border-color: $borders_color; }
+      @extend %toolbar_radio_button;
+
       > widget > box > image { padding: 0; }
     }
 
@@ -1889,9 +1894,7 @@ window.background > box.vertical > toolbar.primary-toolbar {
       min-width: 28px;
       padding: 0;
       margin: 0;
-      @if $variant == 'dark' { border: none; }
-      // &:hover { @include button(flat-hover); }
-      &:active, &:checked { @include button(flat-active); border-color: $borders_color; }
+      @extend %toolbar_radio_button;
     }
   }
 }