diff --git a/build/generate-tray-icons.ts b/build/generate-tray-icons.ts
index 5bcbe2d2ab..ed90d27832 100644
--- a/build/generate-tray-icons.ts
+++ b/build/generate-tray-icons.ts
@@ -22,7 +22,6 @@ function getSvgStyling(colouring: "dark" | "light"): string {
     <style>
       ellipse {
         stroke: ${colouring === "dark" ? "white" : "black"} !important;
-        fill: ${colouring === "dark" ? "black" : "white"} !important;
       }
       path, rect {
         fill: ${colouring === "dark" ? "white" : "black"} !important;
@@ -31,12 +30,14 @@ function getSvgStyling(colouring: "dark" | "light"): string {
   `;
 }
 
-async function getBaseIconImage() {
+type TargetSystems = "macos" | "windows-or-linux";
+
+async function getBaseIconImage(system: TargetSystems) {
   const svgData = await readFile(inputFile, { encoding: "utf-8" });
   const dom = new JSDOM(`<body>${svgData}</body>`);
   const root = dom.window.document.body.getElementsByTagName("svg")[0];
 
-  root.innerHTML += getSvgStyling("light");
+  root.innerHTML += getSvgStyling(system === "macos" ? "light" : "dark");
 
   return Buffer.from(root.outerHTML);
 }
@@ -57,8 +58,8 @@ async function generateImages(image: Buffer, size: number, name: string) {
   ]);
 }
 
-async function generateUpdateAvailableImages(baseImage: Buffer) {
-  const noticeIconImage = await getNoticeIconImage();
+async function generateUpdateAvailableImages(baseImage: Buffer, system: TargetSystems) {
+  const noticeIconImage = await getNoticeIconImage(system);
   const circleBuffer = await sharp(Buffer.from(`
     <svg viewBox="0 0 64 64">
       <circle cx="32" cy="32" r="32" fill="black" />
@@ -91,11 +92,13 @@ async function generateUpdateAvailableImages(baseImage: Buffer) {
     .toBuffer();
 }
 
-async function getNoticeIconImage() {
+async function getNoticeIconImage(system: TargetSystems) {
   const svgData = await readFile(noticeFile, { encoding: "utf-8" });
-  const noticeSvgRoot = new JSDOM(svgData).window.document.getElementsByTagName("svg")[0];
+  const root = new JSDOM(svgData).window.document.getElementsByTagName("svg")[0];
 
-  return Buffer.from(noticeSvgRoot.outerHTML);
+  root.innerHTML += getSvgStyling(system === "macos" ? "light" : "dark");
+
+  return Buffer.from(root.outerHTML);
 }
 
 async function generateTrayIcons() {
@@ -103,12 +106,19 @@ async function generateTrayIcons() {
     console.log("Generating tray icon pngs");
     await ensureOutputFoler();
 
-    const baseIconImage = await getBaseIconImage();
-    const updateAvailableImage = await generateUpdateAvailableImages(baseIconImage);
+    const baseIconTemplateImage = await getBaseIconImage("macos");
+    const updateAvailableTemplateImage = await generateUpdateAvailableImages(baseIconTemplateImage, "macos");
+    const baseIconImage = await getBaseIconImage("windows-or-linux");
+    const updateAvailableImage = await generateUpdateAvailableImages(baseIconImage, "windows-or-linux");
 
     await Promise.all([
-      generateImages(baseIconImage, size, "trayIconTemplate"),
-      generateImages(updateAvailableImage, size, "trayIconUpdateAvailableTemplate"),
+      // Templates are for macOS only
+      generateImages(baseIconTemplateImage, size, "trayIconTemplate"),
+      generateImages(updateAvailableTemplateImage, size, "trayIconUpdateAvailableTemplate"),
+
+      // Non-templates are for windows and linux
+      generateImages(baseIconImage, size, "trayIcon"),
+      generateImages(updateAvailableImage, size, "trayIconUpdateAvailable"),
     ]);
 
     console.log("Generated all images");
diff --git a/build/tray/trayIcon.png b/build/tray/trayIcon.png
new file mode 100644
index 0000000000..63f2eb1895
Binary files /dev/null and b/build/tray/trayIcon.png differ
diff --git a/build/tray/trayIcon@2x.png b/build/tray/trayIcon@2x.png
new file mode 100644
index 0000000000..c5dcfa9e15
Binary files /dev/null and b/build/tray/trayIcon@2x.png differ
diff --git a/build/tray/trayIcon@3x.png b/build/tray/trayIcon@3x.png
new file mode 100644
index 0000000000..c706ec9b3a
Binary files /dev/null and b/build/tray/trayIcon@3x.png differ
diff --git a/build/tray/trayIcon@4x.png b/build/tray/trayIcon@4x.png
new file mode 100644
index 0000000000..22b1c50c28
Binary files /dev/null and b/build/tray/trayIcon@4x.png differ
diff --git a/build/tray/trayIconUpdateAvailable.png b/build/tray/trayIconUpdateAvailable.png
new file mode 100644
index 0000000000..88dd098ce7
Binary files /dev/null and b/build/tray/trayIconUpdateAvailable.png differ
diff --git a/build/tray/trayIconUpdateAvailable@2x.png b/build/tray/trayIconUpdateAvailable@2x.png
new file mode 100644
index 0000000000..b4c1167c04
Binary files /dev/null and b/build/tray/trayIconUpdateAvailable@2x.png differ
diff --git a/build/tray/trayIconUpdateAvailable@3x.png b/build/tray/trayIconUpdateAvailable@3x.png
new file mode 100644
index 0000000000..30af0bb440
Binary files /dev/null and b/build/tray/trayIconUpdateAvailable@3x.png differ
diff --git a/build/tray/trayIconUpdateAvailable@4x.png b/build/tray/trayIconUpdateAvailable@4x.png
new file mode 100644
index 0000000000..42d2effc9e
Binary files /dev/null and b/build/tray/trayIconUpdateAvailable@4x.png differ
