diff --git a/package.json b/package.json
index 81831ae..d2bc362 100644
--- a/package.json
+++ b/package.json
@@ -106,13 +106,13 @@
   "build": {
     "appId": "ryzen-team.app.ryzen-controller",
     "productName": "Ryzen Controller",
-    "icon": "./build/icon.ico",
+    "icon": "./build/icons/app.ico",
     "asarUnpack": [
       "**/build/bin/*"
     ],
     "linux": {
       "category": "Utility",
-      "icon": "./build/icon.png",
+      "icon": "./build/icons/612x612.png",
       "target": [
         {
           "target": "deb"
@@ -123,6 +123,7 @@
       ]
     },
     "nsis": {
+      "installerIcon": "./build/icons/installer.ico",
       "oneClick": false,
       "perMachine": true,
       "allowToChangeInstallationDirectory": true
diff --git a/public/electron.js b/public/electron.js
index 7755819..1549693 100644
--- a/public/electron.js
+++ b/public/electron.js
@@ -23,10 +23,16 @@ const currentSettings = () => {
 
 const createWindow = () => {
   let appIcon = "";
+  let trayIcon = "";
   if (require("os").platform() === "win32") {
-    appIcon = __dirname + "/icon.ico";
+    appIcon = __dirname + "/icons/app_icon.ico";
   } else {
-    appIcon = __dirname + "/icon.png";
+    appIcon = __dirname + "/icons/256x256.png";
+  }
+  if (require("os").platform() === "win32") {
+    trayIcon = __dirname + "/icons/tray_icon.ico";
+  } else {
+    trayIcon = __dirname + "/icons/128x128.png";
   }
 
   const mainWindowOpt = {
@@ -84,7 +90,7 @@ const createWindow = () => {
     },
   ]);
 
-  tray = new Tray(appIcon);
+  tray = new Tray(trayIcon);
   tray.setContextMenu(contextMenu);
   tray.setIgnoreDoubleClickEvents(true);
   tray.on("click", function() {
diff --git a/public/icons/128x128.png b/public/icons/128x128.png
new file mode 100644
index 0000000..b3d66a1
Binary files /dev/null and b/public/icons/128x128.png differ
diff --git a/public/icons/256x256.png b/public/icons/256x256.png
new file mode 100644
index 0000000..3482af0
Binary files /dev/null and b/public/icons/256x256.png differ
diff --git a/public/icon.png b/public/icons/612x612.png
similarity index 100%
rename from public/icon.png
rename to public/icons/612x612.png
diff --git a/public/icons/app.ico b/public/icons/app.ico
new file mode 100644
index 0000000..02f76b6
Binary files /dev/null and b/public/icons/app.ico differ
diff --git a/public/icon.ico b/public/icons/installer.ico
similarity index 100%
rename from public/icon.ico
rename to public/icons/installer.ico
diff --git a/public/icons/tray.ico b/public/icons/tray.ico
new file mode 100644
index 0000000..60e698a
Binary files /dev/null and b/public/icons/tray.ico differ