diff --git a/electron-mattermost.ico b/electron-mattermost.ico
new file mode 100644
index 00000000..079f3cfd
Binary files /dev/null and b/electron-mattermost.ico differ
diff --git a/src/main.js b/src/main.js
index 5b035b59..64a20899 100644
--- a/src/main.js
+++ b/src/main.js
@@ -52,7 +52,7 @@ app.on('before-quit', function() {
 app.on('ready', function() {
   // set up tray icon to show balloon
   if (process.platform === 'win32') {
-    trayIcon = new Tray(null);
+    trayIcon = new Tray(__dirname + '/tray.png');
     trayIcon.setToolTip(app.getName());
     ipc.on('notified', function(event, arg) {
       trayIcon.displayBalloon({
diff --git a/src/tray.png b/src/tray.png
new file mode 100644
index 00000000..ce5a216e
Binary files /dev/null and b/src/tray.png differ