diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 85ad778c84..82ffe56e37 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -814,6 +814,7 @@ GtkComboBox {
     background-color: $osd_bg_color;
     border-radius: 6px;
     padding: 12px;
+    .label { color: $osd_fg_color; }
   }
   //searchbar & inline-toolbar
   &.inline-toolbar {
@@ -1535,28 +1536,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     @include button(normal, $edge: none);
     border-radius: 50%;
     border-color: darken($borders_color,3%);
-    box-shadow: inset 0 1px white,
-                inset 0 #{-2px} $bg_color,
-                inset 0 #{-1px} mix($bg_color,$borders_color,50%);
     &:hover {
       @include button(hover, $edge: none);
       border-color: darken($borders_color,3%);
       border-radius: 50%; // needed for double marks scales
-      box-shadow: inset 0 1px white,
-                  inset 0 #{-2px} white,
-                  inset 0 #{-1px} mix($bg_color,$borders_color,70%);
     }
     &:insensitive {
       border-style: solid; // needed for double marks scales or they'll get
       border-radius: 50%;  // overridden
-      background-image: linear-gradient(to bottom, $insensitive_bg_color);
+      background-image: none;
       box-shadow: none;
     }
     &:backdrop {
       border-style: solid; // needed for double marks scales or they'll get
       border-radius: 50%;  // overridden
       border-color: darken($backdrop_borders_color,3%);
-      background-image: linear-gradient(to bottom, $backdrop_bg_color);
+      background-image: none;
       box-shadow: none;
     }
     &:backdrop:insensitive { @include button(backdrop-insensitive);}
@@ -1574,10 +1569,10 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     box-shadow: inset 1px 1px transparentize(black, 0.9);
     &.highlight {
       border-color: $selected_borders_color;
-      background-color: $selected_bg_color;
+      background-color: $success_color;
       &:backdrop {
          border-color: $selected_bg_color;
-         background-color: $selected_bg_color;
+         background-color: desaturate($success_color,100%);
          box-shadow: none;
       }
     }
diff --git a/gtk/theme/HighContrast/_drawing.scss b/gtk/theme/HighContrast/_drawing.scss
index 76073a732e..a14a5291fd 100644
--- a/gtk/theme/HighContrast/_drawing.scss
+++ b/gtk/theme/HighContrast/_drawing.scss
@@ -124,11 +124,8 @@
   // normal button
   //
     color: $tc;
-    background-image: linear-gradient(to bottom,
-                                  lighten($c,5%),
-                                  $c 40%,
-                                  darken($c,5%)
-                                  );
+    background-image: none;
+    background-color: $c;
 
     @if $c!=$bg_color { @include _button_border_color($c); }
     @else { border-color: $borders_color; }
@@ -139,13 +136,11 @@
   //
   // hovered button
   //
-    color: $tc;
+    color: $tc; //fg_color
+    background-color: $c;
     @if $c!=$bg_color { @include _button_border_color($c); }
     @else { border-color: $borders_color; }
-    background-image: linear-gradient(to bottom,
-                                      lighten($c,14%),
-                                      lighten($c,4%) 40%,
-                                      $c);
+    background-image: none;
 
   }
 
@@ -153,25 +148,20 @@
   //
   // pushed button
   //
+    background-image: none;
+    color: invert($tc);
+    background-color: invert($c);
     @if $c!=$bg_color { @include _button_border_color($c); }
     @else { border-color: $borders_color; }
-    @if $c!=$bg_color {
-      background-image: linear-gradient(to bottom, darken($c,25%));
-      color: $tc;
-    }
-    @else {
-      background-image: linear-gradient(to bottom,
-                                        $borders_color);
-      color: $bg_color;
-    }
   }
   @else if $t==insensitive {
   //
   // insensitive button
   //
     color: $insensitive_fg_color;
+    background-color: $insensitive_bg_color;
     border-color: $insensitive_borders_color;
-    background-image: linear-gradient(to bottom, $insensitive_bg_color);
+    background-image: none;
     text-shadow: none;
     icon-shadow: none;
   }
