diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 9e148b4..308e9f2 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -2382,6 +2382,8 @@ cursor-handle {
   background-color: transparentize($base_color, 1);
   border: 1px solid transparent;
   transition: all 150ms ease-out;
+  border-radius: 0;
+  padding: $container_padding - 4px $container_padding + 4px;
 
   &:hover:not(:checked) {
     color: mix($fg_color, $disabled_fg_color, 50%);
@@ -2401,7 +2403,8 @@ cursor-handle {
   background-color: transparentize($base_color, 1);
   border: none;
   transition: all 150ms ease-out;
-  padding: 0 0;
+  border-radius: $bt_radius;
+  padding: 0 $container_padding + 4px;
 
   &:hover:not(:checked) {
     color: mix($fg_color, $disabled_fg_color, 50%);
@@ -2494,10 +2497,10 @@ notebook {
       min-width: $menuitem_size;
       border: none;
       box-shadow: none;
+      padding: 0;
 
       @if $monterey == 'false' {
         border-radius: 0;
-        padding: 0;
         margin: 0;
       } @else {
         margin-left: $container_padding / 2;
@@ -2521,22 +2524,17 @@ notebook {
         }
 
         > tabs > tab {
-          padding: $container_padding - 4px $container_padding + 4px;
           outline-offset: -4px;
           min-width: 24px;
           min-height: 24px;
 
           @if $monterey == 'false' {
-            border-radius: 0;
-
             // tab overlap
             + tab {
               @if $_pos==top or $_pos==bottom { margin-left: -1px; }
               @else { margin-top: -1px; }
             }
           } @else {
-            border-radius: $bt_radius;
-
             + tab {
               @if $_pos==top or $_pos==bottom { margin-left: $container_padding / 2; }
               @else { margin-top: $container_padding / 2; }
@@ -2605,14 +2603,26 @@ notebook {
       }
 
       // close button
-      button.flat, button.close-button {
-        min-height: $small_size;
-        min-width: $small_size;
+      button.flat,
+      button.close-button,
+      button.image-button.flat {
         border-radius: 3px;
         padding: 0;
-        margin-top: 2px;
-        margin-bottom: 2px;
         color: mix($bg_color, $fg_color, 35%);
+        margin-left: $container_padding / 2;
+        margin-right: -$container_padding;
+
+        @if $monterey == 'false' {
+          min-height: $small_size;
+          min-width: $small_size;
+          margin-top: 2px;
+          margin-bottom: 2px;
+        } @else {
+          min-height: 16px;
+          min-width: 16px;
+          margin-top: 4px;
+          margin-bottom: 4px;
+        }
 
         &:hover {
           @extend %undecorated_button;
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index e76a29b..c91e5d7 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -595,18 +595,12 @@ terminal-window {
 
   notebook {
     button.flat.toggle.popup {
-      min-height: 28px;
-      min-width: 28px;
-      padding: 0;
-
       @if $monterey == 'false' {
         margin: -2px;
       } @else {
         margin: -2px 0;
       }
     }
-
-    tab { padding: 0 0; }
   }
 
   &.background.csd.maximized { border-radius: 0 0 0 0; } // Fixed gnome 3.32 issue: Unable to restore window size after maximization
@@ -1962,29 +1956,48 @@ window.background.csd {
 }
 
 tabbox {
-  background-color: darken($header_bg, 10%);
-  box-shadow: inset 0 -1px $borders_color;
+  @if $monterey == 'false' {
+    background-color: darken($header_bg, 10%);
+    box-shadow: inset 0 -1px $borders_color;
+  } @else {
+    background-color: $header_bg;
+    border-bottom: 1px solid $borders_color;
+    padding: 0 $container_padding / 2 $container_padding / 2;
+  }
 
   > tab {
-    @extend %tabs_tab;
-    border-top: none;
-    padding: 2px 10px;
-    min-width: 24px;
-    min-height: 24px;
-    border-top: 1px solid $borders_color;
+    @if $monterey == 'false' {
+      @extend %tabs_tab;
+      border-top: none;
+      border-top: 1px solid $borders_color;
+      &:checked { border-top-color: $header_bg; }
+    } @else {
+      @extend %monterey_tab;
 
-    &:checked {
-      border-top-color: $header_bg;
+      + tab {
+        margin-left: $container_padding / 2;
+      }
     }
 
-    button {
-      min-height: 20px;
-      min-width: 20px;
+    button.tab-close-button {
       border-radius: 3px;
       border: none;
       padding: 0;
       @extend %flat_button;
 
+      @if $monterey == 'false' {
+        min-height: $small_size;
+        min-width: $small_size;
+        margin-top: 2px;
+        margin-bottom: 2px;
+      } @else {
+        min-height: 16px;
+        min-width: 16px;
+        margin-top: 4px;
+        margin-bottom: 4px;
+        margin-right: -$container_padding;
+      }
+
       &:hover {
         color: $fg_color;
         background-color: rgba($borders_color, 0.1);
@@ -2451,7 +2464,7 @@ window.background.csd {
 //
 // Archive Manager
 //
-.background.csd {
+window.background.csd {
   > grid.horizontal > paned.horizontal {
     > scrolledwindow {
       border-radius: 0 0 $wm_radius $wm_radius;
@@ -2492,7 +2505,7 @@ window.background.csd {
 //
 // Eye of GNOME Image Viewer
 //
-.background.csd {
+window.background.csd {
   > box.vertical > box.vertical > box.vertical{
     > paned.horizontal {
       > separator {