diff --git a/Daybreak.Shared/Utils/NativeMethods.cs b/Daybreak.Shared/Utils/NativeMethods.cs
index d6b5ac39..288815c3 100644
--- a/Daybreak.Shared/Utils/NativeMethods.cs
+++ b/Daybreak.Shared/Utils/NativeMethods.cs
@@ -6,6 +6,10 @@ namespace Daybreak.Shared.Utils;
 
 public static class NativeMethods
 {
+    public const uint WM_SETICON = 0x0080;
+    public const nint ICON_BIG = 1;    // 32x32 (taskbar icon)
+    public const nint ICON_SMALL = 0;  // 16x16 (title bar icon)
+
     public const int STD_OUTPUT_HANDLE = -11;
     public const int ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004;
     public const int ENABLE_PROCESSED_OUTPUT = 0x0001;
diff --git a/Daybreak/Daybreak.csproj b/Daybreak/Daybreak.csproj
index 6320aac1..e39931a7 100644
--- a/Daybreak/Daybreak.csproj
+++ b/Daybreak/Daybreak.csproj
@@ -129,6 +129,16 @@
     <DaybreakInjectorSources Include="..\Daybreak.Shared\**\*.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="Daybreak.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Daybreak.ico">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <!--
   This is a workaround to determine where to place the dependency projects
   It will first check if PublishDir is set.
diff --git a/Daybreak/Launch/Launcher.Main.cs b/Daybreak/Launch/Launcher.Main.cs
index e04c8e1d..5ac88579 100644
--- a/Daybreak/Launch/Launcher.Main.cs
+++ b/Daybreak/Launch/Launcher.Main.cs
@@ -1,4 +1,5 @@
 using Daybreak.Shared.Services.Screens;
+using Daybreak.Shared.Utils;
 using Daybreak.Views;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -39,6 +40,7 @@ public partial class Launcher
             .SetSmoothScrollingEnabled(true)
             .SetChromeless(true);
         app.MainWindow.SetLogVerbosity(0);
+        app.MainWindow.RegisterWindowCreatedHandler((_, __) => SetupWindowIcon(app));
         app.MainWindow.RegisterWindowCreatedHandler((_, __) => SetupRoundedWindows(app));
         app.MainWindow.RegisterWindowCreatedHandler((_, __) => SetupBorderless(app));
         app.MainWindow.RegisterWindowCreatedHandler((_, __) => StartHostedServices(app, cts));
diff --git a/Daybreak/Launch/Launcher.Shared.cs b/Daybreak/Launch/Launcher.Shared.cs
index 406c8798..741810ce 100644
--- a/Daybreak/Launch/Launcher.Shared.cs
+++ b/Daybreak/Launch/Launcher.Shared.cs
@@ -8,17 +8,22 @@ using Photino.Blazor;
 using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.SystemConsole.Themes;
+using System.Drawing;
 using System.Extensions.Core;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 namespace Daybreak.Launch;
 
 public partial class Launcher
 {
+    private const string IconResourceName = "Daybreak.Daybreak.ico";
+
     public const string OutputTemplate = "[{Timestamp:yyyy-MM-dd HH:mm:ss}] {Level:u4}: [{EnvironmentName}] [{ThreadId}:{ThreadName}] [{SourceContext}]{NewLine}{Message:lj}{NewLine}{Exception}";
 
     private static nint OriginalWndProc;
     private static NativeMethods.WndProcDelegate? WndProcDelegate;
+    private static Icon? WindowIcon; 
 
     public static void SetupLogging(IServiceCollection services)
     {
@@ -130,6 +135,49 @@ public partial class Launcher
             0x0001 | 0x0002 | 0x0004 | 0x0020); // SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED
     }
 
+    private static void SetupWindowIcon(PhotinoBlazorApp app)
+    {
+        var hwnd = app.MainWindow.WindowHandle;
+        if (hwnd == IntPtr.Zero)
+        {
+            return;
+        }
+
+        var scopedLogger = app.Services.GetRequiredService<ILogger<Launcher>>().CreateScopedLogger();
+        try
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            if (assembly.GetManifestResourceInfo(IconResourceName) is not ManifestResourceInfo info)
+            {
+                scopedLogger.LogWarning("Icon resource '{IconResourceName}' not found in assembly.", IconResourceName);
+                return;
+            }
+
+            var embeddedIconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(IconResourceName);
+            if (embeddedIconStream is null)
+            {
+                scopedLogger.LogWarning("Icon resource '{IconResourceName}' stream is null.", IconResourceName);
+                return;
+            }
+
+            WindowIcon = new Icon(embeddedIconStream);
+            var hIcon = WindowIcon.Handle;
+            if (hIcon is 0)
+            {
+                scopedLogger.LogWarning("Failed to get handle for window icon.");
+                return;
+            }
+
+            NativeMethods.SendMessage(hwnd, NativeMethods.WM_SETICON, NativeMethods.ICON_BIG, hIcon);
+            NativeMethods.SendMessage(hwnd, NativeMethods.WM_SETICON, NativeMethods.ICON_SMALL, hIcon);
+            scopedLogger.LogDebug("Window icon set successfully.");
+        }
+        catch(Exception ex)
+        {
+            scopedLogger.LogError(ex, "Failed to set window icon.");
+        }
+    }
+
     private static nint WndProc(nint hwnd, uint msg, nint wParam, nint lParam)
     {
         if (msg == NativeMethods.WM_NCCALCSIZE && wParam != 0)
diff --git a/Daybreak/Launch/Launcher.cs b/Daybreak/Launch/Launcher.cs
index 60b1be1b..21aaaeb8 100644
--- a/Daybreak/Launch/Launcher.cs
+++ b/Daybreak/Launch/Launcher.cs
@@ -22,9 +22,6 @@ public partial class Launcher
     [STAThread]
     public static void Main(string[] args)
     {
-#if DEBUG
-        AllocateAnsiConsole();
-#endif
         var bootstrap = SetupBootstrap();
         LaunchSequence(args, bootstrap);
     }