diff --git a/windows-app/assets/icon.png b/windows-app/assets/icon.png
new file mode 100644
index 0000000..948ac4a
Binary files /dev/null and b/windows-app/assets/icon.png differ
diff --git a/windows-app/installer.nsh b/windows-app/installer.nsh
new file mode 100644
index 0000000..5d2023b
--- /dev/null
+++ b/windows-app/installer.nsh
@@ -0,0 +1,17 @@
+!macro customInstall
+  ; Write registry entries for proper Windows app registration
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "DisplayName" "Plugin Compass"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "DisplayIcon" "$INSTDIR\Plugin Compass.exe"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "Publisher" "Plugin Compass"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "DisplayVersion" "${VERSION}"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "UninstallString" "$INSTDIR\Uninstall Plugin Compass.exe"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "InstallLocation" "$INSTDIR"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "InstallDate" "${INSTALL_DATE}"
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "NoModify" 1
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}" "NoRepair" 1
+!macroend
+
+!macro customUnInstall
+  ; Remove registry entries on uninstall
+  DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_GUID}"
+!macroend
diff --git a/windows-app/package.json b/windows-app/package.json
index 12ea5d7..c40ce4f 100644
--- a/windows-app/package.json
+++ b/windows-app/package.json
@@ -29,17 +29,18 @@
     "files": [
       "electron-main.js",
       "electron-preload.js",
-      "ui-dist/**/*"
+      "ui-dist/**/*",
+      "assets/**/*"
     ],
     "win": {
       "target": [
         "nsis"
       ],
-      "icon": "assets/icon.ico"
+      "icon": "assets/icon.png"
     },
     "mac": {
       "target": "dmg",
-      "icon": "assets/icon.icns"
+      "icon": "assets/icon.png"
     },
     "linux": {
       "target": "AppImage",
@@ -49,7 +50,11 @@
       "oneClick": false,
       "allowToChangeInstallationDirectory": true,
       "createDesktopShortcut": true,
-      "createStartMenuShortcut": true
+      "createStartMenuShortcut": true,
+      "runAfterFinish": true,
+      "shortcutName": "Plugin Compass",
+      "include": "installer.nsh",
+      "deleteAppDataOnUninstall": false
     }
   }
 }