diff --git a/PowerEditor/gcc/makefile b/PowerEditor/gcc/makefile
index 31d1000b9..9e6afc588 100644
--- a/PowerEditor/gcc/makefile
+++ b/PowerEditor/gcc/makefile
@@ -26,7 +26,7 @@ BIN_DIRECTORY := ../bin
 INSTALLER_DIRECTORY := ../installer
 
 TARGET_BINARY := notepad++.exe
-SRC_DATA := contextMenu.xml langs.model.xml shortcuts.xml stylers.model.xml tabContextMenu_example.xml
+SRC_DATA := contextMenu.xml langs.model.xml shortcuts.xml stylers.model.xml tabContextMenu_example.xml toolbarIcons.xml
 BIN_DATA := change.log doLocalConf.xml nppLogNulContentCorruptionIssue.xml readme.txt userDefineLangs/
 INSTALLER_DATA := autoCompletion/ functionList/ localization/ themes/
 
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
index 9fc9260e9..98fcdde05 100644
--- a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
+++ b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -75,7 +75,8 @@ Function copyCommonFiles
 	SetOutPath "$UPDATE_PATH\"
 	File "..\bin\contextMenu.xml"
 	File "..\src\tabContextMenu_example.xml"
-	
+	File "..\src\toolbarIcons.xml"
+
 	SetOverwrite on
 	SetOutPath "$INSTDIR\"
 	File "..\bin\langs.model.xml"
diff --git a/PowerEditor/installer/nsisInclude/uninstall.nsh b/PowerEditor/installer/nsisInclude/uninstall.nsh
index d77fdea9a..d2e5ba5cf 100644
--- a/PowerEditor/installer/nsisInclude/uninstall.nsh
+++ b/PowerEditor/installer/nsisInclude/uninstall.nsh
@@ -230,6 +230,7 @@ Section Uninstall
 		Delete "$INSTDIR\nativeLang.xml"
 		Delete "$INSTDIR\userDefineLang.xml"
 		Delete "$INSTDIR\nppLogNulContentCorruptionIssue.xml"
+		Delete "$INSTDIR\toolbarIcons.xml"
 	${endIf}
 	
 	Delete "$INSTDIR\config.model.xml"
@@ -269,6 +270,7 @@ Section Uninstall
 		Delete "$APPDATA\${APPNAME}\userDefineLang.xml"
 		Delete "$APPDATA\${APPNAME}\insertExt.ini"
 		Delete "$APPDATA\${APPNAME}\nppLogNulContentCorruptionIssue.log"
+		Delete "$APPDATA\${APPNAME}\toolbarIcons.xml"
 		Delete "$APPDATA\${APPNAME}\userDefineLangs\userDefinedLang-markdown.default.modern.xml"
 		Delete "$APPDATA\${APPNAME}\userDefineLangs\markdown._preinstalled.udl.xml"
 		Delete "$APPDATA\${APPNAME}\userDefineLangs\markdown._preinstalled_DM.udl.xml"
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index e2231b00e..447bf27df 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -113,6 +113,8 @@ copy /Y ..\bin\"notepad++.exe" .\minimalist\
 If ErrorLevel 1 goto End
 copy /Y ".\themes\DarkModeDefault.xml" .\minimalist\themes\
 If ErrorLevel 1 goto End
+copy /Y ..\src\toolbarIcons.xml .\minimalist\
+If ErrorLevel 1 goto End
 
 
 rmdir /S /Q .\minimalist64
@@ -146,6 +148,8 @@ copy /Y ..\bin64\"notepad++.exe" .\minimalist64\
 If ErrorLevel 1 goto End
 copy /Y ".\themes\DarkModeDefault.xml" .\minimalist64\themes\
 If ErrorLevel 1 goto End
+copy /Y ..\src\toolbarIcons.xml .\minimalist64\
+If ErrorLevel 1 goto End
 
 
 rmdir /S /Q .\minimalistArm64
@@ -179,6 +183,8 @@ copy /Y ..\binarm64\"notepad++.exe" .\minimalistArm64\
 If ErrorLevel 1 goto End
 copy /Y ".\themes\DarkModeDefault.xml" .\minimalistArm64\themes\
 If ErrorLevel 1 goto End
+copy /Y ..\src\toolbarIcons.xml .\minimalistArm64\
+If ErrorLevel 1 goto End
 
 
 rem Remove old built Notepad++ 32-bit package
@@ -261,6 +267,9 @@ copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.release\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\
 If ErrorLevel 1 goto End
+copy /Y ..\src\toolbarIcons.xml .\zipped.package.release\
+If ErrorLevel 1 goto End
+
 
 
 rem Basic Copy needed files into Notepad++ 64-bit package folders
@@ -286,6 +295,8 @@ copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.release64\
 If ErrorLevel 1 goto End
 copy /Y ..\bin64\"notepad++.exe" .\zipped.package.release64\
 If ErrorLevel 1 goto End
+copy /Y ..\src\toolbarIcons.xml .\zipped.package.release64\
+If ErrorLevel 1 goto End
 
 
 rem Basic Copy needed files into Notepad++ ARM64 package folders
@@ -311,6 +322,8 @@ copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.releaseArm64
 If ErrorLevel 1 goto End
 copy /Y ..\binarm64\"notepad++.exe" .\zipped.package.releaseArm64\
 If ErrorLevel 1 goto End
+copy /Y ..\src\toolbarIcons.xml .\zipped.package.releaseArm64\
+If ErrorLevel 1 goto End
 
 
 rem Plugins: Copy needed files into Notepad++ 32-bit package folders