diff --git a/app/tray_icon.js b/app/tray_icon.js
index 75ab391a4..503174882 100644
--- a/app/tray_icon.js
+++ b/app/tray_icon.js
@@ -9,7 +9,7 @@ let tray = null;
 function createTrayIcon(getMainWindow, messages) {
   // A smaller icon is needed on macOS
   const iconSize = process.platform === 'darwin' ? '16' : '256';
-  const iconNoNewMessages = path.join(__dirname, '..', 'images', `icon_${iconSize}.png`);
+  const iconNoNewMessages = path.join(__dirname, '..', 'images', 'session', `session_icon_${iconSize}.png`);
 
   tray = new Tray(iconNoNewMessages);
 
diff --git a/main.js b/main.js
index 6060e43fa..7b8f87b72 100644
--- a/main.js
+++ b/main.js
@@ -724,7 +724,7 @@ async function showMainWindow(sqlKey, passwordAttempt = false) {
 
   ready = true;
 
-  createWindow();
+  await createWindow();
 
   if (usingTrayIcon) {
     tray = createTrayIcon(getMainWindow, locale.messages);