diff --git a/ChangeLog b/ChangeLog
index dbac05766..3528ab752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ v1.13.x
 Bug fixes:
 - #6858 Application is blurry and unfocused on macOS
 - #6872 Check for dns_sd.h only when building GUI
+- #6874 The logo on Windows taskbar is incorrect.
 
 Enhancements:
 - #6867 Create only 1 artefact for macOS
diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
index 1d18807fa..840db2376 100644
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -97,7 +97,9 @@
 			</Component>
 			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
 				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe">
-					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="synergy.ico" Id="GuiShortcut" Name="$(var.Name)"/>
+					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="synergy.exe" Id="GuiShortcut" Name="$(var.Name)">
+						<Icon Id="synergy.exe" SourceFile="$(var.ResPath)/synergy.ico"/>
+					</Shortcut>
 					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
 				</File>
 				<?if $(var.Configuration) = "Debug" ?>