diff --git a/img/icon/pesterchum.icns b/img/icon/pesterchum.icns
new file mode 100644
index 0000000..5223f99
Binary files /dev/null and b/img/icon/pesterchum.icns differ
diff --git a/img/icon/pesterchum.ico b/img/icon/pesterchum.ico
new file mode 100644
index 0000000..db398ba
Binary files /dev/null and b/img/icon/pesterchum.ico differ
diff --git a/img/icon/pesterchum_icon.xcf b/img/icon/pesterchum_icon.xcf
new file mode 100644
index 0000000..5e82e5a
Binary files /dev/null and b/img/icon/pesterchum_icon.xcf differ
diff --git a/pesterchum.ico b/pesterchum.ico
deleted file mode 100755
index 5b8fa1c..0000000
Binary files a/pesterchum.ico and /dev/null differ
diff --git a/pyinst.py b/pyinst.py
index 00d6c3e..ca5847e 100644
--- a/pyinst.py
+++ b/pyinst.py
@@ -364,7 +364,7 @@ if sys.platform == "win32":
         "--name=Pesterchum",
         #'--noconfirm',               # Overwrite output directory.
         #'--windowed',                 # Hide console
-        "--icon=pesterchum.ico",
+        "--icon={}".format(os.path.join("img", "icon", "pesterchum.ico")),
         "--clean",  # Clear cache
     ]
 
@@ -702,7 +702,7 @@ elif sys.platform == "darwin":
         "--name=Pesterchum",
         #'--windowed',             # Hide console
         #'--noconfirm',           # Overwrite output directory.
-        "--icon=trayicon32.icns",  # Icon
+        "--icon={}".format(os.path.join("img", "icon", "pesterchum.icns")),
         "--onedir",
         "--clean",  # Clear cache
         #'--noupx'
@@ -734,7 +734,7 @@ elif sys.platform == "linux":
         "--name=Pesterchum",
         #'--windowed',             # Hide console
         #'--noconfirm',           # Overwrite output directory.
-        "--icon=trayicon32.icns",  # Icon
+        "--icon={}".format(os.path.join("img", "icon", "pesterchum.ico")),
         "--clean",  # Clear cache
     ]
 
diff --git a/trayicon32.icns b/trayicon32.icns
deleted file mode 100644
index 5cb1b0a..0000000
Binary files a/trayicon32.icns and /dev/null differ