1 files changed, 25 insertions, 13 deletions

diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 67150971e..2efe71a71 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -6,12 +6,9 @@ const INDICATOR_TRAY_PLAIN = 'tray';
 const INDICATOR_TRAY_UNREAD = 'tray-unread';
 
 export default class TrayIcon {
-  mainWindow = null;
   trayIcon = null;
-
-  constructor(mainWindow) {
-    this.mainWindow = mainWindow;
-  }
+  indicator = 0;
+  themeChangeSubscriberId = null;
 
   show() {
     if (this.trayIcon) return;
@@ -21,7 +18,7 @@ export default class TrayIcon {
       {
         label: 'Show Franz',
         click() {
-          this.mainWindow.show();
+          app.mainWindow.show();
         },
       }, {
         label: 'Quit Franz',
@@ -35,30 +32,45 @@ export default class TrayIcon {
     this.trayIcon.setContextMenu(trayMenu);
 
     this.trayIcon.on('click', () => {
-      this.mainWindow.show();
+      app.mainWindow.show();
     });
+
+    if (process.platform === 'darwin') {
+      this.themeChangeSubscriberId = systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
+        this._refreshIcon();
+      });
+    }
   }
 
   hide() {
-    if (this.trayIcon) {
-      this.trayIcon.destroy();
-      this.trayIcon = null;
+    if (!this.trayIcon) return;
+
+    this.trayIcon.destroy();
+    this.trayIcon = null;
+
+    if (process.platform === 'darwin' && this.themeChangeSubscriberId) {
+      systemPreferences.unsubscribeNotification(this.themeChangeSubscriberId);
+      this.themeChangeSubscriberId = null;
     }
   }
 
   setIndicator(indicator) {
+    this.indicator = indicator;
+    this._refreshIcon();
+  }
+
+  _refreshIcon() {
     if (!this.trayIcon) return;
 
-    this.trayIcon.setImage(this._getAsset('tray', indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN));
+    this.trayIcon.setImage(this._getAsset('tray', this.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN));
 
     if (process.platform === 'darwin') {
       this.trayIcon.setPressedImage(
-        this._getAsset('tray', `${indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`),
+        this._getAsset('tray', `${this.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`),
       );
     }
   }
 
-
   _getAsset(type, asset) {
     let platform = process.platform;