diff --git a/modules/tray-service.js b/modules/tray-service.js
index 0476d04..4f978a3 100644
--- a/modules/tray-service.js
+++ b/modules/tray-service.js
@@ -11,9 +11,23 @@ let tray = null
 
 let trayService = {}
 
+let getTrayServiceIcon = (iconName = 'icon') => {
+    let iconImage = ''
+    if (process.platform === 'darwin') {
+        iconImage = iconName
+    }
+    else if (process.platform === 'win32') {
+        iconImage = iconName+'-16x16'
+    }
+    else {
+        iconImage = iconName+'-48x48'
+    }
+    return path.join(__dirname, '/../resources/images/' + iconImage + '.png')
+}
+
 trayService.initTray = (window) => {
     trayServiceWindow = window
-    let iconPath = path.join(__dirname, '/../resources/images/icon.png')
+    let iconPath = getTrayServiceIcon()
     tray = new Tray(iconPath)
     tray.setToolTip('Chimeverse')
     tray.on('click', function() {
@@ -26,11 +40,13 @@ trayService.initTray = (window) => {
 }
 
 trayService.showEnvelope = () => {
-    tray.setImage(path.join(__dirname, '/../resources/images/envelope.png'))
+    let iconPath = getTrayServiceIcon('envelope')
+    tray.setImage(iconPath)
 }
 
 trayService.hideEnvelope = () => {
-    tray.setImage(path.join(__dirname, '/../resources/images/icon.png'))
+    let iconPath = getTrayServiceIcon()
+    tray.setImage(iconPath)
 }
 
 module.exports = trayService
diff --git a/resources/images/envelope-16x16.png b/resources/images/envelope-16x16.png
new file mode 100644
index 0000000..95ef4ac
Binary files /dev/null and b/resources/images/envelope-16x16.png differ
diff --git a/resources/images/envelope-48x48.png b/resources/images/envelope-48x48.png
new file mode 100644
index 0000000..f435c1e
Binary files /dev/null and b/resources/images/envelope-48x48.png differ
diff --git a/resources/images/icon-16x16.png b/resources/images/icon-16x16.png
new file mode 100644
index 0000000..272cd85
Binary files /dev/null and b/resources/images/icon-16x16.png differ
diff --git a/resources/images/icon-48x48.png b/resources/images/icon-48x48.png
new file mode 100644
index 0000000..0bd6e89
Binary files /dev/null and b/resources/images/icon-48x48.png differ