Fixed issues

src/sass/gtk/_common-4.0.scss

@@ -5202,6 +5202,8 @@ $window-space: $space-size * 1.5;
 
 headerbar windowcontrols {
   border-spacing: $space-size;
+  margin-top: $space-size;
+  margin-bottom: $space-size;
 
   &:not(.empty) {
     &.start:dir(ltr),

src/sass/gtk/apps/_gnome-4.0.scss

@@ -44,35 +44,6 @@
 }
 
 .nautilus-window {
-  .content-pane .top-bar headerbar {
-    background-color: transparent;
-    box-shadow: inset 0 1px highlight($titlebar);
-
-    &:backdrop {
-      background-color: transparent;
-    }
-  }
-
-  .content-pane {
-    .top-bar headerbar {
-      box-shadow: inset 0 1px highlight($titlebar);
-      background-color: $titlebar;
-      border-bottom: 1px solid $border;
-
-      &:backdrop {
-        background-color: $titlebar-backdrop;
-      }
-    }
-
-    toolbarview.undershoot-top scrolledwindow {
-      @include undershoot(top);
-    }
-
-    toolbarview.undershoot-bottom scrolledwindow {
-      @include undershoot(bottom);
-    }
-  }
-
   placesview {
     label { color: $text-secondary; }
   }
@@ -101,6 +72,29 @@
   }
 }
 
+.nautilus-window,
+#NautilusFileChooser {
+  .content-pane {
+    .top-bar headerbar {
+      box-shadow: inset 0 1px highlight($titlebar);
+      background-color: $titlebar;
+      border-bottom: 1px solid $border;
+
+      &:backdrop {
+        background-color: $titlebar-backdrop;
+      }
+    }
+
+    toolbarview.undershoot-top scrolledwindow {
+      @include undershoot(top);
+    }
+
+    toolbarview.undershoot-bottom scrolledwindow {
+      @include undershoot(bottom);
+    }
+  }
+}
+
 .floating-bar {
   min-height: 32px;
   padding: 0;