diff --git a/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java b/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java
index 650a2789..cc5d3c3a 100644
--- a/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java
+++ b/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java
@@ -51,12 +51,14 @@ public class AppWindowHelper {
         stage.getIcons().clear();
 
         // This allows for assigning logos even if AppImages has not been initialized yet
-        AppResources.with(AppResources.XPIPE_MODULE, "img/logo", path -> {
+        var dir = OsType.getLocal() == OsType.MACOS ? "img/logo/padded" : "img/logo/full";
+        AppResources.with(AppResources.XPIPE_MODULE, dir, path -> {
             for (String s : List.of(
                     "logo_16x16.png",
                     "logo_24x24.png",
                     "logo_32x32.png",
                     "logo_48x48.png",
+                    "logo_64x64.png",
                     "logo_128x128.png",
                     "logo_256x256.png")) {
                 stage.getIcons().add(AppImages.loadImage(path.resolve(s)));
diff --git a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
index 53fa89bb..1c00845c 100644
--- a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
@@ -134,7 +134,7 @@ public abstract class OperationMode {
     public static void postInit(String[] args) {
         try {
             // This will initialize the toolkit on macos and create the dock icon
-            // macOS it does not like applications that run fully in the background, so do it always
+            // macOS does not like applications that run fully in the background, so always do it
             if (OsType.getLocal().equals(OsType.MACOS)) {
                 // URL open operations have to be handled in a special way on macOS!
                 Desktop.getDesktop().setOpenURIHandler(e -> {
@@ -156,7 +156,7 @@ public abstract class OperationMode {
                 // This is necessary in case XPipe was started through a script as it will have no icon otherwise
                 if (AppProperties.get().isDeveloperMode() && AppLogs.get().isWriteToSysout()) {
                     try {
-                        var iconUrl = Main.class.getResourceAsStream("resources/img/logo/logo_macos_128x128.png");
+                        var iconUrl = Main.class.getResourceAsStream("resources/img/logo/padded/logo_128x128.png");
                         if (iconUrl != null) {
                             var awtIcon = ImageIO.read(iconUrl);
                             Taskbar.getTaskbar().setIconImage(awtIcon);
diff --git a/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java b/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java
index 57e95b0e..4110c58e 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AboutCategory.java
@@ -104,7 +104,7 @@ public class AboutCategory extends AppPrefsCategory {
                             AppI18n.get("xPipeClient"),
                             "Version " + AppProperties.get().getVersion() + " ("
                                     + AppProperties.get().getArch() + ")",
-                            "logo/logo_48x48.png");
+                            "logo.png");
                 })
                 .styleClass(Styles.TEXT_BOLD);
 
diff --git a/app/src/main/java/io/xpipe/app/prefs/UpdateCheckComp.java b/app/src/main/java/io/xpipe/app/prefs/UpdateCheckComp.java
index ac3979ca..5d6241b2 100644
--- a/app/src/main/java/io/xpipe/app/prefs/UpdateCheckComp.java
+++ b/app/src/main/java/io/xpipe/app/prefs/UpdateCheckComp.java
@@ -1,6 +1,5 @@
 package io.xpipe.app.prefs;
 
-import atlantafx.base.theme.Styles;
 import io.xpipe.app.comp.base.TileButtonComp;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.fxcomps.SimpleComp;
@@ -89,8 +88,6 @@ public class UpdateCheckComp extends SimpleComp {
 
                     refresh();
                 })
-                .styleClass(Styles.ACCENT)
-                .styleClass("button-comp")
                 .styleClass("update-button")
                 .grow(true, false)
                 .disable(PlatformThread.sync(
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo.png b/app/src/main/resources/io/xpipe/app/resources/img/logo.png
index 0fbcf086..08841c92 100644
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo.png and b/app/src/main/resources/io/xpipe/app/resources/img/logo.png differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_128x128.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_128x128.png
new file mode 100644
index 00000000..b7811622
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_128x128.png differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_16x16.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_16x16.png
new file mode 100644
index 00000000..2c3e2884
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_16x16.png differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_24x24.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_24x24.png
new file mode 100644
index 00000000..17e8f15c
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_24x24.png differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_256x256.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_256x256.png
new file mode 100644
index 00000000..c935a751
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_256x256.png differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_32x32.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_32x32.png
new file mode 100644
index 00000000..78102a58
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_32x32.png differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_48x48.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_48x48.png
new file mode 100644
index 00000000..21576596
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_48x48.png differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_64x64.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_64x64.png
new file mode 100644
index 00000000..ce5fa518
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_64x64.png differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_128x128.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_128x128.png
deleted file mode 100644
index 0fbcf086..00000000
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_128x128.png and /dev/null differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_16x16.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_16x16.png
deleted file mode 100644
index d05eb522..00000000
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_16x16.png and /dev/null differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_22x22.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_22x22.png
deleted file mode 100644
index ffe9c0c3..00000000
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_22x22.png and /dev/null differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_24x24.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_24x24.png
deleted file mode 100644
index 64b4ddb3..00000000
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_24x24.png and /dev/null differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_256x256.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_256x256.png
deleted file mode 100644
index 67ff78ad..00000000
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_256x256.png and /dev/null differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_32x32.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_32x32.png
deleted file mode 100644
index 832763c4..00000000
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_32x32.png and /dev/null differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_48x48.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_48x48.png
deleted file mode 100644
index 08841c92..00000000
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_48x48.png and /dev/null differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png
deleted file mode 100644
index 6cbdf894..00000000
Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png and /dev/null differ
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/padded/logo_128x128.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/padded/logo_128x128.png
new file mode 100644
index 00000000..32e551c5
Binary files /dev/null and b/app/src/main/resources/io/xpipe/app/resources/img/logo/padded/logo_128x128.png differ
diff --git a/dist/logo/ico/logo_128x128.png b/dist/logo/ico/logo_128x128.png
index 0fbcf086..b7811622 100644
Binary files a/dist/logo/ico/logo_128x128.png and b/dist/logo/ico/logo_128x128.png differ
diff --git a/dist/logo/ico/logo_16x16.png b/dist/logo/ico/logo_16x16.png
index d05eb522..2c3e2884 100644
Binary files a/dist/logo/ico/logo_16x16.png and b/dist/logo/ico/logo_16x16.png differ
diff --git a/dist/logo/ico/logo_24x24.png b/dist/logo/ico/logo_24x24.png
index 64b4ddb3..17e8f15c 100644
Binary files a/dist/logo/ico/logo_24x24.png and b/dist/logo/ico/logo_24x24.png differ
diff --git a/dist/logo/ico/logo_256x256.png b/dist/logo/ico/logo_256x256.png
index 67ff78ad..c935a751 100644
Binary files a/dist/logo/ico/logo_256x256.png and b/dist/logo/ico/logo_256x256.png differ
diff --git a/dist/logo/ico/logo_32x32.png b/dist/logo/ico/logo_32x32.png
index 832763c4..78102a58 100644
Binary files a/dist/logo/ico/logo_32x32.png and b/dist/logo/ico/logo_32x32.png differ
diff --git a/dist/logo/ico/logo_48x48.png b/dist/logo/ico/logo_48x48.png
index 08841c92..21576596 100644
Binary files a/dist/logo/ico/logo_48x48.png and b/dist/logo/ico/logo_48x48.png differ
diff --git a/dist/logo/ico/logo_64x64.png b/dist/logo/ico/logo_64x64.png
new file mode 100644
index 00000000..ce5fa518
Binary files /dev/null and b/dist/logo/ico/logo_64x64.png differ
diff --git a/dist/logo/logo.ico b/dist/logo/logo.ico
index b0429b73..ce6e01c8 100644
Binary files a/dist/logo/logo.ico and b/dist/logo/logo.ico differ
diff --git a/dist/logo/logo.png b/dist/logo/logo.png
index f8701278..b7811622 100644
Binary files a/dist/logo/logo.png and b/dist/logo/logo.png differ