diff --git a/wix/MoonlightSetup/Bundle.wxs b/wix/MoonlightSetup/Bundle.wxs
index 39794086..ae24e97f 100644
--- a/wix/MoonlightSetup/Bundle.wxs
+++ b/wix/MoonlightSetup/Bundle.wxs
@@ -60,6 +60,7 @@
                                               LaunchTarget="[InstallFolder]\Moonlight.exe"
                                               ThemeFile="RtfTheme.xml"
                                               Theme="rtfLicense" />
+      <Payload Name="Moonlight.ico" SourceFile="..\..\app\moonlight.ico" Compressed="yes" />
     </BootstrapperApplication>
 
     <Chain>
diff --git a/wix/MoonlightSetup/RtfTheme.xml b/wix/MoonlightSetup/RtfTheme.xml
index a4750ad8..ab2bd157 100644
--- a/wix/MoonlightSetup/RtfTheme.xml
+++ b/wix/MoonlightSetup/RtfTheme.xml
@@ -8,7 +8,7 @@
     <Font Id="2" Height="-22" Weight="500" Foreground="graytext">Segoe UI</Font>
     <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
 
-    <Window Width="485" Height="300" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
+    <Window Width="485" Height="300" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)" IconFile="Moonlight.ico">
         <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" Visible="yes"/>
         <Label X="80" Y="11" Width="-11" Height="64" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Label>