diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs
index a97ee92f9f8..c894eb88d31 100644
--- a/Tools/msi/common.wxs
+++ b/Tools/msi/common.wxs
@@ -44,7 +44,7 @@
     
     <Fragment>
         <!-- Include an icon for the Programs and Features dialog -->
-        <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\icons\setup.ico" />
+        <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\icons\python.ico" />
         <Property Id="ARPPRODUCTICON" Value="ARPIcon" />
         <Property Id="ARPNOMODIFY" Value="1" />
         <Property Id="DISABLEADVTSHORTCUTS" Value="1" />
diff --git a/Tools/msi/launcher/launcher.wxs b/Tools/msi/launcher/launcher.wxs
index ebd875cd9a5..c0ff51a0bf6 100644
--- a/Tools/msi/launcher/launcher.wxs
+++ b/Tools/msi/launcher/launcher.wxs
@@ -5,7 +5,10 @@
         <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
         
         <Property Id="Suppress_TARGETDIR_Check" Value="1" />
-        <PropertyRef Id="ARPPRODUCTICON" />
+        <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\icons\launcher.ico" />
+        <Property Id="ARPPRODUCTICON" Value="ARPIcon" />
+        <Property Id="ARPNOMODIFY" Value="1" />
+        <Property Id="DISABLEADVTSHORTCUTS" Value="1" />
 
         <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
             <ComponentGroupRef Id="launcher_exe" Primary="yes" />