diff --git a/assets/hue_icon.ico b/assets/hue_icon.ico
new file mode 100644
index 0000000..dd2668c
Binary files /dev/null and b/assets/hue_icon.ico differ
diff --git a/assets/hue_icon.png b/assets/hue_icon.png
new file mode 100644
index 0000000..92c03cd
Binary files /dev/null and b/assets/hue_icon.png differ
diff --git a/installer/EchoHub-Installer.exe b/installer/EchoHub-Installer.exe
index 6bc8123..22a0eb0 100644
Binary files a/installer/EchoHub-Installer.exe and b/installer/EchoHub-Installer.exe differ
diff --git a/installer/Installer.iss b/installer/Installer.iss
index 679ec9a..b833071 100644
--- a/installer/Installer.iss
+++ b/installer/Installer.iss
@@ -18,6 +18,7 @@ AppVersion={#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 DefaultDirName={autopf}\{#MyAppName}
 DisableProgramGroupPage=yes
+SetupIconFile=../assets/hue_icon.ico
 ; The [Icons] "quicklaunchicon" entry uses {userappdata} but its [Tasks] entry has a proper IsAdminInstallMode Check.
 UsedUserAreasWarning=no
 ; Remove the following line to run in administrative install mode (install for all users.)
diff --git a/src/EchoHub.Client/EchoHub.Client.csproj b/src/EchoHub.Client/EchoHub.Client.csproj
index a4991f2..27b0268 100644
--- a/src/EchoHub.Client/EchoHub.Client.csproj
+++ b/src/EchoHub.Client/EchoHub.Client.csproj
@@ -20,6 +20,7 @@
     <Content Include="appsettings.json" Condition="Exists('appsettings.json')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="hue_icon.ico" />
     <Content Include="Assets\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -33,6 +34,8 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <PackageIcon></PackageIcon>
+    <ApplicationIcon>hue_icon.ico</ApplicationIcon>
   </PropertyGroup>
 
 </Project>
diff --git a/src/EchoHub.Client/hue_icon.ico b/src/EchoHub.Client/hue_icon.ico
new file mode 100644
index 0000000..dd2668c
Binary files /dev/null and b/src/EchoHub.Client/hue_icon.ico differ
diff --git a/src/EchoHub.Server/EchoHub.Server.csproj b/src/EchoHub.Server/EchoHub.Server.csproj
index 93bbe03..9795f48 100644
--- a/src/EchoHub.Server/EchoHub.Server.csproj
+++ b/src/EchoHub.Server/EchoHub.Server.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
+  <ItemGroup>
+    <Content Include="hue_icon.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\EchoHub.Core\EchoHub.Core.csproj" />
     <ProjectReference Include="..\EchoHub.Server.Irc\EchoHub.Server.Irc.csproj" />
@@ -22,6 +26,8 @@
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <PackageIcon></PackageIcon>
+    <ApplicationIcon>hue_icon.ico</ApplicationIcon>
   </PropertyGroup>
 
 </Project>
diff --git a/src/EchoHub.Server/hue_icon.ico b/src/EchoHub.Server/hue_icon.ico
new file mode 100644
index 0000000..dd2668c
Binary files /dev/null and b/src/EchoHub.Server/hue_icon.ico differ