diff --git a/cmake/functions.cmake b/cmake/functions.cmake
index 2a6a08eb..e365a61b 100644
--- a/cmake/functions.cmake
+++ b/cmake/functions.cmake
@@ -1,5 +1,5 @@
 if (PROJECT_MACOS_ICNS_NAME)
-  set(PROJECT_MACOS_ICNS_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACOS_ICNS_NAME}")
+  set(PROJECT_MACOS_ICNS_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/assets/${PROJECT_MACOS_ICNS_NAME}")
 endif()
 
 function(set_common_target_options name)
diff --git a/icon.icns b/icon.icns
deleted file mode 100644
index 5e1828b9..00000000
Binary files a/icon.icns and /dev/null differ
diff --git a/icon.ico b/icon.ico
deleted file mode 100644
index ca63e588..00000000
Binary files a/icon.ico and /dev/null differ
diff --git a/post_build.sh b/post_build.sh
index f1e50718..f9b107dd 100755
--- a/post_build.sh
+++ b/post_build.sh
@@ -9,6 +9,6 @@ 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
+rsync -av --progress ${CURRENT_DIR}/assets/icon.ico ${PROJECT_DIST_DIR}/icon.ico
 
 rsync -av --progress ${CURRENT_DIR}/assets/blue/logo.iconset/icon_128x128.png ${PROJECT_DIST_DIR}/repertory.png
diff --git a/repertory.iss.in b/repertory.iss.in
index 32450a17..8a0910be 100644
--- a/repertory.iss.in
+++ b/repertory.iss.in
@@ -26,7 +26,7 @@ LicenseFile=repertory\LICENSE.md
 OutputBaseFilename=repertory_{#MyAppVersion}_windows_@PROJECT_MARCH@_setup
 PrivilegesRequired=admin
 SolidCompression=yes
-SetupIconFile=repertory\icon.ico
+SetupIconFile=repertory\assets\icon.ico
 UninstallDisplayIcon={app}\icon.ico
 WizardStyle=modern
 
@@ -161,7 +161,7 @@ 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"; IconFilename: "{app}\icon.ico"
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Parameters: "-ui --hidden"; IconFilename: "{app}\assets\icon.ico"
 
 [Run]
 Filename: "msiexec.exe"; WorkingDir: "{app}"; Parameters: "/i winfsp-@WINFSP_VERSION@.msi /norestart"; \