diff --git a/electron.js b/electron.js
index 31247fb..3d8d809 100644
--- a/electron.js
+++ b/electron.js
@@ -54,7 +54,7 @@ function createWindow() {
       path: path.resolve(path.join(app.getAppPath(), '..\\..\\repertory-ui.exe')),
     });
 
-    const image = nativeImage.createFromPath(path.join(__dirname, '/build/icon.ico'));
+    const image = nativeImage.createFromPath(path.join(__dirname, '/build/logo.png'));
     mainContextWindow = Menu.buildFromTemplate([
       {
         label: 'Visible', type: 'checkbox', click(item) {
@@ -219,6 +219,23 @@ ipcMain.on(Constants.IPC_Detect_Mounts, (event, data) => {
     }
   };
 
+  const setImage = (hsLocation, siaLocation) => {
+    if (os.platform() === 'win32') {
+      let image;
+      if ((siaLocation.length > 0) && (hsLocation.length > 0)) {
+        image = nativeImage.createFromPath(path.join(__dirname, '/build/logo_both.png'));
+      } else if (hsLocation.length > 0) {
+        image = nativeImage.createFromPath(path.join(__dirname, '/build/logo_hs.png'));
+      } else if (siaLocation.length > 0) {
+        image = nativeImage.createFromPath(path.join(__dirname, '/build/logo_sia.png'));
+      } else {
+        image = nativeImage.createFromPath(path.join(__dirname, '/build/logo.png'));
+      }
+
+      mainWindowTray.setImage(image);
+    }
+  };
+
   const dataDirectory = helpers.resolvePath(data.Directory);
   helpers
     .detectRepertoryMounts(dataDirectory, data.Version)
@@ -230,6 +247,7 @@ ipcMain.on(Constants.IPC_Detect_Mounts, (event, data) => {
         siaLocation = siaLocation.toUpperCase();
         grabDriveLetters(hsLocation, siaLocation);
       }
+      setImage(hsLocation, siaLocation);
       standardIPCReply(event, Constants.IPC_Detect_Mounts_Reply, {
         DriveLetters: driveLetters,
         Locations: {
@@ -244,6 +262,7 @@ ipcMain.on(Constants.IPC_Detect_Mounts, (event, data) => {
     })
     .catch(error => {
       grabDriveLetters('', '');
+      setImage('', '');
       standardIPCReply(event, Constants.IPC_Detect_Mounts_Reply, {
         DriveLetters: driveLetters,
       }, error);
diff --git a/public/favicon.ico b/public/favicon.ico
index 530403f..1c44c7e 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/favicon_old.ico b/public/favicon_old.ico
new file mode 100644
index 0000000..530403f
Binary files /dev/null and b/public/favicon_old.ico differ
diff --git a/public/icon.ico b/public/icon.ico
index 391e4a8..1c44c7e 100644
Binary files a/public/icon.ico and b/public/icon.ico differ
diff --git a/public/icon_old.ico b/public/icon_old.ico
new file mode 100644
index 0000000..391e4a8
Binary files /dev/null and b/public/icon_old.ico differ
diff --git a/public/logo.png b/public/logo.png
new file mode 100644
index 0000000..56d6c12
Binary files /dev/null and b/public/logo.png differ
diff --git a/public/logo_both.png b/public/logo_both.png
new file mode 100644
index 0000000..4010799
Binary files /dev/null and b/public/logo_both.png differ
diff --git a/public/logo_hs.png b/public/logo_hs.png
new file mode 100644
index 0000000..a7ce38c
Binary files /dev/null and b/public/logo_hs.png differ
diff --git a/public/logo_sia.png b/public/logo_sia.png
new file mode 100644
index 0000000..bf5c63d
Binary files /dev/null and b/public/logo_sia.png differ