diff --git a/gitnexus-desktop/build/icon.ico b/gitnexus-desktop/build/icon.ico
new file mode 100644
index 000000000..7eb1e5213
Binary files /dev/null and b/gitnexus-desktop/build/icon.ico differ
diff --git a/gitnexus-desktop/electron-builder.yml b/gitnexus-desktop/electron-builder.yml
index 924cffa0b..e04c87ab1 100644
--- a/gitnexus-desktop/electron-builder.yml
+++ b/gitnexus-desktop/electron-builder.yml
@@ -34,12 +34,14 @@ extraResources:
     to: gitnexus/package.json
   - from: 'build/icon.png'
     to: icon.png
+  - from: 'build/icon.ico'
+    to: icon.ico
 asar: false
 npmRebuild: false
 afterPack: scripts/after-pack.mjs
 win:
   signAndEditExecutable: false
-  icon: build/icon.png
+  icon: build/icon.ico
   target:
     - nsis
 mac:
diff --git a/gitnexus-desktop/src/main/main.ts b/gitnexus-desktop/src/main/main.ts
index 7a6eb6f84..ec546d1cc 100644
--- a/gitnexus-desktop/src/main/main.ts
+++ b/gitnexus-desktop/src/main/main.ts
@@ -17,8 +17,11 @@ const DESKTOP_APP_NAME = 'GitNexus Desktop';
 const DESKTOP_SHELL_TITLEBAR_HEIGHT = 38;
 const DESKTOP_BACKGROUND_COLOR = '#0d0d0d';
 const DESKTOP_APP_ICON_PATH = app.isPackaged
-  ? path.join(process.resourcesPath, 'icon.png')
-  : path.resolve(__dirname, '../../build/icon.png');
+  ? path.join(process.resourcesPath, process.platform === 'win32' ? 'icon.ico' : 'icon.png')
+  : path.resolve(
+      __dirname,
+      process.platform === 'win32' ? '../../build/icon.ico' : '../../build/icon.png',
+    );
 const DESKTOP_GET_SHELL_STATE_CHANNEL = 'gitnexus-desktop:get-shell-state';
 const DESKTOP_WINDOW_ACTION_CHANNEL = 'gitnexus-desktop:window-action';
 const DESKTOP_WINDOW_STATE_CHANGED_CHANNEL = 'gitnexus-desktop:window-state-changed';
@@ -43,7 +46,7 @@ const GITNEXUS_WEB_PACKAGED_DIR = path.join(process.resourcesPath, 'gitnexus-web
 // Bundling a real node.exe and using it as the subprocess host avoids the crash.
 const GITNEXUS_PACKAGED_NODE_BINARY = path.join(process.resourcesPath, 'runtime', 'node.exe');
 const GITNEXUS_WEB_EXPECTED_MARKERS = ['<title>GitNexus</title>', '<div id="root"></div>'];
-const GITNEXUS_SERVER_READY_TIMEOUT_MS = 30_000;
+const GITNEXUS_SERVER_READY_TIMEOUT_MS = 120_000;
 const GITNEXUS_WEB_READY_TIMEOUT_MS = 60_000;
 const GITNEXUS_WEB_READY_POLL_MS = 500;
 const PACKAGED_WEB_SERVER_HOST = '127.0.0.1';