@@ -181,9 +171,8 @@
   //
     color: $insensitive_fg_color;
     border-color: $insensitive_borders_color;
-    background-image: linear-gradient(to bottom,
-                        mix($insensitive_borders_color,
-                            $insensitive_bg_color, 10%));
+    background-image: none;
+    background-color: $insensitive_bg_color;
   }
 
   @else if $t==backdrop {
@@ -191,9 +180,9 @@
   // backdrop button
   //
     color: if($c!=$bg_color, $tc, $backdrop_fg_color);
+    background-color: if($c!=$bg_color, $c, $backdrop_bg_color);
     border-color: if($c!=$bg_color, $c, $backdrop_borders_color);
-    background-image: linear-gradient(to bottom,
-                                      if($c!=bg_color,$c,$backdrop_bg_color));
+    background-image: none;
     text-shadow: none;
     icon-shadow: none;
   }
@@ -203,9 +192,9 @@
   // backdrop pushed button
   //
     color: $backdrop_fg_color;
+    background-color: $backdrop_bg_color;
     border-color: $backdrop_borders_color;
-    background-image: linear-gradient(to bottom,
-                        mix($backdrop_borders_color,$backdrop_bg_color, 35%));
+    background-image: none;
   }
 
   @else if $t==backdrop-insensitive {
@@ -213,8 +202,9 @@
   // backdrop insensitive button
   //
     color: $backdrop_insensitive_color;
+    background-color: $insensitive_bg_color;
     border-color: $backdrop_borders_color;
-    background-image: linear-gradient(to bottom, $backdrop_bg_color);
+    background-image: none;
   }
 
   @else if $t==backdrop-insensitive-active {
@@ -223,14 +213,15 @@
   //
     color: $backdrop_insensitive_color;
     border-color: $backdrop_borders_color;
-    background-image: linear-gradient(to bottom,
-                        mix($backdrop_borders_color,$backdrop_bg_color, 8%));
+    background-image: none;
+    background-color: mix($backdrop_borders_color,$backdrop_bg_color, 8%);
   }
   
   @else if $t==osd {
   //
   // normal osd button
   //
+    color: $osd_fg_color;
     background-image: none;
     background-color: $osd_bg_color;
     border-color: $osd_borders_color;
@@ -240,7 +231,8 @@
   //
   // active osd button
   //
-    background-color: transparentize(#fff,0.99);
+    color: $osd_fg_color;
+    background-color: lighten($osd_bg_color,30%);
     border-color: $osd_borders_color;
     box-shadow: none;
   }
@@ -248,7 +240,8 @@
   //
   // active osd button
   //
-    background-color: transparentize(#fff,0.97);
+    color: $osd_bg_color;
+    background-color: $osd_fg_color;
     border-color: $osd_borders_color;
     box-shadow: none;
   }
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index 772581ac8e..bbf1f6e688 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -434,54 +434,62 @@
   border-width: 2px;
   border-style: solid;
   color: #000;
-  background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+  background-image: none;
+  background-color: #fff;
   border-color: #7f7f7f; }
   .button:hover, .button.flat:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
+    background-color: #fff;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, white, white 40%, #fff);
+    background-image: none;
     -gtk-image-effect: highlight; }
   .button:active, .button.flat:active, .button:checked, .button.flat:checked {
     border-width: 2px;
     border-style: solid;
+    background-image: none;
+    color: white;
+    background-color: black;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #7f7f7f);
-    color: #fff;
     transition-duration: 50ms; }
   .button:backdrop, .button.flat:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
