diff --git a/packager/win/setupscript.iss b/packager/win/setupscript.iss
index 42b5909..9b49142 100644
--- a/packager/win/setupscript.iss
+++ b/packager/win/setupscript.iss
@@ -36,10 +36,11 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
 Source: "{{{executable_path}}}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{{{app_icon}}}"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\icon.ico"
 
 [Tasks]
 Name: modifypath; Description: Add espanso to PATH ( recommended );
@@ -59,3 +60,5 @@ end;
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
+[UninstallRun]
+Filename: "{cmd}"; Parameters: "/C ""taskkill /im espanso.exe /f /t"
\ No newline at end of file