diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 46302288..444c16fa 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -688,8 +688,8 @@ $_dot_color: $selected_bg_color;
 %flat_button {
   @include button(flat-normal);
   &:hover { @include button(flat-hover); }
-  &:active, &:active:hover { @include button(flat-active); }
-  &:checked, &:checked:hover { @include button(flat-checked); }
+  &:active { @include button(flat-active); }
+  &:checked { @include button(flat-checked); }
   &:disabled { @include button(flat-insensitive); }
 }
 
@@ -739,6 +739,7 @@ button {
   }
 
   &:active, &:checked {
+    @include button(active);
     background-clip: if($variant=='light', border-box, padding-box);
     transition-duration: 200ms;
 
@@ -747,33 +748,13 @@ button {
 
   &:disabled {
     @include button(insensitive);
-  }
 
-  .background & {
     &:active, &:checked {
-      @include button(active);
-    }
-
-    &:disabled {
-      &:active, &:checked {
-        @include button(insensitive-active);
-      }
+      @include button(insensitive-active);
     }
   }
 
-  .background &.flat { // reset
-    &:active, &:checked {
-      @include button(flat-active);
-    }
-
-    &:disabled {
-      &:active, &:checked {
-        @include button(flat-insensitive-active);
-      }
-    }
-  }
-
-  &.image-button:not(.circular), &.popup:not(.circular) {
+  &.image-button, &.popup {
     min-height: $menuitem_size - 4px;
     min-width: $menuitem_size - 4px;
     padding-left: $container_padding - 2px;
@@ -811,8 +792,11 @@ button {
     &.popup { padding-right: $container_padding; padding-left: $container_padding; }
   }
 
-  &.close, &.circular, &.circular.flat,
-  &.image-button.close:not(.circular) { // The Bloody Circul Button
+  &.close,
+  &.circular,
+  &.circular.image-button,
+  &.circular.flat,
+  &.image-button.close { // The Bloody Circul Button
     @extend %circular_button;
 
     &:active, &:checked {
@@ -2514,16 +2498,19 @@ notebook {
     }
 
     button.flat.toggle.popup {
-      min-width: $medium_size;
       border: none;
       box-shadow: none;
-      border-radius: $bt_radius;
-      padding: 0 $container_padding / 2;
 
       @if $monterey == 'true' {
+        min-width: $medium_size;
         margin-top: -2px;
         margin-bottom: -2px;
         margin-left: $container_padding / 2;
+        border-radius: $bt_radius;
+        padding: 0 $container_padding / 2;
+      } @else {
+        border-radius: 0;
+        padding: 0;
       }
 
       &:active, &:checked {
@@ -2625,36 +2612,26 @@ notebook {
       button.flat,
       button.close-button,
       button.image-button.flat {
+        border: none;
+        box-shadow: none;
         border-radius: 3px;
         padding: 0;
-        color: mix($bg_color, $fg_color, 35%);
+        color: $alt_fg_color;
+        min-height: 16px;
+        min-width: 16px;
+        margin-top: 4px;
+        margin-bottom: 4px;
         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;
-          margin-left: $container_padding / 2;
-          margin-right: -$container_padding / 2;
-        }
+        margin-right: -$container_padding / 2;
 
         &:hover {
-          @extend %undecorated_button;
           color: $fg_color;
-          background-color: rgba($borders_color, 0.1);
+          background-color: rgba($fg_color, 0.1);
         }
 
         &:active {
-          @extend %undecorated_button;
           color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
-          background-color: rgba($borders_color, 0.2);
+          background-color: rgba($fg_color, 0.2);
         }
       }
     }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 05ef7c25..4b3a09cd 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2954,36 +2954,26 @@ notebook {
       button.flat,
       button.close-button,
       button.image-button.flat {
+        border: none;
+        box-shadow: none;
         border-radius: 3px;
         padding: 0;
-        color: mix($bg_color, $fg_color, 35%);
+        color: $alt_fg_color;
+        min-height: 16px;
+        min-width: 16px;
+        margin-top: 4px;
+        margin-bottom: 4px;
         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;
-          margin-left: $container_padding / 2;
-          margin-right: -$container_padding / 2;
-        }
+        margin-right: -$container_padding / 2;
 
         &:hover {
-          @extend %undecorated_button;
           color: $fg_color;
-          background-color: rgba($borders_color, 0.1);
+          background-color: rgba($fg_color, 0.1);
         }
 
         &:active {
-          @extend %undecorated_button;
           color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
-          background-color: rgba($borders_color, 0.2);
+          background-color: rgba($fg_color, 0.2);
         }
       }
     }
diff --git a/src/sass/gtk/_drawing.scss b/src/sass/gtk/_drawing.scss
index 8fe61d4c..67b5e01d 100644
--- a/src/sass/gtk/_drawing.scss
+++ b/src/sass/gtk/_drawing.scss
@@ -546,7 +546,7 @@
 
 @mixin transition-shadows($color) {
   > dimming {
-    background: $color;
+    background: none;
   }
   
   > border {
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index cf0c3c9b..495d4e74 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -319,7 +319,8 @@ preferencesgroup > box {
 //
 
 window.background {
-  > contents > toastoverlay > leaflet {
+  > contents > toastoverlay > leaflet,
+  > widget > toastoverlay > leaflet { // 44.0
     > box {
       background-color: $base_color;
 
@@ -354,7 +355,8 @@ window.background {
   }
 
   &.maximized, &.tiled {
-    > contents > toastoverlay > leaflet {
+    > contents > toastoverlay > leaflet,
+    > widget > toastoverlay > leaflet {
       > box {
         > headerbar {
           &, &:backdrop {
@@ -646,7 +648,7 @@ screenshot-carousel button,
   padding: $container_padding / 2 $container_padding * 1.5;
 }
 
-.card flowboxchild.card {
+flowboxchild.card:not(.category-tile) {
   padding: 0;
   border: none;
   box-shadow: none;
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index 380a8c40..df87d18e 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -478,7 +478,7 @@ flap,
 leaflet,
 navigation-view,
 overlay-split-view {
-  @include transition-shadows($wm_shadow);
+  @include transition-shadows($dark_borders_color);
 }
 
 toolbarview.undershoot-top scrolledwindow {
@@ -558,7 +558,7 @@ toolbarview.undershoot-bottom scrolledwindow {
   leaflet,
   navigation-view,
   overlay-split-view {
-    @include transition-shadows($wm_shadow);
+    @include transition-shadows($dark_borders_color);
   }
 
   banner > revealer > widget {
@@ -628,7 +628,7 @@ toolbarview.undershoot-bottom scrolledwindow {
   leaflet,
   navigation-view,
   overlay-split-view {
-    @include transition-shadows($wm_shadow);
+    @include transition-shadows($dark_borders_color);
   }
 
   banner > revealer > widget {
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index 2b64f913..2a156180 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -413,6 +413,18 @@ window.background.csd {
   }
 }
 
+notebook.tilix-background {
+  > header {
+    > tabs > tab {
+      button.tilix-small-button {
+        padding: 0; // not use ?
+        min-height: 16px;
+        min-width: 16px;
+      }
+    }
+  }
+}
+
 //
 // Lollypop
 //