diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 822023d9a5..357152ab37 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -292,12 +292,13 @@ set(WIX_CANDLE_DEFINES
 	-dWiresharkVersion=${PRODUCT_VERSION}
 	-dAssetDir=${CMAKE_SOURCE_DIR}/packaging/wix
 	-dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}
+	-dDiameterDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/diameter
+	-dIconDir=${CMAKE_SOURCE_DIR}/image
+	-dQtTranslationDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/translations
+	-dRadiusDictDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/radius
+	-dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs
 	-dVCRedistVersion=${MSVC_CRT_VERSION}
 	-dVCRedistDir=${MSVC_REDIST_DIR}
-	-dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs
-	-dRadiusDictDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/radius
-	-dDiameterDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/diameter
-	-dQtTranslationDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/translations
 	${use_gtk}
 	${use_smi}
 	${ENABLE_LIBWIRESHARK}
diff --git a/packaging/wix/UserInterface.wxi b/packaging/wix/UserInterface.wxi
index 114efb68f8..e572666417 100644
--- a/packaging/wix/UserInterface.wxi
+++ b/packaging/wix/UserInterface.wxi
@@ -5,7 +5,8 @@
     <WixVariable Id="WixUILicenseRtf" Value="$(var.EulaPath)" />
     <WixVariable Id="WixUIBannerBmp" Value="$(var.BannerImagePath)" />
     <WixVariable Id="WixUIDialogBmp" Value="$(var.DialogImagePath)" />
-    <Property Id="ARPPRODUCTICON" Value="ProductIcon" />
+    <Icon Id="ProgramsFeaturesIcon" SourceFile="$(var.ProgramsFeaturesIconPath)"/>
+    <Property Id="ARPPRODUCTICON" Value="ProgramsFeaturesIcon" />
 
     <!-- This UI identifier will be used in the product definition-->
     <UI Id="UI.Wireshark">
diff --git a/packaging/wix/Wireshark.wxs b/packaging/wix/Wireshark.wxs
index fc9027a414..f875ba837f 100644
--- a/packaging/wix/Wireshark.wxs
+++ b/packaging/wix/Wireshark.wxs
@@ -8,6 +8,8 @@
   <!-- Windows 8 and later supports PNG. Until then we use cave paintings^W^W BMP. -->
   <?define BannerImagePath="$(var.AssetDir)\banner.bmp"?>
   <?define DialogImagePath="$(var.AssetDir)\dialog.bmp"?>
+  <!-- Use the application icon in "Programs and Features" -->
+  <?define ProgramsFeaturesIconPath="$(var.IconDir)\wireshark.ico"?>
 
   <Product Id="*" Name="$(var.WiresharkName) $(var.WiresharkVersion)" Language="1033" Version="$(var.WiresharkVersion)" Manufacturer="The Wireshark developer community, http://www.wireshark.org/" UpgradeCode="0d67aace-269a-4264-81a3-da8055c1c79c">
         <Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine" />
@@ -40,4 +42,4 @@
   <?include Plugins.wxi ?>
   <?include Features.wxi ?>
   <?include UserInterface.wxi ?>
-</Wix>
\ No newline at end of file
+</Wix>