diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 4caba96f..f2a76265 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -116,7 +116,7 @@ Var UPDATE_PATH
 !include "nsisInclude\mainSectionFuncs.nsh"
 
 Section -"Notepad++" mainSection
-	
+
 	Call setPathAndOptions
 	
 	Call copyCommonFiles
@@ -126,8 +126,6 @@ Section -"Notepad++" mainSection
 	Call removeOldContextMenu
 	
 	Call shortcutLinkManagement
-
-	Call changeIconOption
 	
 SectionEnd
 
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
index c3dc796d..dcda72b8 100644
--- a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
+++ b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -258,13 +258,4 @@ Function shortcutLinkManagement
 	SetShellVarContext current
 FunctionEnd
 
-Function changeIconOption
-	${If} $isOldIconChecked == ${BST_CHECKED}
-		SetOutPath "$TEMP\"
-		File "..\misc\vistaIconTool\changeIcon.exe"
-		File "..\src\icons\npp.ico"
-		nsExec::ExecToStack '"$TEMP\changeIcon.exe" "$TEMP\npp.ico" "$INSTDIR\notepad++.exe" 100 1033'
-	${EndIf}
-FunctionEnd
-
 
diff --git a/PowerEditor/installer/nsisInclude/tools.nsh b/PowerEditor/installer/nsisInclude/tools.nsh
index 2aa1ef85..5678e88a 100644
--- a/PowerEditor/installer/nsisInclude/tools.nsh
+++ b/PowerEditor/installer/nsisInclude/tools.nsh
@@ -36,7 +36,6 @@ FunctionEnd
 ;Installer Functions
 Var Dialog
 Var NoUserDataCheckboxHandle
-Var OldIconCheckboxHandle
 Var ShortcutCheckboxHandle
 Var PluginLoadFromUserDataCheckboxHandle
 Var WinVer
@@ -63,10 +62,6 @@ Function ExtraOptions
 	${NSD_Check} $ShortcutCheckboxHandle
 	${NSD_OnClick} $ShortcutCheckboxHandle OnChange_ShortcutCheckBox
 
-	${NSD_CreateCheckbox} 0 170 100% 30u "Use the old, obsolete and monstrous icon$\nI won't blame you if you want to get the old icon back :)"
-	Pop $OldIconCheckboxHandle
-	${NSD_OnClick} $OldIconCheckboxHandle OnChange_OldIconCheckBox
-	
 	nsDialogs::Show
 FunctionEnd
 
@@ -109,9 +104,6 @@ Function OnChange_ShortcutCheckBox
 	${NSD_GetState} $ShortcutCheckboxHandle $createShortcutChecked
 FunctionEnd
 
-Function OnChange_OldIconCheckBox
-	${NSD_GetState} $OldIconCheckboxHandle $isOldIconChecked
-FunctionEnd
 
 Function writeInstallInfoInRegistry
 	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe" "" "$INSTDIR\notepad++.exe"
diff --git a/PowerEditor/misc/vistaIconTool/ChangeIcon.exe b/PowerEditor/misc/vistaIconTool/ChangeIcon.exe
deleted file mode 100755
index ab3016c3..00000000
Binary files a/PowerEditor/misc/vistaIconTool/ChangeIcon.exe and /dev/null differ
diff --git a/PowerEditor/misc/vistaIconTool/changeIcon.bat b/PowerEditor/misc/vistaIconTool/changeIcon.bat
deleted file mode 100644
index 5f116721..00000000
--- a/PowerEditor/misc/vistaIconTool/changeIcon.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-REM To add vista style icon, you need ChangeIcon.exe in the same directory.
-
-REM %1 should be the path of ChangeIcon.exe
-REM %2 should be the path of notepad++.exe
-
-if exist %1 (
-%1 "..\src\icons\nppNewIcon.ico" %2 100 1033
-)
-
diff --git a/PowerEditor/src/icons/npp.ico b/PowerEditor/src/icons/npp.ico
index bd272c7e..2bf7aaa5 100644
Binary files a/PowerEditor/src/icons/npp.ico and b/PowerEditor/src/icons/npp.ico differ
diff --git a/PowerEditor/visual.net/notepadPlus.vcxproj b/PowerEditor/visual.net/notepadPlus.vcxproj
index 7ba34640..aad6cc14 100755
--- a/PowerEditor/visual.net/notepadPlus.vcxproj
+++ b/PowerEditor/visual.net/notepadPlus.vcxproj
@@ -206,7 +206,6 @@ copy ..\src\stylers.model.xml ..\bin\stylers.model.xml
 copy ..\src\shortcuts.xml ..\bin\shortcuts.xml
 copy ..\src\functionList.xml ..\bin\functionList.xml
 copy ..\src\contextMenu.xml ..\bin\contextMenu.xml
-..\misc\vistaIconTool\changeIcon.bat "..\misc\vistaIconTool\ChangeIcon.exe" "$(OutDir)notepad++.exe"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -256,7 +255,6 @@ copy ..\src\stylers.model.xml ..\bin64\stylers.model.xml
 copy ..\src\shortcuts.xml ..\bin64\shortcuts.xml
 copy ..\src\functionList.xml ..\bin64\functionList.xml
 copy ..\src\contextMenu.xml ..\bin64\contextMenu.xml
-..\misc\vistaIconTool\changeIcon.bat "..\misc\vistaIconTool\ChangeIcon.exe" "$(OutDir)notepad++.exe"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>