diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index ae85153..51071aa 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -138,9 +138,9 @@ delete_subfolder $NAME$
 ;
 ; Example of deleting a shortcut from AllUsers desktop:
 ;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
-; delete_element $ProductId$
+set_basefolder common_desktopdirectory
+set_subfolder ""
+delete_element $NAME$
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 6f4a22b..4a9a541 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -194,24 +194,24 @@ set_link
 	name: $NAME$
 	target: "$InstallDir32$\xnview.exe"
 	parameters:
-	working_dir: $InstallDir$
+	working_dir: $InstallDir32$
 	icon_file:
 	icon_index:
 end_link
 ;
 ; Example of creating an shortcut to the installed exe on AllUsers desktop:
 ;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
+set_basefolder common_desktopdirectory
+set_subfolder ""
 ;
-; set_link
-; 	name: $ProductId$
-; 	target: <path to the program>
-; 	parameters: <some_param>
-; 	working_dir: $InstallDir32$
-; 	icon_file: <path to icon file>
-; 	icon_index: 2
-; end_link
+set_link
+	name: $NAME$
+	target: "$InstallDir32$\xnview.exe"
+	parameters:
+	working_dir: $InstallDir32$
+	icon_file:
+	icon_index:
+end_link
 
 [LinkFolder_install_64]
 ; Example of deleting a folder from AllUsers startmenu:
@@ -235,17 +235,17 @@ end_link
 ;
 ; Example of creating an shortcut to the installed exe on AllUsers desktop:
 ;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
+set_basefolder common_desktopdirectory
+set_subfolder ""
 ;
-; set_link
-; 	name: $ProductId$
-; 	target: <path to the program>
-; 	parameters: <some_param>
-; 	working_dir: $InstallDir$
-; 	icon_file: <path to icon file>
-; 	icon_index: 2
-; end_link
+set_link
+	name: $NAME$
+	target: "$InstallDir64$\xnview.exe"
+	parameters:
+	working_dir: $InstallDir64$
+	icon_file:
+	icon_index:
+end_link
 
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"