diff --git a/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java b/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java index e447772b..741a75c9 100644 --- a/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java +++ b/app/src/main/java/io/xpipe/app/core/AppTrayIcon.java @@ -22,9 +22,9 @@ public class AppTrayIcon { var image = switch (OsType.getLocal()) { - case OsType.Windows windows -> "img/logo/logo_16x16.png"; - case OsType.Linux linux -> "img/logo/logo_24x24.png"; - case OsType.MacOs macOs -> "img/logo/logo_macos_tray_24x24.png"; + case OsType.Windows windows -> "img/logo/full/logo_16x16.png"; + case OsType.Linux linux -> "img/logo/full/logo_24x24.png"; + case OsType.MacOs macOs -> "img/logo/padded/logo_24x24.png"; }; var url = AppResources.getResourceURL(AppResources.XPIPE_MODULE, image).orElseThrow(); 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 cc5d3c3a..1cfc5f0c 100644 --- a/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java +++ b/app/src/main/java/io/xpipe/app/core/AppWindowHelper.java @@ -53,16 +53,12 @@ public class AppWindowHelper { // This allows for assigning logos even if AppImages has not been initialized yet 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))); - } + var size = switch (OsType.getLocal()) { + case OsType.Linux linux -> 128; + case OsType.MacOs macOs -> 128; + case OsType.Windows windows -> 32; + }; + stage.getIcons().add(AppImages.loadImage(path.resolve("logo_" + size + "x" + size + ".png"))); }); } 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 index 2c3e2884..d05eb522 100644 Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_16x16.png 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 index 17e8f15c..64b4ddb3 100644 Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/full/logo_24x24.png 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/logo_macos_tray_24x24.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_tray_24x24.png deleted file mode 100644 index 130262ef..00000000 Binary files a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_tray_24x24.png and /dev/null differ diff --git a/dist/logo/ico/logo_16x16.png b/dist/logo/ico/logo_16x16.png index 2c3e2884..d05eb522 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 17e8f15c..64b4ddb3 100644 Binary files a/dist/logo/ico/logo_24x24.png and b/dist/logo/ico/logo_24x24.png differ diff --git a/dist/logo/logo.ico b/dist/logo/logo.ico index ce6e01c8..e684d9d6 100644 Binary files a/dist/logo/logo.ico and b/dist/logo/logo.ico differ