+    background-color: #fff;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, #fff);
+    background-image: none;
     text-shadow: none;
     icon-shadow: none; }
     .button:backdrop:active, .button:backdrop:checked, .button.flat:backdrop:active, .button.flat:backdrop:checked {
       border-width: 2px;
       border-style: solid;
       color: #000;
+      background-color: #fff;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, #d6d6d6); }
+      background-image: none; }
     .button:backdrop:insensitive, .button.flat:backdrop:insensitive {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, #fff); }
+      background-image: none; }
     .button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:active {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, whitesmoke); }
+      background-image: none;
+      background-color: whitesmoke; }
   .button:insensitive {
     border-width: 2px;
     border-style: solid;
     color: #7f7f7f;
+    background-color: white;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, white);
+    background-image: none;
     text-shadow: none;
     icon-shadow: none; }
     .button:insensitive:active, .button:insensitive.flat:active {
@@ -489,12 +497,14 @@
       border-style: solid;
       color: #7f7f7f;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, #f2f2f2); }
+      background-image: none;
+      background-color: white; }
   .osd .button {
     padding: 6px;
     border-width: 1px 1px 2px 1px;
     border-width: 2px;
     border-style: solid;
+    color: #fff;
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
     border-color: rgba(255, 255, 255, 0.2);
@@ -502,13 +512,15 @@
     .osd .button:hover {
       border-width: 2px;
       border-style: solid;
-      background-color: rgba(255, 255, 255, 0.01);
+      color: #fff;
+      background-color: rgba(77, 77, 77, 0.8);
       border-color: rgba(255, 255, 255, 0.2);
       box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       border-width: 2px;
       border-style: solid;
-      background-color: rgba(255, 255, 255, 0.03);
+      color: rgba(0, 0, 0, 0.8);
+      background-color: #fff;
       border-color: rgba(255, 255, 255, 0.2);
       box-shadow: none; }
     .osd .button:insensitive {
@@ -523,80 +535,92 @@
     border-width: 2px;
     border-style: solid;
     color: white;
-    background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
+    background-image: none;
+    background-color: #4a90d9;
     border-color: #1c5187; }
     .button.suggested-action:hover {
       border-width: 2px;
       border-style: solid;
       color: white;
+      background-color: #4a90d9;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #85b4e5, #5b9add 40%, #4a90d9); }
+      background-image: none; }
     .button.suggested-action:active, .button.suggested-action:checked {
       border-width: 2px;
       border-style: solid;
-      border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #1c5187);
-      color: white; }
+      background-image: none;
+      color: black;
+      background-color: #b56f26;
+      border-color: #1c5187; }
     .button.suggested-action:backdrop {
       border-width: 2px;
       border-style: solid;
       color: white;
+      background-color: #4a90d9;
       border-color: #4a90d9;
-      background-image: linear-gradient(to bottom, #4a90d9);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
       .button.suggested-action:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
         color: #7f7f7f;
+        background-color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, #fff); }
+        background-image: none; }
     .button.suggested-action:insensitive {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
   .button.destructive-action {
     border-width: 2px;
     border-style: solid;
     color: white;
-    background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
+    background-image: none;
+    background-color: #ef2929;
     border-color: #8e0b0b; }
     .button.destructive-action:hover {
       border-width: 2px;
       border-style: solid;
       color: white;
+      background-color: #ef2929;
       border-color: #8e0b0b;
-      background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929); }
+      background-image: none; }
     .button.destructive-action:active, .button.destructive-action:checked {
       border-width: 2px;
       border-style: solid;
-      border-color: #8e0b0b;
-      background-image: linear-gradient(to bottom, #8e0b0b);
-      color: white; }
+      background-image: none;
+      color: black;
+      background-color: #10d6d6;
+      border-color: #8e0b0b; }
     .button.destructive-action:backdrop {
       border-width: 2px;
       border-style: solid;
       color: white;
+      background-color: #ef2929;
       border-color: #ef2929;
-      background-image: linear-gradient(to bottom, #ef2929);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
       .button.destructive-action:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
         color: #7f7f7f;
+        background-color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, #fff); }
+        background-image: none; }
     .button.destructive-action:insensitive {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
   .button.image-button {
@@ -613,26 +637,30 @@
   border-width: 2px;
   border-style: solid;
   color: #000;
-  background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+  background-image: none;
+  background-color: #fff;
   border-color: #7f7f7f; }
   .inline-toolbar GtkToolButton > .button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
+    background-color: #fff;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, white, white 40%, #fff); }
+    background-image: none; }
   .inline-toolbar GtkToolButton > .button:active {
     border-width: 2px;
     border-style: solid;
-    border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #7f7f7f);
-    color: #fff; }
+    background-image: none;
+    color: white;
+    background-color: black;
+    border-color: #7f7f7f; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     border-width: 2px;
     border-style: solid;
     color: #7f7f7f;
+    background-color: white;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, white);
+    background-image: none;
     text-shadow: none;
     icon-shadow: none; }
   .inline-toolbar GtkToolButton > .button:insensitive:active {
@@ -640,33 +668,38 @@
     border-style: solid;
     color: #7f7f7f;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #f2f2f2); }
+    background-image: none;
+    background-color: white; }
   .inline-toolbar GtkToolButton > .button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
+    background-color: #fff;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, #fff);
+    background-image: none;
     text-shadow: none;
     icon-shadow: none; }
   .inline-toolbar GtkToolButton > .button:backdrop:active {
     border-width: 2px;
     border-style: solid;
     color: #000;
+    background-color: #fff;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, #d6d6d6); }
+    background-image: none; }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
     border-width: 2px;
     border-style: solid;
     color: #7f7f7f;
+    background-color: white;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, #fff); }
+    background-image: none; }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active {
     border-width: 2px;
     border-style: solid;
     color: #7f7f7f;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, whitesmoke); }
+    background-image: none;
+    background-color: whitesmoke; }
 
 .inline-toolbar.toolbar GtkToolButton > .button.flat {
   border-radius: 0;
@@ -811,76 +844,87 @@ GtkColorButton.button {
     border-width: 2px;
     border-style: solid;
     color: #000;
-    background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+    background-image: none;
+    background-color: #fff;
     border-color: #7f7f7f; }
     .spinbutton.vertical .button:first-child:active {
       border-width: 2px;
       border-style: solid;
-      border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, #7f7f7f);
-      color: #fff; }
+      background-image: none;
+      color: white;
+      background-color: black;
+      border-color: #7f7f7f; }
     .spinbutton.vertical .button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
+      background-color: #fff;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white, white 40%, #fff); }
+      background-image: none; }
     .spinbutton.vertical .button:first-child:insensitive {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
     .spinbutton.vertical .button:first-child:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #000;
+      background-color: #fff;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, #fff);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
   .spinbutton.vertical .button:last-child {
     border-width: 2px;
     border-style: solid;
     color: #000;
-    background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+    background-image: none;
+    background-color: #fff;
     border-color: #7f7f7f; }
     .spinbutton.vertical .button:last-child:active {
       border-width: 2px;
       border-style: solid;
-      border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, #7f7f7f);
-      color: #fff; }
+      background-image: none;
+      color: white;
+      background-color: black;
+      border-color: #7f7f7f; }
     .spinbutton.vertical .button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
+      background-color: #fff;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white, white 40%, #fff); }
+      background-image: none; }
     .spinbutton.vertical .button:last-child:insensitive {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
     .spinbutton.vertical .button:last-child:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #000;
+      background-color: #fff;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, #fff);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
   .spinbutton.vertical .button:backdrop:insensitive {
     border-width: 2px;
     border-style: solid;
     color: #7f7f7f;
+    background-color: white;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, #fff); }
+    background-image: none; }
   .spinbutton.vertical.entry {
     border-radius: 0; }
   .spinbutton.vertical .button:first-child, .spinbutton.vertical .button:first-child:active, .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical .button:first-child:backdrop {
@@ -936,6 +980,8 @@ GtkComboBox {
     background-color: rgba(0, 0, 0, 0.8);
     border-radius: 6px;
     padding: 12px; }
+    .toolbar.osd .label {
+      color: #fff; }
   .toolbar.inline-toolbar {
     border-width: 0 1px 1px;
     padding: 3px;
@@ -1007,29 +1053,33 @@ GtkComboBox {
       border-width: 2px;
       border-style: solid;
       color: #fff;
-      background-image: linear-gradient(to bottom, #0d0d0d, #000 40%, black);
+      background-image: none;
+      background-color: #000;
       border-color: black; }
       .titlebar.selection-mode .button:hover,
       .header-bar.selection-mode .button:hover {
         border-width: 2px;
         border-style: solid;
         color: #fff;
+        background-color: #000;
         border-color: black;
-        background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, #000); }
+        background-image: none; }
       .titlebar.selection-mode .button:active,
       .header-bar.selection-mode .button:active {
         border-width: 2px;
         border-style: solid;
-        border-color: black;
-        background-image: linear-gradient(to bottom, black);
-        color: #fff; }
+        background-image: none;
+        color: black;
+        background-color: white;
+        border-color: black; }
       .titlebar.selection-mode .button:insensitive,
       .header-bar.selection-mode .button:insensitive {
         border-width: 2px;
         border-style: solid;
         color: #7f7f7f;
+        background-color: white;
         border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, white);
+        background-image: none;
         text-shadow: none;
         icon-shadow: none; }
       .titlebar.selection-mode .button:backdrop,
@@ -1037,8 +1087,9 @@ GtkComboBox {
         border-width: 2px;
         border-style: solid;
         color: #fff;
+        background-color: #000;
         border-color: #000;
-        background-image: linear-gradient(to bottom, #000);
+        background-image: none;
         text-shadow: none;
         icon-shadow: none;
         border-color: black; }
@@ -1047,36 +1098,41 @@ GtkComboBox {
         border-width: 2px;
         border-style: solid;
         color: #7f7f7f;
+        background-color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, #fff); }
+        background-image: none; }
       .titlebar.selection-mode .button.suggested-action,
       .header-bar.selection-mode .button.suggested-action {
         border-width: 2px;
         border-style: solid;
         color: #000;
-        background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+        background-image: none;
+        background-color: #fff;
         border-color: #7f7f7f; }
         .titlebar.selection-mode .button.suggested-action:hover,
         .header-bar.selection-mode .button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #000;
+          background-color: #fff;
           border-color: #7f7f7f;
-          background-image: linear-gradient(to bottom, white, white 40%, #fff); }
+          background-image: none; }
         .titlebar.selection-mode .button.suggested-action:active,
         .header-bar.selection-mode .button.suggested-action:active {
           border-width: 2px;
           border-style: solid;
-          border-color: #7f7f7f;
-          background-image: linear-gradient(to bottom, #7f7f7f);
-          color: #fff; }
+          background-image: none;
+          color: white;
+          background-color: black;
+          border-color: #7f7f7f; }
         .titlebar.selection-mode .button.suggested-action:insensitive,
         .header-bar.selection-mode .button.suggested-action:insensitive {
           border-width: 2px;
           border-style: solid;
           color: #7f7f7f;
+          background-color: white;
           border-color: #7f7f7f;
-          background-image: linear-gradient(to bottom, white);
+          background-image: none;
           text-shadow: none;
           icon-shadow: none; }
         .titlebar.selection-mode .button.suggested-action:backdrop,
@@ -1084,8 +1140,9 @@ GtkComboBox {
           border-width: 2px;
           border-style: solid;
           color: #000;
+          background-color: #fff;
           border-color: #8b8b8b;
-          background-image: linear-gradient(to bottom, #fff);
+          background-image: none;
           text-shadow: none;
           icon-shadow: none; }
         .titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
@@ -1093,8 +1150,9 @@ GtkComboBox {
           border-width: 2px;
           border-style: solid;
           color: #7f7f7f;
+          background-color: white;
           border-color: #8b8b8b;
-          background-image: linear-gradient(to bottom, #fff); }
+          background-image: none; }
     .titlebar.selection-mode .selection-menu,
     .header-bar.selection-mode .selection-menu {
       border-width: 0;
@@ -1226,6 +1284,7 @@ GtkTreeView.view.progressbar {
       text-shadow: none;
       border-width: 2px;
       border-style: solid;
+      color: #fff;
       background-image: none;
       background-color: rgba(0, 0, 0, 0.8);
       border-color: rgba(255, 255, 255, 0.2);
@@ -1233,13 +1292,15 @@ GtkTreeView.view.progressbar {
       .popover.osd .button:hover {
         border-width: 2px;
         border-style: solid;
-        background-color: rgba(255, 255, 255, 0.01);
+        color: #fff;
+        background-color: rgba(77, 77, 77, 0.8);
         border-color: rgba(255, 255, 255, 0.2);
         box-shadow: none; }
       .popover.osd .button:active {
         border-width: 2px;
         border-style: solid;
-        background-color: rgba(255, 255, 255, 0.03);
+        color: rgba(0, 0, 0, 0.8);
+        background-color: #fff;
         border-color: rgba(255, 255, 255, 0.2);
         box-shadow: none; }
       .popover.osd .button:insensitive {
@@ -1479,16 +1540,18 @@ GtkTreeView.view.progressbar {
         border-width: 2px;
         border-style: solid;
         color: #000;
+        background-color: #fff;
         border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, white, white 40%, #fff);
+        background-image: none;
         background-image: none;
         box-shadow: none; }
       .notebook tab .button:active {
         border-width: 2px;
         border-style: solid;
-        border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, #7f7f7f);
-        color: #fff; }
+        background-image: none;
+        color: white;
+        background-color: black;
+        border-color: #7f7f7f; }
       .notebook tab .button:backdrop {
         color: rgba(0, 0, 0, 0.3);
         border-color: transparent; }
@@ -1577,15 +1640,17 @@ GtkSwitch {
     border-width: 2px;
     border-style: solid;
     color: #000;
-    background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+    background-image: none;
+    background-color: #fff;
     border-color: #7f7f7f;
     box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     GtkSwitch.slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
+      background-color: #fff;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white, white 40%, #fff);
+      background-image: none;
       box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     GtkSwitch.slider:active {
       border: 1px solid #000; }
@@ -1593,16 +1658,18 @@ GtkSwitch {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
     GtkSwitch.slider:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #000;
+      background-color: #fff;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, #fff);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
       GtkSwitch.slider:backdrop:active {
@@ -1611,8 +1678,9 @@ GtkSwitch {
         border-width: 2px;
         border-style: solid;
         color: #7f7f7f;
+        background-color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, #fff); }
+        background-image: none; }
 
 /*************************
  * Check and Radio items *
@@ -1704,28 +1772,28 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     border-width: 2px;
     border-style: solid;
     color: #000;
-    background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+    background-image: none;
+    background-color: #fff;
     border-color: #7f7f7f;
     border-radius: 50%;
-    border-color: #777777;
-    box-shadow: inset 0 1px white, inset 0 -2px #fff, inset 0 -1px #bfbfbf; }
+    border-color: #777777; }
     .scale.slider:hover,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:hover,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
+      background-color: #fff;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white, white 40%, #fff);
+      background-image: none;
       border-color: #777777;
-      border-radius: 50%;
-      box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #d8d8d8; }
+      border-radius: 50%; }
     .scale.slider:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:insensitive {
       border-style: solid;
       border-radius: 50%;
-      background-image: linear-gradient(to bottom, white);
+      background-image: none;
       box-shadow: none; }
     .scale.slider:backdrop,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop,
@@ -1733,7 +1801,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       border-style: solid;
       border-radius: 50%;
       border-color: #838383;
-      background-image: linear-gradient(to bottom, #fff);
+      background-image: none;
       box-shadow: none; }
     .scale.slider:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
@@ -1741,8 +1809,9 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, #fff); }
+      background-image: none; }
     .scale.slider:active,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:active,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
@@ -1761,12 +1830,12 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight {
       border-color: #000;
-      background-color: #000; }
+      background-color: #73d216; }
       .scale.trough.highlight:backdrop,
       .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop,
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
         border-color: #000;
-        background-color: #000;
+        background-color: #747474;
         box-shadow: none; }
     .scale.trough:insensitive, .scale.trough.hilight:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.trough:insensitive,
@@ -2028,120 +2097,138 @@ GtkCalendar {
       border-width: 2px;
       border-style: solid;
       color: #000;
-      background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+      background-image: none;
+      background-color: #fff;
       border-color: #7f7f7f; }
       .message-dialog.csd .dialog-action-area .button:hover {
         border-width: 2px;
         border-style: solid;
         color: #000;
+        background-color: #fff;
         border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, white, white 40%, #fff); }
+        background-image: none; }
       .message-dialog.csd .dialog-action-area .button:active {
         border-width: 2px;
         border-style: solid;
-        border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, #7f7f7f);
-        color: #fff; }
+        background-image: none;
+        color: white;
+        background-color: black;
+        border-color: #7f7f7f; }
       .message-dialog.csd .dialog-action-area .button:insensitive {
         border-width: 2px;
         border-style: solid;
         color: #7f7f7f;
+        background-color: white;
         border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, white);
+        background-image: none;
         text-shadow: none;
         icon-shadow: none; }
       .message-dialog.csd .dialog-action-area .button:backdrop {
         border-width: 2px;
         border-style: solid;
         color: #000;
+        background-color: #fff;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, #fff);
+        background-image: none;
         text-shadow: none;
         icon-shadow: none; }
       .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
         border-width: 2px;
         border-style: solid;
         color: #7f7f7f;
+        background-color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, #fff); }
+        background-image: none; }
       .message-dialog.csd .dialog-action-area .button.suggested-action {
         border-width: 2px;
         border-style: solid;
         color: white;
-        background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
+        background-image: none;
+        background-color: #4a90d9;
         border-color: #1c5187; }
         .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: white;
+          background-color: #4a90d9;
           border-color: #1c5187;
-          background-image: linear-gradient(to bottom, #85b4e5, #5b9add 40%, #4a90d9); }
+          background-image: none; }
         .message-dialog.csd .dialog-action-area .button.suggested-action:active {
           border-width: 2px;
           border-style: solid;
-          border-color: #1c5187;
-          background-image: linear-gradient(to bottom, #1c5187);
-          color: white; }
+          background-image: none;
+          color: black;
+          background-color: #b56f26;
+          border-color: #1c5187; }
         .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
           border-width: 2px;
           border-style: solid;
           color: white;
+          background-color: #4a90d9;
           border-color: #4a90d9;
-          background-image: linear-gradient(to bottom, #4a90d9);
+          background-image: none;
           text-shadow: none;
           icon-shadow: none; }
           .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
             border-width: 2px;
             border-style: solid;
             color: #7f7f7f;
+            background-color: white;
             border-color: #8b8b8b;
-            background-image: linear-gradient(to bottom, #fff); }
+            background-image: none; }
         .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
           border-width: 2px;
           border-style: solid;
           color: #7f7f7f;
+          background-color: white;
           border-color: #7f7f7f;
-          background-image: linear-gradient(to bottom, white);
+          background-image: none;
           text-shadow: none;
           icon-shadow: none; }
       .message-dialog.csd .dialog-action-area .button.destructive-action {
         border-width: 2px;
         border-style: solid;
         color: white;
-        background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
+        background-image: none;
+        background-color: #ef2929;
         border-color: #8e0b0b; }
         .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
           border-width: 2px;
           border-style: solid;
           color: white;
+          background-color: #ef2929;
           border-color: #8e0b0b;
-          background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929); }
+          background-image: none; }
         .message-dialog.csd .dialog-action-area .button.destructive-action:active {
           border-width: 2px;
           border-style: solid;
-          border-color: #8e0b0b;
-          background-image: linear-gradient(to bottom, #8e0b0b);
-          color: white; }
+          background-image: none;
+          color: black;
+          background-color: #10d6d6;
+          border-color: #8e0b0b; }
         .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
           border-width: 2px;
           border-style: solid;
           color: white;
+          background-color: #ef2929;
           border-color: #ef2929;
-          background-image: linear-gradient(to bottom, #ef2929);
+          background-image: none;
           text-shadow: none;
           icon-shadow: none; }
           .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
             border-width: 2px;
             border-style: solid;
             color: #7f7f7f;
+            background-color: white;
             border-color: #8b8b8b;
-            background-image: linear-gradient(to bottom, #fff); }
+            background-image: none; }
         .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
           border-width: 2px;
           border-style: solid;
           color: #7f7f7f;
+          background-color: white;
           border-color: #7f7f7f;
-          background-image: linear-gradient(to bottom, white);
+          background-image: none;
           text-shadow: none;
           icon-shadow: none; }
     .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
@@ -2243,7 +2330,8 @@ GtkInfoBar {
     border-width: 2px;
     border-style: solid;
     color: #fff;
-    background-image: linear-gradient(to bottom, #0d0d0d, #000 40%, black);
+    background-image: none;
+    background-color: #000;
     border-color: black; }
     .info .button:hover,
     .question .button:hover,
@@ -2252,17 +2340,19 @@ GtkInfoBar {
       border-width: 2px;
       border-style: solid;
       color: #fff;
+      background-color: #000;
       border-color: black;
-      background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, #000); }
+      background-image: none; }
     .info .button:active,
     .question .button:active,
     .warning .button:active,
     .error .button:active {
       border-width: 2px;
       border-style: solid;
-      border-color: black;
-      background-image: linear-gradient(to bottom, black);
-      color: #fff; }
+      background-image: none;
+      color: black;
+      background-color: white;
+      border-color: black; }
     .info .button:insensitive,
     .question .button:insensitive,
     .warning .button:insensitive,
@@ -2270,8 +2360,9 @@ GtkInfoBar {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
     .info .button:backdrop,
@@ -2281,8 +2372,9 @@ GtkInfoBar {
       border-width: 2px;
       border-style: solid;
       color: #fff;
+      background-color: #000;
       border-color: #000;
-      background-image: linear-gradient(to bottom, #000);
+      background-image: none;
       text-shadow: none;
       icon-shadow: none; }
     .info .button:backdrop:insensitive,
@@ -2292,8 +2384,9 @@ GtkInfoBar {
       border-width: 2px;
       border-style: solid;
       color: #7f7f7f;
+      background-color: white;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, #fff); }
+      background-image: none; }
   .info .label:selected,
   .info .label:selected:focus,
   .info .label:selected:hover,
@@ -2410,20 +2503,23 @@ GtkColorChooserWidget #add-color-button {
     border-width: 2px;
     border-style: solid;
     color: #000;
-    background-image: linear-gradient(to bottom, white, #fff 40%, #f2f2f2);
+    background-image: none;
+    background-color: #fff;
     border-color: #7f7f7f; }
   .button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
-    border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #7f7f7f);
-    color: #fff; }
+    background-image: none;
+    color: white;
+    background-color: black;
+    border-color: #7f7f7f; }
   .button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
+    background-color: #fff;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, #fff);
+    background-image: none;
     text-shadow: none;
     icon-shadow: none;
     border-color: transparent;