diff --git a/icon.ico b/icon.ico
new file mode 100644
index 00000000..ca63e588
Binary files /dev/null and b/icon.ico differ
diff --git a/post_build.sh b/post_build.sh
index 4f5435c6..09f3053c 100755
--- a/post_build.sh
+++ b/post_build.sh
@@ -8,3 +8,5 @@ rsync -av --progress ${CURRENT_DIR}/${PROJECT_NAME}/${PROJECT_NAME}_test/test_in
 
 rsync -av --progress ${CURRENT_DIR}/${PROJECT_NAME}/${PROJECT_NAME}_test/test_input/ \
   ${PROJECT_DIST_DIR}/test_input/
+
+rsync -av --progress ${CURRENT_DIR}/icon.ico \ ${PROJECT_DIST_DIR}/icon.ico
diff --git a/repertory.iss.in b/repertory.iss.in
index 98746b58..168da37d 100644
--- a/repertory.iss.in
+++ b/repertory.iss.in
@@ -26,7 +26,8 @@ LicenseFile=repertory\LICENSE.md
 OutputBaseFilename=repertory_{#MyAppVersion}_windows_@PROJECT_MARCH@_setup
 PrivilegesRequired=admin
 SolidCompression=yes
-UninstallDisplayIcon={app}\{#MyAppExeName}
+SetupIconFile=repertory\icon.ico
+UninstallDisplayIcon={app}\icon.ico
 WizardStyle=modern
 
 [code]
@@ -160,8 +161,8 @@ Source: "repertory\*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs c
 Source: "3rd_party\winfsp-@WINFSP_VERSION@.msi"; DestDir: "{app}"; Flags: ignoreversion; Components: winfsp
 
 [Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Parameters: "-ui --hidden"
-Name: "{commonstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Parameters: "-ui --launch_only --hidden"
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Parameters: "-ui --hidden"; IconFilename: "{app}\icon.ico"
+Name: "{commonstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Parameters: "-ui --launch_only --hidden"; IconFilename: "{app}\icon.ico"
 
 [Run]
 Filename: "msiexec.exe"; WorkingDir: "{app}"; Parameters: "/a winfsp-@WINFSP_VERSION@.msi /norestart"; \