diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb36d6adf9..4702ef059e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -728,11 +728,18 @@ if (MSVC)
   message(STATUS "ARANGO_IMG:  ${ARANGO_IMG}")
   message(STATUS "ARANGO_ICON: ${ARANGO_ICON}")
 
-  set(CPACK_PACKAGE_ICON ${ARANGO_IMG})
+  set(CPACK_PACKAGE_ICON ${ARANGO_ICON})
 
   set(CPACK_NSIS_MODIFY_PATH ON)
   set(CPACK_NSIS_MUI_ICON ${ARANGO_ICON})
   set(CPACK_NSIS_MUI_UNIICON ${ARANGO_ICON})
+  set(CPACK_NSIS_INSTALLED_ICON_NAME ${ARANGO_ICON})
+  
+  # set(CPACK_PACKAGE_EXECUTABLES "arangosh;Arango Shell;arangod;Arango Server")
+  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Arango Shell.lnk'  '$INSTDIR\\\\bin\\\\arangosh.exe'  '' '${ARANGO_ICON}'
+                                     CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Arango Server.lnk'  '$INSTDIR\\\\bin\\\\arangod.exe'  '' '${ARANGO_ICON}'
+                                     ")
+  set(CPACK_NSIS_DISPLAY_NAME, "ArangoDB")
 
   set(CPACK_NSIS_HELP_LINK "http://www.arangodb.org")
   set(CPACK_NSIS_URL_INFO_ABOUT  "http://www.arangodb.org")