diff --git a/Setup/Product.wxs b/Setup/Product.wxs
index 0507b9e..d7d336b 100644
--- a/Setup/Product.wxs
+++ b/Setup/Product.wxs
@@ -37,9 +37,9 @@
     </Upgrade>
 
     <!-- Legt das Icon fest -->
-    <Icon Id="AppIcon" SourceFile="..\DD_PM_WINDREAM\bin\$(var.Configuration)\$(var.ProgramName).exe" />
+    <Icon Id="AppIcon.exe" SourceFile="..\DD_PM_WINDREAM\bin\$(var.Configuration)\$(var.ProgramName).exe" />
     <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
-    <Property Id="ARPPRODUCTICON" Value="AppIcon" />
+    <Property Id="ARPPRODUCTICON" Value="AppIcon.exe" />
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
@@ -51,7 +51,10 @@
 
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B">
-        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes"/>
+        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
+          <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
+          <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
+        </File>
       </Component>
 
       <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
@@ -114,7 +117,7 @@
         </Directory>
       </Directory>
 
-      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="DesktopFolder" Name="Desktop"></Directory>
     </DirectoryRef>
 
     <Feature Id="MainApplication" Title="Main Application" Level="1">