diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java
index 4c7755431..294be06dc 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java
@@ -95,8 +95,8 @@ public class StoreEntryListOverviewComp extends SimpleComp {
                 createDateSortButton().createRegion(),
                 Comp.hspacer(2).createRegion(),
                 createAlphabeticalSortButton().createRegion());
-        AppFont.setSize(label, 3);
-        AppFont.setSize(c, 3);
+        AppFont.setSize(label, 2);
+        AppFont.setSize(c, 2);
         topBar.setAlignment(Pos.CENTER);
         topBar.getStyleClass().add("top");
         return topBar;
@@ -111,9 +111,11 @@ public class StoreEntryListOverviewComp extends SimpleComp {
         });
         var filter = new FilterComp(StoreViewState.get().getFilterString());
         var f = filter.createRegion();
-        var buttons = createAddButton();
-        var hbox = new HBox(buttons, f);
-        f.prefHeightProperty().bind(buttons.heightProperty());
+        var button = createAddButton();
+        var hbox = new HBox(button, f);
+        f.minHeightProperty().bind(button.heightProperty());
+        f.prefHeightProperty().bind(button.heightProperty());
+        f.maxHeightProperty().bind(button.heightProperty());
         hbox.setSpacing(8);
         hbox.setAlignment(Pos.CENTER);
         HBox.setHgrow(f, Priority.ALWAYS);
@@ -136,7 +138,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
         if (OsType.getLocal().equals(OsType.MACOS)) {
             menu.setPadding(new Insets(-2, 0, -2, 0));
         } else {
-            menu.setPadding(new Insets(-3, 0, -3, 0));
+            menu.setPadding(new Insets(-4, 0, -4, 0));
         }
 
         return menu;
@@ -164,6 +166,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
             }
         });
         alphabetical.apply(alphabeticalR -> {
+            AppFont.medium(alphabeticalR.get());
             alphabeticalR
                     .get()
                     .opacityProperty()
@@ -204,6 +207,7 @@ public class StoreEntryListOverviewComp extends SimpleComp {
             }
         });
         date.apply(dateR -> {
+            AppFont.medium(dateR.get());
             dateR.get()
                     .opacityProperty()
                     .bind(Bindings.createDoubleBinding(
diff --git a/app/src/main/java/io/xpipe/app/core/window/ModifiedStage.java b/app/src/main/java/io/xpipe/app/core/window/ModifiedStage.java
index ef0f69fa1..68d1aa8fe 100644
--- a/app/src/main/java/io/xpipe/app/core/window/ModifiedStage.java
+++ b/app/src/main/java/io/xpipe/app/core/window/ModifiedStage.java
@@ -55,7 +55,9 @@ public class ModifiedStage extends Stage {
             return;
         }
 
-        if (OsType.getLocal() == OsType.LINUX || AppPrefs.get() == null || AppPrefs.get().theme.getValue() == null) {
+        var applyToStage = (OsType.getLocal() == OsType.WINDOWS) ||
+                (OsType.getLocal() == OsType.MACOS && AppMainWindow.getInstance() != null && AppMainWindow.getInstance().getStage() == stage);
+        if (!applyToStage || AppPrefs.get() == null || AppPrefs.get().theme.getValue() == null) {
             stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("seamless-frame"), false);
             stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), true);
             return;
@@ -67,7 +69,7 @@ public class ModifiedStage extends Stage {
             case OsType.MacOs macOs -> {
                 var ctrl = new NativeMacOsWindowControl(stage);
                 var seamlessFrame = !AppPrefs.get().performanceMode().get() && mergeFrame();
-                var seamlessFrameApplied = seamlessFrame && ctrl.setAppearance(seamlessFrame, AppPrefs.get().theme.getValue().isDark());
+                var seamlessFrameApplied = ctrl.setAppearance(seamlessFrame, AppPrefs.get().theme.getValue().isDark()) && seamlessFrame;
                 stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("seamless-frame"), seamlessFrameApplied);
                 stage.getScene().getRoot().pseudoClassStateChanged(PseudoClass.getPseudoClass("separate-frame"), !seamlessFrameApplied);
             }
diff --git a/app/src/main/resources/io/xpipe/app/resources/style/filter-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/filter-comp.css
index f9e10e0d9..e69de29bb 100644
--- a/app/src/main/resources/io/xpipe/app/resources/style/filter-comp.css
+++ b/app/src/main/resources/io/xpipe/app/resources/style/filter-comp.css
@@ -1,4 +0,0 @@
-.filter-comp {
-    -fx-padding: 0.15em 0.3em 0.15em 0.7em;
-    -fx-background-color: transparent;
-}
diff --git a/app/src/main/resources/io/xpipe/app/resources/style/sidebar-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/sidebar-comp.css
index 317444173..855e4f9bc 100644
--- a/app/src/main/resources/io/xpipe/app/resources/style/sidebar-comp.css
+++ b/app/src/main/resources/io/xpipe/app/resources/style/sidebar-comp.css
@@ -30,7 +30,7 @@
 }
 
 .sidebar-comp .icon-button-comp {
-    -fx-padding: 1em;
+    -fx-padding: 1.1em;
 }
 
 .sidebar-comp .icon-button-comp .vbox {