diff --git a/rfswarm_agent/icons/rfswarm-agent-128.ico b/rfswarm_agent/icons/rfswarm-agent-128.ico
new file mode 100644
index 000000000..5e2074ebd
Binary files /dev/null and b/rfswarm_agent/icons/rfswarm-agent-128.ico differ
diff --git a/rfswarm_agent/icons/rfswarm-agent-128.png b/rfswarm_agent/icons/rfswarm-agent-128.png
new file mode 100644
index 000000000..335ca6b5b
Binary files /dev/null and b/rfswarm_agent/icons/rfswarm-agent-128.png differ
diff --git a/rfswarm_agent/icons/rfswarm-logo-128.ico b/rfswarm_agent/icons/rfswarm-logo-128.ico
new file mode 100644
index 000000000..9b13261a1
Binary files /dev/null and b/rfswarm_agent/icons/rfswarm-logo-128.ico differ
diff --git a/rfswarm_agent/icons/rfswarm-logo-128.png b/rfswarm_agent/icons/rfswarm-logo-128.png
new file mode 100644
index 000000000..59a42bb7c
Binary files /dev/null and b/rfswarm_agent/icons/rfswarm-logo-128.png differ
diff --git a/rfswarm_manager/icons/rfswarm-logo-128.ico b/rfswarm_manager/icons/rfswarm-logo-128.ico
new file mode 100644
index 000000000..9b13261a1
Binary files /dev/null and b/rfswarm_manager/icons/rfswarm-logo-128.ico differ
diff --git a/rfswarm_manager/icons/rfswarm-manager-128.ico b/rfswarm_manager/icons/rfswarm-manager-128.ico
new file mode 100644
index 000000000..1120f23fe
Binary files /dev/null and b/rfswarm_manager/icons/rfswarm-manager-128.ico differ
diff --git a/rfswarm_reporter/icons/rfswarm-logo-128.ico b/rfswarm_reporter/icons/rfswarm-logo-128.ico
new file mode 100644
index 000000000..9b13261a1
Binary files /dev/null and b/rfswarm_reporter/icons/rfswarm-logo-128.ico differ
diff --git a/rfswarm_reporter/icons/rfswarm-logo-128.png b/rfswarm_reporter/icons/rfswarm-logo-128.png
new file mode 100644
index 000000000..59a42bb7c
Binary files /dev/null and b/rfswarm_reporter/icons/rfswarm-logo-128.png differ
diff --git a/rfswarm_reporter/icons/rfswarm-reporter-128.ico b/rfswarm_reporter/icons/rfswarm-reporter-128.ico
new file mode 100644
index 000000000..f49e621e1
Binary files /dev/null and b/rfswarm_reporter/icons/rfswarm-reporter-128.ico differ
diff --git a/rfswarm_reporter/icons/rfswarm-reporter-128.png b/rfswarm_reporter/icons/rfswarm-reporter-128.png
new file mode 100644
index 000000000..42cd5d2c7
Binary files /dev/null and b/rfswarm_reporter/icons/rfswarm-reporter-128.png differ
diff --git a/setup-manager.py b/setup-manager.py
index bc609a6eb..8352ec2f4 100644
--- a/setup-manager.py
+++ b/setup-manager.py
@@ -7,23 +7,6 @@
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
-
-class PostInstallCommand(install):
-	"""Post-installation for installation mode."""
-	def run(self):
-		install.run(self)
-		# PUT YOUR POST-INSTALL SCRIPT HERE or CALL A FUNCTION
-		sys.stdout.write("Creating Desktop Shortcut for RFSwarm Manager...\n")
-		install_dir = os.path.join(ROOT_DIR, "somewhere")
-		sys.stdout.write("install_dir: " + install_dir + "\n")
-
-		user_dir = os.path.expanduser("~")
-
-		test_file = os.path.join(user_dir, "rfswarm_test.txt")
-		with open(test_file, "a",) as f:
-			f.writelines(["RFSwarm test\n", "install_dir:", install_dir, "\n"])
-
-
 with open("README_PyPi.md", "r", encoding="utf-8") as fh:
 	long_description = fh.read()
 
@@ -42,7 +25,9 @@ def run(self):
 	# package_data={"desktop": ["*.png"]},
 	data_files = [
 		('rfswarm_manager/icons', ['rfswarm_manager/icons/rfswarm-manager-128.png']),
+		('rfswarm_manager/icons', ['rfswarm_manager/icons/rfswarm-manager-128.ico']),
 		('rfswarm_manager/icons', ['rfswarm_manager/icons/rfswarm-logo-128.png']),
+		('rfswarm_manager/icons', ['rfswarm_manager/icons/rfswarm-logo-128.ico']),
 	],
 	include_package_data=True,
 	# I needed a recent version of pip (pip 21.0.1 worked my previous <20 version didn't) for matplotlib
@@ -64,9 +49,6 @@ def run(self):
 		'Say Thanks!': 'https://github.com/damies13/rfswarm#donations',
 		'Source': 'https://github.com/damies13/rfswarm',
 	},
-	cmdclass={
-		'install': PostInstallCommand,
-	},
 	entry_points={'console_scripts': ['rfswarm = rfswarm_manager.rfswarm:RFSwarm', 'rfswarm-manager = rfswarm_manager.rfswarm:RFSwarm']},
 )