149 files changed, 421 insertions, 722 deletions
diff --git a/plugins/FingerprintNG/iconpacks/ClientIcons_Gadu.vcxproj b/plugins/FingerprintNG/iconpacks/ClientIcons_GG.vcxproj
index 8f4076e0be..f5fa2fa722 100644
--- a/plugins/FingerprintNG/iconpacks/ClientIcons_Gadu.vcxproj
+++ b/plugins/FingerprintNG/iconpacks/ClientIcons_GG.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectName>ClientIcons_Gadu</ProjectName>
+    <ProjectName>ClientIcons_GG</ProjectName>
     <ProjectGuid>{48DDA047-898E-4C4C-A567-C76FE007BBB3}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -104,7 +104,7 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\res\icons_Gadu.rc" />
+    <ResourceCompile Include="..\res\icons_GG.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\resource.h" />
diff --git a/plugins/FingerprintNG/iconpacks/ClientIcons_overlays_alt.vcxproj b/plugins/FingerprintNG/iconpacks/ClientIcons_overlays_alt.vcxproj
deleted file mode 100644
index d7a83dbef8..0000000000
--- a/plugins/FingerprintNG/iconpacks/ClientIcons_overlays_alt.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ClientIcons_overlays_alt</ProjectName>
-    <ProjectGuid>{ED974A89-F8E2-4648-B7FA-24207912EFE0}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Icons\fp_ClientIcons\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Icons\fp_ClientIcons\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Icons\fp_ClientIcons\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Icons\fp_ClientIcons\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Link>
-      <NoEntryPoint>true</NoEntryPoint>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Link>
-      <NoEntryPoint>true</NoEntryPoint>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Link>
-      <NoEntryPoint>true</NoEntryPoint>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link>
-      <NoEntryPoint>true</NoEntryPoint>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\res\icons_overlays_alt.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\resource.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/FingerprintNG/icons/AIM/AIM_4.x.ico b/plugins/FingerprintNG/icons/AIM/AIM_4.x.ico
deleted file mode 100644
index 14673231bf..0000000000
--- a/plugins/FingerprintNG/icons/AIM/AIM_4.x.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/AIM/AIM_5.x.ico b/plugins/FingerprintNG/icons/AIM/AIM_5.x.ico
deleted file mode 100644
index b45177f3e3..0000000000
--- a/plugins/FingerprintNG/icons/AIM/AIM_5.x.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/GG/Gadu-Gadu.ico b/plugins/FingerprintNG/icons/GG/Gadu-Gadu.ico
new file mode 100644
index 0000000000..84d9d32c89
--- /dev/null
+++ b/plugins/FingerprintNG/icons/GG/Gadu-Gadu.ico
diff --git a/plugins/FingerprintNG/icons/GG/overlay_GG_v10.ico b/plugins/FingerprintNG/icons/GG/overlay_GG_v10.ico
new file mode 100644
index 0000000000..6fb5d6719e
--- /dev/null
+++ b/plugins/FingerprintNG/icons/GG/overlay_GG_v10.ico
diff --git a/plugins/FingerprintNG/icons/GG/overlay_GG_v11.ico b/plugins/FingerprintNG/icons/GG/overlay_GG_v11.ico
new file mode 100644
index 0000000000..a348a000f9
--- /dev/null
+++ b/plugins/FingerprintNG/icons/GG/overlay_GG_v11.ico
diff --git a/plugins/FingerprintNG/icons/GG/overlay_GG_v8.ico b/plugins/FingerprintNG/icons/GG/overlay_GG_v8.ico
new file mode 100644
index 0000000000..9a29a683fe
--- /dev/null
+++ b/plugins/FingerprintNG/icons/GG/overlay_GG_v8.ico
diff --git a/plugins/FingerprintNG/icons/GG/overlay_GG_v9.ico b/plugins/FingerprintNG/icons/GG/overlay_GG_v9.ico
new file mode 100644
index 0000000000..2e7c530be6
--- /dev/null
+++ b/plugins/FingerprintNG/icons/GG/overlay_GG_v9.ico
diff --git a/plugins/FingerprintNG/icons/Gadu-Gadu/Gadu_Gadu_6.ico b/plugins/FingerprintNG/icons/Gadu-Gadu/Gadu_Gadu_6.ico
deleted file mode 100644
index beffcaaa3b..0000000000
--- a/plugins/FingerprintNG/icons/Gadu-Gadu/Gadu_Gadu_6.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Gadu-Gadu/Gadu_Gadu_7.ico b/plugins/FingerprintNG/icons/Gadu-Gadu/Gadu_Gadu_7.ico
deleted file mode 100644
index b83eb977e4..0000000000
--- a/plugins/FingerprintNG/icons/Gadu-Gadu/Gadu_Gadu_7.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/ICQ/official/ICQ.ico b/plugins/FingerprintNG/icons/ICQ/ICQ.ico
index 63f408b9b4..63f408b9b4 100644
--- a/plugins/FingerprintNG/icons/ICQ/official/ICQ.ico
+++ b/plugins/FingerprintNG/icons/ICQ/ICQ.ico
diff --git a/plugins/FingerprintNG/icons/ICQ/official/overlay_ICQ_v6.ico b/plugins/FingerprintNG/icons/ICQ/overlay_ICQ_v6.ico
index 526a51fb41..526a51fb41 100644
--- a/plugins/FingerprintNG/icons/ICQ/official/overlay_ICQ_v6.ico
+++ b/plugins/FingerprintNG/icons/ICQ/overlay_ICQ_v6.ico
diff --git a/plugins/FingerprintNG/icons/ICQ/official/overlay_ICQ_v7.ico b/plugins/FingerprintNG/icons/ICQ/overlay_ICQ_v7.ico
index 4966ba3b1d..4966ba3b1d 100644
--- a/plugins/FingerprintNG/icons/ICQ/official/overlay_ICQ_v7.ico
+++ b/plugins/FingerprintNG/icons/ICQ/overlay_ICQ_v7.ico
diff --git a/plugins/FingerprintNG/icons/ICQ/official/overlay_ICQ_v8.ico b/plugins/FingerprintNG/icons/ICQ/overlay_ICQ_v8.ico
index 963843737e..963843737e 100644
--- a/plugins/FingerprintNG/icons/ICQ/official/overlay_ICQ_v8.ico
+++ b/plugins/FingerprintNG/icons/ICQ/overlay_ICQ_v8.ico
diff --git a/plugins/FingerprintNG/icons/IRC/IRC.ico b/plugins/FingerprintNG/icons/IRC/IRC.ico
new file mode 100644
index 0000000000..ed024bf650
--- /dev/null
+++ b/plugins/FingerprintNG/icons/IRC/IRC.ico
diff --git a/plugins/FingerprintNG/icons/IRC/IRC_unknown.ico b/plugins/FingerprintNG/icons/IRC/IRC_unknown.ico
deleted file mode 100644
index 4e3463dace..0000000000
--- a/plugins/FingerprintNG/icons/IRC/IRC_unknown.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/IRC/ZipTorrent.ico b/plugins/FingerprintNG/icons/IRC/ZipTorrent.ico
deleted file mode 100644
index 31a33d04b9..0000000000
--- a/plugins/FingerprintNG/icons/IRC/ZipTorrent.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Jabber/PyICQt.ico b/plugins/FingerprintNG/icons/Jabber/PyICQt.ico
deleted file mode 100644
index 1f7dd971d6..0000000000
--- a/plugins/FingerprintNG/icons/Jabber/PyICQt.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Jabber/PyIRCt.ico b/plugins/FingerprintNG/icons/Jabber/PyIRCt.ico
deleted file mode 100644
index 9c8d1d887c..0000000000
--- a/plugins/FingerprintNG/icons/Jabber/PyIRCt.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Jabber/PyMRAt.ico b/plugins/FingerprintNG/icons/Jabber/PyMRAt.ico
deleted file mode 100644
index 4237e8ea8b..0000000000
--- a/plugins/FingerprintNG/icons/Jabber/PyMRAt.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Jabber/PyMSNt.ico b/plugins/FingerprintNG/icons/Jabber/PyMSNt.ico
deleted file mode 100644
index 300b60d871..0000000000
--- a/plugins/FingerprintNG/icons/Jabber/PyMSNt.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Jabber/PyYIMt.ico b/plugins/FingerprintNG/icons/Jabber/PyYIMt.ico
deleted file mode 100644
index 7be9e54128..0000000000
--- a/plugins/FingerprintNG/icons/Jabber/PyYIMt.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/QQ/TM QQ 2011.ico b/plugins/FingerprintNG/icons/QQ/TM QQ 2011.ico
deleted file mode 100644
index 14c829c468..0000000000
--- a/plugins/FingerprintNG/icons/QQ/TM QQ 2011.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/QQ/QQ 2000.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2000.ico
index 5e3b758773..5e3b758773 100644
--- a/plugins/FingerprintNG/icons/QQ/QQ 2000.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2000.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM 1.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2001.ico
index 5300fcbbdc..5300fcbbdc 100644
--- a/plugins/FingerprintNG/icons/QQ/TM 1.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2001.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM 2.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2002.ico
index 529aff661d..529aff661d 100644
--- a/plugins/FingerprintNG/icons/QQ/TM 2.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2002.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM 3 QQ 2003.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2003.ico
index f18af5bad3..f18af5bad3 100644
--- a/plugins/FingerprintNG/icons/QQ/TM 3 QQ 2003.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2003.ico
diff --git a/plugins/FingerprintNG/icons/QQ/QQ 2004.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2004.ico
index 431f7c51a6..431f7c51a6 100644
--- a/plugins/FingerprintNG/icons/QQ/QQ 2004.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2004.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM QQ 2005.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2005.ico
index 3b4deadeba..3b4deadeba 100644
--- a/plugins/FingerprintNG/icons/QQ/TM QQ 2005.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2005.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM QQ 2006.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2006.ico
index 1f2b3a98a9..1f2b3a98a9 100644
--- a/plugins/FingerprintNG/icons/QQ/TM QQ 2006.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2006.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM QQ 2007.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2007.ico
index 263cb4f4b0..263cb4f4b0 100644
--- a/plugins/FingerprintNG/icons/QQ/TM QQ 2007.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2007.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM QQ 2008.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2008.ico
index 29d13060f0..29d13060f0 100644
--- a/plugins/FingerprintNG/icons/QQ/TM QQ 2008.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2008.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM QQ 2009.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2009.ico
index 495ef1436f..495ef1436f 100644
--- a/plugins/FingerprintNG/icons/QQ/TM QQ 2009.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2009.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM QQ 2010.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2010.ico
index 789f9eda5f..789f9eda5f 100644
--- a/plugins/FingerprintNG/icons/QQ/TM QQ 2010.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2010.ico
diff --git a/plugins/FingerprintNG/icons/QQ/overlay_QQ_2011.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2011.ico
new file mode 100644
index 0000000000..3274bc4a50
--- /dev/null
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2011.ico
diff --git a/plugins/FingerprintNG/icons/QQ/TM QQ 2012.ico b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2012.ico
index 9d509b14af..9d509b14af 100644
--- a/plugins/FingerprintNG/icons/QQ/TM QQ 2012.ico
+++ b/plugins/FingerprintNG/icons/QQ/overlay_QQ_2012.ico
diff --git a/plugins/FingerprintNG/icons/Tlen/Tlen 5.ico b/plugins/FingerprintNG/icons/Tlen/overlay_Tlen_v5.ico
index 538b14dfcf..538b14dfcf 100644
--- a/plugins/FingerprintNG/icons/Tlen/Tlen 5.ico
+++ b/plugins/FingerprintNG/icons/Tlen/overlay_Tlen_v5.ico
diff --git a/plugins/FingerprintNG/icons/Tlen/Tlen 6.ico b/plugins/FingerprintNG/icons/Tlen/overlay_Tlen_v6.ico
index 2180a6d17c..2180a6d17c 100644
--- a/plugins/FingerprintNG/icons/Tlen/Tlen 6.ico
+++ b/plugins/FingerprintNG/icons/Tlen/overlay_Tlen_v6.ico
diff --git a/plugins/FingerprintNG/icons/Tlen/Tlen 7.ico b/plugins/FingerprintNG/icons/Tlen/overlay_Tlen_v7.ico
index a416896eaa..a416896eaa 100644
--- a/plugins/FingerprintNG/icons/Tlen/Tlen 7.ico
+++ b/plugins/FingerprintNG/icons/Tlen/overlay_Tlen_v7.ico
diff --git a/plugins/FingerprintNG/icons/Tlen/tlen 8.ico b/plugins/FingerprintNG/icons/Tlen/overlay_Tlen_v8.ico
index 74e53fd11d..74e53fd11d 100644
--- a/plugins/FingerprintNG/icons/Tlen/tlen 8.ico
+++ b/plugins/FingerprintNG/icons/Tlen/overlay_Tlen_v8.ico
diff --git a/plugins/FingerprintNG/icons/Weather/Yahoo Weather.ico b/plugins/FingerprintNG/icons/Weather/Yahoo Weather.ico
new file mode 100644
index 0000000000..eada433727
--- /dev/null
+++ b/plugins/FingerprintNG/icons/Weather/Yahoo Weather.ico
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo 5.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo 5.ico
deleted file mode 100644
index 11c91fe2f6..0000000000
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo 5.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo 6.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo 6.ico
deleted file mode 100644
index 7b3f386424..0000000000
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo 6.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo 7.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo 7.ico
deleted file mode 100644
index 6950e5c63f..0000000000
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo 7.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo 8.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo 8.ico
deleted file mode 100644
index 0242b7f7b4..0000000000
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo 8.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Yahoo/PingBox.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo PingBox.ico
index f5710b678a..f5710b678a 100644
--- a/plugins/FingerprintNG/icons/Yahoo/PingBox.ico
+++ b/plugins/FingerprintNG/icons/Yahoo/Yahoo PingBox.ico
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo 10.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo Web.ico
index d47721787d..d47721787d 100644
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo 10.ico
+++ b/plugins/FingerprintNG/icons/Yahoo/Yahoo Web.ico
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo_5.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo_5.ico
deleted file mode 100644
index 57f038c8c1..0000000000
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo_5.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo_6.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo_6.ico
deleted file mode 100644
index 30d500c055..0000000000
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo_6.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo_7.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo_7.ico
deleted file mode 100644
index fd08dd59f5..0000000000
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo_7.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo_8.ico b/plugins/FingerprintNG/icons/Yahoo/Yahoo_8.ico
deleted file mode 100644
index 4c00c4d29c..0000000000
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo_8.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo_10.ico b/plugins/FingerprintNG/icons/Yahoo/overlay_Yahoo_v10.ico
index e373923ead..e373923ead 100644
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo_10.ico
+++ b/plugins/FingerprintNG/icons/Yahoo/overlay_Yahoo_v10.ico
diff --git a/plugins/FingerprintNG/icons/Yahoo/overlay_Yahoo_v11.ico b/plugins/FingerprintNG/icons/Yahoo/overlay_Yahoo_v11.ico
new file mode 100644
index 0000000000..de1aeb9d71
--- /dev/null
+++ b/plugins/FingerprintNG/icons/Yahoo/overlay_Yahoo_v11.ico
diff --git a/plugins/FingerprintNG/icons/Yahoo/Yahoo_9.ico b/plugins/FingerprintNG/icons/Yahoo/overlay_Yahoo_v9.ico
index 586ec5f3ec..586ec5f3ec 100644
--- a/plugins/FingerprintNG/icons/Yahoo/Yahoo_9.ico
+++ b/plugins/FingerprintNG/icons/Yahoo/overlay_Yahoo_v9.ico
diff --git a/plugins/FingerprintNG/icons/Jabber/GNU_Gadu.ico b/plugins/FingerprintNG/icons/multi-protocol/GNU_Gadu.ico
index 675f7a3cfa..675f7a3cfa 100644
--- a/plugins/FingerprintNG/icons/Jabber/GNU_Gadu.ico
+++ b/plugins/FingerprintNG/icons/multi-protocol/GNU_Gadu.ico
diff --git a/plugins/FingerprintNG/icons/overlays/overlay_platform_Amiga.ico b/plugins/FingerprintNG/icons/overlays/overlay_platform_Amiga.ico
new file mode 100644
index 0000000000..f973b3bb8c
--- /dev/null
+++ b/plugins/FingerprintNG/icons/overlays/overlay_platform_Amiga.ico
diff --git a/plugins/FingerprintNG/icons/overlays/overlay_resource_pda.ico b/plugins/FingerprintNG/icons/overlays/overlay_resource_pda.ico
new file mode 100644
index 0000000000..451139f9ee
--- /dev/null
+++ b/plugins/FingerprintNG/icons/overlays/overlay_resource_pda.ico
diff --git a/plugins/FingerprintNG/icons/overlays/overlay_secure_IMsecure.ico b/plugins/FingerprintNG/icons/overlays/overlay_secure_IMsecure.ico
deleted file mode 100644
index 5656eb4b22..0000000000
--- a/plugins/FingerprintNG/icons/overlays/overlay_secure_IMsecure.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays/overlay_secure_SimpLite.ico b/plugins/FingerprintNG/icons/overlays/overlay_secure_SimpLite.ico
deleted file mode 100644
index 7fa89de2ab..0000000000
--- a/plugins/FingerprintNG/icons/overlays/overlay_secure_SimpLite.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays/overlay_secure_SimpPro.ico b/plugins/FingerprintNG/icons/overlays/overlay_secure_SimpPro.ico
deleted file mode 100644
index 20dac2c1b3..0000000000
--- a/plugins/FingerprintNG/icons/overlays/overlay_secure_SimpPro.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Android.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Android.ico
deleted file mode 100644
index 4ee72d41fa..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Android.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Flash.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Flash.ico
deleted file mode 100644
index a6281a413a..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Flash.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Java.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Java.ico
deleted file mode 100644
index 451946ecc2..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Java.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Symbian.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Symbian.ico
deleted file mode 100644
index 74befa2749..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Symbian.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Windows.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Windows.ico
deleted file mode 100644
index 6ffbdc4c27..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_Windows.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_iMac.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_iMac.ico
deleted file mode 100644
index b05acd620c..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_iMac.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_iOS.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_iOS.ico
deleted file mode 100644
index 6a8e8fab2a..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_iOS.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_linux.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_linux.ico
deleted file mode 100644
index 6bf250c1a7..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_linux.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_x32.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_x32.ico
deleted file mode 100644
index c82e66e4db..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_x32.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_x64.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_x64.ico
deleted file mode 100644
index a063972c62..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_platform_x64.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_AIM.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_AIM.ico
deleted file mode 100644
index 599a874141..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_AIM.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_ICQJ.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_ICQJ.ico
deleted file mode 100644
index 81c5dddb0e..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_ICQJ.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_ICQJ_Plus.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_ICQJ_Plus.ico
deleted file mode 100644
index 75b38aeb54..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_ICQJ_Plus.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_IRC.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_IRC.ico
deleted file mode 100644
index b02937995a..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_IRC.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_JGTalk.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_JGTalk.ico
deleted file mode 100644
index aa42007224..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_JGTalk.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_Jabber.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_Jabber.ico
deleted file mode 100644
index d04c0eec5d..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_Jabber.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_MailRu.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_MailRu.ico
deleted file mode 100644
index 6c05257767..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_MailRu.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_QQ.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_QQ.ico
deleted file mode 100644
index cd872bcb50..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_QQ.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_Tlen.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_Tlen.ico
deleted file mode 100644
index 2ae790eada..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_Tlen.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_gmail.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_gmail.ico
deleted file mode 100644
index 41c923a079..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_gmail.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_msn.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_msn.ico
deleted file mode 100644
index 9e28bf4e9e..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_msn.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_yahoo.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_yahoo.ico
deleted file mode 100644
index 66c910d118..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_proto_yahoo.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_debug.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_debug.ico
deleted file mode 100644
index 56c74ddc4b..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_debug.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_home.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_home.ico
deleted file mode 100644
index 9b8290a1a4..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_home.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_mobile.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_mobile.ico
deleted file mode 100644
index 47f1ff6613..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_mobile.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_notebook.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_notebook.ico
deleted file mode 100644
index e83e899fe8..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_notebook.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_office.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_office.ico
deleted file mode 100644
index 8d9d34a6a7..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_office.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_work.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_work.ico
deleted file mode 100644
index 443b7911cb..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_resource_work.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_IMsecure.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_IMsecure.ico
deleted file mode 100644
index 79cc61731c..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_IMsecure.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SecureIM.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SecureIM.ico
deleted file mode 100644
index 8c74612239..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SecureIM.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SimpLite.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SimpLite.ico
deleted file mode 100644
index eeb075a9b4..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SimpLite.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SimpPro.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SimpPro.ico
deleted file mode 100644
index 0a225fd745..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_secure_SimpPro.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays_alt/overlay_unicode.ico b/plugins/FingerprintNG/icons/overlays_alt/overlay_unicode.ico
deleted file mode 100644
index f22590906d..0000000000
--- a/plugins/FingerprintNG/icons/overlays_alt/overlay_unicode.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_666.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_666.ico
index 4f55f11f5f..4f55f11f5f 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_666.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_666.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_AF.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_AF.ico
index 57513b1d4c..57513b1d4c 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_AF.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_AF.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Cappuccino.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_Cappuccino.ico
index 5315c448b9..5315c448b9 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Cappuccino.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_Cappuccino.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_FaithPack.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_FaithPack.ico
index d48e503146..d48e503146 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_FaithPack.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_FaithPack.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_FinalPack.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_FinalPack.ico
index 623b36bd2c..623b36bd2c 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_FinalPack.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_FinalPack.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_KDL.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_KDL.ico
index 3a5ab2cccc..3a5ab2cccc 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_KDL.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_KDL.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Kolich.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_Kolich.ico
index 1d162609bd..1d162609bd 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Kolich.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_Kolich.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Lestat.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_Lestat.ico
index 1729afaca4..1729afaca4 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Lestat.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_Lestat.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_LexSys.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_LexSys.ico
index a4961f7068..a4961f7068 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_LexSys.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_LexSys.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Miranda_FR.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_Miranda_FR.ico
index 0538eda5e2..0538eda5e2 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Miranda_FR.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_Miranda_FR.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Miranda_ME.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_Miranda_ME.ico
index f27ff09aac..f27ff09aac 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Miranda_ME.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_Miranda_ME.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_New_Style.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_New_Style.ico
index b8eb75780c..b8eb75780c 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_New_Style.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_New_Style.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_RobyerPack.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_RobyerPack.ico
index 36af5b7c62..36af5b7c62 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_RobyerPack.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_RobyerPack.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_SSS.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_SSS.ico
index 38977ec991..38977ec991 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_SSS.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_SSS.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Se7ven.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_Se7ven.ico
index 99c61310dc..99c61310dc 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Se7ven.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_Se7ven.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Stalker.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_Stalker.ico
index 7f8df879c3..7f8df879c3 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Stalker.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_Stalker.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_ValeraVi.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_ValeraVi.ico
index b071fd1bb3..b071fd1bb3 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_ValeraVi.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_ValeraVi.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Yaol.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_Yaol.ico
index a15bbc9c2c..a15bbc9c2c 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_Yaol.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_Yaol.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_a0x.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_a0x.ico
index 0476116d4c..0476116d4c 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_a0x.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_a0x.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_alfamar.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_alfamar.ico
index 6868b75be1..6868b75be1 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_alfamar.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_alfamar.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_amatory.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_amatory.ico
index b9bd78be98..b9bd78be98 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_amatory.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_amatory.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_bri.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_bri.ico
index 8656b71eea..8656b71eea 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_bri.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_bri.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_dar_veter.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_dar_veter.ico
index d03aecb08b..d03aecb08b 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_dar_veter.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_dar_veter.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_dmikos.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_dmikos.ico
index 0a14a89067..0a14a89067 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_dmikos.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_dmikos.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_e33.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_e33.ico
index 21cc19d2db..21cc19d2db 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_e33.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_e33.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_freize.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_freize.ico
index 24e9b83719..24e9b83719 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_freize.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_freize.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_ghost.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_ghost.ico
index 061a2b3404..061a2b3404 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_ghost.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_ghost.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_hieros.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_hieros.ico
index ee8d06c00f..ee8d06c00f 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_hieros.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_hieros.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_induction.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_induction.ico
index 20cd3df39a..20cd3df39a 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_induction.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_induction.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_kuzzman.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_kuzzman.ico
index 1ad9007031..1ad9007031 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_kuzzman.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_kuzzman.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_leninpack.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_leninpack.ico
index 732f3c9500..732f3c9500 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_leninpack.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_leninpack.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_mataes.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_mataes.ico
index 7d763bc194..7d763bc194 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_mataes.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_mataes.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_md.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_md.ico
index 3b2fc33f93..3b2fc33f93 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_md.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_md.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_native.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_native.ico
index bb1c83a217..bb1c83a217 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_native.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_native.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_pilot.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_pilot.ico
index e354089be0..e354089be0 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_pilot.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_pilot.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_razunter.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_razunter.ico
index 6b084129ce..6b084129ce 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_razunter.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_razunter.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_tweety.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_tweety.ico
index 2ca9ab26bb..2ca9ab26bb 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_tweety.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_tweety.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_umedon.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_umedon.ico
index aee0a17baf..aee0a17baf 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_umedon.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_umedon.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_watcher.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_watcher.ico
index 259965bd36..259965bd36 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_watcher.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_watcher.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_xSpellhowleRx.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_xSpellhowleRx.ico
index a52c4ea4cc..a52c4ea4cc 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_xSpellhowleRx.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_xSpellhowleRx.ico
diff --git a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_zeleboba.ico b/plugins/FingerprintNG/icons/packs/overlay_pack_zeleboba.ico
index ff63ac35e3..ff63ac35e3 100644
--- a/plugins/FingerprintNG/icons/overlays/packs/overlay_pack_zeleboba.ico
+++ b/plugins/FingerprintNG/icons/packs/overlay_pack_zeleboba.ico
diff --git a/plugins/FingerprintNG/res/icons_AIM.rc b/plugins/FingerprintNG/res/icons_AIM.rc
index 973ceb25b8..834ae32573 100644
--- a/plugins/FingerprintNG/res/icons_AIM.rc
+++ b/plugins/FingerprintNG/res/icons_AIM.rc
@@ -42,8 +42,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################# AIM ########################################################
 //##############################################################################################################
-   IDI_AIM_4               ICON    "..\\icons\\AIM\\AIM_4.x.ico"
-   IDI_AIM_5               ICON    "..\\icons\\AIM\\AIM_5.x.ico"
    IDI_AIM_6               ICON    "..\\icons\\AIM\\AIM_6.x.ico"
    IDI_AIM_7               ICON    "..\\icons\\AIM\\AIM_7.x.ico"
    IDI_AIM_MAC             ICON    "..\\icons\\AIM\\AIM_Mac.ico"
diff --git a/plugins/FingerprintNG/res/icons_Gadu.rc b/plugins/FingerprintNG/res/icons_GG.rc
index 1477fa98ac..6c90de5c9c 100644
--- a/plugins/FingerprintNG/res/icons_Gadu.rc
+++ b/plugins/FingerprintNG/res/icons_GG.rc
@@ -42,8 +42,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //########################################### Gadu-Gadu ########################################################
 //##############################################################################################################
-   IDI_GADU_GADU_6                ICON    "..\\icons\\Gadu-Gadu\\Gadu_Gadu_6.ico"
-   IDI_GADU_GADU_7                ICON    "..\\icons\\Gadu-Gadu\\Gadu_Gadu_7.ico"
+   IDI_GG				ICON	"..\\icons\\GG\\Gadu-Gadu.ico"
+
+   IDI_GG8_OVERLAY		ICON	"..\\icons\\GG\\overlay_GG_v8.ico"
+   IDI_GG9_OVERLAY		ICON	"..\\icons\\GG\\overlay_GG_v9.ico"
+   IDI_GG10_OVERLAY		ICON	"..\\icons\\GG\\overlay_GG_v10.ico"
+   IDI_GG11_OVERLAY		ICON	"..\\icons\\GG\\overlay_GG_v11.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerprintNG/res/icons_ICQ.rc b/plugins/FingerprintNG/res/icons_ICQ.rc
index 27b3b9091a..9c4c91ca31 100644
--- a/plugins/FingerprintNG/res/icons_ICQ.rc
+++ b/plugins/FingerprintNG/res/icons_ICQ.rc
@@ -59,14 +59,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //############################################# Official ICQ clients ###########################################
 //##############################################################################################################
-	IDI_ICQ                 ICON    "..\\icons\\ICQ\\official\\ICQ.ico" 
+	IDI_ICQ                 ICON    "..\\icons\\ICQ\\ICQ.ico" 
 
 //##############################################################################################################
 //################################# ICQ overlays ###############################################################
 //##############################################################################################################
-   IDI_ICQ6_OVERLAY          ICON    "..\\icons\\ICQ\\official\\overlay_ICQ_v6.ico"
-   IDI_ICQ7_OVERLAY          ICON    "..\\icons\\ICQ\\official\\overlay_ICQ_v7.ico"
-   IDI_ICQ8_OVERLAY          ICON    "..\\icons\\ICQ\\official\\overlay_ICQ_v8.ico"
+   IDI_ICQ6_OVERLAY          ICON    "..\\icons\\ICQ\\overlay_ICQ_v6.ico"
+   IDI_ICQ7_OVERLAY          ICON    "..\\icons\\ICQ\\overlay_ICQ_v7.ico"
+   IDI_ICQ8_OVERLAY          ICON    "..\\icons\\ICQ\\overlay_ICQ_v8.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/FingerprintNG/res/icons_IRC.rc b/plugins/FingerprintNG/res/icons_IRC.rc
index 442c24a73b..b8e30f7be3 100644
--- a/plugins/FingerprintNG/res/icons_IRC.rc
+++ b/plugins/FingerprintNG/res/icons_IRC.rc
@@ -62,9 +62,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
    IDI_GOPOWERTOOLS        ICON    "..\\icons\\IRC\\GoPowerTools.ico"
    IDI_HYDRA_IRC           ICON    "..\\icons\\IRC\\HydraIRC.ico"
    IDI_ICECHAT             ICON    "..\\icons\\IRC\\IceChat.ico"
-//   IDI_ICECHAT5            ICON    "..\\icons\\IRC\\IceChat 5.ico"
-//   IDI_ICECHAT7            ICON    "..\\icons\\IRC\\IceChat 7.ico"
-   IDI_IRC_UNKNOWN         ICON    "..\\icons\\IRC\\IRC_Unknown.ico"
+   IDI_IRC					ICON    "..\\icons\\IRC\\IRC.ico"
    IDI_IRCLE               ICON    "..\\icons\\IRC\\ircle.ico"
    IDI_IRCXPRO             ICON    "..\\icons\\IRC\\IRCXPro.ico"
    IDI_JIRCII              ICON    "..\\icons\\IRC\\jircii.ico"
@@ -101,9 +99,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
    IDI_XCHAT               ICON    "..\\icons\\IRC\\xChat.ico"
    IDI_XIRC                ICON    "..\\icons\\IRC\\Xirc.ico"
    IDI_XIRCON              ICON    "..\\icons\\IRC\\XIRCON.ico"
-   IDI_ZIPTORRENT          ICON    "..\\icons\\IRC\\ZipTorrent.ico"
    IDI_ZSIRC               ICON    "..\\icons\\IRC\\zsIRC.ico"
-	IDI_POCKET_IRC               ICON    "..\\icons\\IRC\\Pocket IRC.ico"
+   IDI_POCKET_IRC		   ICON    "..\\icons\\IRC\\Pocket IRC.ico"
    
    
 /////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/FingerprintNG/res/icons_Jabber.rc b/plugins/FingerprintNG/res/icons_Jabber.rc
index f789a831a0..f37b450988 100644
--- a/plugins/FingerprintNG/res/icons_Jabber.rc
+++ b/plugins/FingerprintNG/res/icons_Jabber.rc
@@ -92,7 +92,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 	IDI_GLU                 ICON    "..\\icons\\Jabber\\glu.ico"
 	IDI_GMAIL               ICON    "..\\icons\\Jabber\\GMail.ico"
 	IDI_GNOME               ICON    "..\\icons\\Jabber\\Gnome.ico"
-	IDI_GNUGADU             ICON    "..\\icons\\Jabber\\GNU_Gadu.ico"
 	IDI_GOIM                ICON    "..\\icons\\Jabber\\GOIM.ico"
 	IDI_GOSSIP              ICON    "..\\icons\\Jabber\\Gossip.ico"
 	IDI_GOTALKMOBILE        ICON    "..\\icons\\Jabber\\GoTalkMobile.ico"
@@ -115,7 +114,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 	IDI_J2J_TRANSPORT 		ICON	"..\\icons\\Jabber\\J2J Transport.ico"
 	IDI_JABBA 				ICON	"..\\icons\\Jabber\\Jabba.ico"
 	IDI_JABBER 				ICON	"..\\icons\\Jabber\\Jabber client.ico"
-	IDI_JABBERDISK 			ICON	"..\\icons\\Jabber\\jabberDisk.ico"
 	IDI_JABBERFOX           ICON    "..\\icons\\Jabber\\JabberFoX.ico"
 	IDI_JABBERNAUT          ICON    "..\\icons\\Jabber\\JabberNaut.ico"
 	IDI_JABBERWOCKY         ICON    "..\\icons\\Jabber\\JabberWocky.ico"
@@ -181,13 +179,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 	IDI_PSIPLUS 			ICON	"..\\icons\\Jabber\\PSI+.ico"
 	IDI_PSTO                ICON    "..\\icons\\Jabber\\Psto.net.ico"
 	IDI_PSYC 				ICON	"..\\icons\\Jabber\\Psyc.ico"
-	IDI_PYAIMT              ICON    "..\\icons\\Jabber\\PyAIMt.ico"
 	IDI_PYGEON 				ICON	"..\\icons\\Jabber\\Pygeon.ico"
-	IDI_PYICQT              ICON    "..\\icons\\Jabber\\PyICQt.ico"
-	IDI_PYIRCT              ICON    "..\\icons\\Jabber\\PyIRCt.ico"
-	IDI_PYMRAT              ICON    "..\\icons\\Jabber\\PyMRAt.ico"
-	IDI_PYMSNT              ICON    "..\\icons\\Jabber\\PyMSNt.ico"
-	IDI_PYYAHOOT            ICON    "..\\icons\\Jabber\\PyYIMt.ico"
 	IDI_QTJIM               ICON    "..\\icons\\Jabber\\QTJim.ico"
 	IDI_QUTECOM 			ICON	"..\\icons\\Jabber\\QuteCom.ico"
 	IDI_RENREN	            ICON    "..\\icons\\Jabber\\RenRen.ico"
diff --git a/plugins/FingerprintNG/res/icons_Packs.rc b/plugins/FingerprintNG/res/icons_Packs.rc
index c195e3a1cc..cea4a70596 100644
--- a/plugins/FingerprintNG/res/icons_Packs.rc
+++ b/plugins/FingerprintNG/res/icons_Packs.rc
@@ -44,49 +44,49 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 
 //##############################################################################################################
-//############################################## MirandaIM Packs ###############################################
+//############################################## Miranda packs #################################################
 //##############################################################################################################
-   IDI_MIRANDA_A0X         ICON    "..\\icons\\overlays\\packs\\overlay_pack_a0x.ico"
-   IDI_MIRANDA_AF          ICON    "..\\icons\\overlays\\packs\\overlay_pack_AF.ico"
-   IDI_MIRANDA_ALFAMAR     ICON    "..\\icons\\overlays\\packs\\overlay_pack_alfamar.ico"
-   IDI_MIRANDA_AMATORY     ICON    "..\\icons\\overlays\\packs\\overlay_pack_amatory.ico"
-   IDI_MIRANDA_BRI         ICON    "..\\icons\\overlays\\packs\\overlay_pack_bri.ico"
-   IDI_MIRANDA_CAPPUCCINO  ICON    "..\\icons\\overlays\\packs\\overlay_pack_Cappuccino.ico"
-   IDI_MIRANDA_DAR         ICON    "..\\icons\\overlays\\packs\\overlay_pack_dar_veter.ico"
-   IDI_MIRANDA_DEVIL       ICON    "..\\icons\\overlays\\packs\\overlay_pack_666.ico"
-   IDI_MIRANDA_DMIKOS      ICON    "..\\icons\\overlays\\packs\\overlay_pack_Dmikos.ico"
-   IDI_MIRANDA_E33         ICON    "..\\icons\\overlays\\packs\\overlay_pack_e33.ico"
-   IDI_MIRANDA_FAITH       ICON    "..\\icons\\overlays\\packs\\overlay_pack_FaithPack.ico"
-   IDI_MIRANDA_FINAL       ICON    "..\\icons\\overlays\\packs\\overlay_pack_FinalPack.ico"
-   IDI_MIRANDA_FR          ICON    "..\\icons\\overlays\\packs\\overlay_pack_Miranda_FR.ico"
-   IDI_MIRANDA_FREIZE      ICON    "..\\icons\\overlays\\packs\\overlay_pack_freize.ico"
-   IDI_MIRANDA_GHOST       ICON    "..\\icons\\overlays\\packs\\overlay_pack_ghost.ico"
-   IDI_MIRANDA_HIEROS      ICON    "..\\icons\\overlays\\packs\\overlay_pack_hieros.ico"
-   IDI_MIRANDA_INDUCTION   ICON    "..\\icons\\overlays\\packs\\overlay_pack_induction.ico"
-   IDI_MIRANDA_KDL         ICON    "..\\icons\\overlays\\packs\\overlay_pack_KDL.ico"
-   IDI_MIRANDA_KOLICH      ICON    "..\\icons\\overlays\\packs\\overlay_pack_Kolich.ico"
-   IDI_MIRANDA_KUZZMAN     ICON    "..\\icons\\overlays\\packs\\overlay_pack_Kuzzman.ico"
-   IDI_MIRANDA_LENINPACK   ICON    "..\\icons\\overlays\\packs\\overlay_pack_LeninPack.ico"
-   IDI_MIRANDA_LESTAT      ICON    "..\\icons\\overlays\\packs\\overlay_pack_Lestat.ico"
-   IDI_MIRANDA_LEXSYS      ICON    "..\\icons\\overlays\\packs\\overlay_pack_LexSys.ico"
-   IDI_MIRANDA_MATAES      ICON    "..\\icons\\overlays\\packs\\overlay_pack_mataes.ico"
-   IDI_MIRANDA_MD          ICON    "..\\icons\\overlays\\packs\\overlay_pack_md.ico"
-   IDI_MIRANDA_ME          ICON    "..\\icons\\overlays\\packs\\overlay_pack_Miranda_ME.ico"
-   IDI_MIRANDA_NATIVE      ICON    "..\\icons\\overlays\\packs\\overlay_pack_native.ico"
-   IDI_MIRANDA_NEW_STYLE   ICON    "..\\icons\\overlays\\packs\\overlay_pack_New_Style.ico"
-   IDI_MIRANDA_PILOT       ICON    "..\\icons\\overlays\\packs\\overlay_pack_pilot.ico"
-   IDI_MIRANDA_RAZUNTER    ICON    "..\\icons\\overlays\\packs\\overlay_pack_razunter.ico"
-   IDI_MIRANDA_ROBYER      ICON    "..\\icons\\overlays\\packs\\overlay_pack_RobyerPack.ico"
-   IDI_MIRANDA_SE7VEN      ICON    "..\\icons\\overlays\\packs\\overlay_pack_Se7ven.ico"
-   IDI_MIRANDA_SPELLHOWLER ICON    "..\\icons\\overlays\\packs\\overlay_pack_xSpellhowleRx.ico"
-   IDI_MIRANDA_SSS_MOD     ICON    "..\\icons\\overlays\\packs\\overlay_pack_SSS.ico"
-   IDI_MIRANDA_STALKER     ICON    "..\\icons\\overlays\\packs\\overlay_pack_Stalker.ico"
-   IDI_MIRANDA_TWEETY      ICON    "..\\icons\\overlays\\packs\\overlay_pack_Tweety.ico"
-   IDI_MIRANDA_UMEDON      ICON    "..\\icons\\overlays\\packs\\overlay_pack_Umedon.ico"
-   IDI_MIRANDA_VALERAVI    ICON    "..\\icons\\overlays\\packs\\overlay_pack_ValeraVi.ico"
-   IDI_MIRANDA_WATCHER     ICON    "..\\icons\\overlays\\packs\\overlay_pack_watcher.ico"
-   IDI_MIRANDA_YAOL        ICON    "..\\icons\\overlays\\packs\\overlay_pack_Yaol.ico"
-   IDI_MIRANDA_ZELEBOBA    ICON    "..\\icons\\overlays\\packs\\overlay_pack_zeleboba.ico"
+   IDI_MIRANDA_A0X         ICON    "..\\icons\\packs\\overlay_pack_a0x.ico"
+   IDI_MIRANDA_AF          ICON    "..\\icons\\packs\\overlay_pack_AF.ico"
+   IDI_MIRANDA_ALFAMAR     ICON    "..\\icons\\packs\\overlay_pack_alfamar.ico"
+   IDI_MIRANDA_AMATORY     ICON    "..\\icons\\packs\\overlay_pack_amatory.ico"
+   IDI_MIRANDA_BRI         ICON    "..\\icons\\packs\\overlay_pack_bri.ico"
+   IDI_MIRANDA_CAPPUCCINO  ICON    "..\\icons\\packs\\overlay_pack_Cappuccino.ico"
+   IDI_MIRANDA_DAR         ICON    "..\\icons\\packs\\overlay_pack_dar_veter.ico"
+   IDI_MIRANDA_DEVIL       ICON    "..\\icons\\packs\\overlay_pack_666.ico"
+   IDI_MIRANDA_DMIKOS      ICON    "..\\icons\\packs\\overlay_pack_Dmikos.ico"
+   IDI_MIRANDA_E33         ICON    "..\\icons\\packs\\overlay_pack_e33.ico"
+   IDI_MIRANDA_FAITH       ICON    "..\\icons\\packs\\overlay_pack_FaithPack.ico"
+   IDI_MIRANDA_FINAL       ICON    "..\\icons\\packs\\overlay_pack_FinalPack.ico"
+   IDI_MIRANDA_FR          ICON    "..\\icons\\packs\\overlay_pack_Miranda_FR.ico"
+   IDI_MIRANDA_FREIZE      ICON    "..\\icons\\packs\\overlay_pack_freize.ico"
+   IDI_MIRANDA_GHOST       ICON    "..\\icons\\packs\\overlay_pack_ghost.ico"
+   IDI_MIRANDA_HIEROS      ICON    "..\\icons\\packs\\overlay_pack_hieros.ico"
+   IDI_MIRANDA_INDUCTION   ICON    "..\\icons\\packs\\overlay_pack_induction.ico"
+   IDI_MIRANDA_KDL         ICON    "..\\icons\\packs\\overlay_pack_KDL.ico"
+   IDI_MIRANDA_KOLICH      ICON    "..\\icons\\packs\\overlay_pack_Kolich.ico"
+   IDI_MIRANDA_KUZZMAN     ICON    "..\\icons\\packs\\overlay_pack_Kuzzman.ico"
+   IDI_MIRANDA_LENINPACK   ICON    "..\\icons\\packs\\overlay_pack_LeninPack.ico"
+   IDI_MIRANDA_LESTAT      ICON    "..\\icons\\packs\\overlay_pack_Lestat.ico"
+   IDI_MIRANDA_LEXSYS      ICON    "..\\icons\\packs\\overlay_pack_LexSys.ico"
+   IDI_MIRANDA_MATAES      ICON    "..\\icons\\packs\\overlay_pack_mataes.ico"
+   IDI_MIRANDA_MD          ICON    "..\\icons\\packs\\overlay_pack_md.ico"
+   IDI_MIRANDA_ME          ICON    "..\\icons\\packs\\overlay_pack_Miranda_ME.ico"
+   IDI_MIRANDA_NATIVE      ICON    "..\\icons\\packs\\overlay_pack_native.ico"
+   IDI_MIRANDA_NEW_STYLE   ICON    "..\\icons\\packs\\overlay_pack_New_Style.ico"
+   IDI_MIRANDA_PILOT       ICON    "..\\icons\\packs\\overlay_pack_pilot.ico"
+   IDI_MIRANDA_RAZUNTER    ICON    "..\\icons\\packs\\overlay_pack_razunter.ico"
+   IDI_MIRANDA_ROBYER      ICON    "..\\icons\\packs\\overlay_pack_RobyerPack.ico"
+   IDI_MIRANDA_SE7VEN      ICON    "..\\icons\\packs\\overlay_pack_Se7ven.ico"
+   IDI_MIRANDA_SPELLHOWLER ICON    "..\\icons\\packs\\overlay_pack_xSpellhowleRx.ico"
+   IDI_MIRANDA_SSS_MOD     ICON    "..\\icons\\packs\\overlay_pack_SSS.ico"
+   IDI_MIRANDA_STALKER     ICON    "..\\icons\\packs\\overlay_pack_Stalker.ico"
+   IDI_MIRANDA_TWEETY      ICON    "..\\icons\\packs\\overlay_pack_Tweety.ico"
+   IDI_MIRANDA_UMEDON      ICON    "..\\icons\\packs\\overlay_pack_Umedon.ico"
+   IDI_MIRANDA_VALERAVI    ICON    "..\\icons\\packs\\overlay_pack_ValeraVi.ico"
+   IDI_MIRANDA_WATCHER     ICON    "..\\icons\\packs\\overlay_pack_watcher.ico"
+   IDI_MIRANDA_YAOL        ICON    "..\\icons\\packs\\overlay_pack_Yaol.ico"
+   IDI_MIRANDA_ZELEBOBA    ICON    "..\\icons\\packs\\overlay_pack_zeleboba.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerprintNG/res/icons_QQ.rc b/plugins/FingerprintNG/res/icons_QQ.rc
index 4565d3d246..348b2c379b 100644
--- a/plugins/FingerprintNG/res/icons_QQ.rc
+++ b/plugins/FingerprintNG/res/icons_QQ.rc
@@ -42,32 +42,33 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //############################################QQ###############################################################
 //##############################################################################################################
-   IDI_MOBILEQQ			  ICON    "..\\icons\\QQ\\Mobile QQ.ico"
    IDI_QQ				  ICON    "..\\icons\\QQ\\QQ.ico"
    IDI_QQCONCEPT		  ICON    "..\\icons\\QQ\\QQ Concept.ico"
    IDI_QQCRM			  ICON    "..\\icons\\QQ\\QQ CRM.ico"
    IDI_QQINT			  ICON    "..\\icons\\QQ\\QQ International.ico"
    IDI_QQSILVER			  ICON    "..\\icons\\QQ\\QQ Silverlight.ico"
-   IDI_TM				  ICON    "..\\icons\\QQ\\TM.ico"
-   IDI_TM2008			  ICON    "..\\icons\\QQ\\TM 2008.ico"
+   IDI_MOBILEQQ			  ICON    "..\\icons\\QQ\\Mobile QQ.ico"
    IDI_WEBQQ			  ICON    "..\\icons\\QQ\\WebQQ.ico"
    IDI_YAMQQ			  ICON    "..\\icons\\QQ\\Yam QQ.ico"
+   IDI_TM				  ICON    "..\\icons\\QQ\\TM.ico"
+   IDI_TM2008			  ICON    "..\\icons\\QQ\\TM 2008.ico"
 
 //##############################################################################################################
 //########################################### QQ overlays ######################################################
 //##############################################################################################################
-   IDI_CLIENT_QQ2000              ICON    "..\\icons\\QQ\\QQ 2000.ico"
-   IDI_CLIENT_QQ2004	          ICON    "..\\icons\\QQ\\QQ 2004.ico"
-   IDI_CLIENT_TM1				  ICON    "..\\icons\\QQ\\TM 1.ico"
-   IDI_CLIENT_TM2				  ICON    "..\\icons\\QQ\\TM 2.ico"
-   IDI_CLIENT_TM_QQ2003           ICON    "..\\icons\\QQ\\TM 3 QQ 2003.ico"
-   IDI_CLIENT_TM_QQ2005           ICON    "..\\icons\\QQ\\TM QQ 2005.ico"
-   IDI_CLIENT_TM_QQ2006           ICON    "..\\icons\\QQ\\TM QQ 2006.ico"
-   IDI_CLIENT_TM_QQ2007           ICON    "..\\icons\\QQ\\TM QQ 2007.ico"
-   IDI_CLIENT_TM_QQ2008           ICON    "..\\icons\\QQ\\TM QQ 2008.ico"
-   IDI_CLIENT_TM_QQ2009           ICON    "..\\icons\\QQ\\TM QQ 2009.ico"
-   IDI_CLIENT_TM_QQ2010           ICON    "..\\icons\\QQ\\TM QQ 2010.ico"
-   IDI_CLIENT_TM_QQ2011           ICON    "..\\icons\\QQ\\TM QQ 2011.ico"
+   IDI_QQ_2000_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2000.ico"
+   IDI_QQ_2001_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2001.ico"
+   IDI_QQ_2002_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2002.ico"
+   IDI_QQ_2003_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2003.ico"
+   IDI_QQ_2004_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2004.ico"
+   IDI_QQ_2005_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2005.ico"
+   IDI_QQ_2006_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2006.ico"
+   IDI_QQ_2007_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2007.ico"
+   IDI_QQ_2008_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2008.ico"
+   IDI_QQ_2009_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2009.ico"
+   IDI_QQ_2010_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2010.ico"
+   IDI_QQ_2011_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2011.ico"
+   IDI_QQ_2012_OVERLAY		ICON    "..\\icons\\QQ\\overlay_QQ_2012.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerprintNG/res/icons_Tlen.rc b/plugins/FingerprintNG/res/icons_Tlen.rc
index 27724f2586..cf7daa4879 100644
--- a/plugins/FingerprintNG/res/icons_Tlen.rc
+++ b/plugins/FingerprintNG/res/icons_Tlen.rc
@@ -47,9 +47,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //########################################### Tlen overlays ####################################################
 //##############################################################################################################
-   IDI_CLIENT_TLEN5        ICON    "..\\icons\\Tlen\\Tlen 5.ico"
-   IDI_CLIENT_TLEN6        ICON    "..\\icons\\Tlen\\Tlen 6.ico"
-   IDI_CLIENT_TLEN7        ICON    "..\\icons\\Tlen\\Tlen 7.ico"
+   IDI_TLEN5_OVERLAY        ICON    "..\\icons\\Tlen\\overlay_Tlen_v5.ico"
+   IDI_TLEN6_OVERLAY        ICON    "..\\icons\\Tlen\\overlay_Tlen_v6.ico"
+   IDI_TLEN7_OVERLAY        ICON    "..\\icons\\Tlen\\overlay_Tlen_v7.ico"
+   IDI_TLEN8_OVERLAY        ICON    "..\\icons\\Tlen\\overlay_Tlen_v8.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerprintNG/res/icons_Yahoo.rc b/plugins/FingerprintNG/res/icons_Yahoo.rc
index 60d4e326c2..bd90e8b669 100644
--- a/plugins/FingerprintNG/res/icons_Yahoo.rc
+++ b/plugins/FingerprintNG/res/icons_Yahoo.rc
@@ -42,14 +42,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################ Yahoo #######################################################
 //##############################################################################################################
-   IDI_LIBYAHOO2           ICON    "..\\icons\\Yahoo\\libyahoo2.ico"
-   IDI_PINGBOX	           ICON    "..\\icons\\Yahoo\\PingBox.ico"
    IDI_YAHOO               ICON    "..\\icons\\Yahoo\\Yahoo.ico"
-   IDI_YAHOO5              ICON    "..\\icons\\Yahoo\\Yahoo 5.ico"
-   IDI_YAHOO6              ICON    "..\\icons\\Yahoo\\Yahoo 6.ico"
-   IDI_YAHOO7              ICON    "..\\icons\\Yahoo\\Yahoo 7.ico"
-   IDI_YAHOO8              ICON    "..\\icons\\Yahoo\\Yahoo 8.ico"
-   IDI_YAHOO10             ICON    "..\\icons\\Yahoo\\Yahoo 10.ico"
+   IDI_LIBYAHOO2           ICON    "..\\icons\\Yahoo\\libyahoo2.ico"
+   IDI_YAHOO_PINGBOX	   ICON    "..\\icons\\Yahoo\\Yahoo PingBox.ico"
+   IDI_YAHOO_WEB           ICON    "..\\icons\\Yahoo\\Yahoo Web.ico"
    IDI_YAHOO_GO_MOBILE     ICON    "..\\icons\\Yahoo\\Yahoo Go Mobile.ico"
 
 //##############################################################################################################
@@ -59,12 +55,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################# Yahoo overlays #############################################################
 //##############################################################################################################
-   IDI_CLIENT_YAHOO5       ICON    "..\\icons\\Yahoo\\Yahoo_5.ico"
-   IDI_CLIENT_YAHOO6       ICON    "..\\icons\\Yahoo\\Yahoo_6.ico"
-   IDI_CLIENT_YAHOO7       ICON    "..\\icons\\Yahoo\\Yahoo_7.ico"
-   IDI_CLIENT_YAHOO8       ICON    "..\\icons\\Yahoo\\Yahoo_8.ico"
-   IDI_CLIENT_YAHOO9       ICON    "..\\icons\\Yahoo\\Yahoo_9.ico"
-   IDI_CLIENT_YAHOO10      ICON    "..\\icons\\Yahoo\\Yahoo_10.ico"
+   IDI_YAHOO9_OVERLAY		ICON    "..\\icons\\Yahoo\\overlay_Yahoo_v9.ico"
+   IDI_YAHOO10_OVERLAY		ICON    "..\\icons\\Yahoo\\overlay_Yahoo_v10.ico"
+   IDI_YAHOO11_OVERLAY		ICON    "..\\icons\\Yahoo\\overlay_Yahoo_v11.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerprintNG/res/icons_multiproto.rc b/plugins/FingerprintNG/res/icons_multiproto.rc
index 768b1efc9d..51c98a7d2e 100644
--- a/plugins/FingerprintNG/res/icons_multiproto.rc
+++ b/plugins/FingerprintNG/res/icons_multiproto.rc
@@ -78,6 +78,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 	IDI_GAIM                ICON    "..\\icons\\multi-protocol\\GAIM.ico"
 	IDI_GALAXIUM        	ICON	"..\\icons\\multi-protocol\\Galaxium.ico"
 	IDI_GMX             	ICON	"..\\icons\\multi-protocol\\GMX MultiMessenger.ico"
+	IDI_GNUGADU             ICON    "..\\icons\\multi-protocol\\GNU_Gadu.ico"
 	IDI_ICALL           	ICON	"..\\icons\\multi-protocol\\iCall.ico"
 	IDI_ICHAT               ICON    "..\\icons\\multi-protocol\\iChat.ico"
 	IDI_IM2             	ICON	"..\\icons\\multi-protocol\\IM2.ico"
diff --git a/plugins/FingerprintNG/res/icons_overlays.rc b/plugins/FingerprintNG/res/icons_overlays.rc
index 1927702792..8f72b2b925 100644
--- a/plugins/FingerprintNG/res/icons_overlays.rc
+++ b/plugins/FingerprintNG/res/icons_overlays.rc
@@ -42,8 +42,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //##################################### Miranda client overlays ################################################
 //##############################################################################################################
-
-	IDI_AIMOSCAR_OVERLAY			ICON	"..\\icons\\overlays\\overlay_proto_AIM.ico"
+	IDI_AIM_OVERLAY					ICON	"..\\icons\\overlays\\overlay_proto_AIM.ico"
 	IDI_GMAIL_OVERLAY				ICON	"..\\icons\\overlays\\overlay_proto_Gmail.ico"
 	IDI_ICQJ_OVERLAY				ICON	"..\\icons\\overlays\\overlay_proto_ICQJ.ico"
 	IDI_ICQJ_PLUS_OVERLAY			ICON	"..\\icons\\overlays\\overlay_proto_ICQJ_Plus.ico"
@@ -70,13 +69,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //########################################### Secure overlays ##################################################
 //##############################################################################################################
 	IDI_SECUREIM_OVERLAY			ICON	"..\\icons\\overlays\\overlay_secure_SecureIM.ico"
-	IDI_IMSECURE_OVERLAY			ICON	"..\\icons\\overlays\\overlay_secure_IMsecure.ico"
-	IDI_SIMPLITE_OVERLAY			ICON	"..\\icons\\overlays\\overlay_secure_SimpLite.ico"
-	IDI_SIMPPRO_OVERLAY				ICON	"..\\icons\\overlays\\overlay_secure_SimpPro.ico"
 
 //##############################################################################################################
 //############################## PLATFORM OVERLAYS #############################################################
 //##############################################################################################################
+	IDI_PLATFORM_AMIGA				ICON	"..\\icons\\overlays\\overlay_platform_Amiga.ico"
 	IDI_PLATFORM_ANDROID			ICON	"..\\icons\\overlays\\overlay_platform_Android.ico"
 	IDI_PLATFORM_FLASH				ICON	"..\\icons\\overlays\\overlay_platform_Flash.ico"
 	IDI_PLATFORM_MAC				ICON	"..\\icons\\overlays\\overlay_platform_iMac.ico"
@@ -96,7 +93,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 	
 //##############################################################################################################
 
-	IDI_CLIENT_UNICODE				ICON	"..\\icons\\overlays\\overlay_Unicode.ico"
+	IDI_UNICODE_CLIENT				ICON	"..\\icons\\overlays\\overlay_Unicode.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerprintNG/res/icons_overlays_alt.rc b/plugins/FingerprintNG/res/icons_overlays_alt.rc
deleted file mode 100644
index 62329e0bb4..0000000000
--- a/plugins/FingerprintNG/res/icons_overlays_alt.rc
+++ /dev/null
@@ -1,125 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "..\src\resource.h"
-
-//
-// Generated from the TEXTINCLUDE 2 resource.
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-#include "afxres.h"
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#endif	// Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-//##################################################################################################################
-//##################################### Miranda client overlays _alt################################################
-//##################################################################################################################
-
-	IDI_AIMOSCAR_OVERLAY			ICON	"..\\icons\\overlays_alt\\overlay_proto_AIM.ico"
-	IDI_GMAIL_OVERLAY				ICON	"..\\icons\\overlays_alt\\overlay_proto_Gmail.ico"
-	IDI_ICQJ_OVERLAY				ICON	"..\\icons\\overlays_alt\\overlay_proto_ICQJ.ico"
-	IDI_ICQJ_PLUS_OVERLAY			ICON	"..\\icons\\overlays_alt\\overlay_proto_ICQJ_Plus.ico"
-	IDI_IRC_OVERLAY					ICON	"..\\icons\\overlays_alt\\overlay_proto_IRC.ico"
-	IDI_JABBER_OVERLAY				ICON	"..\\icons\\overlays_alt\\overlay_proto_Jabber.ico"
-	IDI_JGTALK_OVERLAY				ICON	"..\\icons\\overlays_alt\\overlay_proto_JGTalk.ico"
-	IDI_MAILRU_OVERLAY				ICON	"..\\icons\\overlays_alt\\overlay_proto_MailRu.ico"
-	IDI_MSN_OVERLAY					ICON	"..\\icons\\overlays_alt\\overlay_proto_MSN.ico"
-	IDI_QQ_OVERLAY					ICON	"..\\icons\\overlays_alt\\overlay_proto_QQ.ico"
-	IDI_TLEN_OVERLAY				ICON	"..\\icons\\overlays_alt\\overlay_proto_Tlen.ico"
-	IDI_YAHOO_OVERLAY				ICON	"..\\icons\\overlays_alt\\overlay_proto_Yahoo.ico"
-
-//##################################################################################################################
-//######################################### Platform overlays ######################################################
-//##################################################################################################################
-	IDI_DEBUG_OVERLAY				ICON    "..\\icons\\overlays_alt\\overlay_resource_debug.ico"
-	IDI_HOME_OVERLAY				ICON    "..\\icons\\overlays_alt\\overlay_resource_home.ico"
-	IDI_MOBILE_OVERLAY				ICON    "..\\icons\\overlays_alt\\overlay_resource_mobile.ico"
-	IDI_NOTEBOOK_OVERLAY			ICON    "..\\icons\\overlays_alt\\overlay_resource_notebook.ico"
-	IDI_OFFICE_OVERLAY				ICON    "..\\icons\\overlays_alt\\overlay_resource_office.ico"
-	IDI_WORK_OVERLAY				ICON    "..\\icons\\overlays_alt\\overlay_resource_work.ico"
-
-//##################################################################################################################
-//########################################### Secure overlays ######################################################
-//##################################################################################################################
-	IDI_SECUREIM_OVERLAY			ICON	"..\\icons\\overlays_alt\\overlay_secure_SecureIM.ico"
-	IDI_IMSECURE_OVERLAY			ICON	"..\\icons\\overlays_alt\\overlay_secure_IMsecure.ico"
-	IDI_SIMPLITE_OVERLAY			ICON	"..\\icons\\overlays_alt\\overlay_secure_SimpLite.ico"
-	IDI_SIMPPRO_OVERLAY				ICON	"..\\icons\\overlays_alt\\overlay_secure_SimpPro.ico"
-
-//##################################################################################################################
-//############################## PLATFORM OVERLAYS #################################################################
-//##################################################################################################################
-	IDI_PLATFORM_ANDROID			ICON	"..\\icons\\overlays_alt\\overlay_platform_Android.ico"
-	IDI_PLATFORM_FLASH				ICON	"..\\icons\\overlays_alt\\overlay_platform_Flash.ico"
-	IDI_PLATFORM_MAC				ICON	"..\\icons\\overlays_alt\\overlay_platform_iMac.ico"
-	IDI_PLATFORM_JAVA				ICON	"..\\icons\\overlays_alt\\overlay_platform_Java.ico "
-	IDI_PLATFORM_LINUX				ICON	"..\\icons\\overlays_alt\\overlay_platform_linux.ico"
-	IDI_PLATFORM_SYMBIAN			ICON	"..\\icons\\overlays_alt\\overlay_platform_Symbian.ico"
-	IDI_PLATFORM_WIN				ICON	"..\\icons\\overlays_alt\\overlay_platform_Windows.ico"
-	IDI_PLATFORM_IOS				ICON	"..\\icons\\overlays_alt\\overlay_platform_iOS.ico"
-
-//##################################################################################################################
-//##################################################################################################################
-//##################################################################################################################
-
-	IDI_PLATFORM_X32				ICON	"..\\icons\\overlays_alt\\overlay_platform_x32.ico"
-	IDI_PLATFORM_X64				ICON	"..\\icons\\overlays_alt\\overlay_platform_x64.ico"
-
-
-//##################################################################################################################
-
-	IDI_CLIENT_UNICODE				ICON	"..\\icons\\overlays_alt\\overlay_Unicode.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-	IDS_IDENTIFY			"# Finger Icons #"
-END
-
-#endif	// English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif	// not APSTUDIO_INVOKED
-
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 6eae43a06f..1f135f56e1 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -102,7 +102,7 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"client_eM_Client",		_T("*eM*Client*"),							_T("eM Client"),						_T("ClientIcons_multiproto"),	IDI_EM_CLIENT,			MULTI_CASE,	TRUE	},
 	{"client_eQo",				_T("*eQo*"),								_T("eQo"),								_T("ClientIcons_multiproto"),	IDI_EQO,				MULTI_CASE,	TRUE	},
 	{"client_emesene",			_T("*emesene*"),							_T("emesene"),							_T("ClientIcons_multiproto"),	IDI_EMESENE,			MULTI_CASE,	TRUE	},
-	{"client_Fama",				_T("*Fama*"),								_T("FamaIM"),							_T("ClientIcons_multiproto"),	IDI_FAMAIM,				MULTI_CASE,	TRUE	},
+	{"client_Fama",				_T("*Fama*"),								_T("Fama IM"),							_T("ClientIcons_multiproto"),	IDI_FAMAIM,				MULTI_CASE,	TRUE	},
 	{"client_Fring",			_T("*fring*"),								_T("Fring"),							_T("ClientIcons_multiproto"),	IDI_FRING,				MULTI_CASE,	TRUE	},
 	{"client_GMX",				_T("*GMX*"),								_T("GMX MultiMessenger"),				_T("ClientIcons_multiproto"),	IDI_GMX,				MULTI_CASE,	TRUE	},
 	{"client_Gaim",				_T("*gaim*"),								_T("Gaim (libgaim)"),					_T("ClientIcons_multiproto"),	IDI_GAIM,				MULTI_CASE,	TRUE	},
@@ -144,7 +144,8 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"client_PlayXpert",		_T("*PlayXpert*"),							_T("PlayXpert"),						_T("ClientIcons_multiproto"),	IDI_PLAYXPERT,			MULTI_CASE,	TRUE	},
 	{"client_Prelude",			_T("*Prelude*"),							_T("Prelude"),							_T("ClientIcons_multiproto"),	IDI_PRELUDE,			MULTI_CASE,	TRUE	},
 	{"client_Proteus",			_T("*Proteus*"),							_T("Proteus"),							_T("ClientIcons_multiproto"),	IDI_PROTEUS,			MULTI_CASE,	TRUE	},
-	{"client_Python",			_T("|Py*t|*Python*"),						_T("Python transport clients"),			_T("ClientIcons_multiproto"),	IDI_PYTHON,				MULTI_CASE	},
+
+	{"client_Python",			_T("|Py*-t*|Py???t*|*Python*"),				_T("Python transport clients"),			_T("ClientIcons_multiproto"),	IDI_PYTHON,				MULTI_CASE	},
 
 	{"client_QIP_Android",		_T("QIP *Android*"),						_T("QIP Mobile Android"),				_T("ClientIcons_multiproto"),	IDI_QIP_ANDROID,		MULTI_CASE,	TRUE	},
 	{"client_QIP_iOS",			_T("|QIP*iOS*|QIP*iphone*|QIP*apple*"),		_T("QIP Mobile iOS"),					_T("ClientIcons_multiproto"),	IDI_QIP_IOS,			MULTI_CASE,	TRUE	},
@@ -209,222 +210,210 @@ KN_FP_MASK def_kn_fp_mask[] =
 //###########################################################################################################################################################################################################
 //#################################		JABBER		#########################################################################################################################################################
 //###########################################################################################################################################################################################################
-	{"client_Akeni",			_T("*Akeni*"),								_T("Akeni"),							_T("ClientIcons_Jabber"),		IDI_AKENI,				JABBER_CASE	},
-	{"client_Ambrosia",			_T("*Ambrosia*"),							_T("Ambrosia XMPP Server"),				_T("ClientIcons_Jabber"),		IDI_AMBROSIA,			JABBER_CASE	},
-	{"client_AnothRSSBot",		_T("|*Anothrbot*|*Anothr Rss Bot*"),		_T("Anothr Rss Bot"),					_T("ClientIcons_Jabber"),		IDI_ANOTHRSSBOT,		JABBER_CASE	},
-	{"client_Aqq",				_T("|http://aqq.eu*|aqq*"),					_T("Aqq"),								_T("ClientIcons_Jabber"),		IDI_AQQ,				JABBER_CASE	},
-	{"client_BarnOwl",			_T("*Barn*Owl*"),							_T("BarnOwl"),							_T("ClientIcons_Jabber"),		IDI_BARNOWL,			JABBER_CASE	},
-	{"client_Beem",				_T("*Beem*"),								_T("Beem"),								_T("ClientIcons_Jabber"),		IDI_BEEM,				JABBER_CASE	},
-	{"client_BellSouth",		_T("*BellSouth*"),							_T("BellSouth"),						_T("ClientIcons_Jabber"),		IDI_BELLSOUTH,			JABBER_CASE	},
-	{"client_BitWise",			_T("*BitWise*"),							_T("BitWise"),							_T("ClientIcons_Jabber"),		IDI_BITWISE,			JABBER_CASE	},
-	{"client_Bombus",			_T("*Bombus*"),								_T("Bombus"),							_T("ClientIcons_Jabber"),		IDI_BOMBUS,				JABBER_CASE	},
-	{"client_BombusMod",		_T("|*Bombus*mod*|*bombusmod*"),			_T("BombusMod"),						_T("ClientIcons_Jabber"),		IDI_BOMBUS_MOD,			JABBER_CASE	},
-	{"client_BombusNG",			_T("*Bombus*NG*"),							_T("Bombus NG"),						_T("ClientIcons_Jabber"),		IDI_BOMBUS_NG,			JABBER_CASE	},
-	{"client_BombusQD",			_T("|*Bombusmod-qd*|*bombus*qd*"),			_T("BombusQD"),							_T("ClientIcons_Jabber"),		IDI_BOMBUS_QD,			JABBER_CASE	},
-	{"client_Bowline",			_T("*Bow*line*"),							_T("Bowline"),							_T("ClientIcons_Jabber"),		IDI_BOWLINE,			JABBER_CASE	},
-	{"client_BuddySpace",		_T("Buddy*Space*"),							_T("BuddySpace"),						_T("ClientIcons_Jabber"),		IDI_BUDDYSPACE,			JABBER_CASE	},
-	{"client_CJC",				_T("*CJC*"),								_T("CJC"),								_T("ClientIcons_Jabber"),		IDI_CJC,				JABBER_CASE	},
-	{"client_CRoom",			_T("*CRoom*"),								_T("CRoom"),							_T("ClientIcons_Jabber"),		IDI_CROOM,				JABBER_CASE	},
-	{"client_Candy",			_T("*Candy*"),								_T("Candy"),							_T("ClientIcons_Jabber"),		IDI_CANDY,				JABBER_CASE	},
-	{"client_Chatopus",			_T("*Chatopus*"),							_T("Chatopus"),							_T("ClientIcons_Jabber"),		IDI_CHATOPUS,			JABBER_CASE	},
-	{"client_Chikka",			_T("*Chikka*"),								_T("Chikka"),							_T("ClientIcons_Jabber"),		IDI_CHIKKA,				JABBER_CASE	},
-	{"client_ChitChat",			_T("*Chit*Chat*"),							_T("ChitChat"),							_T("ClientIcons_Jabber"),		IDI_CHITCHAT,			JABBER_CASE	},
-	{"client_Claros_Chat",		_T("*Claros*"),								_T("Claros Chat"),						_T("ClientIcons_Jabber"),		IDI_CLAROS_CHAT,		JABBER_CASE	},
-	{"client_Coccinella",		_T("*Coccinella*"),							_T("Coccinella"),						_T("ClientIcons_Jabber"),		IDI_COCCINELLA,			JABBER_CASE	},
-	{"client_Colibry",			_T("Colibry*"),								_T("Colibry"),							_T("ClientIcons_Jabber"),		IDI_COLIBRY,			JABBER_CASE	},
-	{"client_Colloquy",			_T("Colloquy*"),							_T("Colloquy"),							_T("ClientIcons_Jabber"),		IDI_COLLOQUY,			JABBER_CASE	},
-	{"client_CommuniGate",		_T("*CommuniGate*"),						_T("CommuniGate Pro"),					_T("ClientIcons_Jabber"),		IDI_COMMUNIGATE,		JABBER_CASE	},
+	{"client_Akeni",			_T("*Akeni*"),								_T("Akeni"),							_T("ClientIcons_Jabber"),		IDI_AKENI,				JABBER_CASE,	TRUE	},
+	{"client_Ambrosia",			_T("*Ambrosia*"),							_T("Ambrosia XMPP Server"),				_T("ClientIcons_Jabber"),		IDI_AMBROSIA,			JABBER_CASE,	TRUE	},
+	{"client_AnothRSSBot",		_T("|*Anothrbot*|*Anothr Rss Bot*"),		_T("Anothr Rss Bot"),					_T("ClientIcons_Jabber"),		IDI_ANOTHRSSBOT,		JABBER_CASE,	TRUE	},
+	{"client_Aqq",				_T("|http://aqq.eu*|aqq*"),					_T("Aqq"),								_T("ClientIcons_Jabber"),		IDI_AQQ,				JABBER_CASE,	TRUE	},
+	{"client_BarnOwl",			_T("*Barn*Owl*"),							_T("BarnOwl"),							_T("ClientIcons_Jabber"),		IDI_BARNOWL,			JABBER_CASE,	TRUE	},
+	{"client_Beem",				_T("*Beem*"),								_T("Beem"),								_T("ClientIcons_Jabber"),		IDI_BEEM,				JABBER_CASE,	TRUE	},
+	{"client_BellSouth",		_T("*BellSouth*"),							_T("BellSouth"),						_T("ClientIcons_Jabber"),		IDI_BELLSOUTH,			JABBER_CASE,	TRUE	},
+	{"client_BitWise",			_T("*BitWise*"),							_T("BitWise"),							_T("ClientIcons_Jabber"),		IDI_BITWISE,			JABBER_CASE,	TRUE	},
+	{"client_Bombus",			_T("*Bombus*"),								_T("Bombus"),							_T("ClientIcons_Jabber"),		IDI_BOMBUS,				JABBER_CASE,	TRUE	},
+	{"client_BombusMod",		_T("|*Bombus*mod*|*bombusmod*"),			_T("BombusMod"),						_T("ClientIcons_Jabber"),		IDI_BOMBUS_MOD,			JABBER_CASE,	TRUE	},
+	{"client_BombusNG",			_T("*Bombus*NG*"),							_T("Bombus NG"),						_T("ClientIcons_Jabber"),		IDI_BOMBUS_NG,			JABBER_CASE,	TRUE	},
+	{"client_BombusQD",			_T("|*Bombusmod-qd*|*bombus*qd*"),			_T("Bombus QD"),						_T("ClientIcons_Jabber"),		IDI_BOMBUS_QD,			JABBER_CASE,	TRUE	},
+	{"client_Bowline",			_T("*Bow*line*"),							_T("Bowline"),							_T("ClientIcons_Jabber"),		IDI_BOWLINE,			JABBER_CASE,	TRUE	},
+	{"client_BuddySpace",		_T("Buddy*Space*"),							_T("BuddySpace"),						_T("ClientIcons_Jabber"),		IDI_BUDDYSPACE,			JABBER_CASE,	TRUE	},
+	{"client_CJC",				_T("*CJC*"),								_T("CJC"),								_T("ClientIcons_Jabber"),		IDI_CJC,				JABBER_CASE,	TRUE	},
+	{"client_CRoom",			_T("*CRoom*"),								_T("CRoom"),							_T("ClientIcons_Jabber"),		IDI_CROOM,				JABBER_CASE,	TRUE	},
+	{"client_Candy",			_T("*Candy*"),								_T("Candy"),							_T("ClientIcons_Jabber"),		IDI_CANDY,				JABBER_CASE,	TRUE	},
+	{"client_Chatopus",			_T("*Chatopus*"),							_T("Chatopus"),							_T("ClientIcons_Jabber"),		IDI_CHATOPUS,			JABBER_CASE,	TRUE	},
+	{"client_Chikka",			_T("*Chikka*"),								_T("Chikka"),							_T("ClientIcons_Jabber"),		IDI_CHIKKA,				JABBER_CASE,	TRUE	},
+	{"client_ChitChat",			_T("*Chit*Chat*"),							_T("ChitChat"),							_T("ClientIcons_Jabber"),		IDI_CHITCHAT,			JABBER_CASE,	TRUE	},
+	{"client_Claros_Chat",		_T("*Claros*"),								_T("Claros Chat"),						_T("ClientIcons_Jabber"),		IDI_CLAROS_CHAT,		JABBER_CASE,	TRUE	},
+	{"client_Coccinella",		_T("*Coccinella*"),							_T("Coccinella"),						_T("ClientIcons_Jabber"),		IDI_COCCINELLA,			JABBER_CASE,	TRUE	},
+	{"client_Colibry",			_T("Colibry*"),								_T("Colibry"),							_T("ClientIcons_Jabber"),		IDI_COLIBRY,			JABBER_CASE,	TRUE	},
+	{"client_Colloquy",			_T("Colloquy*"),							_T("Colloquy"),							_T("ClientIcons_Jabber"),		IDI_COLLOQUY,			JABBER_CASE,	TRUE	},
+	{"client_CommuniGate",		_T("*CommuniGate*"),						_T("CommuniGate Pro"),					_T("ClientIcons_Jabber"),		IDI_COMMUNIGATE,		JABBER_CASE,	TRUE	},
 	{"client_Conference",		_T("Conference*"),							_T("Conference Bot (GMail)"),			_T("ClientIcons_Jabber"),		IDI_CONFERENCE,			JABBER_CASE,	TRUE	},
-	{"client_Crosstalk",		_T("*Cross*talk*"),							_T("Crosstalk"),						_T("ClientIcons_Jabber"),		IDI_CROSSTALK,			JABBER_CASE	},
-	{"client_Cudumar",			_T("*Cudumar*"),							_T("Cudumar"),							_T("ClientIcons_Jabber"),		IDI_CUDUMAR,			JABBER_CASE	},
-	{"client_CyclopsChat",		_T("*Cyclops*"),							_T("Cyclops Chat"),						_T("ClientIcons_Jabber"),		IDI_CYCLOPS_CHAT,		JABBER_CASE	},
-	{"client_Desyr",			_T("*Desyr*"),								_T("Desyr Messenger"),					_T("ClientIcons_Jabber"),		IDI_DESYR,				JABBER_CASE	},
-	{"client_EMess",			_T("*EMess*"),								_T("EMess"),							_T("ClientIcons_Jabber"),		IDI_EMESS,				JABBER_CASE	},
-	{"client_Elmer_Bot",		_T("*Elmer*"),								_T("Elmer Bot"),						_T("ClientIcons_Jabber"),		IDI_ELMER,				JABBER_CASE	},
-	{"client_Emacs",			_T("|*Jabber.el*|*Emacs*"),					_T("Emacs (Jabber.el)"),				_T("ClientIcons_Jabber"),		IDI_EMACS,				JABBER_CASE	},
-	{"client_Exodus",			_T("*Exodus*"),								_T("Exodus"),							_T("ClientIcons_Jabber"),		IDI_EXODUS,				JABBER_CASE	},
-	{"client_Facebook",			_T("*Facebook*"),							_T("Facebook"),							_T("ClientIcons_Jabber"),		IDI_FACEBOOK,			JABBER_CASE	},
-	{"client_Fire",				_T("Fire*"),								_T("Fire"),								_T("ClientIcons_Jabber"),		IDI_FIRE,				JABBER_CASE	},
-	{"client_GCN",				_T("*GCN*"),								_T("GCN"),								_T("ClientIcons_Jabber"),		IDI_GCN,				JABBER_CASE	},
-	{"client_GMail",			_T("|*gmail.*|GMail*"),						_T("GMail"),							_T("ClientIcons_Jabber"),		IDI_GMAIL,				JABBER_CASE	},
-	{"client_GOIM",				_T("*GOIM*"),								_T("GOIM"),								_T("ClientIcons_Jabber"),		IDI_GOIM,				JABBER_CASE	},
+	{"client_Crosstalk",		_T("*Cross*talk*"),							_T("Crosstalk"),						_T("ClientIcons_Jabber"),		IDI_CROSSTALK,			JABBER_CASE,	TRUE	},
+	{"client_Cudumar",			_T("*Cudumar*"),							_T("Cudumar"),							_T("ClientIcons_Jabber"),		IDI_CUDUMAR,			JABBER_CASE,	TRUE	},
+	{"client_CyclopsChat",		_T("*Cyclops*"),							_T("Cyclops Chat"),						_T("ClientIcons_Jabber"),		IDI_CYCLOPS_CHAT,		JABBER_CASE,	TRUE	},
+	{"client_Desyr",			_T("*Desyr*"),								_T("Desyr Messenger"),					_T("ClientIcons_Jabber"),		IDI_DESYR,				JABBER_CASE,	TRUE	},
+	{"client_EMess",			_T("*EMess*"),								_T("EMess"),							_T("ClientIcons_Jabber"),		IDI_EMESS,				JABBER_CASE,	TRUE	},
+	{"client_Elmer_Bot",		_T("*Elmer*"),								_T("Elmer Bot"),						_T("ClientIcons_Jabber"),		IDI_ELMER,				JABBER_CASE,	TRUE	},
+	{"client_Emacs",			_T("|*Jabber.el*|*Emacs*"),					_T("Emacs (Jabber.el)"),				_T("ClientIcons_Jabber"),		IDI_EMACS,				JABBER_CASE,	TRUE	},
+	{"client_Exodus",			_T("*Exodus*"),								_T("Exodus"),							_T("ClientIcons_Jabber"),		IDI_EXODUS,				JABBER_CASE,	TRUE	},
+	{"client_Facebook",			_T("*Facebook*"),							_T("Facebook"),							_T("ClientIcons_Jabber"),		IDI_FACEBOOK,			JABBER_CASE,	TRUE	},
+	{"client_Fire",				_T("Fire*"),								_T("Fire"),								_T("ClientIcons_Jabber"),		IDI_FIRE,				JABBER_CASE,	TRUE	},
+	{"client_GCN",				_T("*GCN*"),								_T("GCN"),								_T("ClientIcons_Jabber"),		IDI_GCN,				JABBER_CASE,	TRUE	},
+	{"client_GMail",			_T("|*gmail.*|GMail*"),						_T("GMail"),							_T("ClientIcons_Jabber"),		IDI_GMAIL,				JABBER_CASE,	TRUE	},
+	{"client_GOIM",				_T("*GOIM*"),								_T("GOIM"),								_T("ClientIcons_Jabber"),		IDI_GOIM,				JABBER_CASE,	TRUE	},
 	{"client_GTalk",			_T("|*Talk.v*|*Google*Talk*")
-								_T("|*Gtalk*|*-iPhon*"),					_T("GoogleTalk aka GTalk"),				_T("ClientIcons_Jabber"),		IDI_GTALK,				JABBER_CASE	},
-	{"client_GTalk_Gadget",		_T("*Talk*Gadget*"),						_T("GTalk Gadget"),						_T("ClientIcons_Jabber"),		IDI_GTALK_GADGET,		JABBER_CASE	},
-	{"client_Gabber",			_T("*Gabber*"),								_T("Gabber"),							_T("ClientIcons_Jabber"),		IDI_GABBER,				JABBER_CASE	},
-	{"client_Gajim",			_T("*Gajim*"),								_T("Gajim"),							_T("ClientIcons_Jabber"),		IDI_GAJIM,				JABBER_CASE	},
-	{"client_Gibberbot",		_T("*Gibber*"),								_T("Gibberbot"),						_T("ClientIcons_Jabber"),		IDI_GIBBERBOT,			JABBER_CASE	},
-	{"client_Glu",				_T("|*glu*|http://glu.net/*"),				_T("Glu"),								_T("ClientIcons_Jabber"),		IDI_GLU,				JABBER_CASE	},
-	{"client_Gnome",			_T("*Gnome*"),								_T("Gnome"),							_T("ClientIcons_Jabber"),		IDI_GNOME,				JABBER_CASE	},
-	{"client_GnuGadu",			_T("Gnu Gadu*"),							_T("GNU Gadu"),							_T("ClientIcons_Jabber"),		IDI_GNUGADU,			JABBER_CASE	},
-	{"client_GoTalkMobile",		_T("*Go*Talk*Mobile*"),						_T("GoTalkMobile"),						_T("ClientIcons_Jabber"),		IDI_GOTALKMOBILE,		JABBER_CASE	},
-	{"client_Gossip",			_T("*Gossip*"),								_T("Gossip"),							_T("ClientIcons_Jabber"),		IDI_GOSSIP,				JABBER_CASE	},
-	{"client_GreenThumb",		_T("gReeNtHumB*"),							_T("GreenThumb"),						_T("ClientIcons_Jabber"),		IDI_GREENTHUMB,			JABBER_CASE	},
-	{"client_Gush",				_T("*Gush*"),								_T("Gush"),								_T("ClientIcons_Jabber"),		IDI_GUSH,				JABBER_CASE	},
-	{"client_IMCom",			_T("*IMCom*"),								_T("IMCom"),							_T("ClientIcons_Jabber"),		IDI_IMCOM,				JABBER_CASE	},
-	{"client_IM_Friendly",		_T("*IM*Friendly*"),						_T("IM Friendly!"),						_T("ClientIcons_Jabber"),		IDI_IM_FRIENDLY,		JABBER_CASE	},
-	{"client_Imified",			_T("*someresource*"),						_T("Imified"),							_T("ClientIcons_Jabber"),		IDI_IMIFIED,			JABBER_CASE	},
-	{"client_Importal",			_T("*Importal*"),							_T("Importal"),							_T("ClientIcons_Jabber"),		IDI_IMPORTAL,			JABBER_CASE	},
-	{"client_InstanT",			_T("*Instan-t*"),							_T("Instan-t"),							_T("ClientIcons_Jabber"),		IDI_INSTANT,			JABBER_CASE	},
-	{"client_Interaction",		_T("*Interaction*"),						_T("Interaction"),						_T("ClientIcons_Jabber"),		IDI_INTERACTION,		JABBER_CASE	},
-	{"client_Iruka",			_T("*Iruka*"),								_T("Iruka"),							_T("ClientIcons_Jabber"),		IDI_IRUKA,				JABBER_CASE	},
-	{"client_J2J_Transport",	_T("*J2J*Transport*"),						_T("J2J Transport"),					_T("ClientIcons_Jabber"),		IDI_J2J_TRANSPORT,		JABBER_CASE	},
-	{"client_Jamm",				_T("*Jamm*"),								_T("Jamm"),								_T("ClientIcons_Jabber"),		IDI_JAMM,				JABBER_CASE	},
-	{"client_JClaim",			_T("*JClaim*"),								_T("JClaim"),							_T("ClientIcons_Jabber"),		IDI_JCLAIM,				JABBER_CASE	},
-	{"client_JMC",				_T("JMC*"),									_T("JMC (Jabber Mix Client)"),			_T("ClientIcons_Jabber"),		IDI_JMC,				JABBER_CASE	},
-	{"client_JWChat",			_T("*JWChat*"),								_T("JWChat"),							_T("ClientIcons_Jabber"),		IDI_JWCHAT,				JABBER_CASE	},
-	{"client_JWGC",				_T("|*JWGC*|Jabber *Gram*"),				_T("JWGC (Jabber WindowGram Client)"),	_T("ClientIcons_Jabber"),		IDI_JWGC,				JABBER_CASE	},
-	{"client_Jabba",			_T("*Jabba*"),								_T("Jabba"),							_T("ClientIcons_Jabber"),		IDI_JABBA,				JABBER_CASE	},
-	{"client_Jabber",			_T("*Jabber*client*"),						_T("Jabber client"),					_T("ClientIcons_Jabber"),		IDI_JABBER,				JABBER_CASE	},
-	{"client_JabberApplet",		_T("Jabber*Applet*"),						_T("JabberApplet"),						_T("ClientIcons_Jabber"),		IDI_JABBER_APPLET,		JABBER_CASE	},
-	{"client_JabberBeOS",		_T("Jabber*BeOS*"),							_T("Jabber (BeOS)"),					_T("ClientIcons_Jabber"),		IDI_JABBER_BEOS,		JABBER_CASE	},
-	{"client_JabberFoX",		_T("*fox*"),								_T("JabberFoX"),						_T("ClientIcons_Jabber"),		IDI_JABBERFOX,			JABBER_CASE	},
-	{"client_JabberMSNGR",		_T("Jabber Messenger*"),					_T("Jabber Messenger"),					_T("ClientIcons_Jabber"),		IDI_JABBER_MESSENGER,	JABBER_CASE	},
-	{"client_JabberNaut",		_T("*Jabber*Naut*"),						_T("JabberNaut"),						_T("ClientIcons_Jabber"),		IDI_JABBERNAUT,			JABBER_CASE	},
-	{"client_JabberZilla",		_T("*Zilla*"),								_T("JabberZilla"),						_T("ClientIcons_Jabber"),		IDI_JABBERZILLA,		JABBER_CASE	},
-	{"client_Jabber_Net",		_T("|*Jabber*Net*|*cursive.net*|*csharp*"),	_T("Jabber-Net"),						_T("ClientIcons_Jabber"),		IDI_JABBER_NET,			JABBER_CASE	},
-	{"client_Jabberwocky",		_T("Jabberwocky*"),							_T("Jabberwocky (Amiga)"),				_T("ClientIcons_Jabber"),		IDI_JABBERWOCKY,		JABBER_CASE	},
-	{"client_Jabbroid",			_T("*Jabbroid*"),							_T("Jabbroid"),							_T("ClientIcons_Jabber"),		IDI_JABBROID,			JABBER_CASE	},
-	{"client_Jajc",				_T("|*Jajc*|Just Another Jabber Client"),	_T("JAJC"),								_T("ClientIcons_Jabber"),		IDI_JAJC,				JABBER_CASE	},
-	{"client_Jeti",				_T("*Jeti*"),								_T("Jeti"),								_T("ClientIcons_Jabber"),		IDI_JETI,				JABBER_CASE	},
-	{"client_Jitsi",			_T("*Jitsi*"),								_T("Jitsi"),							_T("ClientIcons_Jabber"),		IDI_JITSI,				JABBER_CASE	},
-	{"client_Joost",			_T("*Joost*"),								_T("Joost"),							_T("ClientIcons_Jabber"),		IDI_JOOST,				JABBER_CASE	},
-	{"client_Kadu",				_T("*Kadu*"),								_T("Kadu"),								_T("ClientIcons_Jabber"),		IDI_KADU,				JABBER_CASE	},
-	{"client_Konnekt",			_T("Konnekt*"),								_T("Konnekt"),							_T("ClientIcons_Jabber"),		IDI_KONNEKT,			JABBER_CASE	},
-	{"client_LLuna",			_T("LLuna*"),								_T("LLuna"),							_T("ClientIcons_Jabber"),		IDI_LLUNA,				JABBER_CASE	},
-	{"client_Lamp",				_T("*Lamp*IM*"),							_T("Lamp IM"),							_T("ClientIcons_Jabber"),		IDI_LAMP_IM,			JABBER_CASE	},
-	{"client_Lampiro",			_T("*Lampiro*"),							_T("Lampiro"),							_T("ClientIcons_Jabber"),		IDI_LAMPIRO,			JABBER_CASE	},
-	{"client_Landell",			_T("*Landell*"),							_T("Landell"),							_T("ClientIcons_Jabber"),		IDI_LANDELL,			JABBER_CASE	},
-	{"client_Leaf",				_T("*Leaf*"),								_T("Leaf Messenger"),					_T("ClientIcons_Jabber"),		IDI_LEAF,				JABBER_CASE	},
-	{"client_LinQ",				_T("*LinQ*"),								_T("LinQ"),								_T("ClientIcons_Jabber"),		IDI_LINQ,				JABBER_CASE	},
-	{"client_M8Jabber",			_T("*M8Jabber*"),							_T("M8Jabber"),							_T("ClientIcons_Jabber"),		IDI_M8JABBER,			JABBER_CASE	},
-	{"client_MCabber",			_T("*mcabber*"),							_T("MCabber"),							_T("ClientIcons_Jabber"),		IDI_MCABBER,			JABBER_CASE	},
-	{"client_MGTalk",			_T("|*MGTalk*|*Mobile?\?\?\?\?\?\?\?"),		_T("MGTalk"),							_T("ClientIcons_Jabber"),		IDI_MGTALK,				JABBER_CASE	},
-	{"client_MUCkl",			_T("*MUCkl*"),								_T("MUCkl"),							_T("ClientIcons_Jabber"),		IDI_MUCKL,				JABBER_CASE	},
-	{"client_Mango",			_T("*Mango*"),								_T("Mango"),							_T("ClientIcons_Jabber"),		IDI_MANGO,				JABBER_CASE	},
-	{"client_Mercury",			_T("*Mercury*"),							_T("Mercury Messenger"),				_T("ClientIcons_Jabber"),		IDI_MERCURY_MESSENGER,	JABBER_CASE	},
-	{"client_Monal",			_T("*Monal*"),								_T("Monal"),							_T("ClientIcons_Jabber"),		IDI_MONAL,				JABBER_CASE	},
-	{"client_MozillaChat",		_T("*Mozilla*Chat*"),						_T("MozillaChat"),						_T("ClientIcons_Jabber"),		IDI_MOZILLACHAT,		JABBER_CASE	},
-	{"client_Neos",				_T("Neos*"),								_T("Neos"),								_T("ClientIcons_Jabber"),		IDI_NEOS,				JABBER_CASE	},
-	{"client_Nitro",			_T("Nitro*"),								_T("Nitro"),							_T("ClientIcons_Jabber"),		IDI_NITRO,				JABBER_CASE	},
-	{"client_Nostromo",			_T("*USCSS*Nostromo*"),						_T("USCSS Nostromo"),					_T("ClientIcons_Jabber"),		IDI_NOSTROMO,			JABBER_CASE	},
-	{"client_OM",				_T("OM*"),									_T("OM aka Online Messenger"),			_T("ClientIcons_Jabber"),		IDI_OM,					JABBER_CASE	},
-	{"client_OctroTalk",		_T("*Octro*"),								_T("OctroTalk"),						_T("ClientIcons_Jabber"),		IDI_OCTROTALK,			JABBER_CASE	},
-	{"client_OneTeam",			_T("*OneTeam*"),							_T("OneTeam"),							_T("ClientIcons_Jabber"),		IDI_ONETEAM,			JABBER_CASE	},
-	{"client_Paltalk",			_T("*Paltalk*"),							_T("Paltalk"),							_T("ClientIcons_Jabber"),		IDI_PALTALK,			JABBER_CASE	},
-	{"client_Pandion",			_T("|*Pandion*|*�������*"),					_T("Pandion"),							_T("ClientIcons_Jabber"),		IDI_PANDION,			JABBER_CASE	},
-	{"client_Papla",			_T("*Papla*"),								_T("Papla"),							_T("ClientIcons_Jabber"),		IDI_PAPLA,				JABBER_CASE	},
-	{"client_Poezio",			_T("*Poezio*"),								_T("Poezio"),							_T("ClientIcons_Jabber"),		IDI_POEZIO,				JABBER_CASE	},
-	{"client_Prosody",			_T("*Prosody*"),							_T("Prosody"),							_T("ClientIcons_Jabber"),		IDI_PROSODY,			JABBER_CASE	},
-
-	{"client_Psi_plus",			_T("|*PSI+*|*psi-dev.googlecode*"),			_T("PSI+"),								_T("ClientIcons_Jabber"),		IDI_PSIPLUS,			JABBER_CASE	},
-	{"client_Psi",				_T("*Psi*"),								_T("PSI"),								_T("ClientIcons_Jabber"),		IDI_PSI,				JABBER_CASE	},
-
-	{"client_Psto",				_T("*Psto*"),								_T("Psto.net"),							_T("ClientIcons_Jabber"),		IDI_PSTO,				JABBER_CASE	},
-	{"client_Psyc",				_T("*Psyc*"),								_T("Psyc"),								_T("ClientIcons_Jabber"),		IDI_PSYC,				JABBER_CASE	},
-	{"client_PyAIM-t",			_T("|*pyAIM*"),								_T("PyAIM-t Jabber Transport"),			_T("ClientIcons_Jabber"),		IDI_PYAIMT,				JABBER_CASE	},
-	{"client_PyICQ-t",			_T("|*pyICQ*|ICQ*Transport*"),				_T("PyICQ-t Jabber Transport"),			_T("ClientIcons_Jabber"),		IDI_PYICQT,				JABBER_CASE	},
-	{"client_PyIRC-t",			_T("|*pyIRC*"),								_T("PyIRC-t Jabber Transport"),			_T("ClientIcons_Jabber"),		IDI_PYIRCT,				JABBER_CASE	},
-	{"client_PyMRA-t",			_T("|*pyMRA*|*svn.xmpp.ru/*/mrim*|Mrim*"),	_T("PyMRA-t Jabber Transport"),			_T("ClientIcons_Jabber"),		IDI_PYMRAT,				JABBER_CASE	},
-	{"client_PyMSN-t",			_T("|*pyMSN*"),								_T("PyMSN-t Jabber Transport"),			_T("ClientIcons_Jabber"),		IDI_PYMSNT,				JABBER_CASE	},
-	{"client_PyYIM-t",			_T("|*pyYIM*"),								_T("PyYahoo-t Jabber Transport"),		_T("ClientIcons_Jabber"),		IDI_PYYAHOOT,			JABBER_CASE	},
-	{"client_Pygeon",			_T("*Pygeon*"),								_T("Pygeon"),							_T("ClientIcons_Jabber"),		IDI_PYGEON,				JABBER_CASE	},
-
-	{"client_QTJim",			_T("*QTJim*"),								_T("QTJim"),							_T("ClientIcons_Jabber"),		IDI_QTJIM,				JABBER_CASE	},
-	{"client_QuteCom",			_T("*Qute*Com*"),							_T("QuteCom"),							_T("ClientIcons_Jabber"),		IDI_QUTECOM,			JABBER_CASE	},
-	{"client_RenRen",			_T("|*WTalkProxy0_0*|*talk.xiaonei.com*"),	_T("RenRen"),							_T("ClientIcons_Jabber"),		IDI_RENREN,				JABBER_CASE	},
-	{"client_SBot",				_T("*SBot*"),								_T("SBot"),								_T("ClientIcons_Jabber"),		IDI_SBOT,				JABBER_CASE	},
-	{"client_SMTP_Transport",	_T("*smtp*transport*"),						_T("SMTP Transport"),					_T("ClientIcons_Jabber"),		IDI_SMTP_TRANSPORT,		JABBER_CASE	},
-	{"client_SamePlace",		_T("*SamePlace*"),							_T("SamePlace"),						_T("ClientIcons_Jabber"),		IDI_SAMEPLACE,			JABBER_CASE	},
-	{"client_Sky_Messager",		_T("Sky*Mess*"),							_T("Sky Messager"),						_T("ClientIcons_Jabber"),		IDI_SKYMESSAGER,		JABBER_CASE	},
-	{"client_Sky_Messager",		_T("*Sky*Messager*"),						_T("Sky Messager"),						_T("ClientIcons_Jabber"),		IDI_SKYMESSAGER,		JABBER_CASE	},
+								_T("|*Gtalk*|*-iPhon*"),					_T("GoogleTalk aka GTalk"),				_T("ClientIcons_Jabber"),		IDI_GTALK,				JABBER_CASE,	TRUE	},
+	{"client_GTalk_Gadget",		_T("*Talk*Gadget*"),						_T("GTalk Gadget"),						_T("ClientIcons_Jabber"),		IDI_GTALK_GADGET,		JABBER_CASE,	TRUE	},
+	{"client_Gabber",			_T("*Gabber*"),								_T("Gabber"),							_T("ClientIcons_Jabber"),		IDI_GABBER,				JABBER_CASE,	TRUE	},
+	{"client_Gajim",			_T("*Gajim*"),								_T("Gajim"),							_T("ClientIcons_Jabber"),		IDI_GAJIM,				JABBER_CASE,	TRUE	},
+	{"client_Gibberbot",		_T("*Gibber*"),								_T("Gibberbot"),						_T("ClientIcons_Jabber"),		IDI_GIBBERBOT,			JABBER_CASE,	TRUE	},
+	{"client_Glu",				_T("|*glu*|http://glu.net/*"),				_T("Glu"),								_T("ClientIcons_Jabber"),		IDI_GLU,				JABBER_CASE,	TRUE	},
+	{"client_Gnome",			_T("*Gnome*"),								_T("Gnome"),							_T("ClientIcons_Jabber"),		IDI_GNOME,				JABBER_CASE,	TRUE	},
+	{"client_GoTalkMobile",		_T("*Go*Talk*Mobile*"),						_T("GoTalkMobile"),						_T("ClientIcons_Jabber"),		IDI_GOTALKMOBILE,		JABBER_CASE,	TRUE	},
+	{"client_Gossip",			_T("*Gossip*"),								_T("Gossip"),							_T("ClientIcons_Jabber"),		IDI_GOSSIP,				JABBER_CASE,	TRUE	},
+	{"client_GreenThumb",		_T("gReeNtHumB*"),							_T("GreenThumb"),						_T("ClientIcons_Jabber"),		IDI_GREENTHUMB,			JABBER_CASE,	TRUE	},
+	{"client_Gush",				_T("*Gush*"),								_T("Gush"),								_T("ClientIcons_Jabber"),		IDI_GUSH,				JABBER_CASE,	TRUE	},
+	{"client_IMCom",			_T("*IMCom*"),								_T("IMCom"),							_T("ClientIcons_Jabber"),		IDI_IMCOM,				JABBER_CASE,	TRUE	},
+	{"client_IM_Friendly",		_T("*IM*Friendly*"),						_T("IM Friendly!"),						_T("ClientIcons_Jabber"),		IDI_IM_FRIENDLY,		JABBER_CASE,	TRUE	},
+	{"client_Imified",			_T("*someresource*"),						_T("Imified"),							_T("ClientIcons_Jabber"),		IDI_IMIFIED,			JABBER_CASE,	TRUE	},
+	{"client_Importal",			_T("*Importal*"),							_T("Importal"),							_T("ClientIcons_Jabber"),		IDI_IMPORTAL,			JABBER_CASE,	TRUE	},
+	{"client_InstanT",			_T("*Instan-t*"),							_T("Instan-t"),							_T("ClientIcons_Jabber"),		IDI_INSTANT,			JABBER_CASE,	TRUE	},
+	{"client_Interaction",		_T("*Interaction*"),						_T("Interaction"),						_T("ClientIcons_Jabber"),		IDI_INTERACTION,		JABBER_CASE,	TRUE	},
+	{"client_Iruka",			_T("*Iruka*"),								_T("Iruka"),							_T("ClientIcons_Jabber"),		IDI_IRUKA,				JABBER_CASE,	TRUE	},
+	{"client_J2J_Transport",	_T("*J2J*Transport*"),						_T("J2J Transport"),					_T("ClientIcons_Jabber"),		IDI_J2J_TRANSPORT,		JABBER_CASE,	TRUE	},
+	{"client_Jamm",				_T("*Jamm*"),								_T("Jamm"),								_T("ClientIcons_Jabber"),		IDI_JAMM,				JABBER_CASE,	TRUE	},
+	{"client_JClaim",			_T("*JClaim*"),								_T("JClaim"),							_T("ClientIcons_Jabber"),		IDI_JCLAIM,				JABBER_CASE,	TRUE	},
+	{"client_JMC",				_T("JMC*"),									_T("JMC (Jabber Mix Client)"),			_T("ClientIcons_Jabber"),		IDI_JMC,				JABBER_CASE,	TRUE	},
+	{"client_JWChat",			_T("*JWChat*"),								_T("JWChat"),							_T("ClientIcons_Jabber"),		IDI_JWCHAT,				JABBER_CASE,	TRUE	},
+	{"client_JWGC",				_T("|*JWGC*|Jabber *Gram*"),				_T("JWGC (Jabber WindowGram Client)"),	_T("ClientIcons_Jabber"),		IDI_JWGC,				JABBER_CASE,	TRUE	},
+	{"client_Jabba",			_T("*Jabba*"),								_T("Jabba"),							_T("ClientIcons_Jabber"),		IDI_JABBA,				JABBER_CASE,	TRUE	},
+	{"client_Jabber",			_T("*Jabber*client*"),						_T("Jabber client"),					_T("ClientIcons_Jabber"),		IDI_JABBER,				JABBER_CASE,	TRUE	},
+	{"client_JabberApplet",		_T("Jabber*Applet*"),						_T("JabberApplet"),						_T("ClientIcons_Jabber"),		IDI_JABBER_APPLET,		JABBER_CASE,	TRUE	},
+	{"client_JabberBeOS",		_T("Jabber*BeOS*"),							_T("Jabber (BeOS)"),					_T("ClientIcons_Jabber"),		IDI_JABBER_BEOS,		JABBER_CASE,	TRUE	},
+	{"client_JabberFoX",		_T("*fox*"),								_T("JabberFoX"),						_T("ClientIcons_Jabber"),		IDI_JABBERFOX,			JABBER_CASE,	TRUE	},
+	{"client_JabberMSNGR",		_T("Jabber Messenger*"),					_T("Jabber Messenger"),					_T("ClientIcons_Jabber"),		IDI_JABBER_MESSENGER,	JABBER_CASE,	TRUE	},
+	{"client_JabberNaut",		_T("*Jabber*Naut*"),						_T("JabberNaut"),						_T("ClientIcons_Jabber"),		IDI_JABBERNAUT,			JABBER_CASE,	TRUE	},
+	{"client_JabberZilla",		_T("*Zilla*"),								_T("JabberZilla"),						_T("ClientIcons_Jabber"),		IDI_JABBERZILLA,		JABBER_CASE,	TRUE	},
+	{"client_Jabber_Net",		_T("|*Jabber*Net*|*cursive.net*|*csharp*"),	_T("Jabber-Net"),						_T("ClientIcons_Jabber"),		IDI_JABBER_NET,			JABBER_CASE,	TRUE	},
+	{"client_Jabberwocky",		_T("Jabberwocky*"),							_T("Jabberwocky (Amiga)"),				_T("ClientIcons_Jabber"),		IDI_JABBERWOCKY,		JABBER_CASE,	TRUE	},
+	{"client_Jabbroid",			_T("*Jabbroid*"),							_T("Jabbroid"),							_T("ClientIcons_Jabber"),		IDI_JABBROID,			JABBER_CASE,	TRUE	},
+	{"client_Jajc",				_T("|*Jajc*|Just Another Jabber Client"),	_T("JAJC"),								_T("ClientIcons_Jabber"),		IDI_JAJC,				JABBER_CASE,	TRUE	},
+	{"client_Jeti",				_T("*Jeti*"),								_T("Jeti"),								_T("ClientIcons_Jabber"),		IDI_JETI,				JABBER_CASE,	TRUE	},
+	{"client_Jitsi",			_T("*Jitsi*"),								_T("Jitsi"),							_T("ClientIcons_Jabber"),		IDI_JITSI,				JABBER_CASE,	TRUE	},
+	{"client_Joost",			_T("*Joost*"),								_T("Joost"),							_T("ClientIcons_Jabber"),		IDI_JOOST,				JABBER_CASE,	TRUE	},
+	{"client_Kadu",				_T("*Kadu*"),								_T("Kadu"),								_T("ClientIcons_Jabber"),		IDI_KADU,				JABBER_CASE,	TRUE	},
+	{"client_Konnekt",			_T("Konnekt*"),								_T("Konnekt"),							_T("ClientIcons_Jabber"),		IDI_KONNEKT,			JABBER_CASE,	TRUE	},
+	{"client_LLuna",			_T("LLuna*"),								_T("LLuna"),							_T("ClientIcons_Jabber"),		IDI_LLUNA,				JABBER_CASE,	TRUE	},
+	{"client_Lamp",				_T("*Lamp*IM*"),							_T("Lamp IM"),							_T("ClientIcons_Jabber"),		IDI_LAMP_IM,			JABBER_CASE,	TRUE	},
+	{"client_Lampiro",			_T("*Lampiro*"),							_T("Lampiro"),							_T("ClientIcons_Jabber"),		IDI_LAMPIRO,			JABBER_CASE,	TRUE	},
+	{"client_Landell",			_T("*Landell*"),							_T("Landell"),							_T("ClientIcons_Jabber"),		IDI_LANDELL,			JABBER_CASE,	TRUE	},
+	{"client_Leaf",				_T("*Leaf*"),								_T("Leaf Messenger"),					_T("ClientIcons_Jabber"),		IDI_LEAF,				JABBER_CASE,	TRUE	},
+	{"client_LinQ",				_T("*LinQ*"),								_T("LinQ"),								_T("ClientIcons_Jabber"),		IDI_LINQ,				JABBER_CASE,	TRUE	},
+	{"client_M8Jabber",			_T("*M8Jabber*"),							_T("M8Jabber"),							_T("ClientIcons_Jabber"),		IDI_M8JABBER,			JABBER_CASE,	TRUE	},
+	{"client_MCabber",			_T("*mcabber*"),							_T("MCabber"),							_T("ClientIcons_Jabber"),		IDI_MCABBER,			JABBER_CASE,	TRUE	},
+	{"client_MGTalk",			_T("|*MGTalk*|*Mobile?\?\?\?\?\?\?\?"),		_T("MGTalk"),							_T("ClientIcons_Jabber"),		IDI_MGTALK,				JABBER_CASE,	TRUE	},
+	{"client_MUCkl",			_T("*MUCkl*"),								_T("MUCkl"),							_T("ClientIcons_Jabber"),		IDI_MUCKL,				JABBER_CASE,	TRUE	},
+	{"client_Mango",			_T("*Mango*"),								_T("Mango"),							_T("ClientIcons_Jabber"),		IDI_MANGO,				JABBER_CASE,	TRUE	},
+	{"client_Mercury",			_T("*Mercury*"),							_T("Mercury Messenger"),				_T("ClientIcons_Jabber"),		IDI_MERCURY_MESSENGER,	JABBER_CASE,	TRUE	},
+	{"client_Monal",			_T("*Monal*"),								_T("Monal"),							_T("ClientIcons_Jabber"),		IDI_MONAL,				JABBER_CASE,	TRUE	},
+	{"client_MozillaChat",		_T("*Mozilla*Chat*"),						_T("MozillaChat"),						_T("ClientIcons_Jabber"),		IDI_MOZILLACHAT,		JABBER_CASE,	TRUE	},
+	{"client_Neos",				_T("Neos*"),								_T("Neos"),								_T("ClientIcons_Jabber"),		IDI_NEOS,				JABBER_CASE,	TRUE	},
+	{"client_Nitro",			_T("Nitro*"),								_T("Nitro"),							_T("ClientIcons_Jabber"),		IDI_NITRO,				JABBER_CASE,	TRUE	},
+	{"client_Nostromo",			_T("*USCSS*Nostromo*"),						_T("USCSS Nostromo"),					_T("ClientIcons_Jabber"),		IDI_NOSTROMO,			JABBER_CASE,	TRUE	},
+	{"client_OM",				_T("OM*"),									_T("OM aka Online Messenger"),			_T("ClientIcons_Jabber"),		IDI_OM,					JABBER_CASE,	TRUE	},
+	{"client_OctroTalk",		_T("*Octro*"),								_T("OctroTalk"),						_T("ClientIcons_Jabber"),		IDI_OCTROTALK,			JABBER_CASE,	TRUE	},
+	{"client_OneTeam",			_T("*OneTeam*"),							_T("OneTeam"),							_T("ClientIcons_Jabber"),		IDI_ONETEAM,			JABBER_CASE,	TRUE	},
+	{"client_Paltalk",			_T("*Paltalk*"),							_T("Paltalk"),							_T("ClientIcons_Jabber"),		IDI_PALTALK,			JABBER_CASE,	TRUE	},
+	{"client_Pandion",			_T("|*Pandion*|*�������*"),					_T("Pandion"),							_T("ClientIcons_Jabber"),		IDI_PANDION,			JABBER_CASE,	TRUE	},
+	{"client_Papla",			_T("*Papla*"),								_T("Papla"),							_T("ClientIcons_Jabber"),		IDI_PAPLA,				JABBER_CASE,	TRUE	},
+	{"client_Poezio",			_T("*Poezio*"),								_T("Poezio"),							_T("ClientIcons_Jabber"),		IDI_POEZIO,				JABBER_CASE,	TRUE	},
+	{"client_Prosody",			_T("*Prosody*"),							_T("Prosody"),							_T("ClientIcons_Jabber"),		IDI_PROSODY,			JABBER_CASE,	TRUE	},
+
+	{"client_Psi_plus",			_T("|*PSI+*|*psi-dev.googlecode*"),			_T("PSI+"),								_T("ClientIcons_Jabber"),		IDI_PSIPLUS,			JABBER_CASE,	TRUE	},
+	{"client_Psi",				_T("*Psi*"),								_T("PSI"),								_T("ClientIcons_Jabber"),		IDI_PSI,				JABBER_CASE,	TRUE	},
+
+	{"client_Psto",				_T("*Psto*"),								_T("Psto.net"),							_T("ClientIcons_Jabber"),		IDI_PSTO,				JABBER_CASE,	TRUE	},
+	{"client_Psyc",				_T("*Psyc*"),								_T("Psyc"),								_T("ClientIcons_Jabber"),		IDI_PSYC,				JABBER_CASE,	TRUE	},
+	{"client_Pygeon",			_T("*Pygeon*"),								_T("Pygeon"),							_T("ClientIcons_Jabber"),		IDI_PYGEON,				JABBER_CASE,	TRUE	},
+
+	{"client_QTJim",			_T("*QTJim*"),								_T("QTJim"),							_T("ClientIcons_Jabber"),		IDI_QTJIM,				JABBER_CASE,	TRUE	},
+	{"client_QuteCom",			_T("*Qute*Com*"),							_T("QuteCom"),							_T("ClientIcons_Jabber"),		IDI_QUTECOM,			JABBER_CASE,	TRUE	},
+	{"client_RenRen",			_T("|*WTalkProxy0_0*|*talk.xiaonei.com*"),	_T("RenRen"),							_T("ClientIcons_Jabber"),		IDI_RENREN,				JABBER_CASE,	TRUE	},
+	{"client_SBot",				_T("*SBot*"),								_T("SBot"),								_T("ClientIcons_Jabber"),		IDI_SBOT,				JABBER_CASE,	TRUE	},
+	{"client_SMTP_Transport",	_T("*smtp*transport*"),						_T("SMTP Transport"),					_T("ClientIcons_Jabber"),		IDI_SMTP_TRANSPORT,		JABBER_CASE,	TRUE	},
+	{"client_SamePlace",		_T("*SamePlace*"),							_T("SamePlace"),						_T("ClientIcons_Jabber"),		IDI_SAMEPLACE,			JABBER_CASE,	TRUE	},
+	{"client_Sky_Messager",		_T("Sky*Mess*"),							_T("Sky Messager"),						_T("ClientIcons_Jabber"),		IDI_SKYMESSAGER,		JABBER_CASE,	TRUE	},
+	{"client_Sky_Messager",		_T("*Sky*Messager*"),						_T("Sky Messager"),						_T("ClientIcons_Jabber"),		IDI_SKYMESSAGER,		JABBER_CASE,	TRUE	},
 
 	{"client_xabber",			_T("|*xabber*")
-								_T("|*bWG06mEjKFM5ygtd84Ov95P8VH0=*"),		_T("xabber"),							_T("ClientIcons_Jabber"),		IDI_XABBER,				JABBER_CASE	},
-
-	{"client_Gabble",			_T("|*Gabble*"),							_T("Gabble"),							_T("ClientIcons_Jabber"),		IDI_GABBLE,				JABBER_CASE	},
-
-	{"client_Smack",			_T("|*igniterealtime.org/*smack*|*smack*"),	_T("Smack"),							_T("ClientIcons_Jabber"),		IDI_SMACK,				JABBER_CASE	},
-
-	{"client_SoapBox",			_T("*SoapBox*"),							_T("SoapBox"),							_T("ClientIcons_Jabber"),		IDI_SOAPBOX,			JABBER_CASE	},
-	{"client_Spark",			_T("*Spark*"),								_T("Spark"),							_T("ClientIcons_Jabber"),		IDI_SPARK,				JABBER_CASE	},
-	{"client_Speakall",			_T("*Speak*all*"),							_T("Speakall"),							_T("ClientIcons_Jabber"),		IDI_SPEAKALL,			JABBER_CASE	},
-	{"client_Speeqe",			_T("*Speeqe*"),								_T("Speeqe"),							_T("ClientIcons_Jabber"),		IDI_SPEEQE,				JABBER_CASE	},
-	{"client_Spik",				_T("*Spik*"),								_T("Spik"),								_T("ClientIcons_Jabber"),		IDI_SPIK,				JABBER_CASE	},
-	{"client_Swift",			_T("*Swift*"),								_T("Swift"),							_T("ClientIcons_Jabber"),		IDI_SWIFT,				JABBER_CASE	},
-	{"client_SworIM",			_T("*Swor*IM*"),							_T("SworIM"),							_T("ClientIcons_Jabber"),		IDI_SWORIM,				JABBER_CASE	},
-	{"client_Synapse",			_T("*Synapse*"),							_T("Synapse"),							_T("ClientIcons_Jabber"),		IDI_SYNAPSE,			JABBER_CASE	},
-	{"client_Talkdroid",		_T("*Talkdroid*"),							_T("Talkdroid"),						_T("ClientIcons_Jabber"),		IDI_TALKDROID,			JABBER_CASE	},
-	{"client_Talkonaut",		_T("*Talkonaut*"),							_T("Talkonaut"),						_T("ClientIcons_Jabber"),		IDI_TALKONAUT,			JABBER_CASE	},
-	{"client_Tapioca",			_T("*Tapioca*"),							_T("Tapioca"),							_T("ClientIcons_Jabber"),		IDI_TAPIOCA,			JABBER_CASE	},
-	{"client_Teabot",			_T("|*teabot*|*teabot.org/bot*|bot"),		_T("Teabot"),							_T("ClientIcons_Jabber"),		IDI_TEABOT,				JABBER_CASE	},
-	{"client_Telepathy",		_T("*Telepathy*"),							_T("Telepathy"),						_T("ClientIcons_Jabber"),		IDI_TELEPATHY,			JABBER_CASE	},
-	{"client_The_Bee",			_T("*The*Bee*"),							_T("The Bee"),							_T("ClientIcons_Jabber"),		IDI_THEBEE,				JABBER_CASE	},
-	{"client_Thunderbird",		_T("*Thunderbi*"),							_T("Thunderbird"),						_T("ClientIcons_Jabber"),		IDI_THUNDERBIRD,		JABBER_CASE	},
-	{"client_Tigase",			_T("*Tigase*"),								_T("Tigase"),							_T("ClientIcons_Jabber"),		IDI_TIGASE,				JABBER_CASE	},
-	{"client_TipicIM",			_T("Tipic*"),								_T("TipicIM"),							_T("ClientIcons_Jabber"),		IDI_TIPICIM,			JABBER_CASE	},
-	{"client_Tkabber",			_T("|*Tkabber*"),							_T("Tkabber"),							_T("ClientIcons_Jabber"),		IDI_TKABBER,			JABBER_CASE	},
-	{"client_TransactIM",		_T("*Transact*"),							_T("TransactIM"),						_T("ClientIcons_Jabber"),		IDI_TRANSACTIM,			JABBER_CASE	},
-	{"client_Translate",		_T("*Translate*"),							_T("Translate component"),				_T("ClientIcons_Jabber"),		IDI_TRANSLATE,			JABBER_CASE	},
-	{"client_Triple",			_T("Triple*"),								_T("TripleSoftwareIM (TSIM)"),			_T("ClientIcons_Jabber"),		IDI_TRIPLE_SOFTWARE,	JABBER_CASE	},
-	{"client_Twitter",			_T("*Twitter*"),							_T("Twitter"),							_T("ClientIcons_Jabber"),		IDI_TWITTER,			JABBER_CASE	},
-	{"client_VK",				_T("|*VKontakte*|*vk.com*"),				_T("VKontakte"),						_T("ClientIcons_Jabber"),		IDI_VK,					JABBER_CASE	},
-	{"client_Vacuum",			_T("*Vacuum*"),								_T("Vacuum IM"),						_T("ClientIcons_Jabber"),		IDI_VACUUM,				JABBER_CASE	},
-	{"client_V&V",				_T("*V&V*"),								_T("V&V Messenger"),					_T("ClientIcons_Jabber"),		IDI_VANDV,				JABBER_CASE	},
-	{"client_Vayusphere",		_T("*Vayusphere*"),							_T("Vayusphere"),						_T("ClientIcons_Jabber"),		IDI_VAYUSPHERE,			JABBER_CASE	},
-	{"client_Vysper",			_T("*Vysper*"),								_T("Vysper"),							_T("ClientIcons_Jabber"),		IDI_VYSPER,				JABBER_CASE	},
-	{"client_WTW",				_T("**WTW**|*wtw.k2t.eu*"),					_T("WTW"),								_T("ClientIcons_Jabber"),		IDI_WTW,				JABBER_CASE	},
-	{"client_WannaChat",		_T("Wanna*Chat*"),							_T("WannaChat"),						_T("ClientIcons_Jabber"),		IDI_WANNACHAT,			JABBER_CASE	},
-	{"client_WebEx",			_T("*webex.com*"),							_T("Cisco WebEx Connect"),				_T("ClientIcons_Jabber"),		IDI_WEBEX,				JABBER_CASE	},
-	{"client_WhisperIM",		_T("*Whisper*"),							_T("WhisperIM"),						_T("ClientIcons_Jabber"),		IDI_WHISPERIM,			JABBER_CASE	},
-	{"client_Wija",				_T("*wija*"),								_T("Wija"),								_T("ClientIcons_Jabber"),		IDI_WIJA,				JABBER_CASE	},
-	{"client_Wildfire",			_T("Wildfire*"),							_T("Wildfire"),							_T("ClientIcons_Jabber"),		IDI_WILDFIRE,			JABBER_CASE	},
-	{"client_WinJab",			_T("*WinJab*"),								_T("WinJab"),							_T("ClientIcons_Jabber"),		IDI_WINJAB,				JABBER_CASE	},
-	{"client_XMPP",				_T("*XMPP*"),								_T("XMPP"),								_T("ClientIcons_Jabber"),		IDI_XMPP,				JABBER_CASE	},
-	{"client_Xiffian",			_T("*Xiffian*"),							_T("Xiffian"),							_T("ClientIcons_Jabber"),		IDI_XIFFIAN,			JABBER_CASE	},
-	{"client_Yambi",			_T("*Yambi*"),								_T("Yambi"),							_T("ClientIcons_Jabber"),		IDI_YAMBI,				JABBER_CASE	},
-	{"client_chat_bots",		_T("*chat*bot*"),							_T("chat bot"),							_T("ClientIcons_Jabber"),		IDI_CHAT_BOT,			JABBER_CASE	},
-	{"client_dziObber",			_T("*dzi?bber*"),							_T("dziObber"),							_T("ClientIcons_Jabber"),		IDI_DZIOBBER,			JABBER_CASE	},
-	{"client_ejabberd",			_T("*ejabberd*"),							_T("ejabberd"),							_T("ClientIcons_Jabber"),		IDI_EJABBERD,			JABBER_CASE	},
-	{"client_emite",			_T("*emite*"),								_T("emite"),							_T("ClientIcons_Jabber"),		IDI_EMITE,				JABBER_CASE	},
-	{"client_gYaber",			_T("gYaber*"),								_T("gYaber"),							_T("ClientIcons_Jabber"),		IDI_GYABER,				JABBER_CASE	},
-	{"client_glu",				_T("*glu*"),								_T("glu"),								_T("ClientIcons_Jabber"),		IDI_GLU,				JABBER_CASE	},
-	{"client_iGoogle",			_T("iGoogle*"),								_T("iGoogle"),							_T("ClientIcons_Jabber"),		IDI_IGOOGLE,			JABBER_CASE	},
-	{"client_iJab",				_T("*iJab*"),								_T("iJab"),								_T("ClientIcons_Jabber"),		IDI_IJAB,				JABBER_CASE	},
-	{"client_iMeem",			_T("iMeem*"),								_T("iMeem"),							_T("ClientIcons_Jabber"),		IDI_IMEEM,				JABBER_CASE	},
-	{"client_iMov",				_T("*imov*"),								_T("iMov"),								_T("ClientIcons_Jabber"),		IDI_IMOV,				JABBER_CASE	},
-	{"client_jTalk",			_T("*jTalk*"),								_T("jTalk"),							_T("ClientIcons_Jabber"),		IDI_JTALK,				JABBER_CASE	},
-	{"client_jabberDisk",		_T("|*jdisk*|*jabberDisk*"),				_T("jabberDisk"),						_T("ClientIcons_Jabber"),		IDI_JABBER_DISK,		JABBER_CASE	},
-	{"client_jabbim",			_T("*jabbim*"),								_T("Jabbim"),							_T("ClientIcons_Jabber"),		IDI_JABBIM,				JABBER_CASE	},
-	{"client_jabiru",			_T("*jabiru*"),								_T("Jabiru"),							_T("ClientIcons_Jabber"),		IDI_JABIRU,				JABBER_CASE	},
-	{"client_jappix",			_T("*jappix*"),								_T("jappix"),							_T("ClientIcons_Jabber"),		IDI_JAPPIX,				JABBER_CASE	},
-	{"client_jrudevels",		_T("*jrudevels*"),							_T("Jrudevels"),						_T("ClientIcons_Jabber"),		IDI_JRUDEVELS,			JABBER_CASE	},
-	{"client_juick",			_T("*juick*"),								_T("Juick"),							_T("ClientIcons_Jabber"),		IDI_JUICK,				JABBER_CASE	},
-	{"client_kf",				_T("|^*smack*|*kf*"),						_T("kf jabber"),						_T("ClientIcons_Jabber"),		IDI_KF,					JABBER_CASE	},
-	{"client_laffer",			_T("*laffer*"),								_T("Laffer"),							_T("ClientIcons_Jabber"),		IDI_LAFFER,				JABBER_CASE	},
-	{"client_mJabber",			_T("*mJabber*"),							_T("mJabber"),							_T("ClientIcons_Jabber"),		IDI_MJABBER,			JABBER_CASE	},
-	{"client_meinvz",			_T("*meinvz*"),								_T("MeinVZ"),							_T("ClientIcons_Jabber"),		IDI_MEINVZ,				JABBER_CASE	},
-	{"client_moJab",			_T("*moJab*"),								_T("moJab"),							_T("ClientIcons_Jabber"),		IDI_MOJAB,				JABBER_CASE	},
-	{"client_mobber",			_T("*mobber*"),								_T("mobber"),							_T("ClientIcons_Jabber"),		IDI_MOBBER,				JABBER_CASE	},
-	{"client_myJabber",			_T("*myJabber*"),							_T("myJabber"),							_T("ClientIcons_Jabber"),		IDI_MYJABBER,			JABBER_CASE	},
-	{"client_orkut",			_T("*orkut*"),								_T("orkut"),							_T("ClientIcons_Jabber"),		IDI_ORKUT,				JABBER_CASE	},
-	{"client_pjc",				_T("|*PJC*|http://pjc.googlecode.com/*"),	_T("PHP Jabber Client"),				_T("ClientIcons_Jabber"),		IDI_PJC,				JABBER_CASE	},
-	{"client_saje",				_T("*saje*"),								_T("saje"),								_T("ClientIcons_Jabber"),		IDI_SAJE,				JABBER_CASE	},
-	{"client_schuelervz",		_T("*schuelervz*"),							_T("SchulerVZ"),						_T("ClientIcons_Jabber"),		IDI_SCHULERVZ,			JABBER_CASE	},
-	{"client_studivz",			_T("*studivz*"),							_T("StudiVZ"),							_T("ClientIcons_Jabber"),		IDI_STUDIVZ,			JABBER_CASE	},
-	{"client_tkchat",			_T("*tkchat*"),								_T("tkchat"),							_T("ClientIcons_Jabber"),		IDI_TKCHAT,				JABBER_CASE	},
-//	{"client_uJabber",			_T("*uJabber*"),							_T("uJabber"),							_T("ClientIcons_Jabber"),		IDI_UJABBER,			JABBER_CASE	},
-	{"client_whoisbot",			_T("whoisbot"),								_T("Swissjabber Whois Bot"),			_T("ClientIcons_Jabber"),		IDI_WHOISBOT,			JABBER_CASE	},
-	{"client_xeus2",			_T("*xeus 2*"),								_T("xeus 2"),							_T("ClientIcons_Jabber"),		IDI_XEUS2,				JABBER_CASE	},
-	{"client_xeus",				_T("*xeus*"),								_T("xeus"),								_T("ClientIcons_Jabber"),		IDI_XEUS,				JABBER_CASE	},
+								_T("|*bWG06mEjKFM5ygtd84Ov95P8VH0=*"),		_T("xabber"),							_T("ClientIcons_Jabber"),		IDI_XABBER,				JABBER_CASE,	TRUE	},
+
+	{"client_Gabble",			_T("|*Gabble*"),							_T("Gabble"),							_T("ClientIcons_Jabber"),		IDI_GABBLE,				JABBER_CASE,	TRUE	},
+
+	{"client_Smack",			_T("|*igniterealtime.org/*smack*|*smack*"),	_T("Smack"),							_T("ClientIcons_Jabber"),		IDI_SMACK,				JABBER_CASE,	TRUE	},
+
+	{"client_SoapBox",			_T("*SoapBox*"),							_T("SoapBox"),							_T("ClientIcons_Jabber"),		IDI_SOAPBOX,			JABBER_CASE,	TRUE	},
+	{"client_Spark",			_T("*Spark*"),								_T("Spark"),							_T("ClientIcons_Jabber"),		IDI_SPARK,				JABBER_CASE,	TRUE	},
+	{"client_Speakall",			_T("*Speak*all*"),							_T("Speakall"),							_T("ClientIcons_Jabber"),		IDI_SPEAKALL,			JABBER_CASE,	TRUE	},
+	{"client_Speeqe",			_T("*Speeqe*"),								_T("Speeqe"),							_T("ClientIcons_Jabber"),		IDI_SPEEQE,				JABBER_CASE,	TRUE	},
+	{"client_Spik",				_T("*Spik*"),								_T("Spik"),								_T("ClientIcons_Jabber"),		IDI_SPIK,				JABBER_CASE,	TRUE	},
+	{"client_Swift",			_T("*Swift*"),								_T("Swift"),							_T("ClientIcons_Jabber"),		IDI_SWIFT,				JABBER_CASE,	TRUE	},
+	{"client_SworIM",			_T("*Swor*IM*"),							_T("SworIM"),							_T("ClientIcons_Jabber"),		IDI_SWORIM,				JABBER_CASE,	TRUE	},
+	{"client_Synapse",			_T("*Synapse*"),							_T("Synapse"),							_T("ClientIcons_Jabber"),		IDI_SYNAPSE,			JABBER_CASE,	TRUE	},
+	{"client_Talkdroid",		_T("*Talkdroid*"),							_T("Talkdroid"),						_T("ClientIcons_Jabber"),		IDI_TALKDROID,			JABBER_CASE,	TRUE	},
+	{"client_Talkonaut",		_T("*Talkonaut*"),							_T("Talkonaut"),						_T("ClientIcons_Jabber"),		IDI_TALKONAUT,			JABBER_CASE,	TRUE	},
+	{"client_Tapioca",			_T("*Tapioca*"),							_T("Tapioca"),							_T("ClientIcons_Jabber"),		IDI_TAPIOCA,			JABBER_CASE,	TRUE	},
+	{"client_Teabot",			_T("|*teabot*|*teabot.org/bot*|bot"),		_T("Teabot"),							_T("ClientIcons_Jabber"),		IDI_TEABOT,				JABBER_CASE,	TRUE	},
+	{"client_Telepathy",		_T("*Telepathy*"),							_T("Telepathy"),						_T("ClientIcons_Jabber"),		IDI_TELEPATHY,			JABBER_CASE,	TRUE	},
+	{"client_The_Bee",			_T("*The*Bee*"),							_T("The Bee"),							_T("ClientIcons_Jabber"),		IDI_THEBEE,				JABBER_CASE,	TRUE	},
+	{"client_Thunderbird",		_T("*Thunderbi*"),							_T("Thunderbird"),						_T("ClientIcons_Jabber"),		IDI_THUNDERBIRD,		JABBER_CASE,	TRUE	},
+	{"client_Tigase",			_T("*Tigase*"),								_T("Tigase"),							_T("ClientIcons_Jabber"),		IDI_TIGASE,				JABBER_CASE,	TRUE	},
+	{"client_TipicIM",			_T("Tipic*"),								_T("TipicIM"),							_T("ClientIcons_Jabber"),		IDI_TIPICIM,			JABBER_CASE,	TRUE	},
+	{"client_Tkabber",			_T("|*Tkabber*"),							_T("Tkabber"),							_T("ClientIcons_Jabber"),		IDI_TKABBER,			JABBER_CASE,	TRUE	},
+	{"client_TransactIM",		_T("*Transact*"),							_T("TransactIM"),						_T("ClientIcons_Jabber"),		IDI_TRANSACTIM,			JABBER_CASE,	TRUE	},
+	{"client_Translate",		_T("*Translate*"),							_T("Translate component"),				_T("ClientIcons_Jabber"),		IDI_TRANSLATE,			JABBER_CASE,	TRUE	},
+	{"client_Triple",			_T("Triple*"),								_T("TripleSoftwareIM (TSIM)"),			_T("ClientIcons_Jabber"),		IDI_TRIPLE_SOFTWARE,	JABBER_CASE,	TRUE	},
+	{"client_Twitter",			_T("*Twitter*"),							_T("Twitter"),							_T("ClientIcons_Jabber"),		IDI_TWITTER,			JABBER_CASE,	TRUE	},
+	{"client_VK",				_T("|*VKontakte*|*vk.com*"),				_T("VKontakte"),						_T("ClientIcons_Jabber"),		IDI_VK,					JABBER_CASE,	TRUE	},
+	{"client_Vacuum",			_T("*Vacuum*"),								_T("Vacuum IM"),						_T("ClientIcons_Jabber"),		IDI_VACUUM,				JABBER_CASE,	TRUE	},
+	{"client_V&V",				_T("*V&V*"),								_T("V&V Messenger"),					_T("ClientIcons_Jabber"),		IDI_VANDV,				JABBER_CASE,	TRUE	},
+	{"client_Vayusphere",		_T("*Vayusphere*"),							_T("Vayusphere"),						_T("ClientIcons_Jabber"),		IDI_VAYUSPHERE,			JABBER_CASE,	TRUE	},
+	{"client_Vysper",			_T("*Vysper*"),								_T("Vysper"),							_T("ClientIcons_Jabber"),		IDI_VYSPER,				JABBER_CASE,	TRUE	},
+	{"client_WTW",				_T("**WTW**|*wtw.k2t.eu*"),					_T("WTW"),								_T("ClientIcons_Jabber"),		IDI_WTW,				JABBER_CASE,	TRUE	},
+	{"client_WannaChat",		_T("Wanna*Chat*"),							_T("WannaChat"),						_T("ClientIcons_Jabber"),		IDI_WANNACHAT,			JABBER_CASE,	TRUE	},
+	{"client_WebEx",			_T("*webex.com*"),							_T("Cisco WebEx Connect"),				_T("ClientIcons_Jabber"),		IDI_WEBEX,				JABBER_CASE,	TRUE	},
+	{"client_WhisperIM",		_T("*Whisper*"),							_T("WhisperIM"),						_T("ClientIcons_Jabber"),		IDI_WHISPERIM,			JABBER_CASE,	TRUE	},
+	{"client_Wija",				_T("*wija*"),								_T("Wija"),								_T("ClientIcons_Jabber"),		IDI_WIJA,				JABBER_CASE,	TRUE	},
+	{"client_Wildfire",			_T("Wildfire*"),							_T("Wildfire"),							_T("ClientIcons_Jabber"),		IDI_WILDFIRE,			JABBER_CASE,	TRUE	},
+	{"client_WinJab",			_T("*WinJab*"),								_T("WinJab"),							_T("ClientIcons_Jabber"),		IDI_WINJAB,				JABBER_CASE,	TRUE	},
+	{"client_XMPP",				_T("*XMPP*"),								_T("XMPP"),								_T("ClientIcons_Jabber"),		IDI_XMPP,				JABBER_CASE,	TRUE	},
+	{"client_Xiffian",			_T("*Xiffian*"),							_T("Xiffian"),							_T("ClientIcons_Jabber"),		IDI_XIFFIAN,			JABBER_CASE,	TRUE	},
+	{"client_Yambi",			_T("*Yambi*"),								_T("Yambi"),							_T("ClientIcons_Jabber"),		IDI_YAMBI,				JABBER_CASE,	TRUE	},
+	{"client_chat_bots",		_T("*chat*bot*"),							_T("chat bot"),							_T("ClientIcons_Jabber"),		IDI_CHAT_BOT,			JABBER_CASE,	TRUE	},
+	{"client_dziObber",			_T("*dzi?bber*"),							_T("dziObber"),							_T("ClientIcons_Jabber"),		IDI_DZIOBBER,			JABBER_CASE,	TRUE	},
+	{"client_ejabberd",			_T("*ejabberd*"),							_T("ejabberd"),							_T("ClientIcons_Jabber"),		IDI_EJABBERD,			JABBER_CASE,	TRUE	},
+	{"client_emite",			_T("*emite*"),								_T("emite"),							_T("ClientIcons_Jabber"),		IDI_EMITE,				JABBER_CASE,	TRUE	},
+	{"client_gYaber",			_T("gYaber*"),								_T("gYaber"),							_T("ClientIcons_Jabber"),		IDI_GYABER,				JABBER_CASE,	TRUE	},
+	{"client_glu",				_T("*glu*"),								_T("glu"),								_T("ClientIcons_Jabber"),		IDI_GLU,				JABBER_CASE,	TRUE	},
+	{"client_iGoogle",			_T("iGoogle*"),								_T("iGoogle"),							_T("ClientIcons_Jabber"),		IDI_IGOOGLE,			JABBER_CASE,	TRUE	},
+	{"client_iJab",				_T("*iJab*"),								_T("iJab"),								_T("ClientIcons_Jabber"),		IDI_IJAB,				JABBER_CASE,	TRUE	},
+	{"client_iMeem",			_T("iMeem*"),								_T("iMeem"),							_T("ClientIcons_Jabber"),		IDI_IMEEM,				JABBER_CASE,	TRUE	},
+	{"client_iMov",				_T("*imov*"),								_T("iMov"),								_T("ClientIcons_Jabber"),		IDI_IMOV,				JABBER_CASE,	TRUE	},
+	{"client_jTalk",			_T("*jTalk*"),								_T("jTalk"),							_T("ClientIcons_Jabber"),		IDI_JTALK,				JABBER_CASE,	TRUE	},
+	{"client_jabberDisk",		_T("|*jdisk*|*jabberDisk*"),				_T("jabberDisk"),						_T("ClientIcons_Jabber"),		IDI_JABBER_DISK,		JABBER_CASE,	TRUE	},
+	{"client_jabbim",			_T("*jabbim*"),								_T("Jabbim"),							_T("ClientIcons_Jabber"),		IDI_JABBIM,				JABBER_CASE,	TRUE	},
+	{"client_jabiru",			_T("*jabiru*"),								_T("Jabiru"),							_T("ClientIcons_Jabber"),		IDI_JABIRU,				JABBER_CASE,	TRUE	},
+	{"client_jappix",			_T("*jappix*"),								_T("jappix"),							_T("ClientIcons_Jabber"),		IDI_JAPPIX,				JABBER_CASE,	TRUE	},
+	{"client_jrudevels",		_T("*jrudevels*"),							_T("Jrudevels"),						_T("ClientIcons_Jabber"),		IDI_JRUDEVELS,			JABBER_CASE,	TRUE	},
+	{"client_juick",			_T("*juick*"),								_T("Juick"),							_T("ClientIcons_Jabber"),		IDI_JUICK,				JABBER_CASE,	TRUE	},
+	{"client_kf",				_T("|^*smack*|*kf*"),						_T("kf jabber"),						_T("ClientIcons_Jabber"),		IDI_KF,					JABBER_CASE,	TRUE	},
+	{"client_laffer",			_T("*laffer*"),								_T("Laffer"),							_T("ClientIcons_Jabber"),		IDI_LAFFER,				JABBER_CASE,	TRUE	},
+	{"client_mJabber",			_T("*mJabber*"),							_T("mJabber"),							_T("ClientIcons_Jabber"),		IDI_MJABBER,			JABBER_CASE,	TRUE	},
+	{"client_meinvz",			_T("*meinvz*"),								_T("MeinVZ"),							_T("ClientIcons_Jabber"),		IDI_MEINVZ,				JABBER_CASE,	TRUE	},
+	{"client_moJab",			_T("*moJab*"),								_T("moJab"),							_T("ClientIcons_Jabber"),		IDI_MOJAB,				JABBER_CASE,	TRUE	},
+	{"client_mobber",			_T("*mobber*"),								_T("mobber"),							_T("ClientIcons_Jabber"),		IDI_MOBBER,				JABBER_CASE,	TRUE	},
+	{"client_myJabber",			_T("*myJabber*"),							_T("myJabber"),							_T("ClientIcons_Jabber"),		IDI_MYJABBER,			JABBER_CASE,	TRUE	},
+	{"client_orkut",			_T("*orkut*"),								_T("orkut"),							_T("ClientIcons_Jabber"),		IDI_ORKUT,				JABBER_CASE,	TRUE	},
+	{"client_pjc",				_T("|*PJC*|http://pjc.googlecode.com/*"),	_T("PHP Jabber Client"),				_T("ClientIcons_Jabber"),		IDI_PJC,				JABBER_CASE,	TRUE	},
+	{"client_saje",				_T("*saje*"),								_T("saje"),								_T("ClientIcons_Jabber"),		IDI_SAJE,				JABBER_CASE,	TRUE	},
+	{"client_schuelervz",		_T("*schuelervz*"),							_T("SchulerVZ"),						_T("ClientIcons_Jabber"),		IDI_SCHULERVZ,			JABBER_CASE,	TRUE	},
+	{"client_studivz",			_T("*studivz*"),							_T("StudiVZ"),							_T("ClientIcons_Jabber"),		IDI_STUDIVZ,			JABBER_CASE,	TRUE	},
+	{"client_tkchat",			_T("*tkchat*"),								_T("tkchat"),							_T("ClientIcons_Jabber"),		IDI_TKCHAT,				JABBER_CASE,	TRUE	},
+//	{"client_uJabber",			_T("*uJabber*"),							_T("uJabber"),							_T("ClientIcons_Jabber"),		IDI_UJABBER,			JABBER_CASE,	TRUE	},
+	{"client_whoisbot",			_T("whoisbot"),								_T("Swissjabber Whois Bot"),			_T("ClientIcons_Jabber"),		IDI_WHOISBOT,			JABBER_CASE,	TRUE	},
+	{"client_xeus2",			_T("*xeus 2*"),								_T("xeus 2"),							_T("ClientIcons_Jabber"),		IDI_XEUS2,				JABBER_CASE,	TRUE	},
+	{"client_xeus",				_T("*xeus*"),								_T("xeus"),								_T("ClientIcons_Jabber"),		IDI_XEUS,				JABBER_CASE,	TRUE	},
 	{"client_yaonline",			_T("|*yandex*|*yaonline*")
-								_T("|*�.������*|*������*"),					_T("Ya.Online"),						_T("ClientIcons_Jabber"),		IDI_YAONLINE,			JABBER_CASE	},
-	{"client_yaxim",			_T("*yaxim*"),								_T("yaxim"),							_T("ClientIcons_Jabber"),		IDI_YAXIM,				JABBER_CASE	},
-
-//###########################################################################################################################################################################################################
-//#################################		TLEN	#############################################################################################################################################################
-//###########################################################################################################################################################################################################
-	{"client_Tlen",				_T("*Tlen*"),								_T("Tlen.pl"),							_T("ClientIcons_Tlen"),			IDI_TLEN,					TLEN_CASE	},
+								_T("|*�.������*|*������*"),					_T("Ya.Online"),						_T("ClientIcons_Jabber"),		IDI_YAONLINE,			JABBER_CASE,	TRUE	},
+	{"client_yaxim",			_T("*yaxim*"),								_T("yaxim"),							_T("ClientIcons_Jabber"),		IDI_YAXIM,				JABBER_CASE,	TRUE	},
 
 //###########################################################################################################################################################################################################
 //#################################		IRC		#############################################################################################################################################################
@@ -466,8 +455,6 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"client_XChatAqua",		_T("*X*Chat*Aqua*"),						_T("X-Chat Aqua"),						_T("ClientIcons_IRC"),			IDI_XCHATAQUA,			IRC_CASE,	TRUE	},
 	{"client_XiRCON",			_T("*XiRCON*"),								_T("XiRCON"),							_T("ClientIcons_IRC"),			IDI_XIRCON,				IRC_CASE,	TRUE	},
 	{"client_Xirc",				_T("*Xirc*"),								_T("Xirc"),								_T("ClientIcons_IRC"),			IDI_XIRC,				IRC_CASE,	TRUE	},
-	{"client_ZipTorrent",		_T("*ZipTorrent*"),							_T("ZipTorrent"),						_T("ClientIcons_IRC"),			IDI_ZIPTORRENT,			IRC_CASE,	TRUE	},
-	{"client_aMule",			_T("*aMule*"),								_T("aMule"),							_T("ClientIcons_IRC"),			IDI_AMULE,				IRC_CASE,	TRUE	},
 	{"client_cbirc",			_T("*cbirc*"),								_T("cbirc"),							_T("ClientIcons_IRC"),			IDI_CBIRC,				IRC_CASE,	TRUE	},
 	{"client_dIRC",				_T("*dIRC*"),								_T("dIRC"),								_T("ClientIcons_IRC"),			IDI_DIRC,				IRC_CASE,	TRUE	},
 
@@ -484,36 +471,20 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"client_xChat",			_T("*xChat*"),								_T("xChat"),							_T("ClientIcons_IRC"),			IDI_XCHAT,				IRC_CASE,	TRUE	},
 	{"client_zsIRC",			_T("*zsIRC*"),								_T("zsIRC"),							_T("ClientIcons_IRC"),			IDI_ZSIRC,				IRC_CASE,	TRUE	},
 
+	{"client_aMule",			_T("*aMule*"),								_T("aMule"),							_T("ClientIcons_IRC"),			IDI_AMULE,				IRC_CASE,	TRUE	},
 	{"client_eMuleMorphXT",		_T("eMule*MorphXT*"),						_T("eMule MorphXT"),					_T("ClientIcons_IRC"),			IDI_EMULE_MORPHXT,		IRC_CASE,	TRUE	},
 	{"client_eMuleNeo",			_T("eMule*Neo*"),							_T("eMule Neo"),						_T("ClientIcons_IRC"),			IDI_EMULE_NEO,			IRC_CASE,	TRUE	},
 	{"client_eMulePlus",		_T("|eMule*plus*|eMule*+*"),				_T("eMule+"),							_T("ClientIcons_IRC"),			IDI_EMULE_PLUS,			IRC_CASE,	TRUE	},
 	{"client_eMuleXtreme",		_T("eMule*Xtreme*"),						_T("eMule Xtreme"),						_T("ClientIcons_IRC"),			IDI_EMULE_XTREME,		IRC_CASE,	TRUE	},
 	{"client_eMule",			_T("*eMule*"),								_T("eMule"),							_T("ClientIcons_IRC"),			IDI_EMULE,				IRC_CASE,	TRUE	},
 
-	{"client_IRCUnknown",		_T("*IRC*"),								_T("Unknown IRC client"),				_T("ClientIcons_IRC"),			IDI_IRC_UNKNOWN,		IRC_CASE,	TRUE	},
-
-//###########################################################################################################################################################################################################
-//#################################		MSN		#############################################################################################################################################################
-//###########################################################################################################################################################################################################
-	{"client_WLM11",			_T("WLM*2011*"),							_T("Windows Live 11"),					_T("ClientIcons_MSN"),			IDI_WLM_10,				MSN_CASE,	TRUE	},
-	{"client_WLM10",			_T("WLM*2010*"),							_T("Windows Live 10"),					_T("ClientIcons_MSN"),			IDI_WLM_10,				MSN_CASE,	TRUE	},
-	{"client_WLM9",				_T("WLM*9*"),								_T("Windows Live v9.x"),				_T("ClientIcons_MSN"),			IDI_WLM_9,				MSN_CASE,	TRUE	},
-	{"client_MSN8",				_T("|WLM*8.*|MSN*8.*"),						_T("Windows Live v8.x"),				_T("ClientIcons_MSN"),			IDI_MSN_8,				MSN_CASE,	TRUE	},
-	{"client_MSN7x",			_T("MSN*7.*"),								_T("MSN Messenger v7.x"),				_T("ClientIcons_MSN"),			IDI_MSN_7,				MSN_CASE,	TRUE	},
-	{"client_MSN6x",			_T("MSN*6.*"),								_T("MSN Messenger v6.x"),				_T("ClientIcons_MSN"),			IDI_MSN_6,				MSN_CASE,	TRUE	},
-	{"client_MSN45",			_T("MSN*4.x-5.x"),							_T("MSN Messenger v4.x-5.x"),			_T("ClientIcons_MSN"),			IDI_MSN_45,				MSN_CASE,	TRUE	},
-	{"client_MSN4Mac",			_T("MSN*Mac*"),								_T("MSN for Mac"),						_T("ClientIcons_MSN"),			IDI_MSN_MAC,			MSN_CASE,	TRUE	},
-	{"client_aMSN",				_T("*aMSN*"),								_T("aMSN"),								_T("ClientIcons_MSN"),			IDI_AMSN,				MSN_CASE,	TRUE	},
-	{"client_MSN_Web",			_T("WebMessenger*"),						_T("WebMessenger"),						_T("ClientIcons_MSN"),			IDI_WEBMESSENGER,		MSN_CASE,	TRUE	},
-	{"client_MSN",				_T("|WLM*|MSN*|Windows Live*"),				_T("MSN"),								_T("ClientIcons_MSN"),			IDI_MSN,				MSN_CASE,	TRUE	},
+	{"client_IRCUnknown",		_T("*IRC*"),								_T("Unknown IRC client"),				_T("ClientIcons_IRC"),			IDI_IRC,				IRC_CASE,	TRUE	},
 
 //###########################################################################################################################################################################################################
 //#################################		AIM		#############################################################################################################################################################
 //###########################################################################################################################################################################################################
 	{"client_Aim7",				_T("AIM*7.*"),								_T("AIM v7.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_7,				AIM_CASE,	TRUE	},
 	{"client_Aim6",				_T("AIM*6.*"),								_T("AIM v6.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_6,				AIM_CASE,	TRUE	},
-	{"client_Aim5",				_T("AIM*5.*"),								_T("AIM v5.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_5,				AIM_CASE,	TRUE	},
-	{"client_Aim4",				_T("AIM*4.*"),								_T("AIM v4.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_4,				AIM_CASE,	TRUE	},
 
 	{"client_AIM_Triton",		_T("*AIM*Triton*"),							_T("AIM Triton"),						_T("ClientIcons_AIM"),	 		IDI_AIM_TRITON,			AIM_CASE,	TRUE	},
 	{"client_AimMac",			_T("AIM*Mac*"),								_T("AIM for MacOS"),					_T("ClientIcons_AIM"),	 		IDI_AIM_MAC,			AIM_CASE,	TRUE	},
@@ -524,25 +495,19 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"client_AIM",				_T("AIM*"),									_T("AIM"),								_T("ClientIcons_AIM"),	 		IDI_AIM_7,				AIM_CASE,	TRUE	},
 
 //###########################################################################################################################################################################################################
-//#################################		YAHOO	#############################################################################################################################################################
-//###########################################################################################################################################################################################################
-	{"client_Yahoo10",			_T("*Yahoo*10*"),							_T("Yahoo v10.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO10,			YAHOO_CASE	},
-	{"client_Yahoo9",			_T("*Yahoo*9*"),							_T("Yahoo v9.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO8,				YAHOO_CASE	},
-	{"client_Yahoo8",			_T("*Yahoo*8*"),							_T("Yahoo v8.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO8,				YAHOO_CASE	},
-	{"client_Yahoo7",			_T("*Yahoo*7*"),							_T("Yahoo v7.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO7,				YAHOO_CASE	},
-	{"client_Yahoo6",			_T("*Yahoo*6*"),							_T("Yahoo v6.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO6,				YAHOO_CASE	},
-	{"client_Yahoo5",			_T("*Yahoo*5*"),							_T("Yahoo v5.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO5,				YAHOO_CASE	},
-	{"client_YahGoMobile",		_T("|Yahoo*Go*|Yahoo*Mobile*"),				_T("Yahoo! Go Mobile"),					_T("ClientIcons_Yahoo"),		IDI_YAHOO_GO_MOBILE,	YAHOO_CASE,	TRUE	},
-	{"client_PingBox",			_T("*Yahoo*PingBox*"),						_T("Yahoo PingBox"),					_T("ClientIcons_Yahoo"),		IDI_PINGBOX,			YAHOO_CASE,	TRUE	},
-	{"client_YahooWeb",			_T("*Yahoo*Web*Messenger"),					_T("Yahoo Web Messenger"),				_T("ClientIcons_Yahoo"),		IDI_YAHOO10,			YAHOO_CASE,	TRUE	},
-	{"client_libyahoo2",		_T("*libyahoo*"),							_T("libyahoo2"),						_T("ClientIcons_Yahoo"),		IDI_LIBYAHOO2,			YAHOO_CASE,	TRUE	},
-	{"client_Yahoo",			_T("*Yahoo*"),								_T("Yahoo"),							_T("ClientIcons_Yahoo"),		IDI_YAHOO,				YAHOO_CASE	},
-
-//###########################################################################################################################################################################################################
-//#################################		GADU-GADU 	#########################################################################################################################################################
+//#################################		MSN		#############################################################################################################################################################
 //###########################################################################################################################################################################################################
-	{"client_Gadu_Gadu_7",		_T("Gadu-Gadu*7*"),							_T("Gadu-Gadu v7.x"),					_T("ClientIcons_Gadu"),			IDI_GADU_GADU_7,		GG_CASE,	TRUE	},
-	{"client_Gadu_Gadu_6",		_T("Gadu-Gadu*6*"),							_T("Gadu-Gadu v6.x"),					_T("ClientIcons_Gadu"),			IDI_GADU_GADU_6,		GG_CASE,	TRUE	},
+	{"client_WLM11",			_T("WLM*2011*"),							_T("Windows Live 11"),					_T("ClientIcons_MSN"),			IDI_WLM_10,				MSN_CASE,	TRUE	},
+	{"client_WLM10",			_T("WLM*2010*"),							_T("Windows Live 10"),					_T("ClientIcons_MSN"),			IDI_WLM_10,				MSN_CASE,	TRUE	},
+	{"client_WLM9",				_T("WLM*9*"),								_T("Windows Live v9.x"),				_T("ClientIcons_MSN"),			IDI_WLM_9,				MSN_CASE,	TRUE	},
+	{"client_MSN8",				_T("|WLM*8.*|MSN*8.*"),						_T("Windows Live v8.x"),				_T("ClientIcons_MSN"),			IDI_MSN_8,				MSN_CASE,	TRUE	},
+	{"client_MSN7x",			_T("MSN*7.*"),								_T("MSN Messenger v7.x"),				_T("ClientIcons_MSN"),			IDI_MSN_7,				MSN_CASE,	TRUE	},
+	{"client_MSN6x",			_T("MSN*6.*"),								_T("MSN Messenger v6.x"),				_T("ClientIcons_MSN"),			IDI_MSN_6,				MSN_CASE,	TRUE	},
+	{"client_MSN45",			_T("MSN*4.x-5.x"),							_T("MSN Messenger v4.x-5.x"),			_T("ClientIcons_MSN"),			IDI_MSN_45,				MSN_CASE,	TRUE	},
+	{"client_MSN4Mac",			_T("MSN*Mac*"),								_T("MSN for Mac"),						_T("ClientIcons_MSN"),			IDI_MSN_MAC,			MSN_CASE,	TRUE	},
+	{"client_aMSN",				_T("*aMSN*"),								_T("aMSN"),								_T("ClientIcons_MSN"),			IDI_AMSN,				MSN_CASE,	TRUE	},
+	{"client_MSN_Web",			_T("WebMessenger*"),						_T("WebMessenger"),						_T("ClientIcons_MSN"),			IDI_WEBMESSENGER,		MSN_CASE,	TRUE	},
+	{"client_MSN",				_T("|WLM*|MSN*|Windows Live*"),				_T("MSN"),								_T("ClientIcons_MSN"),			IDI_MSN,				MSN_CASE,	TRUE	},
 
 //###########################################################################################################################################################################################################
 //#################################		MAIL.RU 	#########################################################################################################################################################
@@ -557,14 +522,13 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"client_MRA_unknown",		_T("Mail.ru Agent*"),						_T("Mail.Ru (unknown client)"),			_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_UNKNOWN,	MRA_CASE,	TRUE	},
 
 //###########################################################################################################################################################################################################
-//#################################		OTHER CLIENTS	#####################################################################################################################################################
+//#################################		YAHOO	#############################################################################################################################################################
 //###########################################################################################################################################################################################################
-	{"client_Android",			_T("*Android*"),							_T("Android"),							_T("ClientIcons_multiproto"),	IDI_ANDROID,			MULTI_CASE,	TRUE	},
-	{"client_Pidgin",			_T("|*Pidgin*|*libpurple*|Purple*"),		_T("Pidgin (libpurple)"),				_T("ClientIcons_multiproto"),	IDI_PIDGIN,				MULTI_CASE	},
-
-	{"client_Skype",			_T("*Skype**"),								_T("Skype client"),						_T("ClientIcons_Others"),		IDI_SKYPE,				OTHER_PROTOS_CASE,	TRUE	},
-
-	{"client_Xfire",			_T("*Xfire*"),								_T("Xfire"),							_T("ClientIcons_multiproto"),	IDI_XFIRE,				OTHER_PROTOS_CASE,	TRUE	},
+	{"client_YahGoMobile",		_T("|Yahoo*Go*|Yahoo*Mobile*"),				_T("Yahoo! Go Mobile"),					_T("ClientIcons_Yahoo"),		IDI_YAHOO_GO_MOBILE,	YAHOO_CASE,	TRUE	},
+	{"client_PingBox",			_T("*Yahoo*PingBox*"),						_T("Yahoo PingBox"),					_T("ClientIcons_Yahoo"),		IDI_YAHOO_PINGBOX,		YAHOO_CASE,	TRUE	},
+	{"client_YahooWeb",			_T("*Yahoo*Web*Messenger"),					_T("Yahoo Web Messenger"),				_T("ClientIcons_Yahoo"),		IDI_YAHOO_WEB,			YAHOO_CASE,	TRUE	},
+	{"client_libyahoo2",		_T("*libyahoo*"),							_T("libyahoo2"),						_T("ClientIcons_Yahoo"),		IDI_LIBYAHOO2,			YAHOO_CASE,	TRUE	},
+	{"client_Yahoo",			_T("*Yahoo*"),								_T("Yahoo Messenger"),					_T("ClientIcons_Yahoo"),		IDI_YAHOO,				YAHOO_CASE	},
 
 //###########################################################################################################################################################################################################
 //#################################		WEATHER		#########################################################################################################################################################
@@ -607,6 +571,27 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"client_QQ",				_T("QQ*"),									_T("QQ"),								_T("ClientIcons_QQ"),			IDI_QQ,					QQ_CASE	},
 
 //###########################################################################################################################################################################################################
+//#################################		GADU-GADU 	#########################################################################################################################################################
+//###########################################################################################################################################################################################################
+	{"client_GG",				_T("|Gadu-Gadu*|GG*"),						_T("Gadu-Gadu client"),					_T("ClientIcons_GG"),			IDI_GG,					GG_CASE	},
+
+//###########################################################################################################################################################################################################
+//#################################		TLEN	#############################################################################################################################################################
+//###########################################################################################################################################################################################################
+	{"client_Tlen",				_T("*Tlen*"),								_T("Tlen.pl client"),					_T("ClientIcons_Tlen"),			IDI_TLEN,				TLEN_CASE	},
+
+//###########################################################################################################################################################################################################
+//#################################		OTHER CLIENTS	#####################################################################################################################################################
+//###########################################################################################################################################################################################################
+	{"client_Android",			_T("*Android*"),							_T("Android"),							_T("ClientIcons_multiproto"),	IDI_ANDROID,			MULTI_CASE,	TRUE	},
+	{"client_Pidgin",			_T("|*Pidgin*|*libpurple*|Purple*"),		_T("Pidgin (libpurple)"),				_T("ClientIcons_multiproto"),	IDI_PIDGIN,				MULTI_CASE	},
+
+	{"client_Skype",			_T("*Skype**"),								_T("Skype client"),						_T("ClientIcons_Others"),		IDI_SKYPE,				OTHER_PROTOS_CASE,	TRUE	},
+
+	{"client_Xfire",			_T("*Xfire*"),								_T("Xfire"),							_T("ClientIcons_multiproto"),	IDI_XFIRE,				OTHER_PROTOS_CASE,	TRUE	},
+
+
+//###########################################################################################################################################################################################################
 //#################################		UNDEFINED CLIENTS	#################################################################################################################################################
 //###########################################################################################################################################################################################################
 	{"client_Notfound",			_T("Notfound"),								_T("client not found"),					_T(""),							IDI_NOTFOUND,			OTHERS_CASE,	TRUE	},
@@ -671,7 +656,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 //###########################################################################################################################################################################################################
 //#################################		PROTO OVERLAYS		#################################################################################################################################################
 //###########################################################################################################################################################################################################
-	{"client_AIM_overlay",		_T("*AIM*"),								_T("AIM overlay"),						_T("ClientIcons_overlays"),		IDI_AIMOSCAR_OVERLAY,	OVERLAYS_PROTO_CASE	},	//FIX
+	{"client_AIM_overlay",		_T("*AIM*"),								_T("AIM overlay"),						_T("ClientIcons_overlays"),		IDI_AIM_OVERLAY,		OVERLAYS_PROTO_CASE	},	//FIX
 	{"client_ICQJ_Plus_over",	_T("*ICQ*Plus*"),							_T("ICQJ Plus Mod overlay"),			_T("ClientIcons_overlays"),		IDI_ICQJ_PLUS_OVERLAY,	OVERLAYS_PROTO_CASE	},
 	{"client_ICQJ_overlay",		_T("|^ICQ*|*ICQ*"),							_T("ICQJ overlay"),						_T("ClientIcons_overlays"),		IDI_ICQJ_OVERLAY,		OVERLAYS_PROTO_CASE	},
 	{"client_IRC_overlay",		_T("Miranda*IRC*"),							_T("IRC overlay"),						_T("ClientIcons_overlays"),		IDI_IRC_OVERLAY,		OVERLAYS_PROTO_CASE	},
@@ -680,7 +665,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{"client_Jabber_overlay",	_T("|Miranda*Jabber*|*t Jabber*"),			_T("Jabber overlay"),					_T("ClientIcons_overlays"),		IDI_JABBER_OVERLAY,		OVERLAYS_PROTO_CASE	},
 	{"client_MailRu_overlay",	_T("|*Mail.ru*IM*|*MRA*"),					_T("Mail.Ru Agent overlay"),			_T("ClientIcons_overlays"),		IDI_MAILRU_OVERLAY,		OVERLAYS_PROTO_CASE	},
 	{"client_MSN_overlay",		_T("Miranda*MSN*"),							_T("MSN overlay"),						_T("ClientIcons_overlays"),		IDI_MSN_OVERLAY,		OVERLAYS_PROTO_CASE	},
-	{"client_QQ_overlay",		_T("|Miranda*QQ*|MIMQQ*"),					_T("QQ overlay"),						_T("ClientIcons_overlays"),		IDI_QQ_OVERLAY,			OVERLAYS_PROTO_CASE	},
+	{"client_QQ_overlay",		_T("|Miranda*QQ*|MIM*QQ*"),					_T("QQ overlay"),						_T("ClientIcons_overlays"),		IDI_QQ_OVERLAY,			OVERLAYS_PROTO_CASE	},
 	{"client_Tlen_overlay",		_T("*tlen.pl"),								_T("Tlen.pl overlay"),					_T("ClientIcons_overlays"),		IDI_TLEN_OVERLAY,		OVERLAYS_PROTO_CASE	},
 	{"client_Yahoo_overlay",	_T("*yahoo*"),								_T("Yahoo overlay"),					_T("ClientIcons_overlays"),		IDI_YAHOO_OVERLAY,		OVERLAYS_PROTO_CASE	},
 
@@ -691,30 +676,33 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{"client_ICQ7_over",		_T("ICQ*7*"),								_T("ICQ v7.x overlay"),					_T("ClientIcons_ICQ"),			IDI_ICQ7_OVERLAY,		ICQ_CASE	},
 	{"client_ICQ8_over",		_T("ICQ*8*"),								_T("ICQ v8.x overlay"),					_T("ClientIcons_ICQ"),			IDI_ICQ8_OVERLAY,		ICQ_CASE	},
 
-	{"client_Yahoo10",			_T("*Yahoo 10*"),							_T("Yahoo v10.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_CLIENT_YAHOO10,		YAHOO_CASE	},
-	{"client_Yahoo9",			_T("*Yahoo 9*"),							_T("Yahoo v9.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_CLIENT_YAHOO9,		YAHOO_CASE	},
-	{"client_Yahoo8",			_T("*Yahoo 8*"),							_T("Yahoo v8.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_CLIENT_YAHOO8,		YAHOO_CASE	},
-	{"client_Yahoo7",			_T("*Yahoo 7*"),							_T("Yahoo v7.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_CLIENT_YAHOO7,		YAHOO_CASE	},
-	{"client_Yahoo6",			_T("*Yahoo 6*"),							_T("Yahoo v6.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_CLIENT_YAHOO6,		YAHOO_CASE	},
-	{"client_Yahoo5",			_T("*Yahoo 5*"),							_T("Yahoo v5.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_CLIENT_YAHOO5,		YAHOO_CASE	},
-
-	{"client_QQ_2011",			_T("|QQ2011*|TM2011*"),						_T("TM/QQ 2011 overlay"),				_T("ClientIcons_QQ"),			IDI_CLIENT_TM_QQ2011,	QQ_CASE	},
-	{"client_QQ_2010",			_T("|QQ2010*|TM2010*"),						_T("TM/QQ 2010 overlay"),				_T("ClientIcons_QQ"),			IDI_CLIENT_TM_QQ2010,	QQ_CASE	},
-	{"client_QQ_2009",			_T("|QQ2009*|TM2009*"),						_T("TM/QQ 2009 overlay"),				_T("ClientIcons_QQ"),			IDI_CLIENT_TM_QQ2009,	QQ_CASE	},
-	{"client_QQ_2008",			_T("|QQ2008*|TM2008*"),						_T("TM/QQ 2008 overlay"),				_T("ClientIcons_QQ"),			IDI_CLIENT_TM_QQ2008,	QQ_CASE	},
-	{"client_QQ_2007",			_T("|QQ2007*|TM2007*"),						_T("TM/QQ 2007 overlay"),				_T("ClientIcons_QQ"),			IDI_CLIENT_TM_QQ2007,	QQ_CASE	},
-	{"client_QQ_2006",			_T("|QQ2006*|TM2006*"),						_T("TM/QQ 2006 overlay"),				_T("ClientIcons_QQ"),			IDI_CLIENT_TM_QQ2006,	QQ_CASE	},
-	{"client_QQ_2005",			_T("|QQ2005*|TM2005*"),						_T("TM/QQ 2005 overlay"),				_T("ClientIcons_QQ"),			IDI_CLIENT_TM_QQ2005,	QQ_CASE	},
-	{"client_QQ_2004",			_T("QQ2004*"),								_T("QQ 2004 overlay"),					_T("ClientIcons_QQ"),			IDI_CLIENT_QQ2004,		QQ_CASE	},
-	{"client_QQ_2003",			_T("|QQ2003*|TM 3.*"),						_T("TM 3.x / QQ 2003 overlay"),			_T("ClientIcons_QQ"),			IDI_CLIENT_TM_QQ2003,	QQ_CASE	},
-	{"client_TM_2002",			_T("TM 2.*"),								_T("TM 2.x overlay"),					_T("ClientIcons_QQ"),			IDI_CLIENT_TM2,			QQ_CASE	},
-	{"client_TM_2001",			_T("TM 1.*"),								_T("TM 1.x overlay"),					_T("ClientIcons_QQ"),			IDI_CLIENT_TM1,			QQ_CASE	},
-	{"client_QQ_2000",			_T("QQ2000*"),								_T("QQ 2000 overlay"),					_T("ClientIcons_QQ"),			IDI_CLIENT_QQ2000,		QQ_CASE	},
-
-
-	{"client_Tlen_7",			_T("Tlen Protocol 16"),						_T("Tlen 7.x overlay"),					_T("ClientIcons_Tlen"),			IDI_CLIENT_TLEN7,		TLEN_CASE	},
-	{"client_Tlen_6",			_T("Tlen Protocol 10"),						_T("Tlen 6.x overlay"),					_T("ClientIcons_Tlen"),			IDI_CLIENT_TLEN6,		TLEN_CASE	},
-	{"client_Tlen_5",			_T("Tlen Protocol 7"),						_T("Tlen 5.x overlay"),					_T("ClientIcons_Tlen"),			IDI_CLIENT_TLEN5,		TLEN_CASE	},
+	{"client_Yahoo11",			_T("*Yahoo 11*"),							_T("Yahoo v11.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_YAHOO11_OVERLAY,	YAHOO_CASE	},
+	{"client_Yahoo10",			_T("*Yahoo 10*"),							_T("Yahoo v10.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_YAHOO10_OVERLAY,	YAHOO_CASE	},
+	{"client_Yahoo9",			_T("*Yahoo 9*"),							_T("Yahoo v9.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_YAHOO9_OVERLAY,		YAHOO_CASE	},
+
+	{"client_GG_11",			_T("|Gadu-Gadu*11*|GG*11*"),				_T("Gadu-Gadu v11 client"),				_T("ClientIcons_GG"),			IDI_GG11_OVERLAY,		GG_CASE	},
+	{"client_GG_10",			_T("|Gadu-Gadu*10*|GG*10"),					_T("Gadu-Gadu v10 client"),				_T("ClientIcons_GG"),			IDI_GG10_OVERLAY,		GG_CASE	},
+	{"client_GG_9",				_T("|Gadu-Gadu*9*|GG*9*"),					_T("Gadu-Gadu v9 client"),				_T("ClientIcons_GG"),			IDI_GG9_OVERLAY,		GG_CASE	},
+	{"client_GG_8",				_T("|Gadu-Gadu*8*|GG*8*"),					_T("Gadu-Gadu v8 client"),				_T("ClientIcons_GG"),			IDI_GG8_OVERLAY,		GG_CASE	},
+
+//	{"client_Tlen_8",			_T("Tlen Protocol 1?"),						_T("Tlen 8.x overlay"),					_T("ClientIcons_Tlen"),			IDI_TLEN8_OVERLAY,		TLEN_CASE	},
+	{"client_Tlen_7",			_T("Tlen Protocol 16"),						_T("Tlen 7.x overlay"),					_T("ClientIcons_Tlen"),			IDI_TLEN7_OVERLAY,		TLEN_CASE	},
+	{"client_Tlen_6",			_T("Tlen Protocol 10"),						_T("Tlen 6.x overlay"),					_T("ClientIcons_Tlen"),			IDI_TLEN6_OVERLAY,		TLEN_CASE	},
+	{"client_Tlen_5",			_T("Tlen Protocol 7"),						_T("Tlen 5.x overlay"),					_T("ClientIcons_Tlen"),			IDI_TLEN5_OVERLAY,		TLEN_CASE	},
+
+	{"client_QQ_2012",			_T("|QQ2012*|TM2012*"),						_T("TM/QQ 2012 overlay"),				_T("ClientIcons_QQ"),			IDI_QQ_2012_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2011",			_T("|QQ2011*|TM2011*"),						_T("TM/QQ 2011 overlay"),				_T("ClientIcons_QQ"),			IDI_QQ_2011_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2010",			_T("|QQ2010*|TM2010*"),						_T("TM/QQ 2010 overlay"),				_T("ClientIcons_QQ"),			IDI_QQ_2010_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2009",			_T("|QQ2009*|TM2009*"),						_T("TM/QQ 2009 overlay"),				_T("ClientIcons_QQ"),			IDI_QQ_2009_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2008",			_T("|QQ2008*|TM2008*"),						_T("TM/QQ 2008 overlay"),				_T("ClientIcons_QQ"),			IDI_QQ_2008_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2007",			_T("|QQ2007*|TM2007*"),						_T("TM/QQ 2007 overlay"),				_T("ClientIcons_QQ"),			IDI_QQ_2007_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2006",			_T("|QQ2006*|TM2006*"),						_T("TM/QQ 2006 overlay"),				_T("ClientIcons_QQ"),			IDI_QQ_2006_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2005",			_T("|QQ2005*|TM2005*"),						_T("TM/QQ 2005 overlay"),				_T("ClientIcons_QQ"),			IDI_QQ_2005_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2004",			_T("QQ2004*"),								_T("QQ 2004 overlay"),					_T("ClientIcons_QQ"),			IDI_QQ_2004_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2003",			_T("|QQ2003*|TM 3.*"),						_T("TM 3.x / QQ 2003 overlay"),			_T("ClientIcons_QQ"),			IDI_QQ_2003_OVERLAY,	QQ_CASE	},
+	{"client_TM_2002",			_T("TM 2.*"),								_T("TM 2.x overlay"),					_T("ClientIcons_QQ"),			IDI_QQ_2002_OVERLAY,	QQ_CASE	},
+	{"client_TM_2001",			_T("TM 1.*"),								_T("TM 1.x overlay"),					_T("ClientIcons_QQ"),			IDI_QQ_2001_OVERLAY,	QQ_CASE	},
+	{"client_QQ_2000",			_T("QQ2000*"),								_T("QQ 2000 overlay"),					_T("ClientIcons_QQ"),			IDI_QQ_2000_OVERLAY,	QQ_CASE	},
 
 //###########################################################################################################################################################################################################
 //#################################		PLATFORM OVERLAYS	#################################################################################################################################################
@@ -727,6 +715,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{"client_on_Flash",			_T("|*Flash*|*Web*ICQ*|"),					_T("Flash overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_FLASH,		OVERLAYS_PLATFORM_CASE	},
 	{"client_on_Java",			_T("|*Java*|jagent*|ICQ2Go!*"),				_T("Java overlay"),						_T("ClientIcons_overlays"),		IDI_PLATFORM_JAVA,		OVERLAYS_PLATFORM_CASE	},
 	{"client_on_Symbian",		_T("|*Symbian*|sagent*"),					_T("Symbian overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_SYMBIAN,	OVERLAYS_PLATFORM_CASE	},
+	{"client_on_Amiga",			_T("|*Amiga*|"),							_T("Amiga overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_AMIGA,		OVERLAYS_PLATFORM_CASE	},
 	{"client_on_Android",		_T("|*Android*|"),							_T("Android overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_ANDROID,	OVERLAYS_PLATFORM_CASE	},
 
 };
@@ -768,14 +757,11 @@ int DEFAULT_KN_FP_OVERLAYS2_COUNT = SIZEOF(def_kn_fp_overlays2_mask);
 KN_FP_MASK def_kn_fp_overlays3_mask[] =
 {//	{"Client_IconName",			_T("|^*Mask*|*names*"),						_T("Icon caption"),						_T("iconpack name"),			IDI_RESOURCE_ID,		CLIENT_CASE,		OVERLAY?	},
 	{"client_SecureIM_over",	_T("*Secure*IM*"),							_T("SecureIM overlay"),					_T("ClientIcons_overlays"),		IDI_SECUREIM_OVERLAY,	OVERLAYS_SECURITY_CASE	},
-	{"client_SimpPro_over",		_T("*SimpPro*"),							_T("SimpPro overlay"),					_T("ClientIcons_overlays"),		IDI_SIMPPRO_OVERLAY,	OVERLAYS_SECURITY_CASE	},
-	{"client_SimpLite_over",	_T("*SimpLite*"),							_T("SimpLite overlay"),					_T("ClientIcons_overlays"),		IDI_SIMPLITE_OVERLAY,	OVERLAYS_SECURITY_CASE	},
-	{"client_IMSecure_over",	_T("*IMSecure*"),							_T("IMSecure overlay"),					_T("ClientIcons_overlays"),		IDI_IMSECURE_OVERLAY,	OVERLAYS_SECURITY_CASE	},
 
 	{"client_platform_x64",		_T("|*x64*|*64*bit*"),						_T("x64 overlay"),						_T("ClientIcons_overlays"),		IDI_PLATFORM_X64,		OVERLAYS_PLATFORM_CASE	},
 	{"client_platform_x32",		_T("|*x32*|*32*bit*|*x86*"),				_T("x32 overlay"),						_T("ClientIcons_overlays"),		IDI_PLATFORM_X32,		OVERLAYS_PLATFORM_CASE	},
 
-	{"client_Unicode",			_T("*unicode*"),							_T("Unicode overlay"),					_T("ClientIcons_overlays"),		IDI_CLIENT_UNICODE,		OVERLAYS_RESOURCE_CASE	},
+	{"client_Unicode",			_T("*unicode*"),							_T("Unicode overlay"),					_T("ClientIcons_overlays"),		IDI_UNICODE_CLIENT,		OVERLAYS_RESOURCE_CASE	},
 };
 
 int DEFAULT_KN_FP_OVERLAYS3_COUNT = SIZEOF(def_kn_fp_overlays3_mask);
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index fca147c4eb..cdee768f46 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -5,9 +5,9 @@
 // Used by resource.rc
 //##############################################################################################################
 //Other
-#define IDI_NOTFOUND			1
-#define IDI_UNDETECTED			2
-#define IDI_UNKNOWN				3
+#define IDI_NOTFOUND			5
+#define IDI_UNDETECTED			6
+#define IDI_UNKNOWN				7
 
 //##############################################################################################################
 //Skype clients
@@ -46,22 +46,23 @@
 
 //##############################################################################################################
 //Platform
-#define IDI_PLATFORM_ANDROID		61
-#define IDI_PLATFORM_FLASH			62
-#define IDI_PLATFORM_IOS			63
-#define IDI_PLATFORM_JAVA			64
-#define IDI_PLATFORM_LINUX			65
-#define IDI_PLATFORM_MAC			66
-#define IDI_PLATFORM_SYMBIAN		67
-#define IDI_PLATFORM_WIN			68
-
-#define IDI_CLIENT_UNICODE			71
+#define IDI_PLATFORM_AMIGA			61
+#define IDI_PLATFORM_ANDROID		62
+#define IDI_PLATFORM_FLASH			63
+#define IDI_PLATFORM_IOS			64
+#define IDI_PLATFORM_JAVA			65
+#define IDI_PLATFORM_LINUX			66
+#define IDI_PLATFORM_MAC			67
+#define IDI_PLATFORM_SYMBIAN		68
+#define IDI_PLATFORM_WIN			69
+
+#define IDI_UNICODE_CLIENT			71
 #define IDI_PLATFORM_X32			72
 #define IDI_PLATFORM_X64			73
 
 //##############################################################################################################
 //Clients overlays
-#define IDI_AIMOSCAR_OVERLAY		75
+#define IDI_AIM_OVERLAY				75
 #define IDI_GMAIL_OVERLAY			76
 #define IDI_ICQJ_OVERLAY			77
 #define IDI_ICQJ_PLUS_OVERLAY		78
@@ -76,13 +77,10 @@
 
 //##############################################################################################################
 //Secure overlays
-#define IDI_IMSECURE_OVERLAY		91
-#define IDI_SECUREIM_OVERLAY		92
-#define IDI_SIMPLITE_OVERLAY		93
-#define IDI_SIMPPRO_OVERLAY			94
+#define IDI_SECUREIM_OVERLAY		91
 
 //##############################################################################################################
-//MirandaIM Packs
+//Miranda packs
 #define IDI_MIRANDA_A0X				101
 #define IDI_MIRANDA_AF				102
 #define IDI_MIRANDA_ALFAMAR			103
@@ -152,31 +150,9 @@
 #define IDI_STRICQ				223
 #define IDI_TICQ				234
 
-//#define IDI_ALICQ				251
-//#define IDI_ANASTASIA			252
-//#define IDI_ANDRQ				253
-//#define IDI_COREPAGER			254
-//#define IDI_DELPHI			255
-//#define IDI_GLICQ				256
-//#define IDI_ICAT				257
-//#define IDI_ICQ2X				258
-//#define IDI_JICQ				259
-//#define IDI_KXICQ				260
-//#define IDI_MICQ				261
-//#define IDI_MIP				262
-//#define IDI_NANOICQ			263
-//#define IDI_NICQ				264
-//#define IDI_SMAPER			265
-//#define IDI_STICQ				266
-//#define IDI_VICQ				267
-//#define IDI_VIRUS				268
-//#define IDI_VMICQ				269
-//#define IDI_WEBICQ			270
-//#define IDI_YEEMP				271
-//#define IDI_YSM				272
-
 //##############################################################################################################
 //IRC
+#define IDI_IRC					300
 #define IDI_AMIRC				301
 #define IDI_AMULE				302
 #define IDI_BABBEL				303
@@ -234,7 +210,6 @@
 #define IDI_XCHAT				355
 #define IDI_XIRC				356
 #define IDI_XIRCON				357
-#define IDI_ZIPTORRENT			358
 #define IDI_ZSIRC				359
 #define IDI_POCKET_IRC			360
 
@@ -291,7 +266,6 @@
 #define IDI_GLU					448
 #define IDI_GMAIL				449
 #define IDI_GNOME				450
-#define IDI_GNUGADU				451
 #define IDI_GOIM				452
 #define IDI_GOSSIP				453
 #define IDI_GOTALKMOBILE		454
@@ -378,13 +352,7 @@
 #define IDI_PSIPLUS 			536
 #define IDI_PSTO				537
 #define IDI_PSYC 				538
-#define IDI_PYAIMT				539
 #define IDI_PYGEON 				540
-#define IDI_PYICQT				541
-#define IDI_PYIRCT				542
-#define IDI_PYMRAT				543
-#define IDI_PYMSNT				544
-#define IDI_PYYAHOOT			545
 #define IDI_QTJIM				546
 #define IDI_QUTECOM 			547
 #define IDI_RENREN				548
@@ -458,8 +426,6 @@
 
 //##############################################################################################################
 //AIM
-#define IDI_AIM_4				712
-#define IDI_AIM_5				713
 #define IDI_AIM_6  				714
 #define IDI_AIM_7  				715
 #define IDI_AIM_MAC				716
@@ -471,18 +437,22 @@
 
 //##############################################################################################################
 //Gadu-Gadu clients
-#define IDI_GADU_GADU_6			731
-#define IDI_GADU_GADU_7			732
+#define IDI_GG					724
+#define IDI_GG8_OVERLAY			725
+#define IDI_GG9_OVERLAY			726
+#define IDI_GG10_OVERLAY		727
+#define IDI_GG11_OVERLAY		728
 
 //##############################################################################################################
 //Tlen clients
-#define IDI_TLEN				734
+#define IDI_TLEN				731
 
 //##############################################################################################################
 //Tlen clients overlays
-#define IDI_CLIENT_TLEN5		735
-#define IDI_CLIENT_TLEN6		736
-#define IDI_CLIENT_TLEN7		737
+#define IDI_TLEN5_OVERLAY		732
+#define IDI_TLEN6_OVERLAY		733
+#define IDI_TLEN7_OVERLAY		734
+#define IDI_TLEN8_OVERLAY		735
 
 //##############################################################################################################
 //MSN
@@ -507,31 +477,32 @@
 
 //##############################################################################################################
 //QQ clients
-#define IDI_MOBILEQQ			771
-#define IDI_QQ					772
-#define IDI_QQCONCEPT			773
-#define IDI_QQCRM				774
-#define IDI_QQINT				775
-#define IDI_QQSILVER			776
-#define IDI_TM					777
-#define IDI_TM2008				778
-#define IDI_WEBQQ				779
-#define IDI_YAMQQ				780
+#define IDI_MOBILEQQ			770
+#define IDI_QQ					771
+#define IDI_QQCONCEPT			772
+#define IDI_QQCRM				773
+#define IDI_QQINT				774
+#define IDI_QQSILVER			775
+#define IDI_TM					776
+#define IDI_TM2008				777
+#define IDI_WEBQQ				778
+#define IDI_YAMQQ				799
 
 //##############################################################################################################
 //QQ clients overlays
-#define IDI_CLIENT_QQ2000		781
-#define IDI_CLIENT_QQ2004		782
-#define IDI_CLIENT_TM1			783
-#define IDI_CLIENT_TM2			784
-#define IDI_CLIENT_TM_QQ2003	785
-#define IDI_CLIENT_TM_QQ2005	786
-#define IDI_CLIENT_TM_QQ2006	787
-#define IDI_CLIENT_TM_QQ2007	788
-#define IDI_CLIENT_TM_QQ2008	789
-#define IDI_CLIENT_TM_QQ2009	790
-#define IDI_CLIENT_TM_QQ2010	791
-#define IDI_CLIENT_TM_QQ2011	792
+#define IDI_QQ_2000_OVERLAY		780
+#define IDI_QQ_2001_OVERLAY		781
+#define IDI_QQ_2002_OVERLAY		782
+#define IDI_QQ_2003_OVERLAY		783
+#define IDI_QQ_2004_OVERLAY		784
+#define IDI_QQ_2005_OVERLAY		785
+#define IDI_QQ_2006_OVERLAY		786
+#define IDI_QQ_2007_OVERLAY		787
+#define IDI_QQ_2008_OVERLAY		788
+#define IDI_QQ_2009_OVERLAY		789
+#define IDI_QQ_2010_OVERLAY		790
+#define IDI_QQ_2011_OVERLAY		791
+#define IDI_QQ_2012_OVERLAY		792
 
 //##############################################################################################################
 //Weather clients
@@ -552,23 +523,20 @@
 //##############################################################################################################
 //Yahoo
 #define IDI_LIBYAHOO2			821
-#define IDI_PINGBOX				822
+#define IDI_YAHOO_PINGBOX		822
 #define IDI_YAHOO				823
-#define IDI_YAHOO5				824
-#define IDI_YAHOO6				825
-#define IDI_YAHOO7				826
-#define IDI_YAHOO8				827
-#define IDI_YAHOO10				828
+#define IDI_YAHOO_WEB			828
 #define IDI_YAHOO_GO_MOBILE		829
 
 //##############################################################################################################
 //Yahoo overlays
-#define IDI_CLIENT_YAHOO5		831
-#define IDI_CLIENT_YAHOO6		832
-#define IDI_CLIENT_YAHOO7		833
-#define IDI_CLIENT_YAHOO8		834
-#define IDI_CLIENT_YAHOO9		835
-#define IDI_CLIENT_YAHOO10		836
+#define IDI_YAHOO5_OVERLAY		831
+#define IDI_YAHOO6_OVERLAY		832
+#define IDI_YAHOO7_OVERLAY		833
+#define IDI_YAHOO8_OVERLAY		834
+#define IDI_YAHOO9_OVERLAY		835
+#define IDI_YAHOO10_OVERLAY		836
+#define IDI_YAHOO11_OVERLAY		837
 
 //##############################################################################################################
 //Multi-protocols clients
@@ -663,6 +631,7 @@
 #define IDI_YEIGO           	1088
 #define IDI_YOONO           	1089
 #define IDI_XFIRE				1090
+#define IDI_GNUGADU				1091
 
 //##############################################################################################################
 //resources