diff --git a/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-NewItems@1x.png b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-NewItems@1x.png
index fe7fc2cd5..f02564c58 100644
Binary files a/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-NewItems@1x.png and b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-NewItems@1x.png differ
diff --git a/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-NewItems@2x.png b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-NewItems@2x.png
index ef3f094a3..5e0efcc89 100644
Binary files a/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-NewItems@2x.png and b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-NewItems@2x.png differ
diff --git a/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-UnreadItems@1x.png b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-UnreadItems@1x.png
new file mode 100644
index 000000000..fe7fc2cd5
Binary files /dev/null and b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-UnreadItems@1x.png differ
diff --git a/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-UnreadItems@2x.png b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-UnreadItems@2x.png
new file mode 100644
index 000000000..ef3f094a3
Binary files /dev/null and b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox-Full-UnreadItems@2x.png differ
diff --git a/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox.psd b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox.psd
new file mode 100644
index 000000000..4153a2d7f
Binary files /dev/null and b/app/internal_packages/system-tray/assets/darwin/MenuItem-Inbox.psd differ
diff --git a/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems.png b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems.png
index d0285af50..ace4696d8 100644
Binary files a/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems.png and b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems.png differ
diff --git a/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems@2x.psd b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems@2x.psd
deleted file mode 100644
index 7ad0ca767..000000000
Binary files a/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems@2x.psd and /dev/null differ
diff --git a/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-UnreadItems.png b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-UnreadItems.png
new file mode 100644
index 000000000..d0285af50
Binary files /dev/null and b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-UnreadItems.png differ
diff --git a/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox.psd b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox.psd
new file mode 100644
index 000000000..16735e8ea
Binary files /dev/null and b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox.psd differ
diff --git a/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-NewItems@2x.png b/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-NewItems@2x.png
index 1ea02cc90..1559a1d9c 100644
Binary files a/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-NewItems@2x.png and b/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-NewItems@2x.png differ
diff --git a/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-NewItems@2x.psd b/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-NewItems@2x.psd
deleted file mode 100644
index 509f6692a..000000000
Binary files a/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-NewItems@2x.psd and /dev/null differ
diff --git a/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-UnreadItems@2x.png b/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-UnreadItems@2x.png
new file mode 100644
index 000000000..1ea02cc90
Binary files /dev/null and b/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox-Full-UnreadItems@2x.png differ
diff --git a/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox.psd b/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox.psd
new file mode 100644
index 000000000..8bed7bce0
Binary files /dev/null and b/app/internal_packages/system-tray/assets/win32/MenuItem-Inbox.psd differ
diff --git a/app/internal_packages/system-tray/lib/system-tray-icon-store.ts b/app/internal_packages/system-tray/lib/system-tray-icon-store.ts
index ef3839f71..6fe5e95da 100644
--- a/app/internal_packages/system-tray/lib/system-tray-icon-store.ts
+++ b/app/internal_packages/system-tray/lib/system-tray-icon-store.ts
@@ -7,13 +7,20 @@ import { BadgeStore } from 'mailspring-exports';
 const { platform } = process;
 const INBOX_ZERO_ICON = path.join(__dirname, '..', 'assets', platform, 'MenuItem-Inbox-Zero.png');
 const INBOX_FULL_ICON = path.join(__dirname, '..', 'assets', platform, 'MenuItem-Inbox-Full.png');
-const INBOX_FULL_UNREAD_ICON = path.join(
+const INBOX_FULL_NEW_ICON = path.join(
   __dirname,
   '..',
   'assets',
   platform,
   'MenuItem-Inbox-Full-NewItems.png'
 );
+const INBOX_FULL_UNREAD_ICON = path.join(
+  __dirname,
+  '..',
+  'assets',
+  platform,
+  'MenuItem-Inbox-Full-UnreadItems.png'
+);
 
 /*
 Current / Intended Behavior:
@@ -23,12 +30,12 @@ Current / Intended Behavior:
 - If the app is in the foreground, we show a gray "full mailbox" icon.
 
 - If the app is in the backgrorund, WHEN the count changes, we switch to showing
-  a blue "new mail in your mailbox" icon. (Eg: going from 4 unread to 5 unread
+  a red "new mail in your mailbox" icon. (Eg: going from 4 unread to 5 unread
   will trigger it.)
 
-The blue is meant to reflect "new stuff since you last foregrounded the app",
-not an absolute count of unread messages. This is a very old design decision (2014?)
-and maybe it should be reconsidered soon.
+- If you have unread mail, we show a blue "unread mail in your mailbox" icon. (Eg:
+  new mail arrives, icon initially shows red, but when you foregrounded the app,
+  it will switch to blue.)
 */
 class SystemTrayIconStore {
   static INBOX_ZERO_ICON = INBOX_ZERO_ICON;
@@ -83,8 +90,12 @@ class SystemTrayIconStore {
     let icon = { path: INBOX_FULL_ICON, isTemplateImg: true };
     if (isInboxZero) {
       icon = { path: INBOX_ZERO_ICON, isTemplateImg: true };
-    } else if (this._windowBackgrounded && unread !== 0) {
-      icon = { path: INBOX_FULL_UNREAD_ICON, isTemplateImg: false };
+    } else if (unread !== 0) {
+      if (this._windowBackgrounded) {
+        icon = { path: INBOX_FULL_NEW_ICON, isTemplateImg: false };
+      } else {
+        icon = { path: INBOX_FULL_UNREAD_ICON, isTemplateImg: false };
+      }
     }
     ipcRenderer.send('update-system-tray', icon.path, unreadString, icon.isTemplateImg);
   };