diff --git a/dist_assets/mac/pyfa.icns b/dist_assets/mac/pyfa.icns
new file mode 100644
index 000000000..a85c47e13
Binary files /dev/null and b/dist_assets/mac/pyfa.icns differ
diff --git a/dist_assets/win/pyfa.ico b/dist_assets/win/pyfa.ico
new file mode 100644
index 000000000..9c7c30801
Binary files /dev/null and b/dist_assets/win/pyfa.ico differ
diff --git a/setup.py b/setup.py
index 79c8a4268..c1f674a7c 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ build_options_winmsi = {
 executable_options = {
     'script': 'pyfa.py',
     'base': 'Win32GUI' if sys.platform=='win32' else None,
-    'icon': 'pyfa.ico',
+    'icon': 'dist_assets/win/pyfa.ico',
     'shortcutDir': 'DesktopFolder',
     'shortcutName': app_name,
 }