diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 4da718af1f..3f2fe303bf 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -955,13 +955,19 @@ GtkPopover {
       @extend %undecorated_button;
       icon-shadow: none;
       transition: none;
-      color: inherit;
+      color: transparentize($fg_color,0.7);
       &:hover {
-        border-color: $borders_color;
-        text-shadow: none;
+        color:  $fg_color;
+        @include button(hover, $noedge: true);
+        background-image: none;
+        box-shadow: none;
       }
       &:active {
-        box-shadow: inset 0 1px 1px transparentize(black,0.7);
+        @include button(active, $noedge: true);
+      }
+      &:backdrop {
+        color: transparentize($backdrop_fg_color,0.7);
+        border-color: transparent;
       }
       & > GtkImage { // this is a hack which makes tabs grow
         padding: 2px;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index d794863e0f..4b0618a4de 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1090,12 +1090,31 @@ GtkPopover {
       border: 1px solid transparent;
       icon-shadow: none;
       transition: none;
-      color: inherit; }
+      color: rgba(238, 238, 236, 0.3); }
       .notebook tab .button:hover {
+        color: #eeeeec;
+        border-width: 1px;
+        border-style: solid;
+        color: #eeeeec;
         border-color: #1c1f1f;
-        text-shadow: none; }
+        background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
+        text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+        icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+        background-image: none;
+        box-shadow: none; }
       .notebook tab .button:active {
-        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.3); }
+        border-width: 1px;
+        border-style: solid;
+        color: #eeeeec;
+        border-color: #1c1f1f;
+        background-image: linear-gradient(to bottom, #212424, #2d3232 3%);
+        text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+        icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+        box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+      .notebook tab .button:backdrop {
+        color: rgba(201, 203, 201, 0.3);
+        border-color: transparent; }
       .notebook tab .button > GtkImage {
         padding: 2px; }
 
@@ -2076,11 +2095,3 @@ GtkColorChooserWidget #add-color-button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     border-color: transparent;
     transition-property: border, box-shadow, color; }
-
-/*
- * Gedit
- */
-.gedit-search-slider {
-  border-radius: 0 0 6px 6px;
-  background-color: #393f3f;
-  padding: 6px; }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index dbdafc99e9..416a16ad06 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1090,12 +1090,31 @@ GtkPopover {
       border: 1px solid transparent;
       icon-shadow: none;
       transition: none;
-      color: inherit; }
+      color: rgba(46, 52, 54, 0.3); }
       .notebook tab .button:hover {
+        color: #2e3436;
+        border-width: 1px;
+        border-style: solid;
+        color: #2e3436;
         border-color: #a1a1a1;
-        text-shadow: none; }
+        background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
+        text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+        icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+        box-shadow: inset 0 1px white;
+        background-image: none;
+        box-shadow: none; }
       .notebook tab .button:active {
-        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.3); }
+        border-width: 1px;
+        border-style: solid;
+        color: #2e3436;
+        border-color: #a1a1a1;
+        background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
+        text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+        icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+        box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+      .notebook tab .button:backdrop {
+        color: rgba(84, 89, 90, 0.3);
+        border-color: transparent; }
       .notebook tab .button > GtkImage {
         padding: 2px; }