diff --git a/Cargo.lock b/Cargo.lock
index a8f8b66..588ec6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3271,6 +3271,7 @@ name = "jarvis-app"
 version = "0.1.0"
 dependencies = [
  "dotenvy",
+ "embed-resource",
  "glib 0.21.5",
  "gtk",
  "image",
diff --git a/crates/jarvis-app/Cargo.toml b/crates/jarvis-app/Cargo.toml
index 2e47394..3a1a89c 100644
--- a/crates/jarvis-app/Cargo.toml
+++ b/crates/jarvis-app/Cargo.toml
@@ -31,4 +31,7 @@ winrt-notification.workspace = true
 
 [target.'cfg(target_os = "linux")'.dependencies]
 gtk = "0.18"
-glib = "0.21.5"
\ No newline at end of file
+glib = "0.21.5"
+
+[target.'cfg(target_os = "windows")'.build-dependencies]
+embed-resource = "3"
\ No newline at end of file
diff --git a/crates/jarvis-app/app.manifest b/crates/jarvis-app/app.manifest
new file mode 100644
index 0000000..de8adb1
--- /dev/null
+++ b/crates/jarvis-app/app.manifest
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity
+    type="win32"
+    name="J.A.R.V.I.S.app"
+    version="0.1.0.0"
+    processorArchitecture="*"
+  />
+  <description>J.A.R.V.I.S. voice assistant daemon</description>
+
+  <!--
+    Declare a dependency on Common Controls v6 so transitive Win32 imports
+    like TaskDialogIndirect (used by tray-icon / winit dialog fallbacks)
+    can find their entry points in comctl32.dll. Without this, Windows
+    loads the legacy v5 comctl32 and the exe fails to start with
+    "TaskDialogIndirect entry point not found".
+  -->
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        processorArchitecture="*"
+        publicKeyToken="6595b64144ccf1df"
+        language="*"
+      />
+    </dependentAssembly>
+  </dependency>
+
+  <!-- DPI / Windows version compatibility -->
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 / 11 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    </application>
+  </compatibility>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2,PerMonitor</dpiAwareness>
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+    </windowsSettings>
+  </application>
+
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/crates/jarvis-app/app.manifest.rc b/crates/jarvis-app/app.manifest.rc
new file mode 100644
index 0000000..bbb1850
--- /dev/null
+++ b/crates/jarvis-app/app.manifest.rc
@@ -0,0 +1,4 @@
+#define RT_MANIFEST 24
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "app.manifest"
diff --git a/crates/jarvis-app/build.rs b/crates/jarvis-app/build.rs
index 30a6d3f..e7a70a7 100644
--- a/crates/jarvis-app/build.rs
+++ b/crates/jarvis-app/build.rs
@@ -1,10 +1,18 @@
 fn main() {
-    // link to Vosk lib
-    // println!("cargo:rustc-link-lib=libvosk.dll");
-
     let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
     let lib_path = std::path::Path::new(&manifest_dir)
         .join("..\\..\\lib\\windows\\amd64");
-    
+
     println!("cargo:rustc-link-search=native={}", lib_path.display());
+
+    // Embed a Common-Controls v6 manifest on Windows so transitive imports
+    // pulled in by tray-icon / winit (TaskDialogIndirect, themed controls,
+    // per-monitor DPI) resolve against comctl32 v6. Without this the exe
+    // crashes at load with "TaskDialogIndirect entry point not found".
+    #[cfg(target_os = "windows")]
+    {
+        println!("cargo:rerun-if-changed=app.manifest");
+        println!("cargo:rerun-if-changed=app.manifest.rc");
+        let _ = embed_resource::compile("app.manifest.rc", embed_resource::NONE);
+    }
 }