From 632ae20b168c6858d80e9e1218f29e0223d5fe5c Mon Sep 17 00:00:00 2001
From: EliverLara <eliverlara@gmail.com>
Date: Thu, 4 Oct 2018 14:48:46 -0500
Subject: [PATCH] Improve buttons look

---
 gtk-3.0/_colors.scss          |   1 +
 gtk-3.0/_drawing.scss         |  28 +-----
 gtk-3.0/gtk-dark.css          | 172 ++++++++++++++-------------------
 gtk-3.0/gtk.css               | 174 +++++++++++++++-------------------
 gtk-3.0/widgets/_buttons.scss |  24 +++--
 gtk-3.0/widgets/_lists.scss   |   4 +
 gtk-3.0/widgets/_sidebar.scss |   5 -
 7 files changed, 170 insertions(+), 238 deletions(-)

diff --git a/gtk-3.0/_colors.scss b/gtk-3.0/_colors.scss
index 0e03eea..b333923 100755
--- a/gtk-3.0/_colors.scss
+++ b/gtk-3.0/_colors.scss
@@ -8,6 +8,7 @@ $bg_color: if($variant == 'light', darken( #EEEEEE, 3%), #161925);
 $fg_color: if($variant == 'light', #31363d, #C3C7D1);
 $switch_bg: if($variant == 'light', #ffffff, transparentize(black,1));
 $shadow_color: rgba(162, 162, 165, 0.21);
+$_sidebar_color: if($variant == 'light', #222e39, #161925);
 
 // Primary colors
 $lime: #71f79f;
diff --git a/gtk-3.0/_drawing.scss b/gtk-3.0/_drawing.scss
index 1d287c4..be5f788 100755
--- a/gtk-3.0/_drawing.scss
+++ b/gtk-3.0/_drawing.scss
@@ -224,10 +224,8 @@
   //
     font-weight: bold;
     color: $tc;
-   // outline-color: transparentize($tc, 0.7);
-    background-color: mix($bg_color, $base_color, 15%);;
+    background-color: mix($bg_color, $base_color, 15%);
     text-shadow: none;
-    @include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
   }
 
   @else if $t==hover {
@@ -238,7 +236,6 @@
     outline-color: transparentize($tc, 0.7);
     background-color: $c;
     text-shadow: none;
-    //@include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
   }
 
   @if $t==normal-header {
@@ -246,17 +243,10 @@
   // normal button headerbar look
   //
   color: if($tc==$text_color, #8b8b8b, $tc);
-  // background-color: transparent;
-  // border-radius: 4px;
   text-shadow: none;
   box-shadow: none;
   background: transparent;
-   border: none;
-
-  // background: if( $variant == 'light', 
-  //                     linear-gradient(to bottom, $base_color, $bg_color),
-  //                     linear-gradient(to bottom, lighten($base_color, 12%), darken($bg_color, 2%))
-  //                 );
+  border: none;
 }
 
   @else if $t==hover-header {
@@ -264,15 +254,9 @@
   // hovered button headerbar look
   //
   color: if($tc==$text_color, $selected_bg_color, $tc);
-  //background-color: transparent;
   border-radius: 0;
   text-shadow: none;
   border:none;
-//   background-image: if( $variant == 'light', 
-//   linear-gradient(to bottom, $base_color, $bg_color),
-//   linear-gradient(to bottom, lighten($base_color, 12%), darken($bg_color, 2%))
-// );
-  //@include lines(up);
 }
 
 @else if $t==backdrop-header {
@@ -281,7 +265,6 @@
 //
 color: if($tc==$text_color, transparentize($tc, 0.6), $tc);
 background-color: transparent;
-
 border-radius: 0;
 text-shadow: none;
 box-shadow: none;
@@ -296,7 +279,6 @@ box-shadow: none;
   outline-color: transparentize($tc, 0.7);
   background-color: if($c==$base_color, $selected_bg_color, $c);
   text-shadow: none;
- // @include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
 }
   @else if $t==insensitive {
   //
@@ -306,7 +288,6 @@ box-shadow: none;
   outline-color: transparentize($tc, 0.7);
   background-color: if($c==$base_color, $insensitive_bg_color, $c);
   text-shadow: none;
-  @include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
 }
   @else if $t==insensitive-active {
   //
@@ -316,7 +297,6 @@ box-shadow: none;
   outline-color: transparentize($tc, 0.7);
   background-color: if($c==$base_color, $selected_bg_color, $c);
   text-shadow: none;
-  @include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
   label { color: transparentize($selected_fg_color, 0.3); }
 }
   @else if $t==backdrop {
@@ -327,7 +307,6 @@ box-shadow: none;
   outline-color: transparentize($tc, 0.7);
   background-color: if($c==$base_color, $backdrop_base_color, $c);
   text-shadow: none;
-  @include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
 }
 
   @else if $t==backdrop-active {
@@ -338,7 +317,6 @@ box-shadow: none;
   outline-color: transparentize($tc, 0.7);
   background-color: $selected_bg_color;
   text-shadow: none;
-  @include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
   label { color: transparentize($selected_fg_color, 0.3); }
 }
 
@@ -350,7 +328,6 @@ box-shadow: none;
   outline-color: transparentize($tc, 0.7);
   background-color: if($c==$base_color, $insensitive_bg_color, $c);
   text-shadow: none;
-  @include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
 }
 
   @else if $t==backdrop-insensitive-active {
@@ -361,7 +338,6 @@ box-shadow: none;
   outline-color: transparentize($tc, 0.7);
   background-color: $selected_bg_color;
   text-shadow: none;
-  @include _shadows(inset 0px 1px 0px 0px $top_highlight,inset 0px -1px 0px 0px $bottom_highlight);
 }
 
   @else if $t==osd {
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index ecb25ca..3c25d33 100755
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -269,8 +269,7 @@ button {
   font-weight: bold;
   color: #C3C7D1;
   background-color: #181b28;
-  text-shadow: none;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+  text-shadow: none; }
   notebook > header > tabs > arrow,
   button.flat {
     background-color: transparent;
@@ -309,7 +308,6 @@ button {
     outline-color: rgba(195, 199, 209, 0.3);
     background-color: #1a1d2b;
     text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
     transition: 200ms ease-out;
     -gtk-icon-effect: none; }
     notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked,
@@ -320,8 +318,7 @@ button {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(195, 199, 209, 0.3);
       background-color: #00D3A7;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       notebook > header > tabs > arrow:backdrop:active label, notebook > header > tabs > arrow:backdrop:checked label, notebook > header > tabs > arrow:backdrop:active label, notebook > header > tabs > arrow:backdrop:checked label,
       button:backdrop.flat:active label,
       button:backdrop.flat:checked label,
@@ -334,8 +331,7 @@ button {
       color: #a1a5b0;
       outline-color: rgba(195, 199, 209, 0.3);
       background-color: #171a26;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked,
       button:backdrop.flat:disabled:active,
       button:backdrop.flat:disabled:checked,
@@ -344,8 +340,7 @@ button {
         color: rgba(254, 254, 254, 0.7);
         outline-color: rgba(195, 199, 209, 0.3);
         background-color: #00D3A7;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+        text-shadow: none; }
   notebook > header > tabs > arrow:backdrop, notebook > header > tabs > arrow:disabled, notebook > header > tabs > arrow:backdrop:disabled,
   button.flat:backdrop,
   button.flat:disabled,
@@ -361,16 +356,14 @@ button {
     color: #a1a5b0;
     outline-color: rgba(195, 199, 209, 0.3);
     background-color: #171a26;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+    text-shadow: none; }
     notebook > header > tabs > arrow:disabled:active, notebook > header > tabs > arrow:disabled:checked,
     button:disabled:active,
     button:disabled:checked {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(195, 199, 209, 0.3);
       background-color: #00D3A7;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       notebook > header > tabs > arrow:disabled:active label, notebook > header > tabs > arrow:disabled:checked label,
       button:disabled:active label,
       button:disabled:checked label {
@@ -380,12 +373,19 @@ button {
     min-width: 24px;
     padding-left: 4px;
     padding-right: 4px; }
-  notebook > header > tabs > arrow.image-button.circular, notebook > header > tabs > arrow.image-button.sidebar-button,
-  button.image-button.circular,
-  button.image-button.sidebar-button {
-    padding: 6px 4px;
-    border-radius: 50px;
-    box-shadow: none; }
+    notebook > header > tabs > arrow.image-button.circular, notebook > header > tabs > arrow.image-button.sidebar-button,
+    button.image-button.circular,
+    button.image-button.sidebar-button {
+      padding: 6px 4px;
+      border-radius: 50px;
+      box-shadow: none; }
+    notebook > header > tabs > arrow.image-button.sidebar-button,
+    button.image-button.sidebar-button {
+      background-color: #252a3e;
+      color: #fff; }
+      notebook > header > tabs > arrow.image-button.sidebar-button:hover,
+      button.image-button.sidebar-button:hover {
+        background-color: #00D3A7; }
   notebook > header > tabs > arrow.text-button,
   button.text-button {
     padding-left: 16px;
@@ -633,8 +633,7 @@ button.suggested-action {
     color: rgba(255, 255, 255, 0.4);
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #00c1e4;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+    text-shadow: none; }
     .selection-mode button.titlebutton:backdrop label,
     button.suggested-action:backdrop label,
     button.suggested-action.flat:backdrop label {
@@ -647,8 +646,7 @@ button.suggested-action {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #00D3A7;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       .selection-mode button.titlebutton:backdrop:active label, .selection-mode button.titlebutton:backdrop:checked label,
       button.suggested-action:backdrop:active label,
       button.suggested-action:backdrop:checked label,
@@ -661,8 +659,7 @@ button.suggested-action {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #00c1e4;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       .selection-mode button.titlebutton:backdrop:disabled label,
       button.suggested-action:backdrop:disabled label,
       button.suggested-action.flat:backdrop:disabled label {
@@ -675,8 +672,7 @@ button.suggested-action {
         color: rgba(254, 254, 254, 0.7);
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00D3A7;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+        text-shadow: none; }
   .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled,
   button.suggested-action.flat:backdrop,
   button.suggested-action.flat:disabled,
@@ -693,16 +689,14 @@ button.suggested-action {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #00c1e4;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+    text-shadow: none; }
     
     button.suggested-action:disabled:active,
     button.suggested-action:disabled:checked {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #00c1e4;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       
       button.suggested-action:disabled:active label,
       button.suggested-action:disabled:checked label {
@@ -792,8 +786,7 @@ button.destructive-action {
     color: rgba(255, 255, 255, 0.4);
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ce1138;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+    text-shadow: none; }
     
     button.destructive-action:backdrop label,
     button.destructive-action.flat:backdrop label {
@@ -806,8 +799,7 @@ button.destructive-action {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #00D3A7;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       
       button.destructive-action:backdrop:active label,
       button.destructive-action:backdrop:checked label,
@@ -820,8 +812,7 @@ button.destructive-action {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #ce1138;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       
       button.destructive-action:backdrop:disabled label,
       button.destructive-action.flat:backdrop:disabled label {
@@ -834,8 +825,7 @@ button.destructive-action {
         color: rgba(254, 254, 254, 0.7);
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00D3A7;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+        text-shadow: none; }
   
   button.destructive-action.flat:backdrop,
   button.destructive-action.flat:disabled,
@@ -852,16 +842,14 @@ button.destructive-action {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ce1138;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+    text-shadow: none; }
     
     button.destructive-action:disabled:active,
     button.destructive-action:disabled:checked {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #ce1138;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
       
       button.destructive-action:disabled:active label,
       button.destructive-action:disabled:checked label {
@@ -978,15 +966,13 @@ toolbar button:hover {
   font-weight: bold;
   color: #C3C7D1;
   background-color: #181b28;
-  text-shadow: none;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+  text-shadow: none; }
 
 toolbar button:active {
   font-weight: bold;
   color: #C3C7D1;
   background-color: #181b28;
-  text-shadow: none;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+  text-shadow: none; }
 
 .inline-toolbar toolbutton > button {
   background-color: transparent;
@@ -1122,9 +1108,9 @@ button.color {
     border-radius: 0; }
 
 notebook button, list button, .view button, iconview button, popover button {
-  box-shadow: inset 0px 0px 0px 1px rgba(238, 238, 238, 0.1); }
+  box-shadow: none; }
   notebook button:backdrop, list button:backdrop, .view button:backdrop, iconview button:backdrop, popover button:backdrop {
-    box-shadow: inset 0px 0px 0px 1px rgba(238, 238, 238, 0.1); }
+    box-shadow: none; }
 
 notebook .linked > button, list .linked > button, .view .linked > button, iconview .linked > button, popover .linked > button {
   box-shadow: none; }
@@ -1627,8 +1613,7 @@ colorswatch#add-color-button {
     font-weight: bold;
     color: #C3C7D1;
     background-color: #181b28;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+    text-shadow: none; }
     colorswatch#add-color-button overlay:hover {
       color: #C3C7D1;
       outline-color: rgba(195, 199, 209, 0.3);
@@ -1638,8 +1623,7 @@ colorswatch#add-color-button {
       color: #a1a5b0;
       outline-color: rgba(195, 199, 209, 0.3);
       background-color: #1a1d2b;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+      text-shadow: none; }
 
 colorswatch:disabled {
   opacity: 0.5; }
@@ -2412,7 +2396,6 @@ headerbar {
       color: white;
       background-color: #181b28;
       text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
       box-shadow: none; }
       .titlebar button.suggested-action:hover,
       headerbar button.suggested-action:hover {
@@ -2431,8 +2414,7 @@ headerbar {
         color: white;
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00c1e4;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+        text-shadow: none; }
         .titlebar button.suggested-action:disabled label,
         headerbar button.suggested-action:disabled label {
           color: rgba(255, 255, 255, 0.5); }
@@ -2442,15 +2424,13 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00c1e4;
         text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
         border-radius: 3px; }
       .titlebar button.suggested-action:backdrop:disabled,
       headerbar button.suggested-action:backdrop:disabled {
         color: white;
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00c1e4;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+        text-shadow: none; }
     .titlebar button.destructive-action,
     headerbar button.destructive-action {
       font-weight: bold;
@@ -2462,7 +2442,6 @@ headerbar {
       color: white;
       background-color: #181b28;
       text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
       box-shadow: none; }
       .titlebar button.destructive-action:hover,
       headerbar button.destructive-action:hover {
@@ -2481,8 +2460,7 @@ headerbar {
         color: white;
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #ce1138;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+        text-shadow: none; }
         .titlebar button.destructive-action:disabled label,
         headerbar button.destructive-action:disabled label {
           color: rgba(255, 255, 255, 0.5); }
@@ -2492,15 +2470,13 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #ce1138;
         text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
         border-radius: 3px; }
       .titlebar button.destructive-action:backdrop:disabled,
       headerbar button.destructive-action:backdrop:disabled {
         color: white;
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #ce1138;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+        text-shadow: none; }
     .titlebar button.titlebutton,
     headerbar button.titlebutton {
       color: transparent;
@@ -2846,6 +2822,8 @@ row {
     background-color: rgba(0, 211, 167, 0.5); }
   row.activatable:selected:backdrop {
     background-color: rgba(0, 211, 167, 0.6); }
+  row.activatable button:not(.image-button) {
+    background-color: transparent; }
 
 /*********
  * Menus *
@@ -4055,39 +4033,37 @@ stacksidebar row {
 placessidebar.sidebar {
   background-color: transparent;
   background-image: linear-gradient(to right, #171e27 40px, #161925 35px, #161925 36px, #161925 36px, #161925 99%, #161925 100%); }
-  placessidebar.sidebar row.sidebar-row {
-    margin-right: -14px; }
-    placessidebar.sidebar row.sidebar-row.sidebar-row .sidebar-icon {
-      margin-left: -14px;
-      margin-right: 12px;
-      padding-left: 14px;
-      padding-right: 12px;
-      color: #98abb2; }
-    placessidebar.sidebar row.sidebar-row:hover {
-      transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-      color: rgba(0, 0, 0, 0.76);
-      background-color: transparent;
-      /*rgba(65,67,75,0.4); */
-      background-image: linear-gradient(to right, rgba(65, 67, 75, 0) 40px, rgba(0, 0, 0, 0.12) 40px, rgba(0, 0, 0, 0.12) 97%); }
-    placessidebar.sidebar row.sidebar-row:active:hover {
-      color: rgba(0, 0, 0, 0.76);
-      background-color: rgba(0, 0, 0, 0.23); }
-    placessidebar.sidebar row.sidebar-row:selected {
+  placessidebar.sidebar row.sidebar-row.sidebar-row .sidebar-icon {
+    margin-left: -14px;
+    margin-right: 12px;
+    padding-left: 14px;
+    padding-right: 12px;
+    color: #98abb2; }
+  placessidebar.sidebar row.sidebar-row:hover {
+    transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    color: rgba(0, 0, 0, 0.76);
+    background-color: transparent;
+    /*rgba(65,67,75,0.4); */
+    background-image: linear-gradient(to right, rgba(65, 67, 75, 0) 40px, rgba(0, 0, 0, 0.12) 40px, rgba(0, 0, 0, 0.12) 97%); }
+  placessidebar.sidebar row.sidebar-row:active:hover {
+    color: rgba(0, 0, 0, 0.76);
+    background-color: rgba(0, 0, 0, 0.23); }
+  placessidebar.sidebar row.sidebar-row:selected {
+    color: rgba(0, 0, 0, 0.54);
+    background-color: transparent;
+    background-image: linear-gradient(to right, #00e8b7 40px, rgba(65, 67, 75, 0) 36px, rgba(65, 67, 75, 0) 97%); }
+    placessidebar.sidebar row.sidebar-row:selected:hover {
+      color: #ffffff;
+      background-color: rgba(0, 0, 0, 0.24); }
+      placessidebar.sidebar row.sidebar-row:selected:hover .sidebar-icon {
+        color: #ffffff; }
+    placessidebar.sidebar row.sidebar-row:selected:backdrop {
       color: rgba(0, 0, 0, 0.54);
       background-color: transparent;
       background-image: linear-gradient(to right, #00e8b7 40px, rgba(65, 67, 75, 0) 36px, rgba(65, 67, 75, 0) 97%); }
-      placessidebar.sidebar row.sidebar-row:selected:hover {
-        color: #ffffff;
-        background-color: rgba(0, 0, 0, 0.24); }
-        placessidebar.sidebar row.sidebar-row:selected:hover .sidebar-icon {
-          color: #ffffff; }
-      placessidebar.sidebar row.sidebar-row:selected:backdrop {
-        color: rgba(0, 0, 0, 0.54);
-        background-color: transparent;
-        background-image: linear-gradient(to right, #00e8b7 40px, rgba(65, 67, 75, 0) 36px, rgba(65, 67, 75, 0) 97%); }
-      placessidebar.sidebar row.sidebar-row:selected .sidebar-icon {
-        -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
-        color: inherit; }
+    placessidebar.sidebar row.sidebar-row:selected .sidebar-icon {
+      -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
+      color: inherit; }
 
 placessidebar list {
   background-color: transparent; }
@@ -5947,8 +5923,7 @@ ConversationListView {
   font-weight: bold;
   color: #C3C7D1;
   background-color: #181b28;
-  text-shadow: none;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+  text-shadow: none; }
   #content_frame button:hover {
     color: #C3C7D1;
     outline-color: rgba(195, 199, 209, 0.3);
@@ -5963,8 +5938,7 @@ ConversationListView {
     color: #a1a5b0;
     outline-color: rgba(195, 199, 209, 0.3);
     background-color: #171a26;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.1); }
+    text-shadow: none; }
 
 #buttonbox_frame {
   padding-top: 20px;
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 6ccc72e..18e4df9 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -269,8 +269,7 @@ button {
   font-weight: bold;
   color: #31363D;
   background-color: #eaeff3;
-  text-shadow: none;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+  text-shadow: none; }
   notebook > header > tabs > arrow,
   button.flat {
     background-color: transparent;
@@ -309,7 +308,6 @@ button {
     outline-color: rgba(49, 54, 61, 0.3);
     background-color: #e8edf3;
     text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2);
     transition: 200ms ease-out;
     -gtk-icon-effect: none; }
     notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, notebook > header > tabs > arrow:backdrop:active, notebook > header > tabs > arrow:backdrop:checked,
@@ -320,8 +318,7 @@ button {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(49, 54, 61, 0.3);
       background-color: #00D3A7;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       notebook > header > tabs > arrow:backdrop:active label, notebook > header > tabs > arrow:backdrop:checked label, notebook > header > tabs > arrow:backdrop:active label, notebook > header > tabs > arrow:backdrop:checked label,
       button:backdrop.flat:active label,
       button:backdrop.flat:checked label,
@@ -334,8 +331,7 @@ button {
       color: #565b61;
       outline-color: rgba(49, 54, 61, 0.3);
       background-color: #e8eaec;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked,
       button:backdrop.flat:disabled:active,
       button:backdrop.flat:disabled:checked,
@@ -344,8 +340,7 @@ button {
         color: rgba(254, 254, 254, 0.7);
         outline-color: rgba(49, 54, 61, 0.3);
         background-color: #00D3A7;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+        text-shadow: none; }
   notebook > header > tabs > arrow:backdrop, notebook > header > tabs > arrow:disabled, notebook > header > tabs > arrow:backdrop:disabled,
   button.flat:backdrop,
   button.flat:disabled,
@@ -361,16 +356,14 @@ button {
     color: #565b61;
     outline-color: rgba(49, 54, 61, 0.3);
     background-color: #e8eaec;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+    text-shadow: none; }
     notebook > header > tabs > arrow:disabled:active, notebook > header > tabs > arrow:disabled:checked,
     button:disabled:active,
     button:disabled:checked {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(49, 54, 61, 0.3);
       background-color: #00D3A7;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       notebook > header > tabs > arrow:disabled:active label, notebook > header > tabs > arrow:disabled:checked label,
       button:disabled:active label,
       button:disabled:checked label {
@@ -380,12 +373,19 @@ button {
     min-width: 24px;
     padding-left: 4px;
     padding-right: 4px; }
-  notebook > header > tabs > arrow.image-button.circular, notebook > header > tabs > arrow.image-button.sidebar-button,
-  button.image-button.circular,
-  button.image-button.sidebar-button {
-    padding: 6px 4px;
-    border-radius: 50px;
-    box-shadow: none; }
+    notebook > header > tabs > arrow.image-button.circular, notebook > header > tabs > arrow.image-button.sidebar-button,
+    button.image-button.circular,
+    button.image-button.sidebar-button {
+      padding: 6px 4px;
+      border-radius: 50px;
+      box-shadow: none; }
+    notebook > header > tabs > arrow.image-button.sidebar-button,
+    button.image-button.sidebar-button {
+      background-color: #314252;
+      color: #fff; }
+      notebook > header > tabs > arrow.image-button.sidebar-button:hover,
+      button.image-button.sidebar-button:hover {
+        background-color: #00D3A7; }
   notebook > header > tabs > arrow.text-button,
   button.text-button {
     padding-left: 16px;
@@ -636,8 +636,7 @@ button.suggested-action {
     color: rgba(255, 255, 255, 0.4);
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #00c1e4;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+    text-shadow: none; }
     .selection-mode button.titlebutton:backdrop label,
     button.suggested-action:backdrop label,
     button.suggested-action.flat:backdrop label {
@@ -650,8 +649,7 @@ button.suggested-action {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #00D3A7;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       .selection-mode button.titlebutton:backdrop:active label, .selection-mode button.titlebutton:backdrop:checked label,
       button.suggested-action:backdrop:active label,
       button.suggested-action:backdrop:checked label,
@@ -664,8 +662,7 @@ button.suggested-action {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #00c1e4;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       .selection-mode button.titlebutton:backdrop:disabled label,
       button.suggested-action:backdrop:disabled label,
       button.suggested-action.flat:backdrop:disabled label {
@@ -678,8 +675,7 @@ button.suggested-action {
         color: rgba(254, 254, 254, 0.7);
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00D3A7;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+        text-shadow: none; }
   .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled,
   button.suggested-action.flat:backdrop,
   button.suggested-action.flat:disabled,
@@ -696,16 +692,14 @@ button.suggested-action {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #00c1e4;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+    text-shadow: none; }
     
     button.suggested-action:disabled:active,
     button.suggested-action:disabled:checked {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #00c1e4;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       
       button.suggested-action:disabled:active label,
       button.suggested-action:disabled:checked label {
@@ -795,8 +789,7 @@ button.destructive-action {
     color: rgba(255, 255, 255, 0.4);
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #e6133e;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+    text-shadow: none; }
     
     button.destructive-action:backdrop label,
     button.destructive-action.flat:backdrop label {
@@ -809,8 +802,7 @@ button.destructive-action {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #00D3A7;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       
       button.destructive-action:backdrop:active label,
       button.destructive-action:backdrop:checked label,
@@ -823,8 +815,7 @@ button.destructive-action {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #e6133e;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       
       button.destructive-action:backdrop:disabled label,
       button.destructive-action.flat:backdrop:disabled label {
@@ -837,8 +828,7 @@ button.destructive-action {
         color: rgba(254, 254, 254, 0.7);
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00D3A7;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+        text-shadow: none; }
   
   button.destructive-action.flat:backdrop,
   button.destructive-action.flat:disabled,
@@ -855,16 +845,14 @@ button.destructive-action {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #e6133e;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+    text-shadow: none; }
     
     button.destructive-action:disabled:active,
     button.destructive-action:disabled:checked {
       color: rgba(254, 254, 254, 0.7);
       outline-color: rgba(255, 255, 255, 0.3);
       background-color: #e6133e;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
       
       button.destructive-action:disabled:active label,
       button.destructive-action:disabled:checked label {
@@ -981,15 +969,13 @@ toolbar button:hover {
   font-weight: bold;
   color: #31363D;
   background-color: #eaeff3;
-  text-shadow: none;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+  text-shadow: none; }
 
 toolbar button:active {
   font-weight: bold;
   color: #31363D;
   background-color: #eaeff3;
-  text-shadow: none;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+  text-shadow: none; }
 
 .inline-toolbar toolbutton > button {
   background-color: transparent;
@@ -1122,16 +1108,16 @@ modelbutton.flat arrow, popover.background checkbutton arrow, popover.background
 button.color {
   padding: 4px; }
   button.color colorswatch:only-child {
-    box-shadow: 0 1px rgba(255, 255, 255, 0.769231); }
+    box-shadow: none; }
     button.color colorswatch:only-child, button.color colorswatch:only-child overlay {
       border-radius: 0; }
     button.color colorswatch:only-child:disabled, button.color colorswatch:only-child:backdrop {
       box-shadow: none; }
 
 notebook button, list button, .view button, iconview button, popover button {
-  box-shadow: inset 0px 0px 0px 1px rgba(0, 0, 0, 0.13); }
+  box-shadow: none; }
   notebook button:backdrop, list button:backdrop, .view button:backdrop, iconview button:backdrop, popover button:backdrop {
-    box-shadow: inset 0px 0px 0px 1px rgba(0, 0, 0, 0.13); }
+    box-shadow: none; }
 
 notebook .linked > button, list .linked > button, .view .linked > button, iconview .linked > button, popover .linked > button {
   box-shadow: none; }
@@ -1634,8 +1620,7 @@ colorswatch#add-color-button {
     font-weight: bold;
     color: #31363D;
     background-color: #eaeff3;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+    text-shadow: none; }
     colorswatch#add-color-button overlay:hover {
       color: #31363D;
       outline-color: rgba(49, 54, 61, 0.3);
@@ -1645,8 +1630,7 @@ colorswatch#add-color-button {
       color: #565b61;
       outline-color: rgba(49, 54, 61, 0.3);
       background-color: #e8edf3;
-      text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+      text-shadow: none; }
 
 colorswatch:disabled {
   opacity: 0.5; }
@@ -2419,7 +2403,6 @@ headerbar {
       color: white;
       background-color: #eaeff3;
       text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2);
       box-shadow: none; }
       .titlebar button.suggested-action:hover,
       headerbar button.suggested-action:hover {
@@ -2438,8 +2421,7 @@ headerbar {
         color: white;
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00c1e4;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+        text-shadow: none; }
         .titlebar button.suggested-action:disabled label,
         headerbar button.suggested-action:disabled label {
           color: rgba(255, 255, 255, 0.5); }
@@ -2449,15 +2431,13 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00c1e4;
         text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2);
         border-radius: 3px; }
       .titlebar button.suggested-action:backdrop:disabled,
       headerbar button.suggested-action:backdrop:disabled {
         color: white;
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #00c1e4;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+        text-shadow: none; }
     .titlebar button.destructive-action,
     headerbar button.destructive-action {
       font-weight: bold;
@@ -2469,7 +2449,6 @@ headerbar {
       color: white;
       background-color: #eaeff3;
       text-shadow: none;
-      box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2);
       box-shadow: none; }
       .titlebar button.destructive-action:hover,
       headerbar button.destructive-action:hover {
@@ -2488,8 +2467,7 @@ headerbar {
         color: white;
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #e6133e;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+        text-shadow: none; }
         .titlebar button.destructive-action:disabled label,
         headerbar button.destructive-action:disabled label {
           color: rgba(255, 255, 255, 0.5); }
@@ -2499,15 +2477,13 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #e6133e;
         text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2);
         border-radius: 3px; }
       .titlebar button.destructive-action:backdrop:disabled,
       headerbar button.destructive-action:backdrop:disabled {
         color: white;
         outline-color: rgba(255, 255, 255, 0.3);
         background-color: #e6133e;
-        text-shadow: none;
-        box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+        text-shadow: none; }
     .titlebar button.titlebutton,
     headerbar button.titlebutton {
       color: transparent;
@@ -2853,6 +2829,8 @@ row {
     background-color: rgba(0, 211, 167, 0.5); }
   row.activatable:selected:backdrop {
     background-color: rgba(0, 211, 167, 0.6); }
+  row.activatable button:not(.image-button) {
+    background-color: transparent; }
 
 /*********
  * Menus *
@@ -4062,39 +4040,37 @@ stacksidebar row {
 placessidebar.sidebar {
   background-color: transparent;
   background-image: linear-gradient(to right, #171e27 40px, #222e39 35px, #222e39 36px, #222e39 36px, #222e39 99%, #222e39 100%); }
-  placessidebar.sidebar row.sidebar-row {
-    margin-right: -14px; }
-    placessidebar.sidebar row.sidebar-row.sidebar-row .sidebar-icon {
-      margin-left: -14px;
-      margin-right: 12px;
-      padding-left: 14px;
-      padding-right: 12px;
-      color: #98abb2; }
-    placessidebar.sidebar row.sidebar-row:hover {
-      transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-      color: rgba(0, 0, 0, 0.76);
-      background-color: transparent;
-      /*rgba(65,67,75,0.4); */
-      background-image: linear-gradient(to right, rgba(65, 67, 75, 0) 40px, rgba(0, 0, 0, 0.12) 40px, rgba(0, 0, 0, 0.12) 97%); }
-    placessidebar.sidebar row.sidebar-row:active:hover {
-      color: rgba(0, 0, 0, 0.76);
-      background-color: rgba(0, 0, 0, 0.23); }
-    placessidebar.sidebar row.sidebar-row:selected {
+  placessidebar.sidebar row.sidebar-row.sidebar-row .sidebar-icon {
+    margin-left: -14px;
+    margin-right: 12px;
+    padding-left: 14px;
+    padding-right: 12px;
+    color: #98abb2; }
+  placessidebar.sidebar row.sidebar-row:hover {
+    transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    color: rgba(0, 0, 0, 0.76);
+    background-color: transparent;
+    /*rgba(65,67,75,0.4); */
+    background-image: linear-gradient(to right, rgba(65, 67, 75, 0) 40px, rgba(0, 0, 0, 0.12) 40px, rgba(0, 0, 0, 0.12) 97%); }
+  placessidebar.sidebar row.sidebar-row:active:hover {
+    color: rgba(0, 0, 0, 0.76);
+    background-color: rgba(0, 0, 0, 0.23); }
+  placessidebar.sidebar row.sidebar-row:selected {
+    color: rgba(0, 0, 0, 0.54);
+    background-color: transparent;
+    background-image: linear-gradient(to right, #00e8b7 40px, rgba(65, 67, 75, 0) 36px, rgba(65, 67, 75, 0) 97%); }
+    placessidebar.sidebar row.sidebar-row:selected:hover {
+      color: #ffffff;
+      background-color: rgba(0, 0, 0, 0.24); }
+      placessidebar.sidebar row.sidebar-row:selected:hover .sidebar-icon {
+        color: #ffffff; }
+    placessidebar.sidebar row.sidebar-row:selected:backdrop {
       color: rgba(0, 0, 0, 0.54);
       background-color: transparent;
       background-image: linear-gradient(to right, #00e8b7 40px, rgba(65, 67, 75, 0) 36px, rgba(65, 67, 75, 0) 97%); }
-      placessidebar.sidebar row.sidebar-row:selected:hover {
-        color: #ffffff;
-        background-color: rgba(0, 0, 0, 0.24); }
-        placessidebar.sidebar row.sidebar-row:selected:hover .sidebar-icon {
-          color: #ffffff; }
-      placessidebar.sidebar row.sidebar-row:selected:backdrop {
-        color: rgba(0, 0, 0, 0.54);
-        background-color: transparent;
-        background-image: linear-gradient(to right, #00e8b7 40px, rgba(65, 67, 75, 0) 36px, rgba(65, 67, 75, 0) 97%); }
-      placessidebar.sidebar row.sidebar-row:selected .sidebar-icon {
-        -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
-        color: inherit; }
+    placessidebar.sidebar row.sidebar-row:selected .sidebar-icon {
+      -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.8);
+      color: inherit; }
 
 placessidebar list {
   background-color: transparent; }
@@ -5972,8 +5948,7 @@ ConversationListView {
   font-weight: bold;
   color: #31363D;
   background-color: #eaeff3;
-  text-shadow: none;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+  text-shadow: none; }
   #content_frame button:hover {
     color: #31363D;
     outline-color: rgba(49, 54, 61, 0.3);
@@ -5988,8 +5963,7 @@ ConversationListView {
     color: #565b61;
     outline-color: rgba(49, 54, 61, 0.3);
     background-color: #e8eaec;
-    text-shadow: none;
-    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.2), inset 0px -1px 0px 0px rgba(0, 0, 0, 0.2); }
+    text-shadow: none; }
 
 #buttonbox_frame {
   padding-top: 20px;
diff --git a/gtk-3.0/widgets/_buttons.scss b/gtk-3.0/widgets/_buttons.scss
index 9529ff2..e76b7eb 100644
--- a/gtk-3.0/widgets/_buttons.scss
+++ b/gtk-3.0/widgets/_buttons.scss
@@ -94,12 +94,20 @@ button {
       min-width: 24px;
       padding-left: 4px;
       padding-right: 4px;
+      &.circular,&.sidebar-button{
+        padding: 6px 4px;
+        border-radius: 50px;
+        box-shadow: none;
+       }
+      &.sidebar-button {
+        background-color: lighten($_sidebar_color, 7.77%); 
+        color: #fff;
+        &:hover{
+          background-color: $selected_bg_color;
+        }
+      }
     }
-    &.image-button.circular,&.image-button.sidebar-button{
-      padding: 6px 4px;
-      border-radius: 50px;
-      box-shadow: none;
-     }
+    
 
     &.text-button {
       padding-left: 16px;
@@ -543,7 +551,7 @@ button.color {
     &, overlay { border-radius: 0; }
 
     @if $variant == 'light' {
-      box-shadow: 0 1px _text_shadow_color();
+      box-shadow: none;
 
       &:disabled,
       &:backdrop { box-shadow: none; }
@@ -553,9 +561,9 @@ button.color {
 
 notebook, list, .view, popover {
   button {
-    box-shadow: inset 0px 0px 0px 1px $borders_color;
+    box-shadow: none;
     &:backdrop {
-      box-shadow: inset 0px 0px 0px 1px $borders_color;
+      box-shadow: none;
     }
   }
   .linked > button {
diff --git a/gtk-3.0/widgets/_lists.scss b/gtk-3.0/widgets/_lists.scss
index bc77253..6824269 100644
--- a/gtk-3.0/widgets/_lists.scss
+++ b/gtk-3.0/widgets/_lists.scss
@@ -41,6 +41,10 @@ row {
 
       &:backdrop { background-color: $backdrop_selected_bg_color; }
     }
+    
+    button:not(.image-button){
+      background-color: transparent;
+    }
   }
 
   &:selected { @extend %selected_items; }
diff --git a/gtk-3.0/widgets/_sidebar.scss b/gtk-3.0/widgets/_sidebar.scss
index fe8ef82..d6a5129 100644
--- a/gtk-3.0/widgets/_sidebar.scss
+++ b/gtk-3.0/widgets/_sidebar.scss
@@ -121,7 +121,6 @@ stacksidebar {
 /*--*/
 
 placessidebar{
-  $_sidebar_color: if($variant == 'light', #222e39, #161925);
 	&.sidebar{
 		background-color: transparent;
 		background-image:linear-gradient(to right, #171e27 40px,
@@ -130,10 +129,8 @@ placessidebar{
 												$_sidebar_color 100%);
 		row{
 			&.sidebar-row {
-				margin-right: -14px;
 				&.sidebar-row{
 					.sidebar-icon {
-			
 						margin-left:-14px;
 						margin-right: 12px;
 						padding-left: 14px;
@@ -143,7 +140,6 @@ placessidebar{
 				}
 				&:hover{
 					transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-				
 					color: rgba(0,0,0,0.76);
 					background-color: transparent; /*rgba(65,67,75,0.4); */
 					background-image:linear-gradient(to right, rgba(65,67,75,0) 40px, rgba(0,0,0,0.12) 40px,rgba(0,0,0,0.12) 97%);
@@ -186,7 +182,6 @@ placessidebar{
 	}
 	list{ 
 		background-color: transparent; 
-
 		&:backdrop { background-color: transparent; }
 	}