diff --git a/kokoro/windows/build.bat b/kokoro/windows/build.bat
index bc92c6eb28..fa70b47330 100644
--- a/kokoro/windows/build.bat
+++ b/kokoro/windows/build.bat
@@ -95,7 +95,8 @@ zip -r gapid-%VERSION%-windows.zip gapid
 
 REM Create an MSI installer.
 copy %SRC%\kokoro\windows\gapid.wxs .
-%WIX%\heat.exe dir gapid -ag -cg gapid -dr GAPID -template fragment -sreg -sfrag -srd -o component.wxs
+copy %SRC%\kokoro\windows\gapid.ico .
+%WIX%\heat.exe dir gapid -ag -cg gapid -dr GAPID -template fragment -sreg -sfrag -srd -suid -o component.wxs
 %WIX%\candle.exe gapid.wxs component.wxs
 %WIX%\light.exe gapid.wixobj component.wixobj -b gapid -ext WixUIExtension -cultures:en-us -o gapid-%VERSION%.msi
 
diff --git a/kokoro/windows/gapid.ico b/kokoro/windows/gapid.ico
new file mode 100644
index 0000000000..3585cc5ec5
Binary files /dev/null and b/kokoro/windows/gapid.ico differ
diff --git a/kokoro/windows/gapid.wxs b/kokoro/windows/gapid.wxs
index 1d36a8a20b..54861ce770 100644
--- a/kokoro/windows/gapid.wxs
+++ b/kokoro/windows/gapid.wxs
@@ -22,16 +22,35 @@
         Comments="Installs the Graphics API Debugger" Manufacturer="Google, Inc"
         InstallerVersion="100" Languages="1033" Compressed="yes" SummaryCodepage="1252" />
     <MediaTemplate EmbedCab="yes" />
+
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="PFiles">
         <Directory Id="GAPID" Name="gapid" />
       </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="GAPID" />
+      </Directory>
     </Directory>
+
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="ApplicationShortcut" Guid="*">
+        <Shortcut Id="ApplicationStartMenuShortcut" Name="GAPID" Description="Graphics API Debugger"
+            Target="[!gapid.bat]" WorkingDirectory="APPLICATIONROOTDIRECTORY" Icon="gapid.ico" />
+        <RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall" />
+        <RegistryValue Root="HKCU" Key="Software\Google\GAPID" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+      </Component>
+    </DirectoryRef>
+
+    <Icon Id="gapid.ico" SourceFile="gapid.ico" />
+
     <Feature Id="GAPID"  Title="Graphics API Debugger" Level="1">
       <ComponentGroupRef Id="gapid" />
+      <ComponentRef Id="ApplicationShortcut" />
     </Feature>
 
     <Property Id="WIXUI_INSTALLDIR" Value="GAPID" />
+    <Property Id="ARPPRODUCTICON" Value="gapid.ico" />
+
     <!-- From WixUI_InstallDir.wxs - without a license dialog -->
     <UI Id="gapid">
       <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />