198 files changed, 44 insertions, 44 deletions

diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln
index 3528dda8db..a4dfed4bb1 100644
--- a/bin10/miranda32.sln
+++ b/bin10/miranda32.sln
@@ -44,19 +44,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miranda32", "..\src\miranda
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msn", "..\protocols\MSN\msn_10.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbrw", "..\plugins\dbrw\dbrw_10.vcxproj", "{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbrw", "..\plugins\dbrw\dbrw_10.vcxproj", "{DD948CA0-E04B-BF22-2FF2-53C36521026C}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clist_nicer", "..\plugins\clist_nicer\clist_nicer_10.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS.vcxproj", "{876125F4-A75A-14E4-E352-8C729653C330}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_jabber", "..\protocols\JabberG\jabber_xstatus\JABBER_XSTATUS_10.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_jabber", "..\protocols\JabberG\jabber_xstatus\JABBER_XSTATUS_10.vcxproj", "{CD88016D-2959-CF09-20D2-BC00A525121A}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolbar_icons", "..\plugins\modernb\icons_pack\ICONS_10.vcxproj", "{796B43EF-DACE-4145-8571-31886F45A2C0}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cln_skinedit", "..\plugins\clist_nicer\skineditor\skinedit_10.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbtool", "..\miranda-tools\dbtool\dbtool_10.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbtool", "..\tools\dbtool\dbtool_10.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -422,20 +422,20 @@ Global
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32

 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64

 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug Unicode|x64.Build.0 = Debug Unicode|x64

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug|Win32.ActiveCfg = Debug|Win32

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug|Win32.Build.0 = Debug|Win32

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug|x64.ActiveCfg = Debug|x64

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug|x64.Build.0 = Debug|x64

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release Unicode|x64.Build.0 = Release Unicode|x64

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release|Win32.ActiveCfg = Release|Win32

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release|Win32.Build.0 = Release|Win32

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release|x64.ActiveCfg = Release|x64

-		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release|x64.Build.0 = Release|x64

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug Unicode|x64.Build.0 = Debug Unicode|x64

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug|Win32.Build.0 = Debug|Win32

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug|x64.ActiveCfg = Debug|x64

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug|x64.Build.0 = Debug|x64

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release Unicode|x64.Build.0 = Release Unicode|x64

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release|Win32.ActiveCfg = Release|Win32

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release|Win32.Build.0 = Release|Win32

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release|x64.ActiveCfg = Release|x64

+		{DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release|x64.Build.0 = Release|x64

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

@@ -452,32 +452,32 @@ Global
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|Win32.Build.0 = Release|Win32

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.ActiveCfg = Release|x64

 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.Build.0 = Release|x64

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug Unicode|Win32.ActiveCfg = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug Unicode|Win32.Build.0 = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug Unicode|x64.ActiveCfg = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.ActiveCfg = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.Build.0 = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.ActiveCfg = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release Unicode|x64.ActiveCfg = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.ActiveCfg = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.Build.0 = Release|Win32

-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.ActiveCfg = Release|Win32

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug Unicode|Win32.ActiveCfg = Release|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug Unicode|x64.ActiveCfg = Release|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug Unicode|x64.Build.0 = Release|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.ActiveCfg = Release|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|x64.ActiveCfg = Release|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|x64.Build.0 = Release|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release Unicode|x64.Build.0 = Release Unicode|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|Win32.ActiveCfg = Release|Win32

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|Win32.Build.0 = Release|Win32

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.ActiveCfg = Release|x64

-		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.Build.0 = Release|x64

+		{876125F4-A75A-14E4-E352-8C729653C330}.Debug Unicode|Win32.ActiveCfg = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Debug Unicode|Win32.Build.0 = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Debug Unicode|x64.ActiveCfg = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Debug|Win32.ActiveCfg = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Debug|Win32.Build.0 = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Debug|x64.ActiveCfg = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Release Unicode|x64.ActiveCfg = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Release|Win32.ActiveCfg = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Release|Win32.Build.0 = Release|Win32

+		{876125F4-A75A-14E4-E352-8C729653C330}.Release|x64.ActiveCfg = Release|Win32

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Debug Unicode|Win32.ActiveCfg = Release|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Debug Unicode|x64.ActiveCfg = Release|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Debug Unicode|x64.Build.0 = Release|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Debug|Win32.ActiveCfg = Release|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Debug|x64.ActiveCfg = Release|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Debug|x64.Build.0 = Release|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Release Unicode|x64.Build.0 = Release Unicode|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Release|Win32.ActiveCfg = Release|Win32

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Release|Win32.Build.0 = Release|Win32

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Release|x64.ActiveCfg = Release|x64

+		{CD88016D-2959-CF09-20D2-BC00A525121A}.Release|x64.Build.0 = Release|x64

 		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

 		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

 		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

diff --git a/miranda-tools/dbtool/aggressive.cpp b/tools/dbtool/aggressive.cpp
index 26312ea5b0..26312ea5b0 100644
--- a/miranda-tools/dbtool/aggressive.cpp
+++ b/tools/dbtool/aggressive.cpp
diff --git a/miranda-tools/dbtool/cleaning.cpp b/tools/dbtool/cleaning.cpp
index efbbde1640..efbbde1640 100644
--- a/miranda-tools/dbtool/cleaning.cpp
+++ b/tools/dbtool/cleaning.cpp
diff --git a/miranda-tools/dbtool/contactchain.cpp b/tools/dbtool/contactchain.cpp
index dd6d50556b..dd6d50556b 100644
--- a/miranda-tools/dbtool/contactchain.cpp
+++ b/tools/dbtool/contactchain.cpp
diff --git a/miranda-tools/dbtool/database.h b/tools/dbtool/database.h
index 964ab6af25..964ab6af25 100644
--- a/miranda-tools/dbtool/database.h
+++ b/tools/dbtool/database.h
diff --git a/miranda-tools/dbtool/dbtool.dep b/tools/dbtool/dbtool.dep
index 119920ccd8..119920ccd8 100644
--- a/miranda-tools/dbtool/dbtool.dep
+++ b/tools/dbtool/dbtool.dep
diff --git a/miranda-tools/dbtool/dbtool.dsp b/tools/dbtool/dbtool.dsp
index 2862ead84e..2862ead84e 100644
--- a/miranda-tools/dbtool/dbtool.dsp
+++ b/tools/dbtool/dbtool.dsp
diff --git a/miranda-tools/dbtool/dbtool.dsw b/tools/dbtool/dbtool.dsw
index 790aea45f4..790aea45f4 100644
--- a/miranda-tools/dbtool/dbtool.dsw
+++ b/tools/dbtool/dbtool.dsw
diff --git a/miranda-tools/dbtool/dbtool.exe.manifest b/tools/dbtool/dbtool.exe.manifest
index 1b6aab686b..1b6aab686b 100644
--- a/miranda-tools/dbtool/dbtool.exe.manifest
+++ b/tools/dbtool/dbtool.exe.manifest
diff --git a/miranda-tools/dbtool/dbtool.h b/tools/dbtool/dbtool.h
index 7bade33d34..7bade33d34 100644
--- a/miranda-tools/dbtool/dbtool.h
+++ b/tools/dbtool/dbtool.h
diff --git a/miranda-tools/dbtool/dbtool.mak b/tools/dbtool/dbtool.mak
index 5a3ba35c29..5a3ba35c29 100644
--- a/miranda-tools/dbtool/dbtool.mak
+++ b/tools/dbtool/dbtool.mak
diff --git a/miranda-tools/dbtool/dbtool.sln b/tools/dbtool/dbtool.sln
index 91c2b49b28..91c2b49b28 100644
--- a/miranda-tools/dbtool/dbtool.sln
+++ b/tools/dbtool/dbtool.sln
diff --git a/miranda-tools/dbtool/dbtool.vcproj b/tools/dbtool/dbtool.vcproj
index 6f15b1903d..6f15b1903d 100644
--- a/miranda-tools/dbtool/dbtool.vcproj
+++ b/tools/dbtool/dbtool.vcproj
diff --git a/miranda-tools/dbtool/dbtool_10.vcxproj b/tools/dbtool/dbtool_10.vcxproj
index be66c50775..be66c50775 100644
--- a/miranda-tools/dbtool/dbtool_10.vcxproj
+++ b/tools/dbtool/dbtool_10.vcxproj
diff --git a/miranda-tools/dbtool/dbtool_10.vcxproj.filters b/tools/dbtool/dbtool_10.vcxproj.filters
index 1a3e2bf55e..1a3e2bf55e 100644
--- a/miranda-tools/dbtool/dbtool_10.vcxproj.filters
+++ b/tools/dbtool/dbtool_10.vcxproj.filters
diff --git a/miranda-tools/dbtool/dbtool_8.vcproj b/tools/dbtool/dbtool_8.vcproj
index 3230ef52c7..3230ef52c7 100644
--- a/miranda-tools/dbtool/dbtool_8.vcproj
+++ b/tools/dbtool/dbtool_8.vcproj
diff --git a/miranda-tools/dbtool/dbtool_9.vcproj b/tools/dbtool/dbtool_9.vcproj
index 700451cd2b..700451cd2b 100644
--- a/miranda-tools/dbtool/dbtool_9.vcproj
+++ b/tools/dbtool/dbtool_9.vcproj
diff --git a/miranda-tools/dbtool/disk.cpp b/tools/dbtool/disk.cpp
index 685f86569f..685f86569f 100644
--- a/miranda-tools/dbtool/disk.cpp
+++ b/tools/dbtool/disk.cpp
diff --git a/miranda-tools/dbtool/docs/dbtool-license.txt b/tools/dbtool/docs/dbtool-license.txt
index 45645b4b53..45645b4b53 100644
--- a/miranda-tools/dbtool/docs/dbtool-license.txt
+++ b/tools/dbtool/docs/dbtool-license.txt
diff --git a/miranda-tools/dbtool/docs/dbtool-readme.txt b/tools/dbtool/docs/dbtool-readme.txt
index 26721a0d6c..26721a0d6c 100644
--- a/miranda-tools/dbtool/docs/dbtool-readme.txt
+++ b/tools/dbtool/docs/dbtool-readme.txt
diff --git a/miranda-tools/dbtool/eventchain.cpp b/tools/dbtool/eventchain.cpp
index c48ab1b821..c48ab1b821 100644
--- a/miranda-tools/dbtool/eventchain.cpp
+++ b/tools/dbtool/eventchain.cpp
diff --git a/miranda-tools/dbtool/fileaccess.cpp b/tools/dbtool/fileaccess.cpp
index 2fdd16c082..2fdd16c082 100644
--- a/miranda-tools/dbtool/fileaccess.cpp
+++ b/tools/dbtool/fileaccess.cpp
diff --git a/miranda-tools/dbtool/finaltasks.cpp b/tools/dbtool/finaltasks.cpp
index b7a99a5189..b7a99a5189 100644
--- a/miranda-tools/dbtool/finaltasks.cpp
+++ b/tools/dbtool/finaltasks.cpp
diff --git a/miranda-tools/dbtool/finished.cpp b/tools/dbtool/finished.cpp
index f39219730d..f39219730d 100644
--- a/miranda-tools/dbtool/finished.cpp
+++ b/tools/dbtool/finished.cpp
diff --git a/miranda-tools/dbtool/initialchecks.cpp b/tools/dbtool/initialchecks.cpp
index aa9a5527fa..aa9a5527fa 100644
--- a/miranda-tools/dbtool/initialchecks.cpp
+++ b/tools/dbtool/initialchecks.cpp
diff --git a/miranda-tools/dbtool/langpack.cpp b/tools/dbtool/langpack.cpp
index 85df5cdf22..85df5cdf22 100644
--- a/miranda-tools/dbtool/langpack.cpp
+++ b/tools/dbtool/langpack.cpp
diff --git a/miranda-tools/dbtool/langpack_dbtool.txt b/tools/dbtool/langpack_dbtool.txt
index 05ad39086c..05ad39086c 100644
--- a/miranda-tools/dbtool/langpack_dbtool.txt
+++ b/tools/dbtool/langpack_dbtool.txt
diff --git a/miranda-tools/dbtool/main.cpp b/tools/dbtool/main.cpp
index 014881e34d..014881e34d 100644
--- a/miranda-tools/dbtool/main.cpp
+++ b/tools/dbtool/main.cpp
diff --git a/miranda-tools/dbtool/modulechain.cpp b/tools/dbtool/modulechain.cpp
index 515ec9bfbd..515ec9bfbd 100644
--- a/miranda-tools/dbtool/modulechain.cpp
+++ b/tools/dbtool/modulechain.cpp
diff --git a/miranda-tools/dbtool/openerror.cpp b/tools/dbtool/openerror.cpp
index 4938e69197..4938e69197 100644
--- a/miranda-tools/dbtool/openerror.cpp
+++ b/tools/dbtool/openerror.cpp
diff --git a/miranda-tools/dbtool/progress.cpp b/tools/dbtool/progress.cpp
index 4b7d7979b4..4b7d7979b4 100644
--- a/miranda-tools/dbtool/progress.cpp
+++ b/tools/dbtool/progress.cpp
diff --git a/miranda-tools/dbtool/res/dbthdr.emf b/tools/dbtool/res/dbthdr.emf
index 554d11b5ea..554d11b5ea 100644
--- a/miranda-tools/dbtool/res/dbthdr.emf
+++ b/tools/dbtool/res/dbthdr.emf
diff --git a/miranda-tools/dbtool/res/dbtool.cdr b/tools/dbtool/res/dbtool.cdr
index e5aef201be..e5aef201be 100644
--- a/miranda-tools/dbtool/res/dbtool.cdr
+++ b/tools/dbtool/res/dbtool.cdr
diff --git a/miranda-tools/dbtool/res/dbtool.emf b/tools/dbtool/res/dbtool.emf
index abce0632ee..abce0632ee 100644
--- a/miranda-tools/dbtool/res/dbtool.emf
+++ b/tools/dbtool/res/dbtool.emf
diff --git a/miranda-tools/dbtool/res/dbtool.ico b/tools/dbtool/res/dbtool.ico
index e10cf950ad..e10cf950ad 100644
--- a/miranda-tools/dbtool/res/dbtool.ico
+++ b/tools/dbtool/res/dbtool.ico
diff --git a/miranda-tools/dbtool/res/delete.ico b/tools/dbtool/res/delete.ico
index 6e39da592b..6e39da592b 100644
--- a/miranda-tools/dbtool/res/delete.ico
+++ b/tools/dbtool/res/delete.ico
diff --git a/miranda-tools/dbtool/res/profileg.ico b/tools/dbtool/res/profileg.ico
index 1cd1caa5e4..1cd1caa5e4 100644
--- a/miranda-tools/dbtool/res/profileg.ico
+++ b/tools/dbtool/res/profileg.ico
diff --git a/miranda-tools/dbtool/res/profiler.ico b/tools/dbtool/res/profiler.ico
index 2dc702c863..2dc702c863 100644
--- a/miranda-tools/dbtool/res/profiler.ico
+++ b/tools/dbtool/res/profiler.ico
diff --git a/miranda-tools/dbtool/res/profiley.ico b/tools/dbtool/res/profiley.ico
index d482ee47ad..d482ee47ad 100644
--- a/miranda-tools/dbtool/res/profiley.ico
+++ b/tools/dbtool/res/profiley.ico
diff --git a/miranda-tools/dbtool/resource.h b/tools/dbtool/resource.h
index a76f82ee1c..a76f82ee1c 100644
--- a/miranda-tools/dbtool/resource.h
+++ b/tools/dbtool/resource.h
diff --git a/miranda-tools/dbtool/resource.rc b/tools/dbtool/resource.rc
index cd3d6eec3c..cd3d6eec3c 100644
--- a/miranda-tools/dbtool/resource.rc
+++ b/tools/dbtool/resource.rc
diff --git a/miranda-tools/dbtool/selectdb.cpp b/tools/dbtool/selectdb.cpp
index d8fa36ed75..d8fa36ed75 100644
--- a/miranda-tools/dbtool/selectdb.cpp
+++ b/tools/dbtool/selectdb.cpp
diff --git a/miranda-tools/dbtool/settingschain.cpp b/tools/dbtool/settingschain.cpp
index 6c7b95febc..6c7b95febc 100644
--- a/miranda-tools/dbtool/settingschain.cpp
+++ b/tools/dbtool/settingschain.cpp
diff --git a/miranda-tools/dbtool/user.cpp b/tools/dbtool/user.cpp
index 79f30eace7..79f30eace7 100644
--- a/miranda-tools/dbtool/user.cpp
+++ b/tools/dbtool/user.cpp
diff --git a/miranda-tools/dbtool/utf.cpp b/tools/dbtool/utf.cpp
index 157d5d00f5..157d5d00f5 100644
--- a/miranda-tools/dbtool/utf.cpp
+++ b/tools/dbtool/utf.cpp
diff --git a/miranda-tools/dbtool/welcome.cpp b/tools/dbtool/welcome.cpp
index 360b94ae00..360b94ae00 100644
--- a/miranda-tools/dbtool/welcome.cpp
+++ b/tools/dbtool/welcome.cpp
diff --git a/miranda-tools/dbtool/wizard.cpp b/tools/dbtool/wizard.cpp
index bdb656dadb..bdb656dadb 100644
--- a/miranda-tools/dbtool/wizard.cpp
+++ b/tools/dbtool/wizard.cpp
diff --git a/miranda-tools/dbtool/worker.cpp b/tools/dbtool/worker.cpp
index 7f22539f8f..7f22539f8f 100644
--- a/miranda-tools/dbtool/worker.cpp
+++ b/tools/dbtool/worker.cpp
diff --git a/miranda-tools/installer/graphics/header.bmp b/tools/installer/graphics/header.bmp
index a38da57046..a38da57046 100644
--- a/miranda-tools/installer/graphics/header.bmp
+++ b/tools/installer/graphics/header.bmp
diff --git a/miranda-tools/installer/graphics/install.ico b/tools/installer/graphics/install.ico
index f7791c3e0b..f7791c3e0b 100644
--- a/miranda-tools/installer/graphics/install.ico
+++ b/tools/installer/graphics/install.ico
diff --git a/miranda-tools/installer/graphics/uninstall.ico b/tools/installer/graphics/uninstall.ico
index 7d1c21f3bd..7d1c21f3bd 100644
--- a/miranda-tools/installer/graphics/uninstall.ico
+++ b/tools/installer/graphics/uninstall.ico
diff --git a/miranda-tools/installer/graphics/welcome.bmp b/tools/installer/graphics/welcome.bmp
index 7f1e8e7d6d..7f1e8e7d6d 100644
--- a/miranda-tools/installer/graphics/welcome.bmp
+++ b/tools/installer/graphics/welcome.bmp
diff --git a/miranda-tools/installer/icons/Makefile b/tools/installer/icons/Makefile
index 123a836be8..123a836be8 100644
--- a/miranda-tools/installer/icons/Makefile
+++ b/tools/installer/icons/Makefile
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_AIM.dll b/tools/installer/icons/bin/hicolor/proto_AIM.dll
index 3a6c1bd3b5..3a6c1bd3b5 100644
--- a/miranda-tools/installer/icons/bin/hicolor/proto_AIM.dll
+++ b/tools/installer/icons/bin/hicolor/proto_AIM.dll
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_GG.dll b/tools/installer/icons/bin/hicolor/proto_GG.dll
index 9d9a660653..9d9a660653 100644
--- a/miranda-tools/installer/icons/bin/hicolor/proto_GG.dll
+++ b/tools/installer/icons/bin/hicolor/proto_GG.dll
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_ICQ.dll b/tools/installer/icons/bin/hicolor/proto_ICQ.dll
index 98ddfd0d15..98ddfd0d15 100644
--- a/miranda-tools/installer/icons/bin/hicolor/proto_ICQ.dll
+++ b/tools/installer/icons/bin/hicolor/proto_ICQ.dll
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_IRC.dll b/tools/installer/icons/bin/hicolor/proto_IRC.dll
index 8332b384ba..8332b384ba 100644
--- a/miranda-tools/installer/icons/bin/hicolor/proto_IRC.dll
+++ b/tools/installer/icons/bin/hicolor/proto_IRC.dll
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_JABBER.dll b/tools/installer/icons/bin/hicolor/proto_JABBER.dll
index 0857d9de6b..0857d9de6b 100644
--- a/miranda-tools/installer/icons/bin/hicolor/proto_JABBER.dll
+++ b/tools/installer/icons/bin/hicolor/proto_JABBER.dll
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_MSN.dll b/tools/installer/icons/bin/hicolor/proto_MSN.dll
index 57884e960f..57884e960f 100644
--- a/miranda-tools/installer/icons/bin/hicolor/proto_MSN.dll
+++ b/tools/installer/icons/bin/hicolor/proto_MSN.dll
diff --git a/miranda-tools/installer/icons/bin/hicolor/proto_YAHOO.dll b/tools/installer/icons/bin/hicolor/proto_YAHOO.dll
index 9a16971a21..9a16971a21 100644
--- a/miranda-tools/installer/icons/bin/hicolor/proto_YAHOO.dll
+++ b/tools/installer/icons/bin/hicolor/proto_YAHOO.dll
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_AIM.dll b/tools/installer/icons/bin/locolor/proto_AIM.dll
index 5d9bb7760d..5d9bb7760d 100644
--- a/miranda-tools/installer/icons/bin/locolor/proto_AIM.dll
+++ b/tools/installer/icons/bin/locolor/proto_AIM.dll
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_GG.dll b/tools/installer/icons/bin/locolor/proto_GG.dll
index 18b86eaa0a..18b86eaa0a 100644
--- a/miranda-tools/installer/icons/bin/locolor/proto_GG.dll
+++ b/tools/installer/icons/bin/locolor/proto_GG.dll
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_ICQ.dll b/tools/installer/icons/bin/locolor/proto_ICQ.dll
index 42811399f8..42811399f8 100644
--- a/miranda-tools/installer/icons/bin/locolor/proto_ICQ.dll
+++ b/tools/installer/icons/bin/locolor/proto_ICQ.dll
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_IRC.dll b/tools/installer/icons/bin/locolor/proto_IRC.dll
index 83ab003197..83ab003197 100644
--- a/miranda-tools/installer/icons/bin/locolor/proto_IRC.dll
+++ b/tools/installer/icons/bin/locolor/proto_IRC.dll
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_JABBER.dll b/tools/installer/icons/bin/locolor/proto_JABBER.dll
index 85b7ba16c1..85b7ba16c1 100644
--- a/miranda-tools/installer/icons/bin/locolor/proto_JABBER.dll
+++ b/tools/installer/icons/bin/locolor/proto_JABBER.dll
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_MSN.dll b/tools/installer/icons/bin/locolor/proto_MSN.dll
index d0883d9215..d0883d9215 100644
--- a/miranda-tools/installer/icons/bin/locolor/proto_MSN.dll
+++ b/tools/installer/icons/bin/locolor/proto_MSN.dll
diff --git a/miranda-tools/installer/icons/bin/locolor/proto_YAHOO.dll b/tools/installer/icons/bin/locolor/proto_YAHOO.dll
index f7ac5da143..f7ac5da143 100644
--- a/miranda-tools/installer/icons/bin/locolor/proto_YAHOO.dll
+++ b/tools/installer/icons/bin/locolor/proto_YAHOO.dll
diff --git a/miranda-tools/installer/icons/i386pe-ico.x b/tools/installer/icons/i386pe-ico.x
index 6db53b6bc6..6db53b6bc6 100644
--- a/miranda-tools/installer/icons/i386pe-ico.x
+++ b/tools/installer/icons/i386pe-ico.x
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Away.ico b/tools/installer/icons/res/AIM/32_aim_Away.ico
index 9f668b4fe7..9f668b4fe7 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Away.ico
+++ b/tools/installer/icons/res/AIM/32_aim_Away.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_DND.ico b/tools/installer/icons/res/AIM/32_aim_DND.ico
index 0ace68680a..0ace68680a 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_DND.ico
+++ b/tools/installer/icons/res/AIM/32_aim_DND.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_FFC.ico b/tools/installer/icons/res/AIM/32_aim_FFC.ico
index f3ecc5fcc3..f3ecc5fcc3 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_FFC.ico
+++ b/tools/installer/icons/res/AIM/32_aim_FFC.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Invisible.ico b/tools/installer/icons/res/AIM/32_aim_Invisible.ico
index 932356b398..932356b398 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Invisible.ico
+++ b/tools/installer/icons/res/AIM/32_aim_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Lunch.ico b/tools/installer/icons/res/AIM/32_aim_Lunch.ico
index 7f6587e73c..7f6587e73c 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Lunch.ico
+++ b/tools/installer/icons/res/AIM/32_aim_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_NA.ico b/tools/installer/icons/res/AIM/32_aim_NA.ico
index f6dc93b5ac..f6dc93b5ac 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_NA.ico
+++ b/tools/installer/icons/res/AIM/32_aim_NA.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Occupied.ico b/tools/installer/icons/res/AIM/32_aim_Occupied.ico
index f89c39625d..f89c39625d 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Occupied.ico
+++ b/tools/installer/icons/res/AIM/32_aim_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Offline.ico b/tools/installer/icons/res/AIM/32_aim_Offline.ico
index 54fabffaa7..54fabffaa7 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Offline.ico
+++ b/tools/installer/icons/res/AIM/32_aim_Offline.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Online.ico b/tools/installer/icons/res/AIM/32_aim_Online.ico
index 429afcc9ff..429afcc9ff 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Online.ico
+++ b/tools/installer/icons/res/AIM/32_aim_Online.ico
diff --git a/miranda-tools/installer/icons/res/AIM/32_aim_Phone.ico b/tools/installer/icons/res/AIM/32_aim_Phone.ico
index 5c568d67bf..5c568d67bf 100644
--- a/miranda-tools/installer/icons/res/AIM/32_aim_Phone.ico
+++ b/tools/installer/icons/res/AIM/32_aim_Phone.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Away.ico b/tools/installer/icons/res/AIM/8_aim_Away.ico
index fa26a1689e..fa26a1689e 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Away.ico
+++ b/tools/installer/icons/res/AIM/8_aim_Away.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_DND.ico b/tools/installer/icons/res/AIM/8_aim_DND.ico
index ce4f5cc56d..ce4f5cc56d 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_DND.ico
+++ b/tools/installer/icons/res/AIM/8_aim_DND.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_FFC.ico b/tools/installer/icons/res/AIM/8_aim_FFC.ico
index f764b757c4..f764b757c4 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_FFC.ico
+++ b/tools/installer/icons/res/AIM/8_aim_FFC.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Invisible.ico b/tools/installer/icons/res/AIM/8_aim_Invisible.ico
index f231c45b8d..f231c45b8d 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Invisible.ico
+++ b/tools/installer/icons/res/AIM/8_aim_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Lunch.ico b/tools/installer/icons/res/AIM/8_aim_Lunch.ico
index d1671bef4e..d1671bef4e 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Lunch.ico
+++ b/tools/installer/icons/res/AIM/8_aim_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_NA.ico b/tools/installer/icons/res/AIM/8_aim_NA.ico
index fab7a8d037..fab7a8d037 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_NA.ico
+++ b/tools/installer/icons/res/AIM/8_aim_NA.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Occupied.ico b/tools/installer/icons/res/AIM/8_aim_Occupied.ico
index fa6c135ec2..fa6c135ec2 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Occupied.ico
+++ b/tools/installer/icons/res/AIM/8_aim_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Offline.ico b/tools/installer/icons/res/AIM/8_aim_Offline.ico
index d859026988..d859026988 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Offline.ico
+++ b/tools/installer/icons/res/AIM/8_aim_Offline.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Online.ico b/tools/installer/icons/res/AIM/8_aim_Online.ico
index bcd70847da..bcd70847da 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Online.ico
+++ b/tools/installer/icons/res/AIM/8_aim_Online.ico
diff --git a/miranda-tools/installer/icons/res/AIM/8_aim_Phone.ico b/tools/installer/icons/res/AIM/8_aim_Phone.ico
index b7bd997967..b7bd997967 100644
--- a/miranda-tools/installer/icons/res/AIM/8_aim_Phone.ico
+++ b/tools/installer/icons/res/AIM/8_aim_Phone.ico
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_Away.ico b/tools/installer/icons/res/GG/32_gg_Away.ico
index a3df6d4e79..a3df6d4e79 100644
--- a/miranda-tools/installer/icons/res/GG/32_gg_Away.ico
+++ b/tools/installer/icons/res/GG/32_gg_Away.ico
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_DND.ico b/tools/installer/icons/res/GG/32_gg_DND.ico
index 5f98ae7ab8..5f98ae7ab8 100644
--- a/miranda-tools/installer/icons/res/GG/32_gg_DND.ico
+++ b/tools/installer/icons/res/GG/32_gg_DND.ico
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_FFC.ico b/tools/installer/icons/res/GG/32_gg_FFC.ico
index d145072f08..d145072f08 100644
--- a/miranda-tools/installer/icons/res/GG/32_gg_FFC.ico
+++ b/tools/installer/icons/res/GG/32_gg_FFC.ico
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_Invisible.ico b/tools/installer/icons/res/GG/32_gg_Invisible.ico
index a6949e34f9..a6949e34f9 100644
--- a/miranda-tools/installer/icons/res/GG/32_gg_Invisible.ico
+++ b/tools/installer/icons/res/GG/32_gg_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_NA.ico b/tools/installer/icons/res/GG/32_gg_NA.ico
index a0b460624c..a0b460624c 100644
--- a/miranda-tools/installer/icons/res/GG/32_gg_NA.ico
+++ b/tools/installer/icons/res/GG/32_gg_NA.ico
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_Offline.ico b/tools/installer/icons/res/GG/32_gg_Offline.ico
index f4093b78cc..f4093b78cc 100644
--- a/miranda-tools/installer/icons/res/GG/32_gg_Offline.ico
+++ b/tools/installer/icons/res/GG/32_gg_Offline.ico
diff --git a/miranda-tools/installer/icons/res/GG/32_gg_Online.ico b/tools/installer/icons/res/GG/32_gg_Online.ico
index acbba11077..acbba11077 100644
--- a/miranda-tools/installer/icons/res/GG/32_gg_Online.ico
+++ b/tools/installer/icons/res/GG/32_gg_Online.ico
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_Away.ico b/tools/installer/icons/res/GG/8_gg_Away.ico
index 4aa9fafdd4..4aa9fafdd4 100644
--- a/miranda-tools/installer/icons/res/GG/8_gg_Away.ico
+++ b/tools/installer/icons/res/GG/8_gg_Away.ico
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_DND.ico b/tools/installer/icons/res/GG/8_gg_DND.ico
index 2bbc99620b..2bbc99620b 100644
--- a/miranda-tools/installer/icons/res/GG/8_gg_DND.ico
+++ b/tools/installer/icons/res/GG/8_gg_DND.ico
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_FFC.ico b/tools/installer/icons/res/GG/8_gg_FFC.ico
index fcc1956365..fcc1956365 100644
--- a/miranda-tools/installer/icons/res/GG/8_gg_FFC.ico
+++ b/tools/installer/icons/res/GG/8_gg_FFC.ico
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_Invisible.ico b/tools/installer/icons/res/GG/8_gg_Invisible.ico
index a416268d85..a416268d85 100644
--- a/miranda-tools/installer/icons/res/GG/8_gg_Invisible.ico
+++ b/tools/installer/icons/res/GG/8_gg_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_NA.ico b/tools/installer/icons/res/GG/8_gg_NA.ico
index 7b28f86624..7b28f86624 100644
--- a/miranda-tools/installer/icons/res/GG/8_gg_NA.ico
+++ b/tools/installer/icons/res/GG/8_gg_NA.ico
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_Offline.ico b/tools/installer/icons/res/GG/8_gg_Offline.ico
index 5ec90e4142..5ec90e4142 100644
--- a/miranda-tools/installer/icons/res/GG/8_gg_Offline.ico
+++ b/tools/installer/icons/res/GG/8_gg_Offline.ico
diff --git a/miranda-tools/installer/icons/res/GG/8_gg_Online.ico b/tools/installer/icons/res/GG/8_gg_Online.ico
index db72acd430..db72acd430 100644
--- a/miranda-tools/installer/icons/res/GG/8_gg_Online.ico
+++ b/tools/installer/icons/res/GG/8_gg_Online.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Away.ico b/tools/installer/icons/res/ICQ/32_icq_Away.ico
index 248a3e9916..248a3e9916 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Away.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_Away.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_DND.ico b/tools/installer/icons/res/ICQ/32_icq_DND.ico
index 4833160eac..4833160eac 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_DND.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_DND.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_FFC.ico b/tools/installer/icons/res/ICQ/32_icq_FFC.ico
index e7ec4d3ae2..e7ec4d3ae2 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_FFC.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_FFC.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Invisible.ico b/tools/installer/icons/res/ICQ/32_icq_Invisible.ico
index 42f80a84cc..42f80a84cc 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Invisible.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Lunch.ico b/tools/installer/icons/res/ICQ/32_icq_Lunch.ico
index e88dd35a2e..e88dd35a2e 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Lunch.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_NA.ico b/tools/installer/icons/res/ICQ/32_icq_NA.ico
index ec0621dc9f..ec0621dc9f 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_NA.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_NA.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Occupied.ico b/tools/installer/icons/res/ICQ/32_icq_Occupied.ico
index 04ea2a5855..04ea2a5855 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Occupied.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Offline.ico b/tools/installer/icons/res/ICQ/32_icq_Offline.ico
index af862168cd..af862168cd 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Offline.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_Offline.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Online.ico b/tools/installer/icons/res/ICQ/32_icq_Online.ico
index 2e33305a76..2e33305a76 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Online.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_Online.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/32_icq_Phone.ico b/tools/installer/icons/res/ICQ/32_icq_Phone.ico
index 74c80b66ed..74c80b66ed 100644
--- a/miranda-tools/installer/icons/res/ICQ/32_icq_Phone.ico
+++ b/tools/installer/icons/res/ICQ/32_icq_Phone.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Away.ico b/tools/installer/icons/res/ICQ/8_icq_Away.ico
index b66daff406..b66daff406 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Away.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_Away.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_DND.ico b/tools/installer/icons/res/ICQ/8_icq_DND.ico
index cb08b68bb3..cb08b68bb3 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_DND.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_DND.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_FFC.ico b/tools/installer/icons/res/ICQ/8_icq_FFC.ico
index 198981b196..198981b196 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_FFC.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_FFC.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Invisible.ico b/tools/installer/icons/res/ICQ/8_icq_Invisible.ico
index f1985a1cfe..f1985a1cfe 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Invisible.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Lunch.ico b/tools/installer/icons/res/ICQ/8_icq_Lunch.ico
index be86b5ce04..be86b5ce04 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Lunch.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_NA.ico b/tools/installer/icons/res/ICQ/8_icq_NA.ico
index 53ac247cec..53ac247cec 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_NA.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_NA.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Occupied.ico b/tools/installer/icons/res/ICQ/8_icq_Occupied.ico
index 2b34792b8f..2b34792b8f 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Occupied.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Offline.ico b/tools/installer/icons/res/ICQ/8_icq_Offline.ico
index 4a94663f96..4a94663f96 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Offline.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_Offline.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Online.ico b/tools/installer/icons/res/ICQ/8_icq_Online.ico
index ffaf5755c6..ffaf5755c6 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Online.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_Online.ico
diff --git a/miranda-tools/installer/icons/res/ICQ/8_icq_Phone.ico b/tools/installer/icons/res/ICQ/8_icq_Phone.ico
index ffd84a2802..ffd84a2802 100644
--- a/miranda-tools/installer/icons/res/ICQ/8_icq_Phone.ico
+++ b/tools/installer/icons/res/ICQ/8_icq_Phone.ico
diff --git a/miranda-tools/installer/icons/res/IRC/32_irc_Away.ico b/tools/installer/icons/res/IRC/32_irc_Away.ico
index a2391df85e..a2391df85e 100644
--- a/miranda-tools/installer/icons/res/IRC/32_irc_Away.ico
+++ b/tools/installer/icons/res/IRC/32_irc_Away.ico
diff --git a/miranda-tools/installer/icons/res/IRC/32_irc_Offline.ico b/tools/installer/icons/res/IRC/32_irc_Offline.ico
index a521360232..a521360232 100644
--- a/miranda-tools/installer/icons/res/IRC/32_irc_Offline.ico
+++ b/tools/installer/icons/res/IRC/32_irc_Offline.ico
diff --git a/miranda-tools/installer/icons/res/IRC/32_irc_Online.ico b/tools/installer/icons/res/IRC/32_irc_Online.ico
index 37b885a806..37b885a806 100644
--- a/miranda-tools/installer/icons/res/IRC/32_irc_Online.ico
+++ b/tools/installer/icons/res/IRC/32_irc_Online.ico
diff --git a/miranda-tools/installer/icons/res/IRC/8_irc_Away.ico b/tools/installer/icons/res/IRC/8_irc_Away.ico
index b1fb5481b3..b1fb5481b3 100644
--- a/miranda-tools/installer/icons/res/IRC/8_irc_Away.ico
+++ b/tools/installer/icons/res/IRC/8_irc_Away.ico
diff --git a/miranda-tools/installer/icons/res/IRC/8_irc_Offline.ico b/tools/installer/icons/res/IRC/8_irc_Offline.ico
index d36b6f0f79..d36b6f0f79 100644
--- a/miranda-tools/installer/icons/res/IRC/8_irc_Offline.ico
+++ b/tools/installer/icons/res/IRC/8_irc_Offline.ico
diff --git a/miranda-tools/installer/icons/res/IRC/8_irc_Online.ico b/tools/installer/icons/res/IRC/8_irc_Online.ico
index eb24605f52..eb24605f52 100644
--- a/miranda-tools/installer/icons/res/IRC/8_irc_Online.ico
+++ b/tools/installer/icons/res/IRC/8_irc_Online.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Away.ico b/tools/installer/icons/res/JABBER/32_jabber_Away.ico
index fc97a61763..fc97a61763 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Away.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_Away.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_DND.ico b/tools/installer/icons/res/JABBER/32_jabber_DND.ico
index 026c7256a7..026c7256a7 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_DND.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_DND.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_FFC.ico b/tools/installer/icons/res/JABBER/32_jabber_FFC.ico
index dbc899c02a..dbc899c02a 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_FFC.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_FFC.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Invisible.ico b/tools/installer/icons/res/JABBER/32_jabber_Invisible.ico
index 9b6cc549e1..9b6cc549e1 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Invisible.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Lunch.ico b/tools/installer/icons/res/JABBER/32_jabber_Lunch.ico
index aad1ab9791..aad1ab9791 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Lunch.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_NA.ico b/tools/installer/icons/res/JABBER/32_jabber_NA.ico
index c23f527379..c23f527379 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_NA.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_NA.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Occupied.ico b/tools/installer/icons/res/JABBER/32_jabber_Occupied.ico
index ed8697bea3..ed8697bea3 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Occupied.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Offline.ico b/tools/installer/icons/res/JABBER/32_jabber_Offline.ico
index e86406abbc..e86406abbc 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Offline.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_Offline.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Online.ico b/tools/installer/icons/res/JABBER/32_jabber_Online.ico
index 0d3b5e0ce2..0d3b5e0ce2 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Online.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_Online.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/32_jabber_Phone.ico b/tools/installer/icons/res/JABBER/32_jabber_Phone.ico
index b66544261c..b66544261c 100644
--- a/miranda-tools/installer/icons/res/JABBER/32_jabber_Phone.ico
+++ b/tools/installer/icons/res/JABBER/32_jabber_Phone.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Away.ico b/tools/installer/icons/res/JABBER/8_jabber_Away.ico
index 39f79e4b68..39f79e4b68 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Away.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_Away.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_DND.ico b/tools/installer/icons/res/JABBER/8_jabber_DND.ico
index 5e6727f5b9..5e6727f5b9 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_DND.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_DND.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_FFC.ico b/tools/installer/icons/res/JABBER/8_jabber_FFC.ico
index 1777876640..1777876640 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_FFC.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_FFC.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Invisible.ico b/tools/installer/icons/res/JABBER/8_jabber_Invisible.ico
index e46dd186b0..e46dd186b0 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Invisible.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Lunch.ico b/tools/installer/icons/res/JABBER/8_jabber_Lunch.ico
index 3166f3263c..3166f3263c 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Lunch.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_NA.ico b/tools/installer/icons/res/JABBER/8_jabber_NA.ico
index c8cb60a156..c8cb60a156 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_NA.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_NA.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Occupied.ico b/tools/installer/icons/res/JABBER/8_jabber_Occupied.ico
index 141e487711..141e487711 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Occupied.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Offline.ico b/tools/installer/icons/res/JABBER/8_jabber_Offline.ico
index a8da8ad81a..a8da8ad81a 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Offline.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_Offline.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Online.ico b/tools/installer/icons/res/JABBER/8_jabber_Online.ico
index 5727cfce57..5727cfce57 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Online.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_Online.ico
diff --git a/miranda-tools/installer/icons/res/JABBER/8_jabber_Phone.ico b/tools/installer/icons/res/JABBER/8_jabber_Phone.ico
index 7adf607d5a..7adf607d5a 100644
--- a/miranda-tools/installer/icons/res/JABBER/8_jabber_Phone.ico
+++ b/tools/installer/icons/res/JABBER/8_jabber_Phone.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Away.ico b/tools/installer/icons/res/MSN/32_msn_Away.ico
index 7d058cea73..7d058cea73 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Away.ico
+++ b/tools/installer/icons/res/MSN/32_msn_Away.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_DND.ico b/tools/installer/icons/res/MSN/32_msn_DND.ico
index c59387be4d..c59387be4d 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_DND.ico
+++ b/tools/installer/icons/res/MSN/32_msn_DND.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_FFC.ico b/tools/installer/icons/res/MSN/32_msn_FFC.ico
index 1f8a5b199f..1f8a5b199f 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_FFC.ico
+++ b/tools/installer/icons/res/MSN/32_msn_FFC.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Invisible.ico b/tools/installer/icons/res/MSN/32_msn_Invisible.ico
index b54168cc94..b54168cc94 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Invisible.ico
+++ b/tools/installer/icons/res/MSN/32_msn_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Lunch.ico b/tools/installer/icons/res/MSN/32_msn_Lunch.ico
index 712bac8b31..712bac8b31 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Lunch.ico
+++ b/tools/installer/icons/res/MSN/32_msn_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_NA.ico b/tools/installer/icons/res/MSN/32_msn_NA.ico
index 790436c42d..790436c42d 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_NA.ico
+++ b/tools/installer/icons/res/MSN/32_msn_NA.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Occupied.ico b/tools/installer/icons/res/MSN/32_msn_Occupied.ico
index 7699d5bd16..7699d5bd16 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Occupied.ico
+++ b/tools/installer/icons/res/MSN/32_msn_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Offline.ico b/tools/installer/icons/res/MSN/32_msn_Offline.ico
index dffd80e7a0..dffd80e7a0 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Offline.ico
+++ b/tools/installer/icons/res/MSN/32_msn_Offline.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Online.ico b/tools/installer/icons/res/MSN/32_msn_Online.ico
index 818824f3a0..818824f3a0 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Online.ico
+++ b/tools/installer/icons/res/MSN/32_msn_Online.ico
diff --git a/miranda-tools/installer/icons/res/MSN/32_msn_Phone.ico b/tools/installer/icons/res/MSN/32_msn_Phone.ico
index 01a806af22..01a806af22 100644
--- a/miranda-tools/installer/icons/res/MSN/32_msn_Phone.ico
+++ b/tools/installer/icons/res/MSN/32_msn_Phone.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Away.ico b/tools/installer/icons/res/MSN/8_msn_Away.ico
index e81618b8f7..e81618b8f7 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Away.ico
+++ b/tools/installer/icons/res/MSN/8_msn_Away.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_DND.ico b/tools/installer/icons/res/MSN/8_msn_DND.ico
index e20a67dddf..e20a67dddf 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_DND.ico
+++ b/tools/installer/icons/res/MSN/8_msn_DND.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_FFC.ico b/tools/installer/icons/res/MSN/8_msn_FFC.ico
index 4638c33321..4638c33321 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_FFC.ico
+++ b/tools/installer/icons/res/MSN/8_msn_FFC.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Invisible.ico b/tools/installer/icons/res/MSN/8_msn_Invisible.ico
index 3bd1550c6a..3bd1550c6a 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Invisible.ico
+++ b/tools/installer/icons/res/MSN/8_msn_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Lunch.ico b/tools/installer/icons/res/MSN/8_msn_Lunch.ico
index 4a0ab90253..4a0ab90253 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Lunch.ico
+++ b/tools/installer/icons/res/MSN/8_msn_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_NA.ico b/tools/installer/icons/res/MSN/8_msn_NA.ico
index 5c57a0689e..5c57a0689e 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_NA.ico
+++ b/tools/installer/icons/res/MSN/8_msn_NA.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Occupied.ico b/tools/installer/icons/res/MSN/8_msn_Occupied.ico
index 75c1872eef..75c1872eef 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Occupied.ico
+++ b/tools/installer/icons/res/MSN/8_msn_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Offline.ico b/tools/installer/icons/res/MSN/8_msn_Offline.ico
index 5fc7722be1..5fc7722be1 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Offline.ico
+++ b/tools/installer/icons/res/MSN/8_msn_Offline.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Online.ico b/tools/installer/icons/res/MSN/8_msn_Online.ico
index a12a560d54..a12a560d54 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Online.ico
+++ b/tools/installer/icons/res/MSN/8_msn_Online.ico
diff --git a/miranda-tools/installer/icons/res/MSN/8_msn_Phone.ico b/tools/installer/icons/res/MSN/8_msn_Phone.ico
index 9de5474cf9..9de5474cf9 100644
--- a/miranda-tools/installer/icons/res/MSN/8_msn_Phone.ico
+++ b/tools/installer/icons/res/MSN/8_msn_Phone.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Away.ico b/tools/installer/icons/res/YAHOO/32_yahoo_Away.ico
index 82d132c8d3..82d132c8d3 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Away.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_Away.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_DND.ico b/tools/installer/icons/res/YAHOO/32_yahoo_DND.ico
index f6357e08bc..f6357e08bc 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_DND.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_DND.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_FFC.ico b/tools/installer/icons/res/YAHOO/32_yahoo_FFC.ico
index e213ec5f59..e213ec5f59 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_FFC.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_FFC.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Invisible.ico b/tools/installer/icons/res/YAHOO/32_yahoo_Invisible.ico
index 8e2c4744f5..8e2c4744f5 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Invisible.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Lunch.ico b/tools/installer/icons/res/YAHOO/32_yahoo_Lunch.ico
index 9dc1968611..9dc1968611 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Lunch.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_NA.ico b/tools/installer/icons/res/YAHOO/32_yahoo_NA.ico
index 534691e78b..534691e78b 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_NA.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_NA.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Occupied.ico b/tools/installer/icons/res/YAHOO/32_yahoo_Occupied.ico
index 0e7fd434a3..0e7fd434a3 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Occupied.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Offline.ico b/tools/installer/icons/res/YAHOO/32_yahoo_Offline.ico
index fd0d04104e..fd0d04104e 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Offline.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_Offline.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Online.ico b/tools/installer/icons/res/YAHOO/32_yahoo_Online.ico
index 1d559e0676..1d559e0676 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Online.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_Online.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Phone.ico b/tools/installer/icons/res/YAHOO/32_yahoo_Phone.ico
index 9279d34c86..9279d34c86 100644
--- a/miranda-tools/installer/icons/res/YAHOO/32_yahoo_Phone.ico
+++ b/tools/installer/icons/res/YAHOO/32_yahoo_Phone.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Away.ico b/tools/installer/icons/res/YAHOO/8_yahoo_Away.ico
index 18c83f7065..18c83f7065 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Away.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_Away.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_DND.ico b/tools/installer/icons/res/YAHOO/8_yahoo_DND.ico
index 3003fc79fc..3003fc79fc 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_DND.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_DND.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_FFC.ico b/tools/installer/icons/res/YAHOO/8_yahoo_FFC.ico
index 7526f8e1d1..7526f8e1d1 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_FFC.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_FFC.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Invisible.ico b/tools/installer/icons/res/YAHOO/8_yahoo_Invisible.ico
index 03cafe0d45..03cafe0d45 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Invisible.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_Invisible.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Lunch.ico b/tools/installer/icons/res/YAHOO/8_yahoo_Lunch.ico
index 89638253bd..89638253bd 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Lunch.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_Lunch.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_NA.ico b/tools/installer/icons/res/YAHOO/8_yahoo_NA.ico
index bdfd99bb57..bdfd99bb57 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_NA.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_NA.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Occupied.ico b/tools/installer/icons/res/YAHOO/8_yahoo_Occupied.ico
index e118f8bd99..e118f8bd99 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Occupied.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_Occupied.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Offline.ico b/tools/installer/icons/res/YAHOO/8_yahoo_Offline.ico
index e34b073446..e34b073446 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Offline.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_Offline.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Online.ico b/tools/installer/icons/res/YAHOO/8_yahoo_Online.ico
index 6bc32598fb..6bc32598fb 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Online.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_Online.ico
diff --git a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Phone.ico b/tools/installer/icons/res/YAHOO/8_yahoo_Phone.ico
index 026aa84d59..026aa84d59 100644
--- a/miranda-tools/installer/icons/res/YAHOO/8_yahoo_Phone.ico
+++ b/tools/installer/icons/res/YAHOO/8_yahoo_Phone.ico
diff --git a/miranda-tools/installer/icons/resource.rc b/tools/installer/icons/resource.rc
index 19c1ccd32d..19c1ccd32d 100644
--- a/miranda-tools/installer/icons/resource.rc
+++ b/tools/installer/icons/resource.rc
diff --git a/miranda-tools/installer/miranda-core.nsi b/tools/installer/miranda-core.nsi
index 90ee6ce249..90ee6ce249 100644
--- a/miranda-tools/installer/miranda-core.nsi
+++ b/tools/installer/miranda-core.nsi
diff --git a/miranda-tools/installer/miranda-install-ansi.nsi b/tools/installer/miranda-install-ansi.nsi
index 61da1563b2..61da1563b2 100644
--- a/miranda-tools/installer/miranda-install-ansi.nsi
+++ b/tools/installer/miranda-install-ansi.nsi
diff --git a/miranda-tools/installer/miranda-install-unicode.nsi b/tools/installer/miranda-install-unicode.nsi
index cf99e8f071..cf99e8f071 100644
--- a/miranda-tools/installer/miranda-install-unicode.nsi
+++ b/tools/installer/miranda-install-unicode.nsi
diff --git a/miranda-tools/installer/miranda-ui-type.ini b/tools/installer/miranda-ui-type.ini
index 86707ea0f6..86707ea0f6 100644
--- a/miranda-tools/installer/miranda-ui-type.ini
+++ b/tools/installer/miranda-ui-type.ini
diff --git a/miranda-tools/installer/miranda-version.nsi b/tools/installer/miranda-version.nsi
index 97dc0dd71c..97dc0dd71c 100644
--- a/miranda-tools/installer/miranda-version.nsi
+++ b/tools/installer/miranda-version.nsi
diff --git a/miranda-tools/lpgen/lpgen.pl b/tools/lpgen/lpgen.pl
index e58c7dbe7a..e58c7dbe7a 100644
--- a/miranda-tools/lpgen/lpgen.pl
+++ b/tools/lpgen/lpgen.pl
diff --git a/miranda-tools/lpgen/trans.pl b/tools/lpgen/trans.pl
index 5bd15f57ce..5bd15f57ce 100644
--- a/miranda-tools/lpgen/trans.pl
+++ b/tools/lpgen/trans.pl
diff --git a/miranda-tools/rebaser/make.bat b/tools/rebaser/make.bat
index e89a46df24..e89a46df24 100644
--- a/miranda-tools/rebaser/make.bat
+++ b/tools/rebaser/make.bat
diff --git a/miranda-tools/rebaser/rebaser.cpp b/tools/rebaser/rebaser.cpp
index f6c048358b..f6c048358b 100644
--- a/miranda-tools/rebaser/rebaser.cpp
+++ b/tools/rebaser/rebaser.cpp