3 files changed, 26 insertions, 3 deletions
diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh
index f6f4a1c8..882fba9a 100644
--- a/installer/settings/files_main_uninstall.nsh
+++ b/installer/settings/files_main_uninstall.nsh
@@ -2,3 +2,27 @@
 ; UltraStar Deluxe Installer - Version 1.1: Main components
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 
+
+; Delete created Icons in startmenu
+
+ SetShellVarContext all
+
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Deinstallieren.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Internetseite.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\UltraStar Deluxe spielen.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Play UltraStar Deluxe.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Lies mich.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Lizenz.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\License.lnk"
+
+; Delete created Icon on Desktop
+
+Delete "$Desktop\Play UltraStar Deluxe.lnk"
+Delete "$Desktop\UltraStar Deluxe spielen.lnk"
+
+StrCpy $0 "$SMPROGRAMS\$ICONS_GROUP"
+Call un.DeleteIfEmpty
+
diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh
index 386def41..8345c4cc 100644
--- a/installer/settings/functions.nsh
+++ b/installer/settings/functions.nsh
@@ -1,5 +1,3 @@
-!define exe2 "USdx"
-
 ; Creates Desktop Shortcut(s) if 
 ; checked on Finish Page
 
@@ -7,7 +5,7 @@ Function CreateDesktopShortCuts
 
 SetOutPath "$INSTDIR"
 
-CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\${exe2}.exe"
+CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\USdx.exe"
 
 FunctionEnd
 
diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh
index 78f9d185..7b53bdbf 100644
--- a/installer/settings/variables.nsh
+++ b/installer/settings/variables.nsh
@@ -27,6 +27,7 @@
 
 ; Registry for Start menu entries:
 
+!define PRODUCT_NAME "${name}"
 !define PRODUCT_VERSION "${version}"
 !define PRODUCT_PUBLISHER "${publisher}"
 !define PRODUCT_WEB_SITE "${homepage}"