diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index a990ed53..bb898955 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -3638,7 +3638,7 @@ calendar {
 // Dialogs
 //
 
-$messagedialog_bg: if($trans == 'true', rgba($bg_color, 0.95), $bg_color);
+$messagedialog_bg: if($trans == 'true', rgba($bg_color, 0.98), $bg_color);
 
 messagedialog { // Message Dialog styling
   &.background { background-color: rgba($messagedialog_bg, 1); }
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index 60bc5b01..e8f77e70 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -301,11 +301,13 @@ window.background:not(.solid-csd):not(.csd) {
       padding: 3px;
     }
 
-    > scrolledwindow > viewport.frame > grid > box.vertical {
-      > toolbar {
-        background: none;
-        border: none;
-        padding: 6px;
+    > scrolledwindow > viewport.frame {
+      > grid > box.vertical {
+        > toolbar {
+          background: none;
+          border: none;
+          padding: 6px;
+        }
       }
     }
 
@@ -317,12 +319,46 @@ window.background:not(.solid-csd):not(.csd) {
   // for 'Notebookbar' toolbar
   > notebook {
     border: none; // unset borders
-    background-color: $base_color;
+    background: none;
     box-shadow: none;
+    padding: 0;
+    margin: 0;
 
     > stack {
-      border: none;
+      border: 1px solid $dark_sidebar_border;
+      border-left: none;
+      border-right: none;
+      background-color: transparent;
       box-shadow: none;
+      border-radius: 0;
+    }
+
+    > header {
+      box-shadow: none;
+      border-radius: $bt_radius;
+      padding: 0;
+      margin: 0;
+      border: none;
+      background: none;
+
+      > tabs > tab {
+        margin: 3px 1px;
+        border-radius: $bt_radius;
+        border: none;
+        box-shadow: none;
+
+        &:hover {
+          background-color: rgba($fg_color, 0.1);
+        }
+
+        &:active {
+          background-color: rgba($fg_color, 0.2);
+        }
+
+        &:selected {
+          background-color: rgba($fg_color, 0.15);
+        }
+      }
     }
   }
 }