diff --git a/program_info/genicons.sh b/program_info/genicons.sh
old mode 100755
new mode 100644
index b62cf4f16..b2ba73291
--- a/program_info/genicons.sh
+++ b/program_info/genicons.sh
@@ -47,18 +47,20 @@ if command -v "inkscape" && command -v "iconutil" && command -v "oxipng"; then
     mkdir -p "$d"
 
     svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_16x16.png" 16 16
-    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_16x16@2.png" 32 32
+    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_16x16@2x.png" 32 32
     svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_32x32.png" 32 32
-    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_32x32@2.png" 64 64
+    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_32x32@2x.png" 64 64
     svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_128x128.png" 128 128
-    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_128x128@2.png" 256 256
+    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_128x128@2x.png" 256 256
     svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_256x256.png" 256 256
-    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_256x256@2.png" 512 512
+    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_256x256@2x.png" 512 512
+    svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_512x512.png" 512 512
     svg2png ${LAUNCHER_APPID}.bigsur.svg "$d/icon_512x512@2x.png" 1024 1024
 
     oxipng --opt max --strip all --alpha --interlace 0 "$d/icon_"*".png"
 
     iconutil -c icns "$d"
+    cp -v "$d/prismlauncher.icns" .
 else
     echo "ERROR: macOS icons were NOT generated!" >&2
     echo "ERROR: requires inkscape, iconutil and oxipng in PATH"
diff --git a/program_info/org.prismlauncher.PrismLauncher.desktop.in b/program_info/org.prismlauncher.PrismLauncher.desktop.in
index 182d02b1d..74c70c5d1 100644
--- a/program_info/org.prismlauncher.PrismLauncher.desktop.in
+++ b/program_info/org.prismlauncher.PrismLauncher.desktop.in
@@ -6,7 +6,7 @@ Type=Application
 Terminal=false
 Exec=@Launcher_APP_BINARY_NAME@ %U
 StartupNotify=true
-Icon=org.@Launcher_APP_BINARY_NAME@.@Launcher_CommonName@
+Icon=@Launcher_AppID@
 Categories=Game;ActionGame;AdventureGame;Simulation;PackageManager;
 Keywords=game;minecraft;mc;
 StartupWMClass=@Launcher_CommonName@