diff --git a/.github/workflows/deploy-launcher.yml b/.github/workflows/deploy-launcher.yml
index e2e2c3b3..88d4f1ea 100644
--- a/.github/workflows/deploy-launcher.yml
+++ b/.github/workflows/deploy-launcher.yml
@@ -90,7 +90,7 @@ jobs:
           INSTALL/launcher/linux/build_appimage.sh \
             dist/photomap "${VERSION}" \
             "dist/PhotoMapAI-${VERSION}-x86_64.AppImage" \
-            photomap/frontend/static/icons/favicon-32x32.png
+            INSTALL/launcher/icons/photomap.png
 
       - uses: actions/upload-artifact@v5
         with:
@@ -138,7 +138,7 @@ jobs:
           chmod +x INSTALL/launcher/macos/build_app.sh
           INSTALL/launcher/macos/build_app.sh \
             dist/photomap "${VERSION}" "dist/PhotoMapAI.app" \
-            photomap/frontend/static/icons/icon.icns
+            INSTALL/launcher/icons/photomap.icns
 
       - name: Import signing certificate
         if: env.SIGNING_ENABLED == 'true'
diff --git a/INSTALL/launcher/icons/photomap.icns b/INSTALL/launcher/icons/photomap.icns
new file mode 100644
index 00000000..7ceef4cf
Binary files /dev/null and b/INSTALL/launcher/icons/photomap.icns differ
diff --git a/INSTALL/launcher/icons/photomap.ico b/INSTALL/launcher/icons/photomap.ico
new file mode 100644
index 00000000..b4e4f9e4
Binary files /dev/null and b/INSTALL/launcher/icons/photomap.ico differ
diff --git a/INSTALL/launcher/icons/photomap.png b/INSTALL/launcher/icons/photomap.png
new file mode 100644
index 00000000..4e595f6c
Binary files /dev/null and b/INSTALL/launcher/icons/photomap.png differ
diff --git a/INSTALL/launcher/windows/photomap.iss b/INSTALL/launcher/windows/photomap.iss
index a2f003a3..65244be8 100644
--- a/INSTALL/launcher/windows/photomap.iss
+++ b/INSTALL/launcher/windows/photomap.iss
@@ -36,8 +36,8 @@ OutputBaseFilename=PhotoMapAI-{#AppVersion}-setup
 Compression=lzma2
 SolidCompression=yes
 WizardStyle=modern
-SetupIconFile=..\..\..\photomap\frontend\static\icons\favicon.ico
-UninstallDisplayIcon={app}\{#AppExe}
+SetupIconFile=..\icons\photomap.ico
+UninstallDisplayIcon={app}\photomap.ico
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -47,13 +47,16 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 Source: "{#SourceExe}"; DestDir: "{app}"; DestName: "{#AppExe}"; Flags: ignoreversion
+; Launcher icon used by the Start Menu / desktop shortcuts (the Go exe has no
+; embedded icon, so shortcuts reference this file).
+Source: "..\icons\photomap.ico"; DestDir: "{app}"; Flags: ignoreversion
 ; Bundled VC++ runtime installer; only extracted when the runtime is missing.
 Source: "{#VCRedist}"; DestDir: "{tmp}"; Flags: deleteafterinstall; Check: VCRedistNeeded
 
 [Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExe}"
+Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExe}"; IconFilename: "{app}\photomap.ico"
 Name: "{group}\Uninstall {#AppName}"; Filename: "{uninstallexe}"
-Name: "{autodesktop}\{#AppName}"; Filename: "{app}\{#AppExe}"; Tasks: desktopicon
+Name: "{autodesktop}\{#AppName}"; Filename: "{app}\{#AppExe}"; IconFilename: "{app}\photomap.ico"; Tasks: desktopicon
 
 [Run]
 ; PyTorch needs the Microsoft Visual C++ runtime (vcruntime140.dll, etc.).
diff --git a/Makefile b/Makefile
index d569a912..8da9fbc4 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ appimage:
 	&& PATH="/tmp:$$PATH" APPIMAGE_EXTRACT_AND_RUN=1 \
 		INSTALL/launcher/linux/build_appimage.sh \
 		dist/photomap "$$version" "dist/PhotoMapAI-$$version-x86_64.AppImage" \
-		photomap/frontend/static/icons/favicon-32x32.png \
+		INSTALL/launcher/icons/photomap.png \
 	&& echo "" \
 	&& echo "Built dist/PhotoMapAI-$$version-x86_64.AppImage"