diff --git a/Cura/cura.ico b/Cura/cura.ico
new file mode 100644
index 0000000..add601a
Binary files /dev/null and b/Cura/cura.ico differ
diff --git a/scripts/win32/cura.ico b/scripts/win32/cura.ico
deleted file mode 100644
index 1919bfe..0000000
Binary files a/scripts/win32/cura.ico and /dev/null differ
diff --git a/scripts/win32/installer.nsi b/scripts/win32/installer.nsi
index e0f0f82..1c0617c 100644
--- a/scripts/win32/installer.nsi
+++ b/scripts/win32/installer.nsi
@@ -26,7 +26,7 @@ SetCompressor /SOLID lzma
 !include "MUI2.nsh"
 !include Library.nsh
 
-!define MUI_ICON "cura.ico"
+!define MUI_ICON "dist/Cura/cura.ico"
 !define MUI_BGCOLOR FFFFFF
 
 ; Directory page defines
@@ -65,7 +65,6 @@ SetCompressor /SOLID lzma
 ; Reserve Files
 !insertmacro MUI_RESERVEFILE_LANGDLL
 ReserveFile '${NSISDIR}\Plugins\InstallOptions.dll'
-ReserveFile "cura.ico"
 ReserveFile "header.bmp"
 
 ;--------------------------------
@@ -93,7 +92,7 @@ Section "Cura ${VERSION}"
   
   CreateDirectory "$SMPROGRAMS\Cura ${VERSION}"
   CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Uninstall Cura ${VERSION}.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '"$INSTDIR\Cura\cura.py"' "$INSTDIR\Cura\stl.ico" 0
+  CreateShortCut "$SMPROGRAMS\Cura ${VERSION}\Cura ${VERSION}.lnk" "$INSTDIR\python\pythonw.exe" '"$INSTDIR\Cura\cura.py"' "$INSTDIR\Cura\cura.ico" 0
   
   ; Give all users write permissions in the install directory, so they can read/write profile and preferences files.
   AccessControl::GrantOnFile "$INSTDIR" "(S-1-5-32-545)" "FullAccess"