diff --git a/src/assets/windows/tray.ico b/src/assets/windows/tray.ico
deleted file mode 100644
index 3ea9753e..00000000
Binary files a/src/assets/windows/tray.ico and /dev/null differ
diff --git a/src/assets/windows/tray@2x.ico b/src/assets/windows/tray@2x.ico
deleted file mode 100644
index 77b80b98..00000000
Binary files a/src/assets/windows/tray@2x.ico and /dev/null differ
diff --git a/src/assets/windows/tray_dark.ico b/src/assets/windows/tray_dark.ico
new file mode 100644
index 00000000..266caa5f
Binary files /dev/null and b/src/assets/windows/tray_dark.ico differ
diff --git a/src/assets/windows/tray_dark_mention.ico b/src/assets/windows/tray_dark_mention.ico
new file mode 100644
index 00000000..59e461e8
Binary files /dev/null and b/src/assets/windows/tray_dark_mention.ico differ
diff --git a/src/assets/windows/tray_dark_unread.ico b/src/assets/windows/tray_dark_unread.ico
new file mode 100644
index 00000000..9facfb6e
Binary files /dev/null and b/src/assets/windows/tray_dark_unread.ico differ
diff --git a/src/assets/windows/tray_light.ico b/src/assets/windows/tray_light.ico
new file mode 100644
index 00000000..4d3edaa9
Binary files /dev/null and b/src/assets/windows/tray_light.ico differ
diff --git a/src/assets/windows/tray_light_mention.ico b/src/assets/windows/tray_light_mention.ico
new file mode 100644
index 00000000..5fa0c69a
Binary files /dev/null and b/src/assets/windows/tray_light_mention.ico differ
diff --git a/src/assets/windows/tray_light_unread.ico b/src/assets/windows/tray_light_unread.ico
new file mode 100644
index 00000000..20cf6b05
Binary files /dev/null and b/src/assets/windows/tray_light_unread.ico differ
diff --git a/src/assets/windows/tray_mention.ico b/src/assets/windows/tray_mention.ico
deleted file mode 100644
index 8fc018c5..00000000
Binary files a/src/assets/windows/tray_mention.ico and /dev/null differ
diff --git a/src/assets/windows/tray_mention@2x.ico b/src/assets/windows/tray_mention@2x.ico
deleted file mode 100644
index 3223eb09..00000000
Binary files a/src/assets/windows/tray_mention@2x.ico and /dev/null differ
diff --git a/src/assets/windows/tray_unread.ico b/src/assets/windows/tray_unread.ico
deleted file mode 100644
index b521a52b..00000000
Binary files a/src/assets/windows/tray_unread.ico and /dev/null differ
diff --git a/src/assets/windows/tray_unread@2x.ico b/src/assets/windows/tray_unread@2x.ico
deleted file mode 100644
index 940cb767..00000000
Binary files a/src/assets/windows/tray_unread@2x.ico and /dev/null differ
diff --git a/src/main/tray/tray.js b/src/main/tray/tray.js
index 56652883..b80a558b 100644
--- a/src/main/tray/tray.js
+++ b/src/main/tray/tray.js
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import path from 'path';
-import {app, nativeImage, Tray, systemPreferences} from 'electron';
+import {app, nativeImage, Tray, systemPreferences, nativeTheme} from 'electron';
 
 import {UPDATE_TRAY} from 'common/communication';
 
@@ -17,12 +17,14 @@ let lastStatus = 'normal';
 let lastMessage = app.name;
 
 export function refreshTrayImages(trayIconTheme) {
+    const winTheme = nativeTheme.shouldUseDarkColors ? 'dark' : 'light';
+
     switch (process.platform) {
     case 'win32':
         trayImages = {
-            normal: nativeImage.createFromPath(path.resolve(assetsDir, 'windows/tray.ico')),
-            unread: nativeImage.createFromPath(path.resolve(assetsDir, 'windows/tray_unread.ico')),
-            mention: nativeImage.createFromPath(path.resolve(assetsDir, 'windows/tray_mention.ico')),
+            normal: nativeImage.createFromPath(path.resolve(assetsDir, `windows/tray_${winTheme}.ico`)),
+            unread: nativeImage.createFromPath(path.resolve(assetsDir, `windows/tray_${winTheme}_unread.ico`)),
+            mention: nativeImage.createFromPath(path.resolve(assetsDir, `windows/tray_${winTheme}_mention.ico`)),
         };
         break;
     case 'darwin':