From a651c4d5a13094e5a4013b3ace2c5110da29af4a Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Fri, 3 Oct 2025 17:33:17 +0800
Subject: [PATCH] Fixed #245

---
 src/sass/libadwaita/apps/_nautilus.scss      | 2 +-
 src/sass/libadwaita/widgets/_header-bar.scss | 8 +++++---
 src/sass/libadwaita/widgets/_sidebars.scss   | 3 ++-
 src/sass/libadwaita/widgets/_toolbars.scss   | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/sass/libadwaita/apps/_nautilus.scss b/src/sass/libadwaita/apps/_nautilus.scss
index 9bb63c4f..74f2447c 100644
--- a/src/sass/libadwaita/apps/_nautilus.scss
+++ b/src/sass/libadwaita/apps/_nautilus.scss
@@ -67,7 +67,7 @@
 
 #NautilusQueryEditor { // search entry
   > menubutton {
-    margin: $base_padding 0;
+    margin: 2px 0;
 
     > button.image-button {
       min-width: 16px;
diff --git a/src/sass/libadwaita/widgets/_header-bar.scss b/src/sass/libadwaita/widgets/_header-bar.scss
index ceed7438..1f988ccc 100644
--- a/src/sass/libadwaita/widgets/_header-bar.scss
+++ b/src/sass/libadwaita/widgets/_header-bar.scss
@@ -249,10 +249,11 @@ $titlebutton_close: $button-close;
 
   &.minimize, &.maximize, &.close {
     color: transparent;
-    background: none;
 
-    &:hover, &:active {
+    &, &:hover, &:active, &:disabled {
       box-shadow: none;
+      background-color: transparent;
+      background-image: none;
     }
 
     &:hover, &:active {
@@ -347,7 +348,8 @@ windowcontrols {
     }
   }
 
-  > button {
+  > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque),
+  > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque).image-button {
     @if $window_button == 'mac' {
       @extend %mac_window_button;
     } @else {
diff --git a/src/sass/libadwaita/widgets/_sidebars.scss b/src/sass/libadwaita/widgets/_sidebars.scss
index c53c63c8..4ce9e401 100644
--- a/src/sass/libadwaita/widgets/_sidebars.scss
+++ b/src/sass/libadwaita/widgets/_sidebars.scss
@@ -236,7 +236,8 @@ stacksidebar row {
       }
 
       windowcontrols {
-        > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
+        > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque),
+        > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque).image-button {
           @if $window_button == 'mac' {
             &.minimize, &.maximize, &.close {
               color: transparent;
diff --git a/src/sass/libadwaita/widgets/_toolbars.scss b/src/sass/libadwaita/widgets/_toolbars.scss
index 35b50363..1d096b5f 100644
--- a/src/sass/libadwaita/widgets/_toolbars.scss
+++ b/src/sass/libadwaita/widgets/_toolbars.scss
@@ -1,7 +1,7 @@
 %toolbar {
   button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
     &.arrow-button,
-    &.image-button,
+    &.image-button:not(.close):not(.minimize):not(.maximize),
     &.image-text-button {
       @extend %button_basic_flat;
     }
@@ -21,7 +21,7 @@
 
   .linked button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
     &.arrow-button,
-    &.image-button,
+    &.image-button:not(.close):not(.minimize):not(.maximize),
     &.image-text-button {
       @extend %button_basic_raised;
     }
@@ -59,7 +59,7 @@
   popover {
     button:not(.flat):not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
       &.arrow-button,
-      &.image-button,
+      &.image-button:not(.close):not(.minimize):not(.maximize),
       &.image-text-button {
         @extend %button_basic_raised;
       }