diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 9e97c66783487add0ffea079ccd077c49b68f0a5..a63240b4160edea2780f50039b7a26314e0dda49 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -76,6 +76,7 @@ ADD_EXECUTABLE( DataExplorer MACOSX_BUNDLE
 	${UIS}
 	${QTRESOURCES}
 	${APP_ICON}
+	exe-icon.rc
 )
 
 TARGET_LINK_LIBRARIES( DataExplorer
diff --git a/Applications/DataExplorer/exe-icon.rc b/Applications/DataExplorer/exe-icon.rc
new file mode 100644
index 0000000000000000000000000000000000000000..1e5fc317137b5a9d2b7a172decece8dbf23ebce8
--- /dev/null
+++ b/Applications/DataExplorer/exe-icon.rc
@@ -0,0 +1 @@
+ IDI_ICON1               ICON    DISCARDABLE     "..\..\..\scripts\packaging\ogs-de-icon.ico"
\ No newline at end of file
diff --git a/Documentation/OpenGeoSys-Logo.bmp b/Documentation/OpenGeoSys-Logo.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..c5d2afab475972117a3f14f4b15544161ca4ec47
Binary files /dev/null and b/Documentation/OpenGeoSys-Logo.bmp differ
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index d48dc87415559bcb2aecc97ad327dcb79f5270e1..ef21ffedef2c16561e547ce6b08115ea2a7cd082 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -16,7 +16,6 @@ ELSE()
 	SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-${CMAKE_SYSTEM}-x${BITS}")
 ENDIF()
 
-SET(CPACK_PACKAGE_ICON ${CMAKE_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.png)
 #SET(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1)
 
 IF (WIN32)
diff --git a/scripts/cmake/packaging/PackagingWin.cmake b/scripts/cmake/packaging/PackagingWin.cmake
index eeb95a68675a29ea4abdcf504b0d25b3ebd92c59..b5dc605693a4c9762437676f128be0cfa089739d 100644
--- a/scripts/cmake/packaging/PackagingWin.cmake
+++ b/scripts/cmake/packaging/PackagingWin.cmake
@@ -1,18 +1,17 @@
-IF(OGS_PACKAGING_NSIS)
-	SET(CPACK_GENERATOR NSIS)
-	# There is a bug in NSI that does not handle full unix paths properly. Make
-	# sure there is at least one set of four (4) backlasshes.
-	#SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\MyExecutable.exe")
-	SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-	SET(CPACK_NSIS_HELP_LINK "https:\\\\\\\\www.opengeosys.org")
-	SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.opengeosys.org")
-	SET(CPACK_NSIS_CONTACT "info@opengeosys.org")
-	SET(CPACK_NSIS_MODIFY_PATH ON)
-	# SET(CPACK_NSIS_MENU_LINKS "http://www.opengeosys.org" "OGS Project Page")
-	# SET(CPACK_NSIS_MENU_LINKS "http://www.opengeosys.org/forum/" "OGS forum")
-	# SET(CPACK_NSIS_MENU_LINKS "https://github.com/ufz/ogs" "OGS source code")
-	# SET(CPACK_NSIS_MENU_LINKS "http://devguide.opengeosys.org" "OGS developer guide")
-ELSE()
-	SET(CPACK_GENERATOR ZIP)
-	SET(CPACK_PACKAGE_FILE_NAME "ogs-6")
-ENDIF()
+SET(CPACK_GENERATOR NSIS ZIP)
+SET(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/scripts/packaging/ogs-de-icon.ico)
+FILE(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.bmp" BACKGROUND_IMAGE)
+SET(CPACK_PACKAGE_ICON ${BACKGROUND_IMAGE})
+SET(CPACK_NSIS_INSTALLED_ICON_NAME ${CPACK_NSIS_MUI_ICON})
+SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
+SET(CPACK_NSIS_CONTACT "info@opengeosys.org")
+SET(CPACK_NSIS_MODIFY_PATH ON)
+SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+SET(CPACK_NSIS_HELP_LINK "http://docs.opengeosys.org/assets/files/Documentation/User_Manual.pdf")
+SET(CPACK_NSIS_MENU_LINKS
+	"bin/DataExplorer.exe" "Data Explorer"
+	"bin" "Executables folder"
+	"http://www.opengeosys.org" "Website"
+	"https://github.com/ufz/ogs" "Source code on GitHub"
+	"http://docs.opengeosys.org" "Documentation"
+)
diff --git a/scripts/packaging/ogs-de-icon.ico b/scripts/packaging/ogs-de-icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4892cb8450d4428710a646e3c40a597bf7800868
Binary files /dev/null and b/scripts/packaging/ogs-de-icon.ico differ