- FingerprintNG is a new default fingerprint now.

- FingerPrintModPlus moved to deprecated - PluginUpdater renames the fingerprint icons to match FingerprintNG git-svn-id: http://svn.miranda-ng.org/main/trunk@2612 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
author: Vadim Dashevskiy <watcherhd@gmail.com> 2012-12-02 20:51:46 +0000
committer: Vadim Dashevskiy <watcherhd@gmail.com> 2012-12-02 20:51:46 +0000
commit: 4f0bbea5843f8ab3c0242f560ea60fdf23de3ed7 (patch)
tree: 8a6c33f460a8f8273e00b2cfc90c759ba7c0c9eb /plugins/FingerPrintModPlus
parent: f12bf963f7d43af7d2c7f8779eeac9d122a72d57 (diff)
562 files changed, 0 insertions, 7701 deletions
diff --git a/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj b/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj
deleted file mode 100644
index 8c17289c1f..0000000000
--- a/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj
+++ /dev/null
@@ -1,202 +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>Fingerprint</ProjectName>
-    <ProjectGuid>{AF7D71D4-19B7-42B8-91DD-701F155AC4AE}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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)'=='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)'=='Debug|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)'=='Release|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)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
-    <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
-    </Link>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\finger_groups.h" />
-    <ClInclude Include="src\global.h" />
-    <ClInclude Include="src\utilities.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\fingerprint.cpp" />
-    <ClCompile Include="src\stdafx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\masks.cpp" />
-    <ClCompile Include="src\options.cpp" />
-    <ClCompile Include="src\main.cpp" />
-    <ClCompile Include="src\utilities.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\icons.rc" />
-    <ResourceCompile Include="res\resource.rc" />
-    <ResourceCompile Include="res\version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj.filters b/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj.filters
deleted file mode 100644
index 99f40472b4..0000000000
--- a/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj.filters
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{624fd4ab-b60d-44c3-8933-ada206cccec0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{d5835025-72d0-4dd0-a8af-fc2183707beb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{1df62bdc-3545-41d9-949c-4d694799b59f}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\finger_groups.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\global.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\utilities.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\fingerprint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\utilities.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\options.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\masks.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\icons.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="res\resource.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="res\version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj
deleted file mode 100644
index d9492edd6b..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.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_AIM</ProjectName>
-    <ProjectGuid>{2D1D3D7C-F86B-4189-8D57-96575D441182}</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|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>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\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_AIM.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/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj
deleted file mode 100644
index 0ce9f55b3d..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.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_Gadu</ProjectName>
-    <ProjectGuid>{48DDA047-898E-4C4C-A567-C76FE007BBB3}</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_Gadu.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/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj
deleted file mode 100644
index ea716fbc37..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.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_General</ProjectName>
-    <ProjectGuid>{7F854B13-37EA-4956-BAEE-9715AE9F4579}</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_General.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/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj
deleted file mode 100644
index d9262c8f29..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.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_ICQ</ProjectName>
-    <ProjectGuid>{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}</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_ICQ.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/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj
deleted file mode 100644
index b97dc15339..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.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_IRC</ProjectName>
-    <ProjectGuid>{3BEFA882-9323-4CFF-83D2-368B7D7C2488}</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_IRC.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/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj
deleted file mode 100644
index 5e13daff31..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.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>
-  <ItemGroup>
-    <ResourceCompile Include="..\res\icons_Jabber.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\resource.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ClientIcons_Jabber</ProjectName>
-    <ProjectGuid>{23CF8697-38C5-4CEB-87BD-544EF8589619}</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>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj
deleted file mode 100644
index 35cadb94d4..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.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_MRA</ProjectName>
-    <ProjectGuid>{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}</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_MRA.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/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj
deleted file mode 100644
index e33831c85b..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.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_MSN</ProjectName>
-    <ProjectGuid>{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}</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_MSN.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/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj
deleted file mode 100644
index 788f37c86b..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.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_Multiprotocols</ProjectName>
-    <ProjectGuid>{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}</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_Multiprotocols.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/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj
deleted file mode 100644
index f5c6556e0c..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.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_Packs</ProjectName>
-    <ProjectGuid>{99331043-10E4-4171-940E-D43E51B0401B}</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_Packs.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/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj
deleted file mode 100644
index f3e63d8220..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.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_QQ</ProjectName>
-    <ProjectGuid>{DD92D185-5AE5-4E39-90C0-D9804E85768F}</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_QQ.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/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj
deleted file mode 100644
index e6b6720e47..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.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_RSS</ProjectName>
-    <ProjectGuid>{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}</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_RSS.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/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj
deleted file mode 100644
index 2d44688e9d..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.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_Skype</ProjectName>
-    <ProjectGuid>{1957D0AE-B386-4BF0-A8B9-42229922BA91}</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_Skype.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/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj
deleted file mode 100644
index 4fa4977da1..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.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_Tlen</ProjectName>
-    <ProjectGuid>{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}</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_Tlen.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/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj
deleted file mode 100644
index 0dcf19136f..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.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_VoIP</ProjectName>
-    <ProjectGuid>{7D81F099-33CC-4FF3-A465-3943CB3F70C6}</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_VoIP.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/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj
deleted file mode 100644
index 414b248d59..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.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_Weather</ProjectName>
-    <ProjectGuid>{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}</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_Weather.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/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj
deleted file mode 100644
index c4f2e8e93c..0000000000
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.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_Yahoo</ProjectName>
-    <ProjectGuid>{CF3A5226-1264-4735-83AE-A65C349FC61E}</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_Yahoo.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/FingerPrintModPlus/res/icons.rc b/plugins/FingerPrintModPlus/res/icons.rc
deleted file mode 100644
index 8276a03576..0000000000
--- a/plugins/FingerPrintModPlus/res/icons.rc
+++ /dev/null
@@ -1,73 +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.
-//##############################################################################################################
-//########################################### Other ############################################################
-//##############################################################################################################
-   IDI_NOTFOUND                   ICON    "icons\\Other\\notfound.ico"
-   IDI_UNDETECTED                 ICON    "icons\\Other\\undetected.ico"
-   IDI_UNKNOWN                    ICON    "icons\\Other\\unknown.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/FingerPrintModPlus/res/icons/AIM/AIM.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM.ico
deleted file mode 100644
index 2d7ba76b21..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/AIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_4.x.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_4.x.ico
deleted file mode 100644
index f82188d57d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_4.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_5.x.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_5.x.ico
deleted file mode 100644
index 17c6907915..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_5.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mac.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mac.ico
deleted file mode 100644
index 7c7c073c56..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mac.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mobile.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mobile.ico
deleted file mode 100644
index a37a19cbef..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mobile.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Triton.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Triton.ico
deleted file mode 100644
index 8df93cc206..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Triton.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/AIM/TerraIM.ico b/plugins/FingerPrintModPlus/res/icons/AIM/TerraIM.ico
deleted file mode 100644
index a1f32418fc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/TerraIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/AIM/miniaim.ico b/plugins/FingerPrintModPlus/res/icons/AIM/miniaim.ico
deleted file mode 100644
index 7daf67f49f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/miniaim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/AIM/naim.ico b/plugins/FingerPrintModPlus/res/icons/AIM/naim.ico
deleted file mode 100644
index 2098e69f67..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/AIM/naim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_6.ico b/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_6.ico
deleted file mode 100644
index 9ed0e8cb7a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_6.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_7.ico b/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_7.ico
deleted file mode 100644
index 59e50ec1a2..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/&RQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/&RQ.ico
deleted file mode 100644
index a420b5e8ed..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/&RQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/1&1.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/1&1.ico
deleted file mode 100644
index 994b8deb77..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/1&1.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/Anastasia.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Anastasia.ico
deleted file mode 100644
index 1484d9534e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/Anastasia.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/D[i]Chat.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/D[i]Chat.ico
deleted file mode 100644
index 316feaf4c2..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/D[i]Chat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/Delphi.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Delphi.ico
deleted file mode 100644
index a00f558c1e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/Delphi.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/GLICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/GLICQ.ico
deleted file mode 100644
index 378d8de089..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/GLICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/GnomeICU.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/GnomeICU.ico
deleted file mode 100644
index ef14568e9c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/GnomeICU.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/IC@.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/IC@.ico
deleted file mode 100644
index ff43ffdb01..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/IC@.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/ICQ_2.x.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/ICQ_2.x.ico
deleted file mode 100644
index 7d82df796a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/ICQ_2.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/IMadering.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/IMadering.ico
deleted file mode 100644
index 501ef90545..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/IMadering.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/JICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/JICQ.ico
deleted file mode 100644
index 46c387fe98..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/JICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/KM_Aska.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/KM_Aska.ico
deleted file mode 100644
index f05acbba54..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/KM_Aska.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/LibICQ2000.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/LibICQ2000.ico
deleted file mode 100644
index e3d26d8511..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/LibICQ2000.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/Licq.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Licq.ico
deleted file mode 100644
index 9090db1cca..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/Licq.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/MIP.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/MIP.ico
deleted file mode 100644
index c63e4ac7ea..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/MIP.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/NanoICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/NanoICQ.ico
deleted file mode 100644
index 85524d7f85..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/NanoICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/QIP.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/QIP.ico
deleted file mode 100644
index 251d6d2d0a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/QIP.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/R&Q.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/R&Q.ico
deleted file mode 100644
index aab46fa0c9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/R&Q.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/SmartICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/SmartICQ.ico
deleted file mode 100644
index 14fb18c8bc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/SmartICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/Spambot.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Spambot.ico
deleted file mode 100644
index 824fd17156..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/Spambot.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/StrICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/StrICQ.ico
deleted file mode 100644
index 662bee3232..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/StrICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/WebICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/WebICQ.ico
deleted file mode 100644
index 157a6899a4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/WebICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/YSM.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/YSM.ico
deleted file mode 100644
index 00e4207a67..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/YSM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/Yeemp.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Yeemp.ico
deleted file mode 100644
index a5f68d5b44..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/Yeemp.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/alICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/alICQ.ico
deleted file mode 100644
index b33abe2ad3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/alICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/biohazard.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/biohazard.ico
deleted file mode 100644
index b0427a1498..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/biohazard.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/corepager.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/corepager.ico
deleted file mode 100644
index ab90b2e25c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/corepager.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/kxICQ2.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/kxICQ2.ico
deleted file mode 100644
index 9254f77a2b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/kxICQ2.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/locid.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/locid.ico
deleted file mode 100644
index a51040b703..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/locid.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/mICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/mICQ.ico
deleted file mode 100644
index 53b337dfef..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/mICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/nICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/nICQ.ico
deleted file mode 100644
index 4f2907e914..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/nICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ for PocketPC.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ for PocketPC.ico
deleted file mode 100644
index fac72c3a84..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ for PocketPC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ.ico
deleted file mode 100644
index f7243308f6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_6.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_6.ico
deleted file mode 100644
index 952a5675e9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_6.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_ABV.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_ABV.ico
deleted file mode 100644
index d345fedc0f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_ABV.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Bigmir.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Bigmir.ico
deleted file mode 100644
index 153481e6af..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Bigmir.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Compad.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Compad.ico
deleted file mode 100644
index 7d517906ea..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Compad.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite4.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite4.ico
deleted file mode 100644
index a075efb3a0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite4.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite7.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite7.ico
deleted file mode 100644
index fc37f0d34f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Netvigator.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Netvigator.ico
deleted file mode 100644
index cefaf9ad2f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Netvigator.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Pro7.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Pro7.ico
deleted file mode 100644
index c622909048..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Pro7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Rambler.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Rambler.ico
deleted file mode 100644
index 8eb7a6d28a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Rambler.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_iMac.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_iMac.ico
deleted file mode 100644
index fbaa66ce30..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_iMac.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.1.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.1.ico
deleted file mode 100644
index daed9c2c54..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.1.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.ico
deleted file mode 100644
index 002ec000e1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 6.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 6.ico
deleted file mode 100644
index 98b04863fe..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 6.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 7.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 7.ico
deleted file mode 100644
index 389d0b5015..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2000.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2000.ico
deleted file mode 100644
index f50be52bea..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2000.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2001.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2001.ico
deleted file mode 100644
index 868ee4db69..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2001.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2002.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2002.ico
deleted file mode 100644
index e2cc9b0ed5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2002.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2003.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2003.ico
deleted file mode 100644
index b22c02784d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2003.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/official/IcqLite 4.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/IcqLite 4.ico
deleted file mode 100644
index d56afea91c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/official/IcqLite 4.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/slick.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/slick.ico
deleted file mode 100644
index 3f0046f889..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/slick.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/smaper.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/smaper.ico
deleted file mode 100644
index 493bdf8f0b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/smaper.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/stICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/stICQ.ico
deleted file mode 100644
index 3ff3b16f91..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/stICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/vICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/vICQ.ico
deleted file mode 100644
index 9a77d80faa..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/vICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/ICQ/vmICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/vmICQ.ico
deleted file mode 100644
index 0047d93b78..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/ICQ/vmICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/AmIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/AmIRC.ico
deleted file mode 100644
index 074acf8732..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/AmIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Babbel.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Babbel.ico
deleted file mode 100644
index cd730a7e54..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Babbel.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/BersIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/BersIRC.ico
deleted file mode 100644
index 3190518a95..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/BersIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/ChatZilla.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ChatZilla.ico
deleted file mode 100644
index 70efe0eac2..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/ChatZilla.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Conversation.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Conversation.ico
deleted file mode 100644
index 028e927bd0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Conversation.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop.ico
deleted file mode 100644
index e02d41c6c0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop_RacBot.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop_RacBot.ico
deleted file mode 100644
index c2f5222c19..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop_RacBot.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/FChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/FChat.ico
deleted file mode 100644
index 9de2c8b39f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/FChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/GDP Web Chat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/GDP Web Chat.ico
deleted file mode 100644
index 62730f82fd..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/GDP Web Chat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/GoPowerTools.ico b/plugins/FingerPrintModPlus/res/icons/IRC/GoPowerTools.ico
deleted file mode 100644
index 575ff82d03..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/GoPowerTools.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/HydraIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/HydraIRC.ico
deleted file mode 100644
index 009ee95638..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/HydraIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/IRCXpro.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IRCXpro.ico
deleted file mode 100644
index 2c88e8d55c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/IRCXpro.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/IRC_unknown.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IRC_unknown.ico
deleted file mode 100644
index 54a3b18f29..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/IRC_unknown.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 5.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 5.ico
deleted file mode 100644
index 9b402b9f57..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 5.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 7.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 7.ico
deleted file mode 100644
index 8d18feaab7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/IceChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat.ico
deleted file mode 100644
index 76e729d2f7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/IceChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/KVIrc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/KVIrc.ico
deleted file mode 100644
index d0c199b463..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/KVIrc.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Klient.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Klient.ico
deleted file mode 100644
index c686b77c7e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Klient.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Konversation.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Konversation.ico
deleted file mode 100644
index 4dfab48e8a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Konversation.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/NeoRa Trion.ico b/plugins/FingerPrintModPlus/res/icons/IRC/NeoRa Trion.ico
deleted file mode 100644
index 41e3799a42..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/NeoRa Trion.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Nettalk.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Nettalk.ico
deleted file mode 100644
index 9fdf9a5674..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Nettalk.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/NoNameScript.ico b/plugins/FingerPrintModPlus/res/icons/IRC/NoNameScript.ico
deleted file mode 100644
index da3fe7d929..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/NoNameScript.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Opera.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Opera.ico
deleted file mode 100644
index 2d0390104f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Opera.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/PJIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/PJIRC.ico
deleted file mode 100644
index d279e6e3db..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/PJIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Pirch.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Pirch.ico
deleted file mode 100644
index 220d78069f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Pirch.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/ProChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ProChat.ico
deleted file mode 100644
index c627e92b80..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/ProChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/SmartIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/SmartIRC.ico
deleted file mode 100644
index 17dc01c2f7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/SmartIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Snak.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Snak.ico
deleted file mode 100644
index f6f508b145..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Snak.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/SysReset.ico b/plugins/FingerPrintModPlus/res/icons/IRC/SysReset.ico
deleted file mode 100644
index f6cde31e8d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/SysReset.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/VircaIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/VircaIRC.ico
deleted file mode 100644
index 90c28f6472..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/VircaIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/VisionIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/VisionIRC.ico
deleted file mode 100644
index 9f55866ef4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/VisionIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/VisualIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/VisualIRC.ico
deleted file mode 100644
index 73dd1a1a6b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/VisualIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/VortecIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/VortecIRC.ico
deleted file mode 100644
index 49928fcaa7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/VortecIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/WLIrc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/WLIrc.ico
deleted file mode 100644
index 474d8780df..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/WLIrc.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/WeeChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/WeeChat.ico
deleted file mode 100644
index 3b6b38b632..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/WeeChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/X-Chat Aqua.ico b/plugins/FingerPrintModPlus/res/icons/IRC/X-Chat Aqua.ico
deleted file mode 100644
index 258a6578ba..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/X-Chat Aqua.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Xirc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Xirc.ico
deleted file mode 100644
index f9ce1a0d2f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Xirc.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/Xircon.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Xircon.ico
deleted file mode 100644
index 608b8cba74..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/Xircon.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/ZipTorrent.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ZipTorrent.ico
deleted file mode 100644
index 93487f6939..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/ZipTorrent.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/aMule.ico b/plugins/FingerPrintModPlus/res/icons/IRC/aMule.ico
deleted file mode 100644
index 13d28001e0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/aMule.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/cbirc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/cbirc.ico
deleted file mode 100644
index 8055b6336e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/cbirc.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/dIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/dIRC.ico
deleted file mode 100644
index 2c17d91dac..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/dIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/eMule.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule.ico
deleted file mode 100644
index cac21886ff..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/eMule.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/eMule_MorphXT.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_MorphXT.ico
deleted file mode 100644
index cfa35f193c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/eMule_MorphXT.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Neo.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Neo.ico
deleted file mode 100644
index c52b7a0cb1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Neo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Xtreme.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Xtreme.ico
deleted file mode 100644
index 0e65fc0c51..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Xtreme.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/eMule_plus.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_plus.ico
deleted file mode 100644
index 72dbdcb633..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/eMule_plus.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/ircle.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ircle.ico
deleted file mode 100644
index 456a7feec4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/ircle.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/irssi.ico b/plugins/FingerPrintModPlus/res/icons/IRC/irssi.ico
deleted file mode 100644
index b8a7abea69..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/irssi.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/jircii.ico b/plugins/FingerPrintModPlus/res/icons/IRC/jircii.ico
deleted file mode 100644
index 5a38f9ecb1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/jircii.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/jmIrc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/jmIrc.ico
deleted file mode 100644
index e576c402f3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/jmIrc.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/ksirc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ksirc.ico
deleted file mode 100644
index 70d057271b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/ksirc.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/mIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/mIRC.ico
deleted file mode 100644
index cd4020a8ca..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/mIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/mp3script.ico b/plugins/FingerPrintModPlus/res/icons/IRC/mp3script.ico
deleted file mode 100644
index 964f2a2e61..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/mp3script.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/pIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/pIRC.ico
deleted file mode 100644
index 1ef17e436c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/pIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/piorun.ico b/plugins/FingerPrintModPlus/res/icons/IRC/piorun.ico
deleted file mode 100644
index f1037d52a3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/piorun.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/psyBNC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/psyBNC.ico
deleted file mode 100644
index b04803c123..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/psyBNC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/savIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/savIRC.ico
deleted file mode 100644
index c79fe7006c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/savIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/wmIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/wmIRC.ico
deleted file mode 100644
index 21f5216c95..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/wmIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/xBitch.ico b/plugins/FingerPrintModPlus/res/icons/IRC/xBitch.ico
deleted file mode 100644
index 8f2ce34a7a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/xBitch.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/xChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/xChat.ico
deleted file mode 100644
index 792f37b5ca..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/xChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/IRC/zsIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/zsIRC.ico
deleted file mode 100644
index 26875552f3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/IRC/zsIRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Akeni.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Akeni.ico
deleted file mode 100644
index 5dd2c6c926..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Akeni.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Android.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Android.ico
deleted file mode 100644
index 1a6d688560..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Android.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Anothr Rss Bot.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Anothr Rss Bot.ico
deleted file mode 100644
index 27d44e1a89..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Anothr Rss Bot.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Aqq.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Aqq.ico
deleted file mode 100644
index 40b26eed58..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Aqq.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/BellSouth.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/BellSouth.ico
deleted file mode 100644
index 099fe07ecd..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/BellSouth.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/BitWise.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/BitWise.ico
deleted file mode 100644
index 2fba693e72..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/BitWise.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/BlackBerry.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/BlackBerry.ico
deleted file mode 100644
index d40cdb5036..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/BlackBerry.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Bowline.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Bowline.ico
deleted file mode 100644
index 209eabf70c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Bowline.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/BuddySpace.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/BuddySpace.ico
deleted file mode 100644
index ad3345ef24..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/BuddySpace.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Chatopus.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Chatopus.ico
deleted file mode 100644
index c4ee122394..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Chatopus.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Chikka.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Chikka.ico
deleted file mode 100644
index 730154466c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Chikka.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/ChitChat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/ChitChat.ico
deleted file mode 100644
index 1b2312ee49..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/ChitChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Coccinella.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Coccinella.ico
deleted file mode 100644
index 07f5a2ca87..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Coccinella.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Colibry.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Colibry.ico
deleted file mode 100644
index 9f72281c31..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Colibry.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Colloquy.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Colloquy.ico
deleted file mode 100644
index c9634272dd..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Colloquy.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Desyr.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Desyr.ico
deleted file mode 100644
index 2427e48c6b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Desyr.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Emacs.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Emacs.ico
deleted file mode 100644
index 71b7124194..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Emacs.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Exodus.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Exodus.ico
deleted file mode 100644
index c3e81b8e17..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Exodus.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Eyeball Chat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Eyeball Chat.ico
deleted file mode 100644
index cd359a0870..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Eyeball Chat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Facebook.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Facebook.ico
deleted file mode 100644
index eb23aac442..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Facebook.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Fire.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Fire.ico
deleted file mode 100644
index 40ddc7b1ab..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Fire.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/GCN.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GCN.ico
deleted file mode 100644
index 28cc5f698c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/GCN.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/GNU_Gadu.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GNU_Gadu.ico
deleted file mode 100644
index 40b9b219a8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/GNU_Gadu.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/GOIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GOIM.ico
deleted file mode 100644
index 0840fa46c9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/GOIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk Gadget.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk Gadget.ico
deleted file mode 100644
index f682046446..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk Gadget.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk.ico
deleted file mode 100644
index 4126f32885..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Gabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gabber.ico
deleted file mode 100644
index 729bc9b0e0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Gabber.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Gajim.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gajim.ico
deleted file mode 100644
index 91ad77a053..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Gajim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail.ico
deleted file mode 100644
index 09dcf65ce3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail_Conference_Bot.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail_Conference_Bot.ico
deleted file mode 100644
index dbcc7d54fa..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail_Conference_Bot.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Gnome.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gnome.ico
deleted file mode 100644
index ae58e8673c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Gnome.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/GoTalkMobile.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GoTalkMobile.ico
deleted file mode 100644
index d86299c12b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/GoTalkMobile.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Gossip.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gossip.ico
deleted file mode 100644
index c0cdd46f0b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Gossip.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/GreenThumb.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GreenThumb.ico
deleted file mode 100644
index 4b298e3c31..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/GreenThumb.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Gush.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gush.ico
deleted file mode 100644
index 02c9bdbb19..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Gush.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/IMCom.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/IMCom.ico
deleted file mode 100644
index a0e3dc414e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/IMCom.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Imified.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Imified.ico
deleted file mode 100644
index b958bf0ee5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Imified.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Importal.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Importal.ico
deleted file mode 100644
index 49fd324f9d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Importal.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Instan-t.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Instan-t.ico
deleted file mode 100644
index 6e4c2744d4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Instan-t.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Interaction.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Interaction.ico
deleted file mode 100644
index b651eb4435..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Interaction.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JAJC.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JAJC.ico
deleted file mode 100644
index 13096e9849..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JAJC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JBother.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JBother.ico
deleted file mode 100644
index ac8656acf1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JBother.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JClaim.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JClaim.ico
deleted file mode 100644
index bd19a824be..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JClaim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JMC.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JMC.ico
deleted file mode 100644
index 5161f07d5f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JMC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JWChat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JWChat.ico
deleted file mode 100644
index 96b6bd984b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JWChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JWGC.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JWGC.ico
deleted file mode 100644
index 032bdd9a75..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JWGC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberApplet.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberApplet.ico
deleted file mode 100644
index 704b035510..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberApplet.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberFoX.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberFoX.ico
deleted file mode 100644
index c87f28b49c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberFoX.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberMessenger.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberMessenger.ico
deleted file mode 100644
index 05ae27db71..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberMessenger.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberNaut.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberNaut.ico
deleted file mode 100644
index 30131ccf1f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberNaut.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberWocky.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberWocky.ico
deleted file mode 100644
index 72e6bf47aa..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberWocky.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberZilla.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberZilla.ico
deleted file mode 100644
index 910f06315c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/JabberZilla.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Jabber_BeOS.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabber_BeOS.ico
deleted file mode 100644
index 80ec6eaf75..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Jabber_BeOS.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Jabbin.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabbin.ico
deleted file mode 100644
index 8c5ef1376f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Jabbin.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Jabiru.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabiru.ico
deleted file mode 100644
index f3ba55b573..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Jabiru.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Jeti.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Jeti.ico
deleted file mode 100644
index c935ef7d77..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Jeti.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Konnekt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Konnekt.ico
deleted file mode 100644
index 48af506663..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Konnekt.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/LLuna.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/LLuna.ico
deleted file mode 100644
index a3e4de6785..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/LLuna.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Laffer.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Laffer.ico
deleted file mode 100644
index f782a0ffcb..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Laffer.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Leaf Messenger.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Leaf Messenger.ico
deleted file mode 100644
index f60ce37531..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Leaf Messenger.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/LeechCraft.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/LeechCraft.ico
deleted file mode 100644
index ef54b8d264..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/LeechCraft.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/LinQ.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/LinQ.ico
deleted file mode 100644
index cbebfe537e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/LinQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/M8Jabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/M8Jabber.ico
deleted file mode 100644
index b68951d5dd..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/M8Jabber.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/MCabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/MCabber.ico
deleted file mode 100644
index 2041ace2ce..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/MCabber.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/MGTalk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/MGTalk.ico
deleted file mode 100644
index 9bd4df764d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/MGTalk.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Mango.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Mango.ico
deleted file mode 100644
index 807ceabc60..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Mango.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Mercury_Messenger.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Mercury_Messenger.ico
deleted file mode 100644
index 6fe30d0fcd..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Mercury_Messenger.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/MozillaChat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/MozillaChat.ico
deleted file mode 100644
index afd5d692f9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/MozillaChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Neos.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Neos.ico
deleted file mode 100644
index 8389d7b9e4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Neos.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Nitro.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Nitro.ico
deleted file mode 100644
index d72e39d3a7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Nitro.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Nostromo.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Nostromo.ico
deleted file mode 100644
index cdb7ca7d51..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Nostromo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/OM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/OM.ico
deleted file mode 100644
index 4a6a5b6b92..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/OM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Octro.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Octro.ico
deleted file mode 100644
index 70d67386c4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Octro.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/PSI.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PSI.ico
deleted file mode 100644
index e71eca7465..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/PSI.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Pandion.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Pandion.ico
deleted file mode 100644
index 2c8e063be9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Pandion.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Papla.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Papla.ico
deleted file mode 100644
index 1b30efec3c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Papla.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Psto.net.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Psto.net.ico
deleted file mode 100644
index ee1e35218e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Psto.net.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/PyAIMt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyAIMt.ico
deleted file mode 100644
index 68411ccc7d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/PyAIMt.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/PyICQt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyICQt.ico
deleted file mode 100644
index cd994f20a5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/PyICQt.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/PyIRCt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyIRCt.ico
deleted file mode 100644
index fcaa822e35..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/PyIRCt.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/PyMRAt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyMRAt.ico
deleted file mode 100644
index 1bd28dee69..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/PyMRAt.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/PyMSNt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyMSNt.ico
deleted file mode 100644
index 6577a76fc2..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/PyMSNt.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/PyYIMt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyYIMt.ico
deleted file mode 100644
index 00c4cdbc00..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/PyYIMt.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/QTJim.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/QTJim.ico
deleted file mode 100644
index 20436f91f1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/QTJim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/RenRen.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/RenRen.ico
deleted file mode 100644
index 2841cd9851..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/RenRen.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/SIP Communicator.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/SIP Communicator.ico
deleted file mode 100644
index 3aeabd542e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/SIP Communicator.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Sky Messager.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Sky Messager.ico
deleted file mode 100644
index 710a4c866c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Sky Messager.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Smack.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Smack.ico
deleted file mode 100644
index c5fbd3c9b4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Smack.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/SoapBox.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/SoapBox.ico
deleted file mode 100644
index e3dbfbb8fa..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/SoapBox.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Spark.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Spark.ico
deleted file mode 100644
index 50089266f3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Spark.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Spik.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Spik.ico
deleted file mode 100644
index 42e96964c1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Spik.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/SworIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/SworIM.ico
deleted file mode 100644
index becf0d4013..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/SworIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Tapioca.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Tapioca.ico
deleted file mode 100644
index 7a37dbbd61..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Tapioca.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Teabot.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Teabot.ico
deleted file mode 100644
index b0174968a0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Teabot.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Telepathy.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Telepathy.ico
deleted file mode 100644
index b35d87d063..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Telepathy.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Thunderbird.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Thunderbird.ico
deleted file mode 100644
index 6b9ecad200..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Thunderbird.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/TipicIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/TipicIM.ico
deleted file mode 100644
index f316201d7c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/TipicIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Tkabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Tkabber.ico
deleted file mode 100644
index 4016d7af63..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Tkabber.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/TransactIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/TransactIM.ico
deleted file mode 100644
index e94e6e0f9f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/TransactIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/TripleSoftwareIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/TripleSoftwareIM.ico
deleted file mode 100644
index e7181f8421..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/TripleSoftwareIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Vayusphere.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Vayusphere.ico
deleted file mode 100644
index 034fa7d690..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Vayusphere.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/WTW.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WTW.ico
deleted file mode 100644
index 3a5b5ba4f1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/WTW.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/WannaChat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WannaChat.ico
deleted file mode 100644
index bab246d551..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/WannaChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/WebEx.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WebEx.ico
deleted file mode 100644
index ebc1b1a16b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/WebEx.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/WhisperIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WhisperIM.ico
deleted file mode 100644
index 641e51fd50..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/WhisperIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/WhoisBot.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WhoisBot.ico
deleted file mode 100644
index 6e0849bd66..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/WhoisBot.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Wildfire.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Wildfire.ico
deleted file mode 100644
index 89941a30e7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Wildfire.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/WinJab.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WinJab.ico
deleted file mode 100644
index 049d469984..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/WinJab.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Xiffian.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Xiffian.ico
deleted file mode 100644
index 4dd1f72a93..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Xiffian.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/Yambi.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Yambi.ico
deleted file mode 100644
index 7cf0a8e5de..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/Yambi.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/beejive.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/beejive.ico
deleted file mode 100644
index fe25acf392..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/beejive.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/bombus.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/bombus.ico
deleted file mode 100644
index 0bc47f1030..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/bombus.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/bombusmod.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/bombusmod.ico
deleted file mode 100644
index 2801754430..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/bombusmod.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/bombusqd.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/bombusqd.ico
deleted file mode 100644
index 1db263729f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/bombusqd.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/emess.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/emess.ico
deleted file mode 100644
index 914b5f4212..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/emess.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/gYaber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/gYaber.ico
deleted file mode 100644
index 72f7b55491..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/gYaber.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/glu.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/glu.ico
deleted file mode 100644
index cca3bf4041..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/glu.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/iGoogle.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/iGoogle.ico
deleted file mode 100644
index ee7c943abf..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/iGoogle.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/iMeem.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/iMeem.ico
deleted file mode 100644
index 8ad5587735..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/iMeem.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/iMov.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/iMov.ico
deleted file mode 100644
index e552e61418..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/iMov.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/iruka.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/iruka.ico
deleted file mode 100644
index 62c56814fe..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/iruka.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/jTalk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/jTalk.ico
deleted file mode 100644
index 24e5898d6a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/jTalk.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/jabbim.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/jabbim.ico
deleted file mode 100644
index 0b87f542f8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/jabbim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/jdisk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/jdisk.ico
deleted file mode 100644
index 721202ac2a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/jdisk.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/jrudevels.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/jrudevels.ico
deleted file mode 100644
index 6bb29faa8d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/jrudevels.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/juick.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/juick.ico
deleted file mode 100644
index 14cad3c4cd..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/juick.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/kadu.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/kadu.ico
deleted file mode 100644
index ed62e52e82..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/kadu.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/kf.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/kf.ico
deleted file mode 100644
index 9d00748a45..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/kf.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/landell.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/landell.ico
deleted file mode 100644
index 957d6775c8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/landell.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/meinvz.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/meinvz.ico
deleted file mode 100644
index bda6d5348d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/meinvz.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/moJab.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/moJab.ico
deleted file mode 100644
index 1ea938faea..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/moJab.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/mobber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/mobber.ico
deleted file mode 100644
index 2cb80ec49c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/mobber.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/myJabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/myJabber.ico
deleted file mode 100644
index 661593e201..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/myJabber.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/orkut.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/orkut.ico
deleted file mode 100644
index 323a2e8cd3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/orkut.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/paltalk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/paltalk.ico
deleted file mode 100644
index 4929d82c4d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/paltalk.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/pjc.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/pjc.ico
deleted file mode 100644
index ebf12bdf5b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/pjc.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/schuelervz.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/schuelervz.ico
deleted file mode 100644
index a6069c911e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/schuelervz.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/smtp_transport.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/smtp_transport.ico
deleted file mode 100644
index bfe044db15..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/smtp_transport.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/studivz.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/studivz.ico
deleted file mode 100644
index 7749a07ec8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/studivz.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/talkonaut.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/talkonaut.ico
deleted file mode 100644
index 6c7155f13c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/talkonaut.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/twitter.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/twitter.ico
deleted file mode 100644
index e46ccc7548..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/twitter.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/vacuum.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/vacuum.ico
deleted file mode 100644
index b1d09122e4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/vacuum.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/wija.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/wija.ico
deleted file mode 100644
index fc69f43e2b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/wija.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/xeus.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/xeus.ico
deleted file mode 100644
index 19c5b0824f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/xeus.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Jabber/yaonline.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/yaonline.ico
deleted file mode 100644
index cf75d455c5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Jabber/yaonline.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/MSN Mac.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN Mac.ico
deleted file mode 100644
index 44dabaeed0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/MSN Mac.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/MSN v4.5-v5.x.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v4.5-v5.x.ico
deleted file mode 100644
index a4540eaee6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/MSN v4.5-v5.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/MSN v6.x.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v6.x.ico
deleted file mode 100644
index 2fb63feb47..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/MSN v6.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/MSN v7.x.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v7.x.ico
deleted file mode 100644
index 3ec3f7e440..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/MSN v7.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/MSN v8.x.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v8.x.ico
deleted file mode 100644
index 8e4a3dc8a8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/MSN v8.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/WLM10-11.ico b/plugins/FingerPrintModPlus/res/icons/MSN/WLM10-11.ico
deleted file mode 100644
index 2c154ef5d8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/WLM10-11.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/WLM9.ico b/plugins/FingerPrintModPlus/res/icons/MSN/WLM9.ico
deleted file mode 100644
index a2dfe8d6b5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/WLM9.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/WebMessenger.ico b/plugins/FingerPrintModPlus/res/icons/MSN/WebMessenger.ico
deleted file mode 100644
index 9f2d38ce0b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/WebMessenger.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MSN/aMSN.ico b/plugins/FingerPrintModPlus/res/icons/MSN/aMSN.ico
deleted file mode 100644
index 07a95e539e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MSN/aMSN.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_Mobile.ico b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_Mobile.ico
deleted file mode 100644
index 48f321e1fc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_Mobile.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_WebAgent.ico b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_WebAgent.ico
deleted file mode 100644
index 8e80a47002..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_WebAgent.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_official.ico b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_official.ico
deleted file mode 100644
index 56da10df60..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_official.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_unknown.ico b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_unknown.ico
deleted file mode 100644
index 7d4d19b1b2..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_unknown.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/10.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/10.ico
deleted file mode 100644
index 3dc71f8086..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/10.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/10s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/10s.ico
deleted file mode 100644
index bb2b0bd10b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/10s.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/4.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/4.ico
deleted file mode 100644
index e1f14b8c47..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/4.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/4s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/4s.ico
deleted file mode 100644
index af3cdef913..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/4s.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/5.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/5.ico
deleted file mode 100644
index 2ba6064762..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/5.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/5s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/5s.ico
deleted file mode 100644
index f58fd94462..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/5s.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/6.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/6.ico
deleted file mode 100644
index ec58723af1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/6.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/6s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/6s.ico
deleted file mode 100644
index 89b77c92d2..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/6s.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/7.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/7.ico
deleted file mode 100644
index 9aa81b69b1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/7s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/7s.ico
deleted file mode 100644
index a30e3c6308..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/7s.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/8.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/8.ico
deleted file mode 100644
index 504c807977..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/8.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/8s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/8s.ico
deleted file mode 100644
index d19c0b32f5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/8s.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/9.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/9.ico
deleted file mode 100644
index f61e48c305..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/9.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/9s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/9s.ico
deleted file mode 100644
index 1f9b0d2025..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/9s.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010.ico
deleted file mode 100644
index b3f949735d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010U.ico
deleted file mode 100644
index c154c9ef94..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010U.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_04.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_04.ico
deleted file mode 100644
index 59ec76e2b0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_04.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05.ico
deleted file mode 100644
index ce8c786623..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05U.ico
deleted file mode 100644
index ee2fc5e5f0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05U.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06.ico
deleted file mode 100644
index ae1e8b075f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06U.ico
deleted file mode 100644
index bcbd8ea62a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06U.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07.ico
deleted file mode 100644
index f3393df560..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07U.ico
deleted file mode 100644
index 5fabd369a1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07U.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08.ico
deleted file mode 100644
index 7be689b639..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08U.ico
deleted file mode 100644
index 30f58fbe5b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08U.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09.ico
deleted file mode 100644
index 7be689b639..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09U.ico
deleted file mode 100644
index 30f58fbe5b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09U.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_666.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_666.ico
deleted file mode 100644
index 157bd3edb6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_666.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_U.ico
deleted file mode 100644
index c154c9ef94..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_U.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_unknown.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_unknown.ico
deleted file mode 100644
index b3f949735d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_unknown.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaNG.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaNG.ico
deleted file mode 100644
index 0162722316..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaNG.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Other/notfound.ico b/plugins/FingerPrintModPlus/res/icons/Other/notfound.ico
deleted file mode 100644
index 020747cea8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Other/notfound.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Other/undetected.ico b/plugins/FingerPrintModPlus/res/icons/Other/undetected.ico
deleted file mode 100644
index 322c62b943..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Other/undetected.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Other/unknown.ico b/plugins/FingerPrintModPlus/res/icons/Other/unknown.ico
deleted file mode 100644
index 55fb08edcc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Other/unknown.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/Mobile QQ.ico b/plugins/FingerPrintModPlus/res/icons/QQ/Mobile QQ.ico
deleted file mode 100644
index 49240fec0e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/Mobile QQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2000.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2000.ico
deleted file mode 100644
index c53bcd41dd..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2000.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2004.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2004.ico
deleted file mode 100644
index 013f666ff3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2004.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/QQ CRM.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ CRM.ico
deleted file mode 100644
index 859bba24d5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/QQ CRM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/QQ Concept.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ Concept.ico
deleted file mode 100644
index eddd5a5faa..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/QQ Concept.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/QQ International.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ International.ico
deleted file mode 100644
index a99a4fc558..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/QQ International.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/QQ Silverlight.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ Silverlight.ico
deleted file mode 100644
index bbfd8fe31a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/QQ Silverlight.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/QQ.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ.ico
deleted file mode 100644
index 38a1b1eada..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/QQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM 1.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM 1.ico
deleted file mode 100644
index 1ef0abe1c0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM 1.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM 2.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM 2.ico
deleted file mode 100644
index 85012dc0bc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM 2.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM 2008.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM 2008.ico
deleted file mode 100644
index 4b1685b09f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM 2008.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM 3 QQ 2003.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM 3 QQ 2003.ico
deleted file mode 100644
index 6c07b7a1b0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM 3 QQ 2003.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2005.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2005.ico
deleted file mode 100644
index 6b8450cf95..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2005.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2006.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2006.ico
deleted file mode 100644
index add255a825..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2006.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2007.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2007.ico
deleted file mode 100644
index ef304c6793..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2007.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2008.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2008.ico
deleted file mode 100644
index 58091c2168..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2008.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2009.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2009.ico
deleted file mode 100644
index f422cb907a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2009.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2010.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2010.ico
deleted file mode 100644
index b7670661c5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2010.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2011.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2011.ico
deleted file mode 100644
index ff36d17d88..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2011.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/TM.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM.ico
deleted file mode 100644
index c9b62cbd93..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/TM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/WebQQ.ico b/plugins/FingerPrintModPlus/res/icons/QQ/WebQQ.ico
deleted file mode 100644
index 51b3982eba..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/WebQQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/QQ/Yam QQ.ico b/plugins/FingerPrintModPlus/res/icons/QQ/Yam QQ.ico
deleted file mode 100644
index e3cb6a9bdb..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/QQ/Yam QQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/RSS/Atom 1.ico b/plugins/FingerPrintModPlus/res/icons/RSS/Atom 1.ico
deleted file mode 100644
index abfc7807c0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/RSS/Atom 1.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/RSS/Atom 3.ico b/plugins/FingerPrintModPlus/res/icons/RSS/Atom 3.ico
deleted file mode 100644
index 52100ff1b6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/RSS/Atom 3.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/RSS/RSS 0.9.ico b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 0.9.ico
deleted file mode 100644
index 38ca23ca9b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/RSS/RSS 0.9.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/RSS/RSS 1.ico b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 1.ico
deleted file mode 100644
index d0c9475429..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/RSS/RSS 1.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/RSS/RSS 2.ico b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 2.ico
deleted file mode 100644
index fc51d5b147..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/RSS/RSS 2.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Skype/Skype 1.x.ico b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 1.x.ico
deleted file mode 100644
index 6e764ef493..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Skype/Skype 1.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Skype/Skype 2.x.ico b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 2.x.ico
deleted file mode 100644
index 1ffe3a011f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Skype/Skype 2.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Skype/Skype 3.x.ico b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 3.x.ico
deleted file mode 100644
index 07fbb024a5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Skype/Skype 3.x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 5.ico b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 5.ico
deleted file mode 100644
index fe8af13dff..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 5.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 6.ico b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 6.ico
deleted file mode 100644
index 2afdd191cc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 6.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 7.ico b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 7.ico
deleted file mode 100644
index 6c9831fb53..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen.ico b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen.ico
deleted file mode 100644
index df6c175f9f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/VoIP/Gizmo.ico b/plugins/FingerPrintModPlus/res/icons/VoIP/Gizmo.ico
deleted file mode 100644
index 793ba48cc9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/VoIP/Gizmo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/VoIP/WengoPhone.ico b/plugins/FingerPrintModPlus/res/icons/VoIP/WengoPhone.ico
deleted file mode 100644
index c3c9b3a02e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/VoIP/WengoPhone.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/VoIP/Zoep.ico b/plugins/FingerPrintModPlus/res/icons/VoIP/Zoep.ico
deleted file mode 100644
index 79556887a0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/VoIP/Zoep.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/accu.ico b/plugins/FingerPrintModPlus/res/icons/Weather/accu.ico
deleted file mode 100644
index 5c370e31f9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/accu.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/gismeteo.ico b/plugins/FingerPrintModPlus/res/icons/Weather/gismeteo.ico
deleted file mode 100644
index 212d5838f8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/gismeteo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/intelli.ico b/plugins/FingerPrintModPlus/res/icons/Weather/intelli.ico
deleted file mode 100644
index e6370e0538..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/intelli.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/meteogid.ico b/plugins/FingerPrintModPlus/res/icons/Weather/meteogid.ico
deleted file mode 100644
index cddbdddeb5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/meteogid.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/meteonovosti.ico b/plugins/FingerPrintModPlus/res/icons/Weather/meteonovosti.ico
deleted file mode 100644
index 46348fc70d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/meteonovosti.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/noaa.ico b/plugins/FingerPrintModPlus/res/icons/Weather/noaa.ico
deleted file mode 100644
index 1d5206c330..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/noaa.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/realmeteo.ico b/plugins/FingerPrintModPlus/res/icons/Weather/realmeteo.ico
deleted file mode 100644
index d385b816ef..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/realmeteo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/underground.ico b/plugins/FingerPrintModPlus/res/icons/Weather/underground.ico
deleted file mode 100644
index 045c3988eb..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/underground.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/weather.ico b/plugins/FingerPrintModPlus/res/icons/Weather/weather.ico
deleted file mode 100644
index b907fc3c9c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/weather.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/weather_cn.ico b/plugins/FingerPrintModPlus/res/icons/Weather/weather_cn.ico
deleted file mode 100644
index 41993241d5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/weather_cn.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/weather_over.ico b/plugins/FingerPrintModPlus/res/icons/Weather/weather_over.ico
deleted file mode 100644
index e956eac7f7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/weather_over.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/weatherxml.ico b/plugins/FingerPrintModPlus/res/icons/Weather/weatherxml.ico
deleted file mode 100644
index ea1b4bbccd..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/weatherxml.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/wetter.ico b/plugins/FingerPrintModPlus/res/icons/Weather/wetter.ico
deleted file mode 100644
index 2036baa0a9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/wetter.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Weather/yweather.ico b/plugins/FingerPrintModPlus/res/icons/Weather/yweather.ico
deleted file mode 100644
index c42698714c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Weather/yweather.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/PingBox.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/PingBox.ico
deleted file mode 100644
index 6e49570976..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/PingBox.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 10.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 10.ico
deleted file mode 100644
index 14ce1900ea..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 10.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 5.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 5.ico
deleted file mode 100644
index 5a22be6fb8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 5.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 6.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 6.ico
deleted file mode 100644
index c6565cde4d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 6.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 7.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 7.ico
deleted file mode 100644
index 531cc43748..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 8.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 8.ico
deleted file mode 100644
index 73cafdcb07..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 8.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo Go Mobile.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo Go Mobile.ico
deleted file mode 100644
index 196496d789..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo Go Mobile.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo.ico
deleted file mode 100644
index adaf64febb..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_10.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_10.ico
deleted file mode 100644
index b575c5e6cb..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_10.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_5.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_5.ico
deleted file mode 100644
index a3fe1e9f09..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_5.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_6.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_6.ico
deleted file mode 100644
index 00b6f25f04..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_6.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_7.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_7.ico
deleted file mode 100644
index ce09e47108..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_7.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_8.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_8.ico
deleted file mode 100644
index 1323522c9a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_8.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_9.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_9.ico
deleted file mode 100644
index 4716d9c3d1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_9.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/Yahoo/libyahoo2.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/libyahoo2.ico
deleted file mode 100644
index 1fab69de59..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/Yahoo/libyahoo2.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Adium.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Adium.ico
deleted file mode 100644
index 7c7a3d247f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Adium.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/AgileMobile.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/AgileMobile.ico
deleted file mode 100644
index d87a841f7b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/AgileMobile.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Ayttm.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Ayttm.ico
deleted file mode 100644
index 7fb3d10033..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Ayttm.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/BayanICQ.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/BayanICQ.ico
deleted file mode 100644
index 3414210a9b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/BayanICQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/BitlBee.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/BitlBee.ico
deleted file mode 100644
index 196f8efe87..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/BitlBee.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Centericq.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Centericq.ico
deleted file mode 100644
index 36b6f30642..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Centericq.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Citronim.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Citronim.ico
deleted file mode 100644
index 53825f29c4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Citronim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Digsby.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Digsby.ico
deleted file mode 100644
index 4257b5269d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Digsby.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/EKG2.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/EKG2.ico
deleted file mode 100644
index 72fba64294..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/EKG2.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/EasyMessage.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/EasyMessage.ico
deleted file mode 100644
index 8b70f78a87..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/EasyMessage.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Fring.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Fring.ico
deleted file mode 100644
index 1d070ba059..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Fring.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/GAIM.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/GAIM.ico
deleted file mode 100644
index 1b634b65b6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/GAIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM+.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM+.ico
deleted file mode 100644
index 84c86794fe..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM+.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM2.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM2.ico
deleted file mode 100644
index 6949b09f7e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM2.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Inlux Messenger.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Inlux Messenger.ico
deleted file mode 100644
index c3b31c5f96..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Inlux Messenger.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Instantbird.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Instantbird.ico
deleted file mode 100644
index 082d0d869f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Instantbird.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/JasmineIM.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/JasmineIM.ico
deleted file mode 100644
index dab1238e02..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/JasmineIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Jimm.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Jimm.ico
deleted file mode 100644
index 26491e3403..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Jimm.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Kopete.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Kopete.ico
deleted file mode 100644
index dd1f86cf57..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Kopete.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Meetro.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Meetro.ico
deleted file mode 100644
index 840ef00211..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Meetro.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/NatSiemens.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/NatSiemens.ico
deleted file mode 100644
index 2a38ddf1f6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/NatSiemens.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/OneTeam.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/OneTeam.ico
deleted file mode 100644
index 5711775483..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/OneTeam.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Palringo.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Palringo.ico
deleted file mode 100644
index b520f9b171..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Palringo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Pidgin.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Pidgin.ico
deleted file mode 100644
index b3e6880afb..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Pidgin.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Prelude.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Prelude.ico
deleted file mode 100644
index db00c912e0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Prelude.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Proteus.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Proteus.ico
deleted file mode 100644
index b4ee01981b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Proteus.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2010.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2010.ico
deleted file mode 100644
index 70e0241580..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2010.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2012.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2012.ico
deleted file mode 100644
index e4ec765b41..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2012.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP Infium.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP Infium.ico
deleted file mode 100644
index 70e0241580..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP Infium.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP PDA.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP PDA.ico
deleted file mode 100644
index 061a562f91..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP PDA.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Qnext.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Qnext.ico
deleted file mode 100644
index 6851be474d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Qnext.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM.ico
deleted file mode 100644
index af988017e6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux.ico
deleted file mode 100644
index 06eed2c444..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux_old.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux_old.ico
deleted file mode 100644
index f30e9dcce4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux_old.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX.ico
deleted file mode 100644
index afb6e3a1e8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX_old.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX_old.ico
deleted file mode 100644
index cc4c5fb62f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX_old.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win.ico
deleted file mode 100644
index 31f9757c38..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win_old.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win_old.ico
deleted file mode 100644
index 331b3834d9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win_old.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_other_old.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_other_old.ico
deleted file mode 100644
index 25baed70e7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_other_old.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Astra.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Astra.ico
deleted file mode 100644
index 42e02c7dfb..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Astra.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Pro.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Pro.ico
deleted file mode 100644
index 5888781e79..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Pro.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian.ico
deleted file mode 100644
index 70afe6d8d2..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Yamigo.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Yamigo.ico
deleted file mode 100644
index 6cbba7d241..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/Yamigo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/eBuddy.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/eBuddy.ico
deleted file mode 100644
index afc84a95d4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/eBuddy.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/iChat.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/iChat.ico
deleted file mode 100644
index 72a1c32399..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/iChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/imoim.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/imoim.ico
deleted file mode 100644
index c139b0c0a0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/imoim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/mChat.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/mChat.ico
deleted file mode 100644
index 4ebf39c24e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/mChat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/meebo.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/meebo.ico
deleted file mode 100644
index 433df7f464..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/meebo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/pigeon.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/pigeon.ico
deleted file mode 100644
index 333e0a8c0e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/pigeon.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/python.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/python.ico
deleted file mode 100644
index 10549ee4e1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/python.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/qutim.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/qutim.ico
deleted file mode 100644
index 8526a3dea5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/qutim.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/multi-protocol/uIM.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/uIM.ico
deleted file mode 100644
index 8e8b27f8e6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/multi-protocol/uIM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_AimOscar.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_AimOscar.ico
deleted file mode 100644
index 9c52652661..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_AimOscar.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ.ico
deleted file mode 100644
index 06fb768cc7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ_Plus.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ_Plus.ico
deleted file mode 100644
index 97db43f146..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ_Plus.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQM.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQM.ico
deleted file mode 100644
index 1e72ea45db..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQM.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQ_Sin.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQ_Sin.ico
deleted file mode 100644
index adcdcc4275..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQ_Sin.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_IRC.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_IRC.ico
deleted file mode 100644
index bae07272fc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_IRC.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JGTalk.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JGTalk.ico
deleted file mode 100644
index 061653862e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JGTalk.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JMeebo.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JMeebo.ico
deleted file mode 100644
index 4bb4e64f39..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JMeebo.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Jabber.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Jabber.ico
deleted file mode 100644
index f55fb4583e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Jabber.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_MailRu.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_MailRu.ico
deleted file mode 100644
index c50cbb92c3..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_MailRu.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_QQ.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_QQ.ico
deleted file mode 100644
index f9e3912207..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_QQ.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Tlen.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Tlen.ico
deleted file mode 100644
index 44ecce6bbc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Tlen.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_gmail.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_gmail.ico
deleted file mode 100644
index ee4f45e1b5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_gmail.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_msn.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_msn.ico
deleted file mode 100644
index 7bee4e6d5c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_msn.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Android.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Android.ico
deleted file mode 100644
index cc0f91559f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Android.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Flash.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Flash.ico
deleted file mode 100644
index 36a24aae64..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Flash.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Java.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Java.ico
deleted file mode 100644
index 5641b558e5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Java.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Symbian.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Symbian.ico
deleted file mode 100644
index 74befa2749..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Symbian.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Windows.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Windows.ico
deleted file mode 100644
index 2ab31cd56c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Windows.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_iMac.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_iMac.ico
deleted file mode 100644
index 0e11f643d4..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_iMac.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_linux.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_linux.ico
deleted file mode 100644
index b605426c71..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_linux.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_IMsecure_arrow.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_IMsecure_arrow.ico
deleted file mode 100644
index 47ffb37058..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_IMsecure_arrow.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SecureIM_arrow.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SecureIM_arrow.ico
deleted file mode 100644
index 0e855dd172..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SecureIM_arrow.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpLite_arrow.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpLite_arrow.ico
deleted file mode 100644
index 8b4c9d3a9b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpLite_arrow.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpPro_arrow.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpPro_arrow.ico
deleted file mode 100644
index 85544d349f..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpPro_arrow.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/_blank.ico b/plugins/FingerPrintModPlus/res/icons/overlays/_blank.ico
deleted file mode 100644
index 74ae0e1255..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/_blank.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_debug.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_debug.ico
deleted file mode 100644
index 11a788c58c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_debug.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_home.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_home.ico
deleted file mode 100644
index 36029b7589..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_home.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_mobile.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_mobile.ico
deleted file mode 100644
index 4ab82a4a77..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_mobile.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_notebook.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_notebook.ico
deleted file mode 100644
index 7ead77c78d..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_notebook.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_office.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_office.ico
deleted file mode 100644
index b31a7cba16..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_office.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_work.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_work.ico
deleted file mode 100644
index 95f77d9711..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_work.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_666.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_666.ico
deleted file mode 100644
index c5d4596bf5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_666.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_AF.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_AF.ico
deleted file mode 100644
index 846513ebb7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_AF.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Cappuccino.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Cappuccino.ico
deleted file mode 100644
index 5315c448b9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Cappuccino.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FaithPack.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FaithPack.ico
deleted file mode 100644
index 3d44d86af9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FaithPack.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FinalPack.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FinalPack.ico
deleted file mode 100644
index 7f9f1e83a9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FinalPack.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_KDL.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_KDL.ico
deleted file mode 100644
index 1a2b1a7f73..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_KDL.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Kolich.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Kolich.ico
deleted file mode 100644
index a314b055c8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Kolich.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Lestat.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Lestat.ico
deleted file mode 100644
index 4c33f3d1b6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Lestat.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_LexSys.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_LexSys.ico
deleted file mode 100644
index c8f8d1c4c8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_LexSys.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_FR.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_FR.ico
deleted file mode 100644
index 1c371967f6..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_FR.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_ME.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_ME.ico
deleted file mode 100644
index 93d0dbf6ec..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_ME.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_New_Style.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_New_Style.ico
deleted file mode 100644
index 2b85e1b905..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_New_Style.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_RobyerPack.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_RobyerPack.ico
deleted file mode 100644
index f3b01cd8bf..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_RobyerPack.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_SSS.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_SSS.ico
deleted file mode 100644
index 9507959186..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_SSS.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Se7ven.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Se7ven.ico
deleted file mode 100644
index 409e3a9573..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Se7ven.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Stalker.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Stalker.ico
deleted file mode 100644
index 7ded7bfcf0..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Stalker.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ValeraVi.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ValeraVi.ico
deleted file mode 100644
index 646a11b28b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ValeraVi.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Yaol.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Yaol.ico
deleted file mode 100644
index 64dff745b2..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Yaol.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_a0x.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_a0x.ico
deleted file mode 100644
index 17f5cc040b..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_a0x.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_alfamar.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_alfamar.ico
deleted file mode 100644
index 81ee5cf7cc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_alfamar.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_amatory.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_amatory.ico
deleted file mode 100644
index a87232910e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_amatory.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_bri.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_bri.ico
deleted file mode 100644
index bdfb92c5a7..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_bri.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dar_veter.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dar_veter.ico
deleted file mode 100644
index 0b9b163b67..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dar_veter.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dmikos.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dmikos.ico
deleted file mode 100644
index 8ca679a637..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dmikos.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_e33.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_e33.ico
deleted file mode 100644
index adff0303fc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_e33.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_freize.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_freize.ico
deleted file mode 100644
index 969e034447..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_freize.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ghost.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ghost.ico
deleted file mode 100644
index a9b566d6d1..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ghost.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_hieros.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_hieros.ico
deleted file mode 100644
index b53e707612..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_hieros.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_kuzzman.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_kuzzman.ico
deleted file mode 100644
index cde20a9e13..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_kuzzman.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_leninpack.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_leninpack.ico
deleted file mode 100644
index d79e07d646..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_leninpack.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_mataes.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_mataes.ico
deleted file mode 100644
index 44677c40d9..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_mataes.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_md.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_md.ico
deleted file mode 100644
index 314a9fb029..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_md.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_native.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_native.ico
deleted file mode 100644
index 8381cbf2bf..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_native.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_pilot.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_pilot.ico
deleted file mode 100644
index 267e644b69..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_pilot.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_razunter.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_razunter.ico
deleted file mode 100644
index ee7ef57085..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_razunter.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_tweety.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_tweety.ico
deleted file mode 100644
index ebef950336..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_tweety.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_umedon.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_umedon.ico
deleted file mode 100644
index e9ef5ad413..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_umedon.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_watcher.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_watcher.ico
deleted file mode 100644
index a26cfab0cf..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_watcher.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_xSpellhowleRx.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_xSpellhowleRx.ico
deleted file mode 100644
index a52c4ea4cc..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_xSpellhowleRx.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_zeleboba.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_zeleboba.ico
deleted file mode 100644
index 37fb67b984..0000000000
--- a/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_zeleboba.ico
+++ /dev/null
diff --git a/plugins/FingerPrintModPlus/res/icons_AIM.rc b/plugins/FingerPrintModPlus/res/icons_AIM.rc
deleted file mode 100644
index ad083d37aa..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_AIM.rc
+++ /dev/null
@@ -1,79 +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.
-//##############################################################################################################
-//################################################# AIM ########################################################
-//##############################################################################################################
-   IDI_AIM                 ICON    "icons\\AIM\\AIM.ico"
-   IDI_AIM_4               ICON    "icons\\AIM\\AIM_4.x.ico"
-   IDI_AIM_5               ICON    "icons\\AIM\\AIM_5.x.ico"
-   IDI_AIM_MAC             ICON    "icons\\AIM\\AIM_Mac.ico"
-   IDI_AIM_MOBILE          ICON    "icons\\AIM\\AIM_Mobile.ico"
-   IDI_AIM_TRITON          ICON    "icons\\AIM\\AIM_Triton.ico"
-   IDI_MINIAIM             ICON    "icons\\AIM\\miniaim.ico"
-   IDI_NAIM                ICON    "icons\\AIM\\naim.ico"
-   IDI_TERRAIM             ICON    "icons\\AIM\\TerraIM.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/FingerPrintModPlus/res/icons_Gadu.rc b/plugins/FingerPrintModPlus/res/icons_Gadu.rc
deleted file mode 100644
index b0079a9484..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_Gadu.rc
+++ /dev/null
@@ -1,72 +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.
-//##############################################################################################################
-//########################################### 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"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 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/FingerPrintModPlus/res/icons_General.rc b/plugins/FingerPrintModPlus/res/icons_General.rc
deleted file mode 100644
index a8ed94221a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_General.rc
+++ /dev/null
@@ -1,147 +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.
-//##############################################################################################################
-//################################################### MirandaIM clients ########################################
-//##############################################################################################################
-   IDI_MIRANDA_4           ICON    "icons\\MirandaIM\\4.ico"
-   IDI_MIRANDA_4s          ICON    "icons\\MirandaIM\\4s.ico"
-   IDI_MIRANDA_5           ICON    "icons\\MirandaIM\\5.ico"
-   IDI_MIRANDA_5s          ICON    "icons\\MirandaIM\\5s.ico"
-   IDI_MIRANDA_6           ICON    "icons\\MirandaIM\\6.ico"
-   IDI_MIRANDA_6s          ICON    "icons\\MirandaIM\\6s.ico"
-   IDI_MIRANDA_7           ICON    "icons\\MirandaIM\\7.ico"
-   IDI_MIRANDA_7s          ICON    "icons\\MirandaIM\\7s.ico"
-   IDI_MIRANDA_8           ICON    "icons\\MirandaIM\\8.ico"
-   IDI_MIRANDA_8s          ICON    "icons\\MirandaIM\\8s.ico"
-   IDI_MIRANDA_9           ICON    "icons\\MirandaIM\\9.ico"
-   IDI_MIRANDA_9s          ICON    "icons\\MirandaIM\\9s.ico"
-   IDI_MIRANDA_10          ICON    "icons\\MirandaIM\\10.ico"
-   IDI_MIRANDA_10s         ICON    "icons\\MirandaIM\\10s.ico"
-   IDI_MIRANDA_04          ICON    "icons\\MirandaIM\\MirandaIM_04.ico"
-   IDI_MIRANDA_05          ICON    "icons\\MirandaIM\\MirandaIM_05.ico"
-   IDI_MIRANDA_05U         ICON    "icons\\MirandaIM\\MirandaIM_05U.ico"
-   IDI_MIRANDA_06          ICON    "icons\\MirandaIM\\MirandaIM_06.ico"
-   IDI_MIRANDA_06U         ICON    "icons\\MirandaIM\\MirandaIM_06U.ico"
-   IDI_MIRANDA_07          ICON    "icons\\MirandaIM\\MirandaIM_07.ico"
-   IDI_MIRANDA_07U         ICON    "icons\\MirandaIM\\MirandaIM_07U.ico"
-   IDI_MIRANDA_08          ICON    "icons\\MirandaIM\\MirandaIM_08.ico"
-   IDI_MIRANDA_08U         ICON    "icons\\MirandaIM\\MirandaIM_08U.ico"
-   IDI_MIRANDA_09          ICON    "icons\\MirandaIM\\MirandaIM_09.ico"
-   IDI_MIRANDA_09U         ICON    "icons\\MirandaIM\\MirandaIM_09U.ico"
-   IDI_MIRANDA_010         ICON    "icons\\MirandaIM\\MirandaIM_010.ico"
-   IDI_MIRANDA_010U        ICON    "icons\\MirandaIM\\MirandaIM_010U.ico"
-   IDI_MIRANDA_666         ICON    "icons\\MirandaIM\\MirandaIM_666.ico"
-   IDI_MIRANDA_U           ICON    "icons\\MirandaIM\\MirandaIM_U.ico"
-   IDI_MIRANDA_NG          ICON    "icons\\MirandaIM\\MirandaNG.ico"
-   IDI_MIRANDA_UNKNOWN     ICON    "icons\\MirandaIM\\MirandaIM_unknown.ico"
-
-//##############################################################################################################
-//################################################## Overlays ##################################################
-//##############################################################################################################
-
-//##############################################################################################################
-//##################################### Miranda client overlays ################################################
-//##############################################################################################################
-   IDI_AIMOSCAR_OVERLAY		      ICON    "icons\\overlays\\Miranda client\\overlay_AimOscar.ico"
-   IDI_GMAIL_OVERLAY              ICON    "icons\\overlays\\Miranda client\\overlay_Gmail.ico"
-   IDI_ICQJ_SIN_MOD_OVERLAY       ICON    "icons\\overlays\\Miranda client\\overlay_ICQ_Sin.ico"
-   IDI_ICQJ_OVERLAY               ICON    "icons\\overlays\\Miranda client\\overlay_ICQJ.ico"
-   IDI_ICQJ_PLUS_MOD_OVERLAY      ICON    "icons\\overlays\\Miranda client\\overlay_ICQJ_Plus.ico"
-   IDI_ICQJM_OVERLAY              ICON    "icons\\overlays\\Miranda client\\overlay_ICQM.ico"
-   IDI_IRC_OVERLAY                ICON    "icons\\overlays\\Miranda client\\overlay_IRC.ico"
-   IDI_JABBER_OVERLAY             ICON    "icons\\overlays\\Miranda client\\overlay_Jabber.ico"
-   IDI_JGTALK_OVERLAY             ICON    "icons\\overlays\\Miranda client\\overlay_JGTalk.ico"
-   IDI_JMEEBO_OVERLAY             ICON    "icons\\overlays\\Miranda client\\overlay_JMeebo.ico"
-   IDI_MAILRU_OVERLAY             ICON    "icons\\overlays\\Miranda client\\overlay_MailRu.ico"
-   IDI_MSN_OVERLAY                ICON    "icons\\overlays\\Miranda client\\overlay_MSN.ico"
-   IDI_QQ_OVERLAY                 ICON    "icons\\overlays\\Miranda client\\overlay_QQ.ico"
-   IDI_TLEN_OVERLAY               ICON    "icons\\overlays\\Miranda client\\overlay_Tlen.ico"
-
-//##############################################################################################################
-//########################################### OS ############################################################
-//##############################################################################################################
-   IDI_CLIENTANDROID		      ICON    "icons\\overlays\\OS\\overlay_Android.ico"
-   IDI_CLIENTFLASH                ICON    "icons\\overlays\\OS\\overlay_Flash.ico"
-   IDI_CLIENTMAC                  ICON    "icons\\overlays\\OS\\overlay_iMac.ico"
-   IDI_CLIENTJAVA                 ICON    "icons\\overlays\\OS\\overlay_Java.ico "
-   IDI_CLIENTLINUX                ICON    "icons\\overlays\\OS\\overlay_linux.ico"
-   IDI_CLIENTSYMBIAN              ICON    "icons\\overlays\\OS\\overlay_Symbian.ico"
-   IDI_CLIENTWIN                  ICON    "icons\\overlays\\OS\\overlay_Windows.ico"
-
-//##############################################################################################################
-//########################################### Secure overlays ##################################################
-//##############################################################################################################
-   IDI_IMSECURE_OVERLAY           ICON    "icons\\overlays\\Secure\\overlay_IMsecure_arrow.ico"
-   IDI_SECUREIM_OVERLAY           ICON    "icons\\overlays\\Secure\\overlay_SecureIM_arrow.ico"
-   IDI_SIMPLITE_OVERLAY           ICON    "icons\\overlays\\Secure\\overlay_SimpLite_arrow.ico"
-   IDI_SIMPPRO_OVERLAY            ICON    "icons\\overlays\\Secure\\overlay_SimpPro_arrow.ico"
-
-//##############################################################################################################
-//########################################### Other ############################################################
-//##############################################################################################################
-   IDI_BLANK                      ICON    "icons\\overlays\\_blank.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/FingerPrintModPlus/res/icons_ICQ.rc b/plugins/FingerPrintModPlus/res/icons_ICQ.rc
deleted file mode 100644
index 1a730956ce..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_ICQ.rc
+++ /dev/null
@@ -1,140 +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.
-//##############################################################################################################
-//########################################## Unofficial ICQ clients ############################################
-//##############################################################################################################
-   IDI_ANDRQ               ICON    "icons\\ICQ\\&RQ.ico"
-   IDI_1UND1               ICON    "icons\\ICQ\\1&1.ico"
-   IDI_ALICQ               ICON    "icons\\ICQ\\Alicq.ico"
-   IDI_ANASTASIA           ICON    "icons\\ICQ\\Anastasia.ico"
-   IDI_VIRUS               ICON    "icons\\ICQ\\Biohazard.ico"
-   IDI_COREPAGER           ICON    "icons\\ICQ\\corepager.ico"
-   IDI_DICHAT              ICON    "icons\\ICQ\\D[i]Chat.ico"
-   IDI_DELPHI              ICON    "icons\\ICQ\\Delphi.ico"
-   IDI_GLICQ               ICON    "icons\\ICQ\\GLICQ.ico"
-   IDI_GNOMEICU            ICON    "icons\\ICQ\\GnomeICU.ico"
-   IDI_ICAT                ICON    "icons\\ICQ\\IC@.ico"
-   IDI_ICQ2X               ICON    "icons\\ICQ\\ICQ_2.x.ico"
-   IDI_IMADERING           ICON    "icons\\ICQ\\imadering.ico"
-   IDI_JICQ                ICON    "icons\\ICQ\\JICQ.ico"
-   IDI_KMASKA              ICON    "icons\\ICQ\\KM_Aska.ico"
-   IDI_KXICQ               ICON    "icons\\ICQ\\kxICQ2.ico"
-   IDI_LIBICQ2000          ICON    "icons\\ICQ\\LibICQ2000.ico"
-   IDI_LICQ                ICON    "icons\\ICQ\\Licq.ico"
-   IDI_LOCID               ICON    "icons\\ICQ\\locid.ico"
-   IDI_MICQ                ICON    "icons\\ICQ\\mICQ.ico"
-   IDI_MIP                 ICON    "icons\\ICQ\\MIP.ico"
-   IDI_NANOICQ             ICON    "icons\\ICQ\\NanoICQ.ico"
-   IDI_NICQ                ICON    "icons\\ICQ\\nICQ.ico"
-   IDI_QIP                 ICON    "icons\\ICQ\\QIP.ico"
-   IDI_RANDQ_NEW           ICON    "icons\\ICQ\\R&Q.ico"
-   IDI_SLICK               ICON    "icons\\ICQ\\slick.ico"
-   IDI_SMAPER              ICON    "icons\\ICQ\\smaper.ico"
-   IDI_SMARTICQ            ICON    "icons\\ICQ\\SmartICQ.ico"
-   IDI_SPAMBOT             ICON    "icons\\ICQ\\Spambot.ico"
-   IDI_STICQ               ICON    "icons\\ICQ\\stICQ.ico"
-   IDI_STRICQ              ICON    "icons\\ICQ\\StrICQ.ico"
-   IDI_VICQ                ICON    "icons\\ICQ\\vICQ.ico"
-   IDI_VMICQ               ICON    "icons\\ICQ\\vmICQ.ico"
-   IDI_WEBICQ              ICON    "icons\\ICQ\\WebICQ.ico"
-   IDI_YEEMP               ICON    "icons\\ICQ\\Yeemp.ico"
-   IDI_YSM                 ICON    "icons\\ICQ\\YSM.ico"
-
-//##############################################################################################################
-//############################################# Official ICQ clients ###########################################
-//##############################################################################################################
-   IDI_ICQ                 ICON    "icons\\ICQ\\official\\ICQ.ico" 
-   IDI_ICQ_6               ICON    "icons\\ICQ\\official\\ICQ_6.ico"
-   IDI_ICQ_ABV             ICON    "icons\\ICQ\\official\\ICQ_ABV.ico"
-   IDI_ICQ_BIGMIR          ICON    "icons\\ICQ\\official\\ICQ_Bigmir.ico"
-   IDI_ICQ_COMPAD          ICON    "icons\\ICQ\\official\\ICQ_ComPad.ico"
-   IDI_ICQ4MAC             ICON    "icons\\ICQ\\official\\ICQ_iMac.ico"   
-   IDI_ICQ_LITE4           ICON    "icons\\ICQ\\official\\ICQ_Lite4.ico"
-   IDI_ICQ_LITE7           ICON    "icons\\ICQ\\official\\ICQ_Lite7.ico"
-   IDI_ICQ_NETVIGATOR      ICON    "icons\\ICQ\\official\\ICQ_Netvigator.ico"
-   IDI_ICQ_PRO7            ICON    "icons\\ICQ\\official\\ICQ_Pro7.ico"
-   IDI_ICQ_RAMBLER         ICON    "icons\\ICQ\\official\\ICQ_Rambler.ico"
-   IDI_ICQ_POCKETPC        ICON    "icons\\ICQ\\official\\ICQ for PocketPC.ico"
-
-//##############################################################################################################
-//################################################## Overlays ##################################################
-//##############################################################################################################
-
-//##############################################################################################################
-//################################# ICQ overlays ###############################################################
-//##############################################################################################################
-
-   IDI_CLIENTICQLITE5      ICON    "icons\\ICQ\\official\\Icq 5.ico"
-   IDI_CLIENTICQLITE51     ICON    "icons\\ICQ\\official\\Icq 5.1.ico"
-   IDI_CLIENTICQ6          ICON    "icons\\ICQ\\official\\Icq 6.ico"
-   IDI_CLIENTICQ7          ICON    "icons\\ICQ\\official\\Icq 7.ico"
-   IDI_CLIENTICQ2000       ICON    "icons\\ICQ\\official\\Icq2000.ico"
-   IDI_CLIENTICQ2001       ICON    "icons\\ICQ\\official\\icq2001.ico"
-   IDI_CLIENTICQ2002       ICON    "icons\\ICQ\\official\\icq2002.ico"
-   IDI_CLIENTICQ2003       ICON    "icons\\ICQ\\official\\icq2003.ico"
-   IDI_CLIENTICQLITE4      ICON    "icons\\ICQ\\official\\IcqLite 4.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/FingerPrintModPlus/res/icons_IRC.rc b/plugins/FingerPrintModPlus/res/icons_IRC.rc
deleted file mode 100644
index 311d20840e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_IRC.rc
+++ /dev/null
@@ -1,132 +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.
-//##############################################################################################################
-//################################################ IRC #########################################################
-//##############################################################################################################
-   IDI_AMIRC               ICON    "icons\\IRC\\AmIRC.ico"
-   IDI_AMULE               ICON    "icons\\IRC\\aMule.ico"
-   IDI_BABBEL              ICON    "icons\\IRC\\Babbel.ico"
-   IDI_BERSIRC             ICON    "icons\\IRC\\BersIRC.ico"
-   IDI_CBIRC               ICON    "icons\\IRC\\cbirc.ico"
-   IDI_CHATZILLA           ICON    "icons\\IRC\\ChatZilla.ico"
-   IDI_CONVERSATION        ICON    "icons\\IRC\\Conversation.ico"
-   IDI_DIRC                ICON    "icons\\IRC\\dIRC.ico"
-   IDI_EGGDROP             ICON    "icons\\IRC\\Eggdrop.ico"
-   IDI_EGGDROP_RACBOT      ICON    "icons\\IRC\\Eggdrop_RacBot.ico"
-   IDI_EMULE               ICON    "icons\\IRC\\eMule.ico"
-   IDI_EMULE_MORPHXT       ICON    "icons\\IRC\\eMule_MorphXT.ico"
-   IDI_EMULE_NEO           ICON    "icons\\IRC\\eMule_Neo.ico"
-   IDI_EMULE_PLUS          ICON    "icons\\IRC\\eMule_Plus.ico"
-   IDI_EMULE_XTREME        ICON    "icons\\IRC\\eMule_Xtreme.ico"
-   IDI_FCHAT               ICON    "icons\\IRC\\FChat.ico"
-   IDI_GDPCHAT             ICON    "icons\\IRC\\GDP Web Chat.ico"
-   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_IRCLE               ICON    "icons\\IRC\\ircle.ico"
-   IDI_IRCXPRO             ICON    "icons\\IRC\\IRCXPro.ico"
-   IDI_IRSSI               ICON    "icons\\IRC\\irssi.ico"
-   IDI_JIRCII              ICON    "icons\\IRC\\jircii.ico"
-   IDI_JMIRC               ICON    "icons\\IRC\\jmIRC.ico"
-   IDI_KLIENT              ICON    "icons\\IRC\\Klient.ico"
-   IDI_KONVERSATION        ICON    "icons\\IRC\\Konversation.ico"
-   IDI_KSIRC               ICON    "icons\\IRC\\ksirc.ico"
-   IDI_KVIRC               ICON    "icons\\IRC\\KVIrc.ico"
-   IDI_MIRC                ICON    "icons\\IRC\\MIRC.ico"
-   IDI_MP3_SCRIPT          ICON    "icons\\IRC\\mp3script.ico"
-   IDI_NEORATRION          ICON    "icons\\IRC\\NeoRa Trion.ico"
-   IDI_NETTALK             ICON    "icons\\IRC\\Nettalk.ico"
-   IDI_NONAME_SCRIPT       ICON    "icons\\IRC\\NoNameScript.ico"
-   IDI_OPERA               ICON    "icons\\IRC\\Opera.ico"
-   IDI_PIORUN              ICON    "icons\\IRC\\Piorun.ico"
-   IDI_PIRC                ICON    "icons\\IRC\\pIRC.ico"
-   IDI_PIRCH               ICON    "icons\\IRC\\Pirch.ico"
-   IDI_PJIRC               ICON    "icons\\IRC\\pjIRC.ico"
-   IDI_PROCHAT             ICON    "icons\\IRC\\ProChat.ico"
-   IDI_PSYBNC              ICON    "icons\\IRC\\PsyBNC.ico"
-   IDI_SAVIRC              ICON    "icons\\IRC\\savIRC.ico"
-   IDI_SMART_IRC           ICON    "icons\\IRC\\SmartIRC.ico"
-   IDI_SNAK                ICON    "icons\\IRC\\Snak.ico"
-   IDI_SYSRESET            ICON    "icons\\IRC\\SysReset.ico"
-   IDI_VIRCAIRC            ICON    "icons\\IRC\\VircaIRC.ico"
-   IDI_VISIONIRC           ICON    "icons\\IRC\\VisionIRC.ico"
-   IDI_VISUALIRC           ICON    "icons\\IRC\\VisualIRC.ico"
-   IDI_VORTECIRC           ICON    "icons\\IRC\\VortecIRC.ico"
-   IDI_WEECHAT             ICON    "icons\\IRC\\WeeChat.ico"
-   IDI_WLIRC               ICON    "icons\\IRC\\wlIRC.ico"
-   IDI_WMIRC               ICON    "icons\\IRC\\wmIRC.ico"
-   IDI_XCHATAQUA           ICON    "icons\\IRC\\X-Chat Aqua.ico"
-   IDI_XBITCH              ICON    "icons\\IRC\\xBitch.ico"
-   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"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 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/FingerPrintModPlus/res/icons_Jabber.rc b/plugins/FingerPrintModPlus/res/icons_Jabber.rc
deleted file mode 100644
index fc88c36709..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_Jabber.rc
+++ /dev/null
@@ -1,230 +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.
-//##############################################################################################################
-//################################################## Jabber clients ############################################
-//##############################################################################################################
-   IDI_AKENI               ICON    "icons\\Jabber\\Akeni.ico"
-   IDI_ANDROID             ICON    "icons\\Jabber\\Android.ico"
-   IDI_ANOTHRSSBOT         ICON    "icons\\Jabber\\Anothr Rss Bot.ico"
-   IDI_AQQ                 ICON    "icons\\Jabber\\Aqq.ico"
-   IDI_BEEJIVE             ICON    "icons\\Jabber\\beejive.ico"
-   IDI_BELLSOUTH           ICON    "icons\\Jabber\\BellSouth.ico"
-   IDI_BITWISE             ICON    "icons\\Jabber\\BitWise.ico"
-   IDI_BLACKBERRY          ICON    "icons\\Jabber\\BlackBerry.ico"
-   IDI_BOMBUS              ICON    "icons\\Jabber\\Bombus.ico"
-   IDI_BOMBUSMOD           ICON    "icons\\Jabber\\Bombusmod.ico"
-   IDI_BOMBUSQD            ICON    "icons\\Jabber\\bombusqd.ico"
-   IDI_BOWLINE             ICON    "icons\\Jabber\\Bowline.ico"
-   IDI_BUDDYSPACE          ICON    "icons\\Jabber\\BuddySpace.ico"
-   IDI_CHATOPUS            ICON    "icons\\Jabber\\Chatopus.ico"
-   IDI_CHIKKA              ICON    "icons\\Jabber\\Chikka.ico"
-   IDI_CHITCHAT            ICON    "icons\\Jabber\\ChitChat.ico"
-   IDI_COCCINELLA          ICON    "icons\\Jabber\\Coccinella.ico"
-   IDI_COLIBRY             ICON    "icons\\Jabber\\Colibry.ico"
-   IDI_COLLOQUY            ICON    "icons\\Jabber\\Colloquy.ico"
-   IDI_DESYR               ICON    "icons\\Jabber\\Desyr.ico"
-   IDI_EMACS               ICON    "icons\\Jabber\\Emacs.ico"
-   IDI_EMESS               ICON    "icons\\Jabber\\emess.ico"
-   IDI_EXODUS              ICON    "icons\\Jabber\\Exodus.ico"
-   IDI_EYEBALL_CHAT        ICON    "icons\\Jabber\\Eyeball Chat.ico"
-   IDI_FACEBOOK            ICON    "icons\\Jabber\\Facebook.ico"
-   IDI_FIRE                ICON    "icons\\Jabber\\Fire.ico"
-   IDI_GABBER              ICON    "icons\\Jabber\\Gabber.ico"
-   IDI_GAJIM               ICON    "icons\\Jabber\\Gajim.ico"
-   IDI_GCN                 ICON    "icons\\Jabber\\GCN.ico"
-   IDI_GLU                 ICON    "icons\\Jabber\\glu.ico"
-   IDI_GMAIL               ICON    "icons\\Jabber\\GMail.ico"
-   IDI_CONFERENCE          ICON    "icons\\Jabber\\Gmail_Conference_Bot.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"
-   IDI_GREENTHUMB          ICON    "icons\\Jabber\\GreenThumb.ico"
-   IDI_GTALK               ICON    "icons\\Jabber\\GTalk.ico"
-   IDI_GTALK_GADGET        ICON    "icons\\Jabber\\GTalk Gadget.ico"
-   IDI_GUSH                ICON    "icons\\Jabber\\Gush.ico"
-   IDI_GYABER              ICON    "icons\\Jabber\\gYaber.ico"
-   IDI_IGOOGLE             ICON    "icons\\Jabber\\iGoogle.ico"
-   IDI_IMCOM               ICON    "icons\\Jabber\\IMCom.ico"
-   IDI_IMEEM               ICON    "icons\\Jabber\\iMeem.ico"
-   IDI_IMIFIED             ICON    "icons\\Jabber\\Imified.ico"
-   IDI_IMOV                ICON    "icons\\Jabber\\iMov.ico"
-   IDI_IMPORTAL            ICON    "icons\\Jabber\\Importal.ico"
-   IDI_INSTANT             ICON    "icons\\Jabber\\Instan-t.ico"
-   IDI_INTERACTION         ICON    "icons\\Jabber\\Interaction.ico"
-   IDI_IRUKA               ICON    "icons\\Jabber\\iruka.ico"
-   IDI_JABBER_BEOS         ICON    "icons\\Jabber\\Jabber_BeOS.ico"
-   IDI_JABBER_APPLET       ICON    "icons\\Jabber\\JabberApplet.ico"
-   IDI_JABBERFOX           ICON    "icons\\Jabber\\JabberFoX.ico"
-   IDI_JABBER_MESSENGER    ICON    "icons\\Jabber\\JabberMessenger.ico"
-   IDI_JABBERNAUT          ICON    "icons\\Jabber\\JabberNaut.ico"
-   IDI_JABBERWOCKY         ICON    "icons\\Jabber\\JabberWocky.ico"
-   IDI_JABBERZILLA         ICON    "icons\\Jabber\\JabberZilla.ico"
-   IDI_JABBIM              ICON    "icons\\Jabber\\jabbim.ico"
-   IDI_JABBIN              ICON    "icons\\Jabber\\Jabbin.ico"
-   IDI_JABIRU              ICON    "icons\\Jabber\\Jabiru.ico"
-   IDI_JAJC                ICON    "icons\\Jabber\\JAJC.ico"
-   IDI_JBOTHER             ICON    "icons\\Jabber\\JBother.ico"
-   IDI_JCLAIM              ICON    "icons\\Jabber\\JClaim.ico"
-   IDI_JDISK               ICON    "icons\\Jabber\\jdisk.ico"
-   IDI_JETI                ICON    "icons\\Jabber\\Jeti.ico"
-   IDI_JMC                 ICON    "icons\\Jabber\\JMC.ico"
-   IDI_JRUDEVELS           ICON    "icons\\Jabber\\jrudevels.ico"
-   IDI_JTALK               ICON    "icons\\Jabber\\jTalk.ico"
-   IDI_JUICK               ICON    "icons\\Jabber\\juick.ico"
-   IDI_JWCHAT              ICON    "icons\\Jabber\\JWChat.ico"
-   IDI_JWGC                ICON    "icons\\Jabber\\JWGC.ico"
-   IDI_KADU                ICON    "icons\\Jabber\\kadu.ico"
-   IDI_KF                  ICON    "icons\\Jabber\\kf.ico"
-   IDI_KONNEKT             ICON    "icons\\Jabber\\Konnekt.ico"
-   IDI_LAFFER              ICON    "icons\\Jabber\\Laffer.ico"    
-   IDI_LANDELL             ICON    "icons\\Jabber\\Landell.ico"
-   IDI_LEAF                ICON    "icons\\Jabber\\Leaf Messenger.ico"
-   IDI_LEECHCRAFT          ICON    "icons\\Jabber\\LeechCraft.ico"
-   IDI_LINQ                ICON    "icons\\Jabber\\LinQ.ico"
-   IDI_LLUNA               ICON    "icons\\Jabber\\LLuna.ico"
-   IDI_M8JABBER            ICON    "icons\\Jabber\\m8jabber.ico"
-   IDI_MANGO               ICON    "icons\\Jabber\\Mango.ico"
-   IDI_MCABBER             ICON    "icons\\Jabber\\MCabber.ico"
-   IDI_MEINVZ              ICON    "icons\\Jabber\\meinvz.ico"
-   IDI_MERCURY_MESSENGER   ICON    "icons\\Jabber\\Mercury_Messenger.ico"
-   IDI_MGTALK              ICON    "icons\\Jabber\\MGTalk.ico"
-   IDI_MOBBER              ICON    "icons\\Jabber\\mobber.ico"
-   IDI_MOJAB               ICON    "icons\\Jabber\\moJab.ico"
-   IDI_MOZILLACHAT         ICON    "icons\\Jabber\\MozillaChat.ico"
-   IDI_MYJABBER            ICON    "icons\\Jabber\\myJabber.ico"
-   IDI_NEOS                ICON    "icons\\Jabber\\Neos.ico"
-   IDI_NITRO               ICON    "icons\\Jabber\\Nitro.ico"
-   IDI_NOSTROMO            ICON    "icons\\Jabber\\Nostromo.ico"
-   IDI_OCTRO               ICON    "icons\\Jabber\\Octro.ico"
-   IDI_OM                  ICON    "icons\\Jabber\\OM.ico"
-   IDI_ORKUT               ICON    "icons\\Jabber\\orkut.ico"
-   IDI_PALTALK             ICON    "icons\\Jabber\\paltalk.ico"
-   IDI_PANDION             ICON    "icons\\Jabber\\Pandion.ico"
-   IDI_PAPLA               ICON    "icons\\Jabber\\Papla.ico"
-   IDI_PJC                 ICON    "icons\\Jabber\\pjc.ico"
-   IDI_PSI                 ICON    "icons\\Jabber\\PSI.ico"
-   IDI_PSTO                ICON    "icons\\Jabber\\Psto.net.ico"
-   IDI_PYAIMT              ICON    "icons\\Jabber\\PyAIMt.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_RENREN	           ICON    "icons\\Jabber\\RenRen.ico"
-   IDI_SCHULERVZ           ICON    "icons\\Jabber\\schuelervz.ico"
-   IDI_SIP_COMM            ICON    "icons\\Jabber\\SIP Communicator.ico"
-   IDI_SKYMESSAGER         ICON    "icons\\Jabber\\Sky Messager.ico"
-   IDI_SMACK               ICON    "icons\\Jabber\\Smack.ico"
-   IDI_SMTP_TRANSPORT      ICON    "icons\\Jabber\\smtp_transport.ico"
-   IDI_SOAPBOX             ICON    "icons\\Jabber\\SoapBox.ico"
-   IDI_SPARK               ICON    "icons\\Jabber\\Spark.ico"
-   IDI_SPIK                ICON    "icons\\Jabber\\Spik.ico"
-   IDI_STUDIVZ             ICON    "icons\\Jabber\\studivz.ico"
-   IDI_SWORIM              ICON    "icons\\Jabber\\SworIM.ico"
-   IDI_TALKONAUT           ICON    "icons\\Jabber\\Talkonaut.ico"
-   IDI_TAPIOCA             ICON    "icons\\Jabber\\Tapioca.ico"
-   IDI_TEABOT              ICON    "icons\\Jabber\\Teabot.ico"
-   IDI_TELEPATHY           ICON    "icons\\Jabber\\Telepathy.ico"
-   IDI_THUNDERBIRD         ICON    "icons\\Jabber\\Thunderbird.ico"
-   IDI_TIPICIM             ICON    "icons\\Jabber\\TipicIM.ico"
-   IDI_TKABBER             ICON    "icons\\Jabber\\Tkabber.ico"
-   IDI_TRANSACTIM          ICON    "icons\\Jabber\\TransactIM.ico"
-   IDI_TRIPLE_SOFTWARE     ICON    "icons\\Jabber\\TripleSoftwareIM.ico"
-   IDI_TWITTER             ICON    "icons\\Jabber\\twitter.ico"
-   IDI_VACUUM              ICON    "icons\\Jabber\\Vacuum.ico"
-   IDI_VAYUSPHERE          ICON    "icons\\Jabber\\Vayusphere.ico"
-   IDI_WANNACHAT           ICON    "icons\\Jabber\\WannaChat.ico"
-   IDI_WEBEX               ICON    "icons\\Jabber\\WebEx.ico"
-   IDI_WHISPERIM           ICON    "icons\\Jabber\\WhisperIM.ico"
-   IDI_WHOISBOT            ICON    "icons\\Jabber\\WhoisBot.ico"
-   IDI_WIJA                ICON    "icons\\Jabber\\wija.ico"
-   IDI_WILDFIRE            ICON    "icons\\Jabber\\Wildfire.ico"
-   IDI_WINJAB              ICON    "icons\\Jabber\\WinJab.ico"
-   IDI_WTW                 ICON    "icons\\Jabber\\WTW.ico"
-   IDI_XEUS                ICON    "icons\\Jabber\\Xeus.ico"
-   IDI_XIFFIAN             ICON    "icons\\Jabber\\Xiffian.ico"
-   IDI_YAMBI               ICON    "icons\\Jabber\\Yambi.ico"
-   IDI_YAONLINE            ICON    "icons\\Jabber\\yaonline.ico"
-
-//##############################################################################################################
-//################################################## Overlays ##################################################
-//##############################################################################################################
-
-//##############################################################################################################
-//########################################### overlay2 #########################################################
-//##############################################################################################################
-
-   IDI_DEBUG_OVERLAY              ICON    "icons\\overlays\\overlay2\\overlay_debug.ico"
-   IDI_HOME_OVERLAY               ICON    "icons\\overlays\\overlay2\\overlay_home.ico"
-   IDI_MOBILE_OVERLAY             ICON    "icons\\overlays\\overlay2\\overlay_mobile.ico"
-   IDI_NOTEBOOK_OVERLAY           ICON    "icons\\overlays\\overlay2\\overlay_notebook.ico"
-   IDI_OFFICE_OVERLAY             ICON    "icons\\overlays\\overlay2\\overlay_office.ico"
-   IDI_WORK_OVERLAY               ICON    "icons\\overlays\\overlay2\\overlay_work.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/FingerPrintModPlus/res/icons_MRA.rc b/plugins/FingerPrintModPlus/res/icons_MRA.rc
deleted file mode 100644
index 60e8b0c7d8..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_MRA.rc
+++ /dev/null
@@ -1,74 +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.
-//##############################################################################################################
-//########################################### Mail.ru Agent ####################################################
-//##############################################################################################################
-   IDI_MAIL_RU_MOBILE             ICON    "icons\\Mail.Ru\\Mail.Ru_Mobile.ico"
-   IDI_MAIL_RU_OFFICIAL           ICON    "icons\\Mail.Ru\\Mail.Ru_official.ico"
-   IDI_MAIL_RU_UNKNOWN            ICON    "icons\\Mail.Ru\\Mail.Ru_unknown.ico"
-   IDI_MAIL_RU_WEBAGENT           ICON    "icons\\Mail.Ru\\Mail.Ru_WebAgent.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/FingerPrintModPlus/res/icons_MSN.rc b/plugins/FingerPrintModPlus/res/icons_MSN.rc
deleted file mode 100644
index 7259133b43..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_MSN.rc
+++ /dev/null
@@ -1,80 +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.
-//##############################################################################################################
-//################################################### MSN ######################################################
-//##############################################################################################################
-   IDI_AMSN                ICON    "icons\\MSN\\aMSN.ico"
-   IDI_MSN_MAC             ICON    "icons\\MSN\\MSN Mac.ico"
-   IDI_MSN_45              ICON    "icons\\MSN\\MSN v4.5-v5.x.ico"
-   IDI_MSN_6               ICON    "icons\\MSN\\MSN v6.x.ico"
-   IDI_MSN_7               ICON    "icons\\MSN\\MSN v7.x.ico"
-   IDI_MSN_8               ICON    "icons\\MSN\\MSN v8.x.ico"
-   IDI_MSN                 ICON    "icons\\MSN\\MSN v8.x.ico"
-   IDI_WEBMESSENGER        ICON    "icons\\MSN\\WebMessenger.ico"
-   IDI_WLM_9               ICON    "icons\\MSN\\wlm9.ico"
-   IDI_WLM_10              ICON    "icons\\MSN\\WLM10-11.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/FingerPrintModPlus/res/icons_Multiprotocols.rc b/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc
deleted file mode 100644
index 465358cb24..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc
+++ /dev/null
@@ -1,121 +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.
-//##############################################################################################################
-//#################################### Multi-protocol clients ##################################################
-//##############################################################################################################
-   IDI_ADIUM               ICON    "icons\\multi-protocol\\Adium.ico"
-   IDI_AGILE               ICON    "icons\\multi-protocol\\AgileMobile.ico"
-   IDI_AYTTM               ICON    "icons\\multi-protocol\\Ayttm.ico"
-   IDI_BAYANICQ            ICON    "icons\\multi-protocol\\BayanICQ.ico"
-   IDI_BITLBEE             ICON    "icons\\multi-protocol\\BitlBee.ico"
-   IDI_CENTERICQ           ICON    "icons\\multi-protocol\\Centericq.ico"
-   IDI_CITRON   		   ICON    "icons\\multi-protocol\\Citronim.ico"
-   IDI_DIGSBY   		   ICON    "icons\\multi-protocol\\Digsby.ico"
-   IDI_EASYMESSAGE         ICON    "icons\\multi-protocol\\EasyMessage.ico"
-   IDI_EBUDDY              ICON    "icons\\multi-protocol\\eBuddy.ico"
-   IDI_EKG2                ICON    "icons\\multi-protocol\\EKG2.ico"
-   IDI_FRING               ICON    "icons\\multi-protocol\\Fring.ico"
-   IDI_GAIM                ICON    "icons\\multi-protocol\\GAIM.ico"
-   IDI_ICHAT               ICON    "icons\\multi-protocol\\iChat.ico"
-   IDI_IMPLUS              ICON    "icons\\multi-protocol\\IM+.ico"
-   IDI_IM2                 ICON    "icons\\multi-protocol\\IM2.ico"
-   IDI_IMOIM               ICON    "icons\\multi-protocol\\imoim.ico"
-   IDI_INLUX               ICON    "icons\\multi-protocol\\Inlux Messenger.ico"
-   IDI_INSTANTBIRD         ICON    "icons\\multi-protocol\\Instantbird.ico"
-   IDI_JASMINEIM           ICON    "icons\\multi-protocol\\JasmineIM.ico"
-   IDI_JIMM                ICON    "icons\\multi-protocol\\Jimm.ico"
-   IDI_KOPETE              ICON    "icons\\multi-protocol\\Kopete.ico"
-   IDI_MCHAT               ICON    "icons\\multi-protocol\\mChat.ico"
-   IDI_MEEBO               ICON    "icons\\multi-protocol\\Meebo.ico"
-   IDI_MEETRO              ICON    "icons\\multi-protocol\\Meetro.ico"
-   IDI_NATSIEMENS          ICON    "icons\\multi-protocol\\NatSiemens.ico"
-   IDI_ONETEAM             ICON    "icons\\multi-protocol\\OneTeam.ico"
-   IDI_PALRINGO		       ICON    "icons\\multi-protocol\\Palringo.ico"
-   IDI_PIDGIN              ICON    "icons\\multi-protocol\\Pidgin.ico"
-   IDI_PIGEON              ICON    "icons\\multi-protocol\\Pigeon.ico"
-   IDI_PRELUDE             ICON    "icons\\multi-protocol\\Prelude.ico"
-   IDI_PROTEUS             ICON    "icons\\multi-protocol\\Proteus.ico"
-   IDI_PYTHON              ICON    "icons\\multi-protocol\\Python.ico"
-   IDI_QIP_2012            ICON    "icons\\multi-protocol\\QIP 2012.ico"
-   IDI_QIP_2010            ICON    "icons\\multi-protocol\\QIP 2010.ico"
-   IDI_QIP_INFIUM          ICON    "icons\\multi-protocol\\QIP Infium.ico"
-   IDI_QIP_PDA             ICON    "icons\\multi-protocol\\QIP PDA.ico"
-   IDI_QNEXT               ICON    "icons\\multi-protocol\\Qnext.ico"
-   IDI_QUTIM               ICON    "icons\\multi-protocol\\qutim.ico"
-   IDI_SIM                 ICON    "icons\\multi-protocol\\SIM.ico"
-   IDI_SIM_LINUX           ICON    "icons\\multi-protocol\\SIM_Linux.ico"
-   IDI_SIM_LINUX_OLD       ICON    "icons\\multi-protocol\\SIM_Linux_old.ico"
-   IDI_SIM_MACOSX          ICON    "icons\\multi-protocol\\SIM_MacOSX.ico"
-   IDI_SIM_MACOSX_OLD      ICON    "icons\\multi-protocol\\SIM_MacOSX_old.ico"
-   IDI_SIM_OLD             ICON    "icons\\multi-protocol\\SIM_other_old.ico"
-   IDI_SIM_WIN             ICON    "icons\\multi-protocol\\SIM_Win.ico"
-   IDI_SIM_WIN_OLD         ICON    "icons\\multi-protocol\\SIM_Win_old.ico"
-   IDI_TRILLIAN            ICON    "icons\\multi-protocol\\Trillian.ico"
-   IDI_TRILLIAN_ASTRA      ICON    "icons\\multi-protocol\\Trillian Astra.ico"
-   IDI_TRILLIAN_PRO        ICON    "icons\\multi-protocol\\Trillian Pro.ico"
-   IDI_UIM                 ICON    "icons\\multi-protocol\\uIM.ico"
-   IDI_YAMIGO              ICON    "icons\\multi-protocol\\Yamigo.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/FingerPrintModPlus/res/icons_Packs.rc b/plugins/FingerPrintModPlus/res/icons_Packs.rc
deleted file mode 100644
index baa6e55b35..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_Packs.rc
+++ /dev/null
@@ -1,114 +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.
-//##############################################################################################################
-//################################################## Overlays ##################################################
-//##############################################################################################################
-
-//##############################################################################################################
-//############################################## MirandaIM Packs ###############################################
-//##############################################################################################################
-   IDI_MIRANDA_A0X         ICON    "icons\\overlays\\packs\\overlay_packs_a0x.ico"
-   IDI_MIRANDA_AF          ICON    "icons\\overlays\\packs\\overlay_packs_AF.ico"
-   IDI_MIRANDA_ALFAMAR     ICON    "icons\\overlays\\packs\\overlay_packs_alfamar.ico"
-   IDI_MIRANDA_AMATORY     ICON    "icons\\overlays\\packs\\overlay_packs_amatory.ico"
-   IDI_MIRANDA_BRI         ICON    "icons\\overlays\\packs\\overlay_packs_bri.ico"
-   IDI_MIRANDA_CAPPUCCINO  ICON    "icons\\overlays\\packs\\overlay_packs_Cappuccino.ico"
-   IDI_MIRANDA_DAR         ICON    "icons\\overlays\\packs\\overlay_packs_dar_veter.ico"
-   IDI_MIRANDA_DMIKOS      ICON    "icons\\overlays\\packs\\overlay_packs_Dmikos.ico"
-   IDI_MIRANDA_E33         ICON    "icons\\overlays\\packs\\overlay_packs_e33.ico"
-   IDI_MIRANDA_FAITH       ICON    "icons\\overlays\\packs\\overlay_packs_FaithPack.ico"
-   IDI_MIRANDA_FINAL       ICON    "icons\\overlays\\packs\\overlay_packs_FinalPack.ico"
-   IDI_MIRANDA_FREIZE      ICON    "icons\\overlays\\packs\\overlay_packs_freize.ico"
-   IDI_MIRANDA_GHOST       ICON    "icons\\overlays\\packs\\overlay_packs_ghost.ico"
-   IDI_MIRANDA_HIEROS      ICON    "icons\\overlays\\packs\\overlay_packs_hieros.ico"
-   IDI_MIRANDA_KDL         ICON    "icons\\overlays\\packs\\overlay_packs_KDL.ico"
-   IDI_MIRANDA_KOLICH      ICON    "icons\\overlays\\packs\\overlay_packs_Kolich.ico"
-   IDI_MIRANDA_KUZZMAN     ICON    "icons\\overlays\\packs\\overlay_packs_Kuzzman.ico"
-   IDI_MIRANDA_LESTAT      ICON    "icons\\overlays\\packs\\overlay_packs_Lestat.ico"
-   IDI_MIRANDA_LEXSYS      ICON    "icons\\overlays\\packs\\overlay_packs_LexSys.ico"
-   IDI_MIRANDA_MATAES      ICON    "icons\\overlays\\packs\\overlay_packs_mataes.ico"
-   IDI_MIRANDA_MD          ICON    "icons\\overlays\\packs\\overlay_packs_md.ico"
-   IDI_MIRANDA_FR          ICON    "icons\\overlays\\packs\\overlay_packs_Miranda_FR.ico"
-   IDI_MIRANDA_ME          ICON    "icons\\overlays\\packs\\overlay_packs_Miranda_ME.ico"
-   IDI_MIRANDA_NATIVE      ICON    "icons\\overlays\\packs\\overlay_packs_native.ico"
-   IDI_MIRANDA_NEW_STYLE   ICON    "icons\\overlays\\packs\\overlay_packs_New_Style.ico"
-   IDI_MIRANDA_PILOT       ICON    "icons\\overlays\\packs\\overlay_packs_pilot.ico"
-   IDI_MIRANDA_RAZUNTER    ICON    "icons\\overlays\\packs\\overlay_packs_razunter.ico"
-   IDI_MIRANDA_ROBYER      ICON    "icons\\overlays\\packs\\overlay_packs_RobyerPack.ico"
-   IDI_MIRANDA_SE7VEN      ICON    "icons\\overlays\\packs\\overlay_packs_Se7ven.ico"
-   IDI_MIRANDA_SSS_MOD     ICON    "icons\\overlays\\packs\\overlay_packs_SSS.ico"
-   IDI_MIRANDA_STALKER     ICON    "icons\\overlays\\packs\\overlay_packs_Stalker.ico"
-   IDI_MIRANDA_TWEETY      ICON    "icons\\overlays\\packs\\overlay_packs_Tweety.ico"
-   IDI_MIRANDA_UMEDON      ICON    "icons\\overlays\\packs\\overlay_packs_Umedon.ico"
-   IDI_MIRANDA_VALERAVI    ICON    "icons\\overlays\\packs\\overlay_packs_ValeraVi.ico"
-   IDI_MIRANDA_WATCHER     ICON    "icons\\overlays\\packs\\overlay_packs_watcher.ico"
-   IDI_MIRANDA_SPELLHOWLER ICON    "icons\\overlays\\packs\\overlay_packs_xSpellhowleRx.ico"
-   IDI_MIRANDA_YAOL        ICON    "icons\\overlays\\packs\\overlay_packs_Yaol.ico"
-   IDI_MIRANDA_ZELEBOBA    ICON    "icons\\overlays\\packs\\overlay_packs_zeleboba.ico"
-   IDI_MIRANDA_DEVIL       ICON    "icons\\overlays\\packs\\overlay_packs_666.ico"
-   IDI_MIRANDA_LENINPACK   ICON    "icons\\overlays\\packs\\overlay_packs_LeninPack.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/FingerPrintModPlus/res/icons_QQ.rc b/plugins/FingerPrintModPlus/res/icons_QQ.rc
deleted file mode 100644
index 11eaa23c9c..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_QQ.rc
+++ /dev/null
@@ -1,96 +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.
-//##############################################################################################################
-//############################################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_WEBQQ			  ICON    "icons\\QQ\\WebQQ.ico"
-   IDI_YAMQQ			  ICON    "icons\\QQ\\Yam QQ.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"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 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/FingerPrintModPlus/res/icons_RSS.rc b/plugins/FingerPrintModPlus/res/icons_RSS.rc
deleted file mode 100644
index 5f34b3cd7e..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_RSS.rc
+++ /dev/null
@@ -1,75 +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.
-//##############################################################################################################
-//############################################RSS###############################################################
-//##############################################################################################################
-   IDI_ATOM1                      ICON    "icons\\rss\\Atom 1.ico"
-   IDI_ATOM3                      ICON    "icons\\rss\\Atom 3.ico"
-   IDI_RSS09                      ICON    "icons\\rss\\RSS 0.9.ico"
-   IDI_RSS1                       ICON    "icons\\rss\\RSS 1.ico"
-   IDI_RSS2                       ICON    "icons\\rss\\RSS 2.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/FingerPrintModPlus/res/icons_Skype.rc b/plugins/FingerPrintModPlus/res/icons_Skype.rc
deleted file mode 100644
index 46f7e1ec86..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_Skype.rc
+++ /dev/null
@@ -1,73 +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.
-//##############################################################################################################
-//############################################# Skype ##########################################################
-//##############################################################################################################
-   IDI_SKYPE1              ICON    "icons\\Skype\\Skype 1.x.ico"
-   IDI_SKYPE2              ICON    "icons\\Skype\\Skype 2.x.ico"
-   IDI_SKYPE3              ICON    "icons\\Skype\\Skype 3.x.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/FingerPrintModPlus/res/icons_Tlen.rc b/plugins/FingerPrintModPlus/res/icons_Tlen.rc
deleted file mode 100644
index c7751d2602..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_Tlen.rc
+++ /dev/null
@@ -1,78 +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.
-//##############################################################################################################
-//################################################### Tlen #####################################################
-//##############################################################################################################
-   IDI_TLEN                ICON    "icons\\Tlen\\Tlen.ico"
-   
-//##############################################################################################################
-//########################################### 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"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 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/FingerPrintModPlus/res/icons_VoIP.rc b/plugins/FingerPrintModPlus/res/icons_VoIP.rc
deleted file mode 100644
index 72377b5508..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_VoIP.rc
+++ /dev/null
@@ -1,73 +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.
-//##############################################################################################################
-//######################################### VoIP clients #######################################################
-//##############################################################################################################
-   IDI_GIZMO               ICON    "icons\\VoIP\\Gizmo.ico"
-   IDI_WENGOPHONE          ICON    "icons\\VoIP\\WengoPhone.ico"
-   IDI_ZOEP                ICON    "icons\\VoIP\\Zoep.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/FingerPrintModPlus/res/icons_Weather.rc b/plugins/FingerPrintModPlus/res/icons_Weather.rc
deleted file mode 100644
index cc2f04507a..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_Weather.rc
+++ /dev/null
@@ -1,92 +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.
-//##############################################################################################################
-//############################################# Weather ########################################################
-//##############################################################################################################
-   IDI_ACCU                ICON    "icons\\Weather\\accu.ico"
-   IDI_GISMETEO            ICON    "icons\\Weather\\gismeteo.ico"
-   IDI_INTELLI             ICON    "icons\\Weather\\intelli.ico"
-   IDI_METEOGID            ICON    "icons\\Weather\\meteogid.ico"
-   IDI_METEONOVOSTI        ICON    "icons\\Weather\\meteonovosti.ico"
-   IDI_NOAA                ICON    "icons\\Weather\\noaa.ico"
-   IDI_REALMETEO           ICON    "icons\\Weather\\realmeteo.ico"
-   IDI_UNDERGROUND         ICON    "icons\\Weather\\underground.ico"
-   IDI_WEATHER             ICON    "icons\\Weather\\weather.ico"
-   IDI_WEATHER_CN          ICON    "icons\\Weather\\weather_cn.ico"
-   IDI_WEATHERXML          ICON    "icons\\Weather\\weatherxml.ico"
-   IDI_WETTER              ICON    "icons\\Weather\\wetter.ico"
-   IDI_YWEATHER            ICON    "icons\\Weather\\yweather.ico"
-
-//##############################################################################################################
-//################################################## Overlays ##################################################
-//##############################################################################################################
-
-//##############################################################################################################
-//################################# Weather overlays ###########################################################
-//##############################################################################################################
-   IDI_CLIENT_WEATHER      ICON    "icons\\Weather\\weather_over.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/FingerPrintModPlus/res/icons_Yahoo.rc b/plugins/FingerPrintModPlus/res/icons_Yahoo.rc
deleted file mode 100644
index 8cb3a061a5..0000000000
--- a/plugins/FingerPrintModPlus/res/icons_Yahoo.rc
+++ /dev/null
@@ -1,93 +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.
-//##############################################################################################################
-//################################################ 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_YAHOO_GO_MOBILE     ICON    "icons\\Yahoo\\Yahoo Go Mobile.ico"
-
-//##############################################################################################################
-//################################################## Overlays ##################################################
-//##############################################################################################################
-
-//##############################################################################################################
-//################################# 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"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 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/FingerPrintModPlus/res/resource.rc b/plugins/FingerPrintModPlus/res/resource.rc
deleted file mode 100644
index 96ce67b6fb..0000000000
--- a/plugins/FingerPrintModPlus/res/resource.rc
+++ /dev/null
@@ -1,118 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "..\src\resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG DIALOGEX 0, 0, 314, 254
-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Fingerprint icons",IDC_STATIC,0,0,156,238
-    CONTROL         "Overlay#1",IDC_OVERLAY1,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,6,13,144,10
-    CONTROL         "Overlay#2",IDC_OVERLAY2,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,6,23,144,10
-    CONTROL         "Overlay#3",IDC_OVERLAY3,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,6,33,144,10
-    CONTROL         "Show Version as Overlay#2",IDC_VERSION,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,6,43,144,10
-    GROUPBOX        "Showing groups",IDC_STATIC,158,0,155,238
-    CONTROL         "Miranda",IDC_GROUPMIRANDA,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,13,144,10
-    CONTROL         "Multi-Protocol",IDC_GROUPMULTI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,23,144,10
-    CONTROL         "Pack overlays",IDC_GROUPPACKS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,33,144,10
-    CONTROL         "Others",IDC_GROUPOTHERS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,43,144,10
-    CONTROL         "AIM",IDC_GROUPAIM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,63,144,10
-    CONTROL         "Gadu-Gadu",IDC_GROUPGADU,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,73,144,10
-    CONTROL         "ICQ",IDC_GROUPICQ,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,83,144,10
-    CONTROL         "IRC",IDC_GROUPIRC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,93,144,10
-    CONTROL         "Jabber",IDC_GROUPJABBER,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,103,144,10
-    CONTROL         "Mail.ru Agent",IDC_GROUPMAIL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,113,144,10
-    CONTROL         "MSN",IDC_GROUPMSN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,123,144,10
-    CONTROL         "QQ",IDC_GROUPQQ,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,133,144,10
-    CONTROL         "RSS",IDC_GROUPRSS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,143,144,10
-    CONTROL         "Skype",IDC_GROUPSKYPE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,153,144,10
-    CONTROL         "Tlen",IDC_GROUPTLEN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,163,144,10
-    CONTROL         "VoIP",IDC_GROUPVOIP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,173,144,10
-    CONTROL         "Weather",IDC_GROUPWEATHER,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,183,144,10
-    CONTROL         "Yahoo",IDC_GROUPYAHOO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,164,193,144,10
-    LTEXT           "Note: Miranda NG will have to be restarted for changes to take effect.",IDC_OPTCHANGENOTE,0,240,302,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 307
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 233
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/plugins/FingerPrintModPlus/res/version.rc b/plugins/FingerPrintModPlus/res/version.rc
deleted file mode 100644
index cfcefd0a61..0000000000
--- a/plugins/FingerPrintModPlus/res/version.rc
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda NG
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifdef APSTUDIO_INVOKED
-#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-#include <windows.h>
-#include "..\src\version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "041904b0"
-        BEGIN
-            VALUE "FileDescription", "Fingerprint Mod+ client version icons module"
-            VALUE "FileVersion", __VERSION_STRING
-            VALUE "InternalName", __INTERNAL_NAME_STRING
-            VALUE "LegalCopyright", __LEGAL_COPYRIGHT_STRING
-            VALUE "OriginalFilename", "fingerprint.dll"
-            VALUE "ProductName", "Fingerprint Mod+ client version icons module"
-            VALUE "ProductVersion", __VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x419, 1200
-    END
-END
-
diff --git a/plugins/FingerPrintModPlus/src/finger_groups.h b/plugins/FingerPrintModPlus/src/finger_groups.h
deleted file mode 100644
index 75c595a491..0000000000
--- a/plugins/FingerPrintModPlus/src/finger_groups.h
+++ /dev/null
@@ -1,94 +0,0 @@
-case MIRANDA_CASE:
-	if ( db_get_b(NULL, "Finger", "GroupMiranda", 1))
-		return _T("Client Icons/Miranda");
-	break;
-case MULTIPROTOCOL_CASE:		
-	if ( db_get_b(NULL, "Finger", "GroupMulti", 1))
-		return _T("Client Icons/Multi-Protocol");	
-	break;
-case ICQ_OFF_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupIcq", 1))
-		return _T("Client Icons/ICQ/Official");
-	break;
-case ICQ_UNOFF_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupIcq", 1))
-		return _T("Client Icons/ICQ/Unofficial");
-	break;
-case JABBER_CASE:		
-	if ( db_get_b(NULL, "Finger", "GroupJabber", 1))
-		return _T("Client Icons/Jabber");	
-	break;
-case MSN_CASE:		
-	if ( db_get_b(NULL, "Finger", "GroupMsn", 1))
-		return _T("Client Icons/MSN");
-	break;
-case AIM_CASE:		
-	if ( db_get_b(NULL, "Finger", "GroupAim", 1))
-		return _T("Client Icons/AIM");
-	break;
-case YAHOO_CASE:		
-	if ( db_get_b(NULL, "Finger", "GroupYahoo", 1))
-		return _T("Client Icons/Yahoo");
-	break;
-case IRC_CASE:
-	if ( db_get_b(NULL, "Finger", "GroupIrc", 1))
-		return _T("Client Icons/IRC");
-	break;
-case VOIP_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupVoIP", 1))
-		return _T("Client Icons/VoIP");
-	break;
-case SKYPE_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupSkype", 1))
-		return _T("Client Icons/Skype");
-	break;
-case GADU_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupGadu", 1))
-		return _T("Client Icons/Gadu-Gadu");
-	break;
-case PACKS_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupPacks", 1))
-		return _T("Client Icons/Miranda/Pack overlays");
-	break;
-case MRA_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupMail", 1))
-		return _T("Client Icons/Mail.Ru Agent");
-	break;
-case OVER1_CASE:
-	if ( db_get_b(NULL, "Finger", "GroupMiranda", 1))
-		return _T("Client Icons/Miranda/Overlays#1");
-	break;
-case SECURITY_CASE:
-	if ( db_get_b(NULL, "Finger", "GroupOtherProtos", 1))
-		return _T("Client Icons/Overlays/Security");
-	break;
-case OTHER_CASE:
-	if ( db_get_b(NULL, "Finger", "GroupOtherProtos", 1))
-		return _T("Client Icons/Other");
-	break;
-case OVER2_CASE:
-	if ( db_get_b(NULL, "Finger", "GroupMiranda", 1))
-		return _T("Client Icons/Miranda/Overlays#2");
-	break;
-case PLATFORM_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupOtherProtos", 1))
-		return _T("Client Icons/Overlays/Platform");
-	break;
-case WEATHER_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupWeather", 1))
-		return _T("Client Icons/Weather");
-	break;
-case RSS_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupRSS", 1))
-		return _T("Client Icons/RSS");
-	break;
-case QQ_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupQQ", 1))
-		return _T("Client Icons/QQ");
-	break;
-case TLEN_CASE:	
-	if ( db_get_b(NULL, "Finger", "GroupTlen", 1))
-		return _T("Client Icons/Tlen");
-	break;
-default:
-	return _T("Client Icons");
-\ No newline at end of file
diff --git a/plugins/FingerPrintModPlus/src/fingerprint.cpp b/plugins/FingerPrintModPlus/src/fingerprint.cpp
deleted file mode 100644
index 0a628b23bd..0000000000
--- a/plugins/FingerPrintModPlus/src/fingerprint.cpp
+++ /dev/null
@@ -1,1102 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda IM
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-//Start of header
-#include "global.h"
-
-static UINT g_LPCodePage;
-static TCHAR g_szSkinLib[MAX_PATH];
-static HANDLE hExtraIcon = NULL;
-static HANDLE hFolderChanged = NULL, hIconFolder = NULL;
-
-static FOUNDINFO* fiList = NULL;
-static int nFICount = 0;
-
-/*
-*	Prepare
-*	prepares upperstring masks and registers them in IcoLib
-*/
-
-static TCHAR* getSectionName(int flag)
-{
-	switch(flag)
-	{
-		#include "finger_groups.h"
-	}
-	return NULL;
-}
-
-void FASTCALL Prepare(KN_FP_MASK* mask, bool bEnable)
-{
-	mask->szMaskUpper = NULL;
-
-	if (mask->hIcolibItem)
-		Skin_RemoveIcon(mask->szIconName);
-	mask->hIcolibItem = NULL;
-
-	if (!mask->szMask || !mask->szIconFileName || !bEnable)
-		return;
-
-	size_t iMaskLen = _tcslen(mask->szMask) + 1;
-	LPTSTR pszNewMask = (LPTSTR)HeapAlloc(hHeap, HEAP_NO_SERIALIZE, iMaskLen * sizeof(TCHAR));
-	_tcscpy_s(pszNewMask, iMaskLen, mask->szMask);
-	_tcsupr_s(pszNewMask, iMaskLen);
-	mask->szMaskUpper = pszNewMask;
-
-	TCHAR destfile[MAX_PATH];
-	if (*mask->szIconFileName == 0)
-		GetModuleFileName(g_hInst, destfile, MAX_PATH);
-	else {
-		mir_sntprintf(destfile, SIZEOF(destfile), _T("%s\\%s.dll"), g_szSkinLib, mask->szIconFileName);
-
-		struct _stat64i32 stFileInfo;
-		if ( _tstat(destfile, &stFileInfo) == -1)
-			return;
-	}
-
-	LPTSTR SectName = getSectionName(mask->iSectionFlag);
-	if (SectName == NULL)
-		return;
-
-	SKINICONDESC sid = { sizeof(sid) };
-	sid.flags = SIDF_ALL_TCHAR;
-	sid.ptszSection = SectName;
-	sid.pszName = mask->szIconName;
-	sid.ptszDescription = mask->szClientDescription;
-	sid.ptszDefaultFile = destfile;
-	sid.iDefaultIndex = -mask->iIconIndex;
-	sid.cx = sid.cy = 16;
-	mask->hIcolibItem = Skin_AddIcon(&sid);
-}
-
-/*
-*	Register icons
-*/
-
-void RegisterIcons()
-{
-	// prepare masks
-	int i;
-
-	if (hHeap)
-		HeapDestroy(hHeap);
-	hHeap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0);
-
-	for (i=0; i < DEFAULT_KN_FP_MASK_COUNT; i++)
-		Prepare(&def_kn_fp_mask[i], true);
-
-	bool bEnable = db_get_b(NULL, "Finger", "Overlay1", 1) != 0;
-	for (i=0; i < DEFAULT_KN_FP_OVERLAYS_COUNT; i++)
-		Prepare(&def_kn_fp_overlays_mask[i], bEnable);
-
-	bEnable = db_get_b(NULL, "Finger", "Overlay2", 1) != 0;
-	if ( db_get_b(NULL, "Finger", "ShowVersion", 0)) {
-		for (i = 0; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++)
-			Prepare(&def_kn_fp_overlays2_mask[i], bEnable);
-	}
-	else {
-		for (i=0; i < DEFAULT_KN_FP_OVERLAYS2_NO_VER_COUNT; i++)
-			Prepare(&def_kn_fp_overlays2_mask[i], bEnable);
-		for (; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++)
-			Prepare(&def_kn_fp_overlays2_mask[i], false);
-	}
-
-	bEnable = db_get_b(NULL, "Finger", "Overlay3", 1) != 0;
-	for (i=0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++)
-		Prepare(&def_kn_fp_overlays3_mask[i], bEnable);
-}
-
-/*
-*	OnModulesLoaded
-*	Hook necessary events here
-*/
-int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
-{
-	g_LPCodePage = CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);
-
-	//Hook necessary events
-	HookEvent(ME_SKIN2_ICONSCHANGED, OnIconsChanged);
-	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged);
-	HookEvent(ME_OPT_INITIALISE, OnOptInitialise);
-
-	hExtraIcon = ExtraIcon_Register("Client","Fingerprint","client_Miranda_Unknown",
-		OnExtraIconListRebuild,OnExtraImageApply,OnExtraIconClick);
-
-	if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) {
-		hIconFolder = FoldersRegisterCustomPathT("Fingerprint", "Icons", _T(MIRANDA_PATH) _T("\\") DEFAULT_SKIN_FOLDER);
-		FoldersGetCustomPathT(hIconFolder, g_szSkinLib, SIZEOF(g_szSkinLib), _T(""));
-	}
-	else CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)DEFAULT_SKIN_FOLDER, (LPARAM)g_szSkinLib);
-
-	RegisterIcons();
-	return 0;
-}
-
-/*	ApplyFingerprintImage
-*	 1)Try to find appropriate mask
-*	 2)Register icon in extraimage list if not yet registered (EMPTY_EXTRA_ICON)
-*	 3)Set ExtraImage for contact
-*/
-
-int FASTCALL ApplyFingerprintImage(HANDLE hContact, LPTSTR szMirVer)
-{
-	if (hContact == NULL)
-		return 0;
-
-	HANDLE hImage = INVALID_HANDLE_VALUE;
-	if (szMirVer)
-		hImage = GetIconIndexFromFI(szMirVer);
-
-	ExtraIcon_SetIcon(hExtraIcon, hContact, hImage);
-	return 0;
-}
-
-int OnExtraIconClick(WPARAM wParam, LPARAM lParam, LPARAM)
-{
-	CallService(MS_USERINFO_SHOWDIALOG, wParam, NULL);
-	return 0;
-}
-
-/*
-*	OnExtraIconListRebuild
-*	Set all registered indexes in array to EMPTY_EXTRA_ICON (unregistered icon)
-*/
-int OnExtraIconListRebuild(WPARAM wParam, LPARAM lParam)
-{
-	ClearFI();
-	return 0;
-}
-
-/*
-*	OnIconsChanged
-*/
-int OnIconsChanged(WPARAM wParam, LPARAM lParam)
-{
-	ClearFI();
-	return 0;
-}
-
-/*
-*	 OnExtraImageApply
-*	 Try to get MirVer value from db for contact and if success calls ApplyFingerprintImage
-*/
-
-int OnExtraImageApply(WPARAM wParam, LPARAM lParam)
-{
-	HANDLE hContact = (HANDLE)wParam;
-	if (hContact == NULL)
-		return 0;
-
-	char *szProto = GetContactProto((HANDLE)wParam);
-	if (szProto != NULL) {
-		DBVARIANT dbvMirVer = { 0 };
-
-		if (!DBGetContactSettingTString(hContact, szProto, "MirVer", &dbvMirVer)) {
-			ApplyFingerprintImage(hContact, dbvMirVer.ptszVal);
-			DBFreeVariant(&dbvMirVer);
-		}
-		else ApplyFingerprintImage(hContact, NULL);
-	}
-	else ApplyFingerprintImage(hContact, NULL);
-	return 0;
-}
-
-/*
-*	 OnContactSettingChanged
-*	 if contact settings changed apply new image or remove it
-*/
-int OnContactSettingChanged(WPARAM wParam, LPARAM lParam)
-{
-	if ((HANDLE)wParam == NULL)
-		return 0;
-
-	DBCONTACTWRITESETTING* cws = (DBCONTACTWRITESETTING*)lParam;
-	if (cws && cws->szSetting && !strcmp(cws->szSetting, "MirVer")) {
-		if (cws->value.type == DBVT_UTF8) {
-			LPWSTR wszVal = NULL;
-			int iValLen = MultiByteToWideChar(CP_UTF8, 0, cws->value.pszVal, -1, NULL, 0);
-			if (iValLen > 0) {
-				wszVal = (LPWSTR)mir_alloc(iValLen * sizeof(WCHAR));
-				MultiByteToWideChar(CP_UTF8, 0, cws->value.pszVal, -1, wszVal, iValLen);
-			}
-			ApplyFingerprintImage((HANDLE)wParam, wszVal);
-			mir_free(wszVal);
-		}
-		else if (cws->value.type == DBVT_ASCIIZ) {
-			LPWSTR wszVal = NULL;
-			int iValLen = MultiByteToWideChar(g_LPCodePage, 0, cws->value.pszVal, -1, NULL, 0);
-			if (iValLen > 0) {
-				wszVal = (LPWSTR)mir_alloc(iValLen * sizeof(WCHAR));
-				MultiByteToWideChar(g_LPCodePage, 0, cws->value.pszVal, -1, wszVal, iValLen);
-			}
-			ApplyFingerprintImage((HANDLE)wParam, wszVal);
-			mir_free(wszVal);
-		}
-		else if (cws->value.type == DBVT_WCHAR) {
-			ApplyFingerprintImage((HANDLE)wParam, cws->value.pwszVal);
-		}
-		else ApplyFingerprintImage((HANDLE)wParam, NULL);
-	}
-	return 0;
-}
-
-/*
-*	WildCompareA
-*	Compare 'name' string with 'mask' strings.
-*	Masks can contain '*' or '?' wild symbols
-*	Asterics '*' symbol covers 'empty' symbol too e.g WildCompare("Tst","T*st*"), returns TRUE
-*	In order to handle situation 'at least one any sybol' use "?*" combination:
-*	e.g WildCompare("Tst","T?*st*"), returns FALSE, but both WildCompare("Test","T?*st*") and
-*	WildCompare("Teeest","T?*st*") return TRUE.
-*
-*	Function is case sensitive! so convert input or modify func to use _qtoupper()
-*
-*	Mask can contain several submasks. In this case each submask (including first)
-*	should start from '|' e.g: "|first*submask|second*mask".
-*
-*	Dec 25, 2006 by FYR:
-*	Added Exception to masks: the mask "|^mask3|mask2|mask1" means:
-*	if NOT according to mask 3 AND (mask1 OR mask2)
-*	EXCEPTION should be BEFORE main mask:
-*		IF Exception match - the comparing stops as FALSE
-*		IF Exception does not match - comparing continue
-*		IF Mask match - comparing stops as TRUE
-*		IF Mask does not not match comparing continue
-*/
-BOOL FASTCALL WildCompareA(LPSTR szName, LPSTR szMask)
-{
-	if (*szMask != '|')
-		return WildCompareProcA(szName, szMask);
-
-	size_t s = 1, e = 1;
-	LPSTR szTemp = (LPSTR)_alloca(strlen(szMask) * sizeof(CHAR) + sizeof(CHAR));
-	BOOL bExcept;
-
-	while(szMask[e] != '\0') {
-		s = e;
-		while(szMask[e] != '\0' && szMask[e] != '|') e++;
-
-		// exception mask
-		bExcept = (*(szMask + s) == '^');
-		if (bExcept) s++;
-
-		memcpy(szTemp, szMask + s, (e - s) * sizeof(CHAR));
-		szTemp[e - s] = '\0';
-
-		if (WildCompareProcA(szName, szTemp))
-			return !bExcept;
-
-		if (szMask[e] != '\0')
-			e++;
-		else
-			return FALSE;
-	}
-	return FALSE;
-}
-
-/*
-*	WildCompareW
-*	Compare 'name' string with 'mask' strings.
-*	Masks can contain '*' or '?' wild symbols
-*	Asterics '*' symbol covers 'empty' symbol too e.g WildCompare("Tst","T*st*"), returns TRUE
-*	In order to handle situation 'at least one any sybol' use "?*" combination:
-*	e.g WildCompare("Tst","T?*st*"), returns FALSE, but both WildCompare("Test","T?*st*") and
-*	WildCompare("Teeest","T?*st*") return TRUE.
-*
-*	Function is case sensitive! so convert input or modify func to use _qtoupper()
-*
-*	Mask can contain several submasks. In this case each submask (including first)
-*	should start from '|' e.g: "|first*submask|second*mask".
-*
-*	Dec 25, 2006 by FYR:
-*	Added Exception to masks: the mask "|^mask3|mask2|mask1" means:
-*	if NOT according to mask 3 AND (mask1 OR mask2)
-*	EXCEPTION should be BEFORE main mask:
-*		IF Exception match - the comparing stops as FALSE
-*		IF Exception does not match - comparing continue
-*		IF Mask match - comparing stops as TRUE
-*		IF Mask does not not match comparing continue
-*/
-BOOL FASTCALL WildCompareW(LPWSTR wszName, LPWSTR wszMask)
-{
-	if (wszMask == NULL)
-		return NULL;
-
-	if (*wszMask != L'|')
-		return WildCompareProcW(wszName, wszMask);
-
-	size_t s = 1, e = 1;
-	LPWSTR wszTemp = (LPWSTR)_alloca(wcslen(wszMask) * sizeof(WCHAR) + sizeof(WCHAR));
-	BOOL bExcept;
-
-	while(wszMask[e] != L'\0')
-	{
-		s = e;
-		while(wszMask[e] != L'\0' && wszMask[e] != L'|') e++;
-
-		// exception mask
-		bExcept = (*(wszMask + s) == L'^');
-		if (bExcept) s++;
-
-		memcpy(wszTemp, wszMask + s, (e - s) * sizeof(WCHAR));
-		wszTemp[e - s] = L'\0';
-
-		if (WildCompareProcW(wszName, wszTemp))
-			return !bExcept;
-
-		if (wszMask[e] != L'\0')
-			e++;
-		else
-			return FALSE;
-	}
-	return FALSE;
-}
-
-BOOL __inline WildCompareProcA(LPSTR szName, LPSTR szMask)
-{
-	LPSTR szLast = NULL;
-	for (;; szMask++, szName++)
-	{
-		if (*szMask != '?' && *szMask != *szName) break;
-		if (*szName == '\0') return ((BOOL)!*szMask);
-	}
-	if (*szMask != '*') return FALSE;
-	for (;; szMask++, szName++)
-	{
-		while(*szMask == '*')
-		{
-			szLast = szMask++;
-			if (*szMask == '\0') return ((BOOL)!*szMask);	/* true */
-		}
-		if (*szName == '\0') return ((BOOL)!*szMask);		/* *mask == EOS */
-		if (*szMask != '?' && *szMask != *szName && szLast != NULL)
-		{
-			szName -= (size_t)(szMask - szLast) - 1;
-			szMask = szLast;
-		}
-	}
-}
-
-BOOL __inline WildCompareProcW(LPWSTR wszName, LPWSTR wszMask)
-{
-	LPWSTR wszLast = NULL;
-	for (;; wszMask++, wszName++)
-	{
-		if (*wszMask != L'?' && *wszMask != *wszName) break;
-		if (*wszName == L'\0') return ((BOOL)!*wszMask);
-	}
-	if (*wszMask != L'*') return FALSE;
-	for (;; wszMask++, wszName++)
-	{
-		while(*wszMask == L'*')
-		{
-			wszLast = wszMask++;
-			if (*wszMask == L'\0') return ((BOOL)!*wszMask);	/* true */
-		}
-		if (*wszName == L'\0') return ((BOOL)!*wszMask);		/* *mask == EOS */
-		if (*wszMask != L'?' && *wszMask != *wszName && wszLast != NULL)
-		{
-			wszName -= (size_t)(wszMask - wszLast) - 1;
-			wszMask = wszLast;
-		}
-	}
-}
-
-static void MatchMasks(TCHAR* szMirVer, short *base, short *overlay,short *overlay2,short *overlay3)
-{
-	short i = 0, j = -1, k = -1, n = -1;
-
-	for (i=0; i < DEFAULT_KN_FP_MASK_COUNT; i++) {
-		KN_FP_MASK& p = def_kn_fp_mask[i];
-		if (p.hIcolibItem == NULL)
-			continue;
-
-		if ( !WildCompareW(szMirVer, p.szMaskUpper))
-			continue;
-
-		if (p.szIconFileName != _T("")) {
-			TCHAR destfile[MAX_PATH];
-			mir_sntprintf(destfile, SIZEOF(destfile), _T("%s\\%s.dll"), g_szSkinLib, p.szIconFileName);
-			struct _stat64i32 stFileInfo;
-
-			if (_tstat(destfile, &stFileInfo) == -1)
-				i = NOTFOUND_MASK_NUMBER;
-		}
-		break;
-	}
-
-	if (!def_kn_fp_mask[i].fNotUseOverlay && i < DEFAULT_KN_FP_MASK_COUNT) {
-		for (j = 0; j < DEFAULT_KN_FP_OVERLAYS_COUNT; j++) {
-			KN_FP_MASK& p = def_kn_fp_overlays_mask[j];
-			if (p.hIcolibItem == NULL)
-				continue;
-
-			if ( !WildCompare(szMirVer, p.szMaskUpper))
-				continue;
-
-			if (p.szIconFileName != _T("ClientIcons_Packs"))
-				break;
-
-			TCHAR destfile[MAX_PATH];
-			mir_sntprintf(destfile, SIZEOF(destfile), _T("%s\\%s.dll"), g_szSkinLib, p.szIconFileName);
-
-			struct _stat64i32 stFileInfo;
-			if ( _tstat(destfile, &stFileInfo) != -1)
-				break;
-		}
-
-		for (k = 0; k < DEFAULT_KN_FP_OVERLAYS2_COUNT; k++) {
-			KN_FP_MASK& p = def_kn_fp_overlays2_mask[k];
-			if (p.hIcolibItem == NULL)
-				continue;
-
-			if ( WildCompareW(szMirVer, p.szMaskUpper))
-				break;
-		}
-
-		for (n = 0; n < DEFAULT_KN_FP_OVERLAYS3_COUNT; n++) {
-			KN_FP_MASK& p = def_kn_fp_overlays3_mask[n];
-			if (p.hIcolibItem == NULL)
-				continue;
-
-			if ( WildCompareW(szMirVer, p.szMaskUpper))
-				break;
-		}
-	}
-
-	*base = (i < DEFAULT_KN_FP_MASK_COUNT) ? i : -1;
-	*overlay = (j < DEFAULT_KN_FP_OVERLAYS_COUNT) ? j : -1;
-	*overlay2 = (k < DEFAULT_KN_FP_OVERLAYS2_COUNT) ? k : -1;
-	*overlay3 = (n < DEFAULT_KN_FP_OVERLAYS3_COUNT) ? n : -1;
-}
-
-/*	GetIconsIndexesA
-*	Retrieves Icons indexes by Mirver
-*/
-
-void FASTCALL GetIconsIndexesA(LPSTR szMirVer, short *base, short *overlay,short *overlay2,short *overlay3)
-{
-	if (strcmp(szMirVer, "?") == 0) {
-		*base = UNKNOWN_MASK_NUMBER;
-		*overlay = -1;
-		*overlay2 = -1;
-		*overlay3 = -1;
-		return;
-	}
-
-	LPTSTR tszMirVerUp = mir_a2t(szMirVer);
-	_tcsupr(tszMirVerUp);
-	MatchMasks(tszMirVerUp, base, overlay, overlay2, overlay3);
-	mir_free(tszMirVerUp);
-}
-
-/*	GetIconsIndexesW
-*	Retrieves Icons indexes by Mirver
-*/
-
-void FASTCALL GetIconsIndexesW(LPWSTR wszMirVer, short *base, short *overlay,short *overlay2,short *overlay3)
-{
-	if (wcscmp(wszMirVer, L"?") == 0)
-	{
-		*base = UNKNOWN_MASK_NUMBER;
-		*overlay = -1;
-		*overlay2 = -1;
-		*overlay3 = -1;
-		return;
-	}
-
-	LPWSTR wszMirVerUp = NEWWSTR_ALLOCA(wszMirVer);
-	_wcsupr(wszMirVerUp);
-	MatchMasks(wszMirVerUp, base, overlay, overlay2, overlay3);
-}
-
-/*
-* CreateIconFromIndexes
-* returns hIcon of joined icon by given indexes
-*/
-
-HICON FASTCALL CreateIconFromIndexes(short base, short overlay, short overlay2, short overlay3)
-{
-	HICON hIcon = NULL;	// returned HICON
-	HICON hTmp = NULL;
-	HICON icMain = NULL;
-	HICON icOverlay = NULL;
-	HICON icOverlay2 = NULL;
-	HICON icOverlay3 = NULL;
-
-	KN_FP_MASK* mainMask = &(def_kn_fp_mask[base]);
-	icMain = Skin_GetIconByHandle(mainMask->hIcolibItem);
-
-	if (icMain) {
-		KN_FP_MASK* overlayMask = (overlay != -1) ? &(def_kn_fp_overlays_mask[overlay]) : NULL;
-		KN_FP_MASK* overlay2Mask = (overlay2 != -1) ? &(def_kn_fp_overlays2_mask[overlay2]) : NULL;
-		KN_FP_MASK* overlay3Mask = (overlay3 != -1) ? &(def_kn_fp_overlays3_mask[overlay3]) : NULL;
-		icOverlay = (overlayMask == NULL) ? NULL : Skin_GetIconByHandle(overlayMask->hIcolibItem);
-		icOverlay2 = (overlay2Mask == NULL) ? NULL : Skin_GetIconByHandle(overlay2Mask->hIcolibItem);
-		icOverlay3 = (overlay3Mask == NULL) ? NULL : Skin_GetIconByHandle(overlay3Mask->hIcolibItem);
-
-		hIcon = icMain;
-
-		if (overlayMask) {
-			hIcon = CreateJoinedIcon(hIcon, icOverlay);
-			hTmp = hIcon;
-		}
-
-		if (overlay2Mask) {
-			hIcon = CreateJoinedIcon(hIcon, icOverlay2);
-			if (hTmp) DestroyIcon(hTmp);
-			hTmp = hIcon;
-		}
-
-		if (overlay3Mask) {
-			hIcon = CreateJoinedIcon(hIcon, icOverlay3);
-			if (hTmp) DestroyIcon(hTmp);
-		}
-	}
-
-	if (hIcon == icMain)
-		hIcon = CopyIcon(icMain);
-
-	Skin_ReleaseIcon(icMain);
-	Skin_ReleaseIcon(icOverlay);
-	Skin_ReleaseIcon(icOverlay2);
-	Skin_ReleaseIcon(icOverlay3);
-	return hIcon;
-}
-
-/*
-*	ServiceGetClientIconA
-*	MS_FP_GETCLIENTICON service implementation.
-*	wParam - char * MirVer value to get client for.
-*	lParam - int noCopy - if wParam is equal to "1"	will return icon handler without copiing icon.
-*	ICON IS ALWAYS COPIED!!!
-*/
-
-INT_PTR ServiceGetClientIconA(WPARAM wParam, LPARAM lParam)
-{
-	LPSTR szMirVer = (LPSTR)wParam;			// MirVer value to get client for.
-	if (szMirVer == NULL)
-		return 0;
-
-	HICON hIcon = NULL;			// returned HICON
-	int NoCopy = (int)lParam;	// noCopy
-	short base, overlay, overlay2, overlay3;
-
-	GetIconsIndexesA(szMirVer, &base, &overlay, &overlay2, &overlay3);
-	if (base != -1)
-		hIcon = CreateIconFromIndexes(base, overlay, overlay2, overlay3);
-	return (INT_PTR)hIcon;
-}
-
-/*
- *	 ServiceSameClientA
- *	 MS_FP_SAMECLIENTS service implementation.
- *	 wParam - char * first MirVer value
- *	 lParam - char * second MirVer value
- *	 return pointer to char string - client desription (do not destroy) if clients are same
- */
-
-INT_PTR ServiceSameClientsA(WPARAM wParam, LPARAM lParam)
-{
-	LPSTR szMirVerFirst = (LPSTR)wParam;	// MirVer value to get client for.
-	LPSTR szMirVerSecond = (LPSTR)lParam;	// MirVer value to get client for.
-	int firstIndex, secondIndex;
-	BOOL Result = FALSE;
-
-	firstIndex = secondIndex = 0;
-	if (!szMirVerFirst || !szMirVerSecond)
-		return (INT_PTR)NULL;	//one of its is not null
-
-	{
-		LPTSTR tszMirVerFirstUp, tszMirVerSecondUp;
-		int iMirVerFirstUpLen, iMirVerSecondUpLen;
-
-		iMirVerFirstUpLen = MultiByteToWideChar(g_LPCodePage, 0, szMirVerFirst, -1, NULL, 0);
-		iMirVerSecondUpLen = MultiByteToWideChar(g_LPCodePage, 0, szMirVerSecond, -1, NULL, 0);
-
-		tszMirVerFirstUp = (LPTSTR)mir_alloc(iMirVerFirstUpLen * sizeof(TCHAR));
-		tszMirVerSecondUp = (LPTSTR)mir_alloc(iMirVerSecondUpLen * sizeof(TCHAR));
-
-		MultiByteToWideChar(g_LPCodePage, 0, szMirVerFirst, -1, tszMirVerFirstUp, iMirVerFirstUpLen);
-		MultiByteToWideChar(g_LPCodePage, 0, szMirVerSecond, -1, tszMirVerSecondUp, iMirVerSecondUpLen);
-
-		_tcsupr_s(tszMirVerFirstUp, iMirVerFirstUpLen);
-		_tcsupr_s(tszMirVerSecondUp, iMirVerSecondUpLen);
-
-		if (_tcscmp(tszMirVerFirstUp, _T("?")) == 0)
-			firstIndex = UNKNOWN_MASK_NUMBER;
-		else
-			while(firstIndex < DEFAULT_KN_FP_MASK_COUNT) {
-				if (WildCompare(tszMirVerFirstUp, def_kn_fp_mask[firstIndex].szMaskUpper))
-					break;
-				firstIndex++;
-			}
-
-		if (_tcscmp(tszMirVerSecondUp, _T("?")) == 0)
-			secondIndex = UNKNOWN_MASK_NUMBER;
-		else
-			while(secondIndex < DEFAULT_KN_FP_MASK_COUNT) {
-				if (WildCompare(tszMirVerSecondUp, def_kn_fp_mask[secondIndex].szMaskUpper))
-					break;
-	 			secondIndex++;
-			}
-
-		mir_free(tszMirVerFirstUp);
-		mir_free(tszMirVerSecondUp);
-
-		if (firstIndex == secondIndex && firstIndex < DEFAULT_KN_FP_MASK_COUNT)
-		{
-			int iClientDescriptionLen = WideCharToMultiByte(g_LPCodePage, 0, def_kn_fp_mask[firstIndex].szClientDescription, -1, NULL, 0, NULL, NULL);
-			if (iClientDescriptionLen > 0)
-				g_szClientDescription = (LPSTR)mir_realloc(g_szClientDescription, iClientDescriptionLen * sizeof(CHAR));
-			else
-				return (INT_PTR)NULL;
-
-			WideCharToMultiByte(g_LPCodePage, 0, def_kn_fp_mask[firstIndex].szClientDescription, -1, g_szClientDescription, iClientDescriptionLen, NULL, NULL);
-			return (INT_PTR)g_szClientDescription;
-
-		}
-	}
-	return (INT_PTR)NULL;
-}
-
-/*
-*	ServiceGetClientIconW
-*	MS_FP_GETCLIENTICONW service implementation.
-*	wParam - LPWSTR MirVer value to get client for.
-*	lParam - int noCopy - if wParam is equal to "1"	will return icon handler without copiing icon.
-*	ICON IS ALWAYS COPIED!!!
-*/
-
-INT_PTR ServiceGetClientIconW(WPARAM wParam, LPARAM lParam)
-{
-	LPWSTR wszMirVer = (LPWSTR)wParam;			// MirVer value to get client for.
-	if (wszMirVer == NULL)
-		return 0;
-
-	short base, overlay, overlay2, overlay3;
-	GetIconsIndexesW(wszMirVer, &base, &overlay, &overlay2, &overlay3);
-
-	HICON hIcon = NULL;			// returned HICON
-	if (base != -1)
-		hIcon = CreateIconFromIndexes(base, overlay, overlay2, overlay3);
-
-	return (INT_PTR)hIcon;
-}
-
-/*
- *	 ServiceSameClientW
- *	 MS_FP_SAMECLIENTSW service implementation.
- *	 wParam - LPWSTR first MirVer value
- *	 lParam - LPWSTR second MirVer value
- *	 return pointer to char string - client desription (do not destroy) if clients are same
- */
-INT_PTR ServiceSameClientsW(WPARAM wParam, LPARAM lParam)
-{
-	LPWSTR wszMirVerFirst = (LPWSTR)wParam;	// MirVer value to get client for.
-	LPWSTR wszMirVerSecond = (LPWSTR)lParam;	// MirVer value to get client for.
-	int firstIndex, secondIndex;
-	BOOL Result = FALSE;
-
-	firstIndex = secondIndex = 0;
-	if (!wszMirVerFirst || !wszMirVerSecond) return (INT_PTR)NULL;	//one of its is not null
-
-	{
-		LPWSTR wszMirVerFirstUp, wszMirVerSecondUp;
-		size_t iMirVerFirstUpLen, iMirVerSecondUpLen;
-
-		iMirVerFirstUpLen = wcslen(wszMirVerFirst) + 1;
-		iMirVerSecondUpLen = wcslen(wszMirVerSecond) + 1;
-
-		wszMirVerFirstUp = (LPWSTR)mir_alloc(iMirVerFirstUpLen * sizeof(WCHAR));
-		wszMirVerSecondUp = (LPWSTR)mir_alloc(iMirVerSecondUpLen * sizeof(WCHAR));
-
-		wcscpy_s(wszMirVerFirstUp, iMirVerFirstUpLen, wszMirVerFirst);
-		wcscpy_s(wszMirVerSecondUp, iMirVerSecondUpLen, wszMirVerSecond);
-
-		_wcsupr_s(wszMirVerFirstUp, iMirVerFirstUpLen);
-		_wcsupr_s(wszMirVerSecondUp, iMirVerSecondUpLen);
-
-		if (wcscmp(wszMirVerFirstUp, L"?") == 0)
-			firstIndex = UNKNOWN_MASK_NUMBER;
-		else
-			while(firstIndex < DEFAULT_KN_FP_MASK_COUNT) {
-				if (WildCompareW(wszMirVerFirstUp, def_kn_fp_mask[firstIndex].szMaskUpper))
-					break;
-				firstIndex++;
-			}
-
-		if (wcscmp(wszMirVerSecondUp, L"?") == 0)
-			secondIndex = UNKNOWN_MASK_NUMBER;
-		else
-			while(secondIndex < DEFAULT_KN_FP_MASK_COUNT) {
-				if (WildCompareW(wszMirVerSecondUp, def_kn_fp_mask[secondIndex].szMaskUpper))
-					break;
-	 			secondIndex++;
-			}
-
-		mir_free(wszMirVerFirstUp);
-		mir_free(wszMirVerSecondUp);
-
-		if (firstIndex == secondIndex && firstIndex < DEFAULT_KN_FP_MASK_COUNT)
-		{
-			return (INT_PTR)def_kn_fp_mask[firstIndex].szClientDescription;
-		}
-	}
-	return (INT_PTR)NULL;
-}
-
-/******************************************************************************
- *	Futher routines is for creating joined 'overlay' icons.
- ******************************************************************************/
-
- /*
- *	CreateBitmap32 - Create DIB 32 bitmap with sizes cx*cy
- */
-
-HBITMAP __inline CreateBitmap32(int cx, int cy)
-{
-	return CreateBitmap32Point(cx, cy, NULL);
-}
-
- /*
- *	CreateBitmap32 - Create DIB 32 bitmap with sizes cx*cy and put reference
- *				to new bitmap pixel image memory area to void ** bits
- */
-HBITMAP FASTCALL CreateBitmap32Point(int cx, int cy, LPVOID* bits)
-{
-	BITMAPINFO bmpi = { 0 };
-	LPVOID ptPixels = NULL;
-	HBITMAP DirectBitmap;
-
-	if (cx < 0 || cy < 0) return NULL;
-
-	bmpi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-	bmpi.bmiHeader.biWidth = cx;
-	bmpi.bmiHeader.biHeight = cy;
-	bmpi.bmiHeader.biPlanes = 1;
-//	bmpi.bmiHeader.biCompression = BI_RGB;
-	bmpi.bmiHeader.biBitCount = 32;
-
-	DirectBitmap = CreateDIBSection(NULL,
-					&bmpi,
-					DIB_RGB_COLORS,
-					&ptPixels,
-					NULL, 0);
- 	GdiFlush();
-	if (ptPixels) memset(ptPixels, 0, cx * cy * 4);
-	if (bits != NULL) *bits = ptPixels;
-
-	return DirectBitmap;
-}
-
-/*
-*	 checkHasAlfa - checks if image has at least one BYTE in alpha channel
-*				 that is not a 0. (is image real 32 bit or just 24 bit)
-*/
-BOOL FASTCALL checkHasAlfa(LPBYTE from, int width, int height)
-{
-	LPDWORD pt = (LPDWORD)from;
-	LPDWORD lim = pt + width * height;
-	while(pt < lim)
-	{
-		if (*pt & 0xFF000000)
-			return TRUE;
-		pt++;
-	}
-
-	return FALSE;
-}
-
-/*
-*	 checkMaskUsed - checks if mask image has at least one that is not a 0.
-*	 Not sure is it required or not
-*/
-BOOL FASTCALL checkMaskUsed(LPBYTE from)
-{
-	int i;
-	for (i=0; i < 16 * 16 / 8; i++)
-	{
-		if (from[i] != 0) return TRUE;
-	}
-	return FALSE;
-}
-
-/*
-*	 GetMaskBit - return value of apropriate mask bit in line at x position
-*/
-BOOL __inline GetMaskBit(LPBYTE line, int x)
-{
-	return ((*(line + (x >> 3))) & (0x01 << (7 - (x & 0x07)))) != 0;
-}
-
-/*
-*	blend	- alpha blend ARGB values of 2 pixels. X1 - underlaying,
-*	 X2 - overlaying points.
-*/
-DWORD FASTCALL blend(DWORD X1,DWORD X2)
-{
-	RGBA* q1 = (RGBA*)&X1;
-	RGBA* q2 = (RGBA*)&X2;
-	BYTE a_1 = ~q1->a;
-	BYTE a_2 = ~q2->a;
-	WORD am = q1->a * a_2;
-
-	WORD ar = q1->a + ((a_1 * q2->a) / 255);
-	// if a2 more than 0 than result should be more
-	// or equal (if a1==0) to a2, else in combination
-	// with mask we can get here black points
-
-	ar = (q2->a > ar) ? q2->a : ar;
-
-	if (ar == 0) return 0;
-
-	{
-		WORD arm = ar * 255;
-		WORD rr = ((q1->r * am + q2->r * q2->a * 255)) / arm;
-		WORD gr = ((q1->g * am + q2->g * q2->a * 255)) / arm;
-		WORD br = ((q1->b * am + q2->b * q2->a * 255)) / arm;
-		return (ar << 24) | (rr << 16) | (gr << 8) | br;
-	}
-}
-
-/*
-*	CreateJoinedIcon	- creates new icon by drawing hTop over hBottom.
-*/
-HICON FASTCALL CreateJoinedIcon(HICON hBottom, HICON hTop)
-{
-	BOOL drawn = FALSE;
-	HDC tempDC, tempDC2, tempDC3;
-	HICON res = NULL;
-	HBITMAP oImage,nImage;
-	HBITMAP nMask, hbm, obmp, obmp2;
-	LPBYTE ptPixels = NULL;
-	ICONINFO iNew = { 0 };
-	BYTE p[32] = { 0 };
-
-	tempDC = CreateCompatibleDC(NULL);
-	nImage = CreateBitmap32Point(16, 16, (LPVOID*)&ptPixels);
-	oImage = (HBITMAP)SelectObject(tempDC, nImage);
-
-//	if (ptPixels) memset(ptPixels, 0, 16 * 16 * 4);
-
-	if (IsWinVerXPPlus())
-	{
-		ICONINFO iciBottom = { 0 };
-		ICONINFO iciTop = { 0 };
-
-		BITMAP bmp_top = { 0 };
-		BITMAP bmp_top_mask = { 0 };
-
-		BITMAP bmp_bottom = { 0 };
-		BITMAP bmp_bottom_mask = { 0 };
-
-		GetIconInfo(hBottom, &iciBottom);
-		GetObject(iciBottom.hbmColor, sizeof(BITMAP), &bmp_bottom);
-		GetObject(iciBottom.hbmMask, sizeof(BITMAP), &bmp_bottom_mask);
-
-		GetIconInfo(hTop, &iciTop);
-		GetObject(iciTop.hbmColor, sizeof(BITMAP), &bmp_top);
-		GetObject(iciTop.hbmMask, sizeof(BITMAP), &bmp_top_mask);
-
-		if (bmp_bottom.bmBitsPixel == 32 && bmp_top.bmBitsPixel == 32)
-		{
-			LPBYTE BottomBuffer, TopBuffer, BottomMaskBuffer, TopMaskBuffer;
-			LPBYTE bb, tb, bmb, tmb;
-			LPBYTE db = ptPixels;
-			int vstep_d = 16 * 4;
-			int vstep_b = bmp_bottom.bmWidthBytes;
-			int vstep_t = bmp_top.bmWidthBytes;
-			int vstep_bm = bmp_bottom_mask.bmWidthBytes;
-			int vstep_tm = bmp_top_mask.bmWidthBytes;
-
-			if (bmp_bottom.bmBits)
-				bb = BottomBuffer = (LPBYTE)bmp_bottom.bmBits;
-			else
-			{
-				BottomBuffer = (LPBYTE)_alloca(bmp_bottom.bmHeight * bmp_bottom.bmWidthBytes);
-				GetBitmapBits(iciBottom.hbmColor, bmp_bottom.bmHeight * bmp_bottom.bmWidthBytes, BottomBuffer);
-				bb = BottomBuffer + vstep_b * (bmp_bottom.bmHeight - 1);
-				vstep_b = -vstep_b;
-			}
-			if (bmp_top.bmBits)
-				tb = TopBuffer = (LPBYTE)bmp_top.bmBits;
-			else
-			{
-				TopBuffer = (LPBYTE)_alloca(bmp_top.bmHeight * bmp_top.bmWidthBytes);
-				GetBitmapBits(iciTop.hbmColor, bmp_top.bmHeight * bmp_top.bmWidthBytes, TopBuffer);
-				tb = TopBuffer + vstep_t * (bmp_top.bmHeight - 1);
-				vstep_t = -vstep_t;
-			}
-			if (bmp_bottom_mask.bmBits)
-				bmb = BottomMaskBuffer = (LPBYTE)bmp_bottom_mask.bmBits;
-			else
-			{
-				BottomMaskBuffer = (LPBYTE)_alloca(bmp_bottom_mask.bmHeight * bmp_bottom_mask.bmWidthBytes);
-				GetBitmapBits(iciBottom.hbmMask, bmp_bottom_mask.bmHeight * bmp_bottom_mask.bmWidthBytes, BottomMaskBuffer);
-				bmb = BottomMaskBuffer + vstep_bm * (bmp_bottom_mask.bmHeight - 1);
-				vstep_bm = -vstep_bm;
-			}
-			if (bmp_top_mask.bmBits)
-				tmb = TopMaskBuffer = (LPBYTE)bmp_top_mask.bmBits;
-			else
-			{
-				TopMaskBuffer = (LPBYTE)_alloca(bmp_top_mask.bmHeight * bmp_top_mask.bmWidthBytes);
-				GetBitmapBits(iciTop.hbmMask, bmp_top_mask.bmHeight * bmp_top_mask.bmWidthBytes, TopMaskBuffer);
-				tmb = TopMaskBuffer + vstep_tm * (bmp_top_mask.bmHeight - 1);
-				vstep_tm = -vstep_tm;
-			}
-			{
-				int x; int y;
-				BOOL topHasAlpha = checkHasAlfa(TopBuffer, bmp_top.bmWidth, bmp_top.bmHeight);
-				BOOL bottomHasAlpha = checkHasAlfa(BottomBuffer, bmp_bottom.bmWidth, bmp_bottom.bmHeight);
-				BOOL topMaskUsed = !topHasAlpha && checkMaskUsed(TopMaskBuffer);
-				BOOL bottomMaskUsed = !bottomHasAlpha && checkMaskUsed(BottomMaskBuffer);
-
-				for(y = 0; y < 16; y++)
-				{
-					for(x = 0; x < 16; x++)
-					{
-						DWORD bottom_d = ((LPDWORD)bb)[x];
-						DWORD top_d = ((LPDWORD)tb)[x];
-
-						if (topMaskUsed)
-						{
-							if (GetMaskBit(tmb, x))
-								top_d &= 0x00FFFFFF;
-							else
-								top_d |= 0xFF000000;
-						}
-						else if (!topHasAlpha)
-							top_d |= 0xFF000000;
-
-						if (bottomMaskUsed)
-						{
-							if (GetMaskBit(bmb, x))
-								bottom_d &= 0x00FFFFFF;
-							else
-								bottom_d |= 0xFF000000;
-						}
-						else if (!bottomHasAlpha)
-							bottom_d |= 0xFF000000;
-
-						((LPDWORD)db)[x] = blend(bottom_d, top_d);
-					}
-					bb += vstep_b;
-					tb += vstep_t;
-					bmb += vstep_bm;
-					tmb += vstep_tm;
-					db += vstep_d;
-				}
-			}
-
-			drawn = TRUE;
-		}
-
-		DeleteObject(iciBottom.hbmColor);
-		DeleteObject(iciTop.hbmColor);
-		DeleteObject(iciBottom.hbmMask);
-		DeleteObject(iciTop.hbmMask);
-	}
-
-	if (!drawn) {
-		DrawIconEx(tempDC, 0, 0, hBottom, 16, 16, 0, NULL, DI_NORMAL);
-		DrawIconEx(tempDC, 0, 0, hTop, 16, 16, 0, NULL, DI_NORMAL);
-	}
-
-	nMask = CreateBitmap(16, 16, 1, 1, p);
-	tempDC2 = CreateCompatibleDC(NULL);
-	tempDC3 = CreateCompatibleDC(NULL);
-	hbm = CreateCompatibleBitmap(tempDC3, 16, 16);
-	obmp = (HBITMAP)SelectObject(tempDC2, nMask);
-	obmp2 = (HBITMAP)SelectObject(tempDC3, hbm);
-	DrawIconEx(tempDC2, 0, 0, hBottom, 16, 16, 0, NULL, DI_MASK);
-	DrawIconEx(tempDC3, 0, 0, hTop, 16, 16, 0, NULL, DI_MASK);
-	BitBlt(tempDC2, 0, 0, 16, 16, tempDC3, 0, 0, SRCAND);
-
-	GdiFlush();
-
-	SelectObject(tempDC2, obmp);
-	DeleteDC(tempDC2);
-
-	SelectObject(tempDC3, obmp2);
-	DeleteDC(tempDC3);
-
-	SelectObject(tempDC, oImage);
-	DeleteDC(tempDC);
-
-	DeleteObject(hbm);
-
-	iNew.fIcon = TRUE;
-	iNew.hbmColor = nImage;
-	iNew.hbmMask = nMask;
-	res = CreateIconIndirect(&iNew);
-
-	DeleteObject(nImage);
-	DeleteObject(nMask);
-
-	return res;
-}
-
-HANDLE FASTCALL GetIconIndexFromFI(LPTSTR szMirVer)
-{
-	short base, overlay, overlay2, overlay3;
-	GetIconsIndexes(szMirVer, &base, &overlay, &overlay2, &overlay3);
-	if (base == -1 || nFICount == 0xFFFF)
-		return INVALID_HANDLE_VALUE;
-
-	// MAX: 1024 + 256 + 128 + 128
-	DWORD val = (base << 22) | ((overlay & 0xFF) << 14) | ((overlay2 & 0x7F) << 7) | (overlay3 & 0x7F);
-
-	int i;
-	HANDLE hFoundImage = INVALID_HANDLE_VALUE;
-	for (i=0; i < nFICount; i++) {
-		if (fiList[i].dwArray == val) {
-			hFoundImage = fiList[i].hRegisteredImage;
-			break;
-		}
-	}
-
-	if (hFoundImage == INVALID_HANDLE_VALUE && i == nFICount) { //not found - then add
-		HICON hIcon = CreateIconFromIndexes(base, overlay, overlay2, overlay3);
-
-		fiList = (FOUNDINFO*)mir_realloc(fiList, sizeof(FOUNDINFO) * (nFICount + 1));
-		fiList[nFICount].dwArray = val;
-
-		if (hIcon != NULL) {
-			hFoundImage = (HANDLE)CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)hIcon, 0);
-			fiList[nFICount].hRegisteredImage = hFoundImage;
-			DestroyIcon(hIcon);
-		}
-		else fiList[nFICount].hRegisteredImage = INVALID_HANDLE_VALUE;
-
-		nFICount++;
-	}
-
-	return hFoundImage;
-}
-
-VOID ClearFI()
-{
-	if (fiList != NULL)
-		mir_free(fiList);
-	fiList = NULL;
-	nFICount = 0;
-}
diff --git a/plugins/FingerPrintModPlus/src/global.h b/plugins/FingerPrintModPlus/src/global.h
deleted file mode 100644
index 408b36e07e..0000000000
--- a/plugins/FingerPrintModPlus/src/global.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda IM
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER				// Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.
-#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
-#endif
-
-#define _CRT_SECURE_NO_DEPRECATE
-
-//Start of header
-// Native include
-#include <windows.h>
-#include <windowsx.h>
-#include <malloc.h>
-
-// Miranda IM SDK includes
-#include <newpluginapi.h>
-#include <win2k.h>
-#include <m_cluiframes.h>
-#include <m_database.h>
-#include <m_options.h>
-#include <m_langpack.h>
-#include <m_icolib.h>
-#include <m_protocols.h>
-#include <m_userinfo.h>
-
-// plugins SDK
-#include <m_extraicons.h>
-#include <m_folders.h>
-
-//plugins header
-#include "version.h"
-#include "m_fingerprint.h"
-#include "resource.h"
-#include "utilities.h"
-
-#if defined(__GNUC__)
-#define _alloca alloca
-//#define FASTCALL
-#else
-#define FASTCALL __fastcall
-#endif
-
-typedef struct {
-	BYTE	b;
-	BYTE	g;
-	BYTE	r;
-	BYTE	a;
-} RGBA;
-
-struct KN_FP_MASK
-{
-	LPSTR	  szIconName;
-	LPTSTR  szMask;
-	LPTSTR  szClientDescription;
-	LPTSTR  szIconFileName;
-	int     iIconIndex;
-	int     iSectionFlag;
-	BOOL    fNotUseOverlay;
-
-	HANDLE  hIcolibItem;
-	LPTSTR  szMaskUpper;
-};
-
-typedef struct _foundInfo
-{
-	DWORD	dwArray;
-	HANDLE	hRegisteredImage;
-} FOUNDINFO;
-
-#define MIRANDA_CASE			1
-#define MULTIPROTOCOL_CASE		2
-#define ICQ_OFF_CASE			3
-#define ICQ_UNOFF_CASE			4
-#define JABBER_CASE				5
-#define MSN_CASE				6
-#define AIM_CASE				7
-#define YAHOO_CASE				8
-#define IRC_CASE				9
-#define VOIP_CASE				10
-#define SKYPE_CASE				11
-#define GADU_CASE				12
-#define PACKS_CASE				13
-#define MRA_CASE				14
-#define OVER1_CASE				15
-#define SECURITY_CASE			16
-#define OTHER_CASE				17
-#define OVER2_CASE				18
-#define PLATFORM_CASE			19
-#define WEATHER_CASE			20
-#define RSS_CASE				21
-#define QQ_CASE					22
-#define TLEN_CASE				23
-
-#define PtrIsValid(p)		(((p)!=0)&&(((HANDLE)(p))!=INVALID_HANDLE_VALUE))
-#define SAFE_FREE(p)		{if (PtrIsValid(p)){free((VOID*)p);(p)=NULL;}}
-
-#define LIB_REG		2
-#define LIB_USE		3
-
-#define DEFAULT_SKIN_FOLDER		_T("Icons\\Fp_ClientIcons")
-
-void ClearFI();
-
-int OnIconsChanged(WPARAM wParam, LPARAM lParam);
-int OnExtraIconClick(WPARAM wParam, LPARAM lParam,LPARAM);
-int OnExtraIconListRebuild(WPARAM wParam, LPARAM lParam);
-int OnExtraImageApply(WPARAM wParam, LPARAM lParam);
-int OnContactSettingChanged(WPARAM wParam, LPARAM lParam);
-int OnOptInitialise(WPARAM wParam, LPARAM lParam);
-int OnModulesLoaded(WPARAM wParam, LPARAM lParam);
-int OnPreShutdown(WPARAM wParam, LPARAM lParam);
-
-INT_PTR ServiceSameClientsA(WPARAM wParam, LPARAM lParam);
-INT_PTR ServiceGetClientIconA(WPARAM wParam, LPARAM lParam);
-INT_PTR ServiceSameClientsW(WPARAM wParam, LPARAM lParam);
-INT_PTR ServiceGetClientIconW(WPARAM wParam, LPARAM lParam);
-
-HICON FASTCALL CreateJoinedIcon(HICON hBottom, HICON hTop);
-HBITMAP __inline CreateBitmap32(int cx, int cy);
-HBITMAP FASTCALL CreateBitmap32Point(int cx, int cy, LPVOID* bits);
-HANDLE FASTCALL GetIconIndexFromFI(LPTSTR szMirVer);
-
-BOOL FASTCALL WildCompareA(LPSTR name, LPSTR mask);
-BOOL FASTCALL WildCompareW(LPWSTR name, LPWSTR mask);
-BOOL __inline WildCompareProcA(LPSTR name, LPSTR mask);
-BOOL __inline WildCompareProcW(LPWSTR name, LPWSTR mask);
-
-void FASTCALL Prepare(KN_FP_MASK* mask);
-void RegisterIcons();
-
-#define WildCompare		WildCompareW
-#define GetIconsIndexes	GetIconsIndexesW
-
-extern HINSTANCE g_hInst;
-extern HANDLE hHeap;
-extern LPSTR g_szClientDescription;
-
-extern KN_FP_MASK 
-	def_kn_fp_mask[], 
-	def_kn_fp_overlays_mask[], 
-	def_kn_fp_overlays1_mask[], 
-	def_kn_fp_overlays2_mask[],
-	def_kn_fp_overlays3_mask[];
-
-extern int DEFAULT_KN_FP_MASK_COUNT, DEFAULT_KN_FP_OVERLAYS_COUNT, DEFAULT_KN_FP_OVERLAYS2_COUNT, DEFAULT_KN_FP_OVERLAYS3_COUNT;
-
-#define UNKNOWN_MASK_NUMBER (DEFAULT_KN_FP_MASK_COUNT - 2)								// second from end
-#define NOTFOUND_MASK_NUMBER (DEFAULT_KN_FP_MASK_COUNT - 3)								// third from end
-#define DEFAULT_KN_FP_OVERLAYS2_NO_VER_COUNT (DEFAULT_KN_FP_OVERLAYS2_COUNT - 7)
diff --git a/plugins/FingerPrintModPlus/src/main.cpp b/plugins/FingerPrintModPlus/src/main.cpp
deleted file mode 100644
index 4de8a793a2..0000000000
--- a/plugins/FingerPrintModPlus/src/main.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda IM
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-//Start of header
-#include "global.h"
-
-#define LIB_REG		2
-#define LIB_USE		3
-
-HINSTANCE g_hInst;
-int       hLangpack;
-
-HANDLE hHeap					= NULL;
-
-HANDLE compClientServA			= NULL;
-HANDLE getClientIconA			= NULL;
-
-HANDLE compClientServW			= NULL;
-HANDLE getClientIconW			= NULL;
-LPSTR  g_szClientDescription	= NULL;
-
-HANDLE hStaticHooks[1]			= { NULL };
-
-//End of header
-
-// PluginInfo & PluginInfoEx
-PLUGININFOEX pluginInfoEx = {
-	sizeof(PLUGININFOEX),
-	__INTERNAL_NAME_STRING,
-	__VERSION_DWORD,
-	"Fingerprint Mod+ (client version) icons module set extra icon of your buddies according to their client version.",
-	"Artem Shpynov aka FYR, Bio, Faith Healer, HierOS",
-	"crazy.hieros@gmail.com",
-	__LEGAL_COPYRIGHT_STRING,
-	"http://miranda-ng.org/",
-	UNICODE_AWARE,
-	MIID_THIS_PLUGIN
-};
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-	g_hInst = hinstDLL;
-	return TRUE;
-}
-
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
-{
-	return &pluginInfoEx;
-}
-
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_FINGERPRINT, MIID_LAST };
-
-///////////////////////////////////////////////////////////////////////////////
-
-static int OnPreShutdown(WPARAM wParam, LPARAM lParam)
-{
-	DestroyServiceFunction(compClientServA);
-	DestroyServiceFunction(getClientIconA);
-	DestroyServiceFunction(compClientServW);
-	DestroyServiceFunction(getClientIconW);
-
-	return 0;
-}
-
-extern "C" int	__declspec(dllexport) Load(void)
-{
-	mir_getLP(&pluginInfoEx);
-
-	hStaticHooks[0] = HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
-	HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown);
-	compClientServA = CreateServiceFunction(MS_FP_SAMECLIENTS, ServiceSameClientsA);
-	getClientIconA = CreateServiceFunction(MS_FP_GETCLIENTICON, ServiceGetClientIconA);
-
-	compClientServW = CreateServiceFunction(MS_FP_SAMECLIENTSW, ServiceSameClientsW);
-	getClientIconW = CreateServiceFunction(MS_FP_GETCLIENTICONW, ServiceGetClientIconW);
-	return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-extern "C" int	__declspec(dllexport) Unload()
-{
-	if (g_szClientDescription != NULL)
-		mir_free(g_szClientDescription);
-
-	HeapDestroy(hHeap);
-	ClearFI();
-
-	for (size_t i = 0; i < SIZEOF(hStaticHooks); i++)
-	{
-		UnhookEvent(hStaticHooks[i]);
-		hStaticHooks[i] = NULL;
-	}
-	return 0;
-}
diff --git a/plugins/FingerPrintModPlus/src/masks.cpp b/plugins/FingerPrintModPlus/src/masks.cpp
deleted file mode 100644
index 21fb0d160e..0000000000
--- a/plugins/FingerPrintModPlus/src/masks.cpp
+++ /dev/null
@@ -1,751 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda IM
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include "global.h"
-
-/************************************************************************/
-/* This file contains data about appropriate MirVer values				*/
-/************************************************************************/
-
-/*
-*	NOTE: Masks can contain '*' or '?' wild symbols
-*	Asterics '*' symbol covers 'empty' symbol too e.g WildCompare("Tst","T*st*"), returns TRUE
-*	In order to handle situation 'at least one any sybol' use '?*' combination:
-*	e.g WildCompare("Tst","T?*st*"), returns FALSE, but both WildCompare("Test","T?*st*") and
-*	WildCompare("Teeest","T?*st*") return TRUE.
-*
-*	Function is 'dirt' case insensitive (it is ignore 5th bit (0x20) so it is no difference
-*	beetween some symbols. But it is faster than valid converting to uppercase.
-*
-*	Mask can contain several submasks. In this case each submask (including first)
-*	should start from '|' e.g: "|first*submask|second*mask".
-*
-*	ORDER OF RECORDS IS IMPORTANT: system search first suitable mask and returns it.
-*	e.g. if MirVer is "Miranda IM" and first mask is "*im*" and second is "Miranda *" the
-*	result will be client associated with first mask, not second!
-*	So in order to avoid such situation, place most generalised masks to latest place.
-*
-*	In order to get "Unknown" client, last mask should be "?*".
-*/
-
-KN_FP_MASK def_kn_fp_mask[] =
-{//	IconName							Mask										Icon caption							NULL ICON_RESOURCE_ID
-//#########################################################################################################################################
-//######################################################### MirandaIM clients #############################################################
-//#########################################################################################################################################
-   { "client_Miranda_NG",      _T("|*http://miranda-ng.org*|*http://nightly.miranda.im*")
-                               _T("|*Miranda*NG*"),                      _T("Miranda NG"),             _T("ClientIcons_General"),   IDI_MIRANDA_NG,   MIRANDA_CASE },
-   { "client_Miranda_666",     _T("Miranda*6.6.6*"),                     _T("Miranda evil"),           _T("ClientIcons_General"),   IDI_MIRANDA_666,  MIRANDA_CASE },
-   { "client_Miranda_010U",    _T("|Miranda IM*0.10.*Unicode*")
-                               _T("|Miranda IM*Unicode*0.10.*"),         _T("Miranda v0.10 Unicode"),  _T("ClientIcons_General"),   IDI_MIRANDA_010U, MIRANDA_CASE },
-   { "client_Miranda_09U",     _T("|Miranda IM*0.9.*Unicode*")
-                               _T("|Miranda IM*Unicode*0.9.*"),          _T("Miranda v0.9 Unicode"),   _T("ClientIcons_General"),   IDI_MIRANDA_09U,  MIRANDA_CASE },
-   { "client_Miranda_08U",     _T("|Miranda IM*0.8.*Unicode*")
-                               _T("|Miranda IM*Unicode*0.8.*"),          _T("Miranda v0.8 Unicode"),   _T("ClientIcons_General"),   IDI_MIRANDA_08U,  MIRANDA_CASE },
-   { "client_Miranda_07U",     _T("|Miranda IM*0.7.*Unicode*")
-                               _T("|Miranda IM*Unicode*0.7.*"),          _T("Miranda v0.7 Unicode"),   _T("ClientIcons_General"),   IDI_MIRANDA_07U,  MIRANDA_CASE },
-   { "client_Miranda_06U",     _T("|Miranda IM*0.6.*Unicode*")
-                               _T("|Miranda IM*Unicode*0.6.*"),          _T("Miranda v0.6 Unicode"),   _T("ClientIcons_General"),   IDI_MIRANDA_06U,  MIRANDA_CASE },
-   { "client_Miranda_05U",     _T("|Miranda IM*0.5.*Unicode*")
-                               _T("|Miranda IM*Unicode*0.5.*"),          _T("Miranda v0.5 Unicode"),   _T("ClientIcons_General"),   IDI_MIRANDA_05U,  MIRANDA_CASE },
-   { "client_Miranda_U",       _T("*Miranda IM*Unicode*"),               _T("Miranda Unicode"),        _T("ClientIcons_General"),   IDI_MIRANDA_U,    MIRANDA_CASE },
-   { "client_Miranda_010",     _T("*Miranda IM*0.10.*"),                 _T("Miranda v0.10"),          _T("ClientIcons_General"),   IDI_MIRANDA_010,  MIRANDA_CASE },
-   { "client_Miranda_09",      _T("*Miranda IM*0.9.*"),                  _T("Miranda v0.9"),           _T("ClientIcons_General"),   IDI_MIRANDA_09,   MIRANDA_CASE },
-   { "client_Miranda_08",      _T("*Miranda IM*0.8.*"),                  _T("Miranda v0.8"),           _T("ClientIcons_General"),   IDI_MIRANDA_08,   MIRANDA_CASE },
-   { "client_Miranda_07",      _T("*Miranda IM*0.7.*"),                  _T("Miranda v0.7"),           _T("ClientIcons_General"),   IDI_MIRANDA_07,   MIRANDA_CASE },
-   { "client_Miranda_06",      _T("*Miranda IM*0.6.*"),                  _T("Miranda v0.6"),           _T("ClientIcons_General"),   IDI_MIRANDA_06,   MIRANDA_CASE },
-   { "client_Miranda_05",      _T("*Miranda IM*0.5.*"),                  _T("Miranda v0.5"),           _T("ClientIcons_General"),   IDI_MIRANDA_05,   MIRANDA_CASE },
-   { "client_Miranda_04",      _T("*Miranda IM*0.4.*"),                  _T("Miranda v0.4"),           _T("ClientIcons_General"),   IDI_MIRANDA_04,   MIRANDA_CASE },
-   { "client_Miranda_Unknown", _T("|*Miranda*|*Mira*"),                  _T("Miranda IM"),             _T("ClientIcons_General"),   IDI_MIRANDA_UNKNOWN, MIRANDA_CASE },
-
-//#########################################################################################################################################
-//###################################################### Multi-protocol clients ###########################################################
-//#########################################################################################################################################
-   { "client_SIM_Win32_old",   _T("|^*SIM*0.9.4*|^*SIM*0.9.5*")
-                               _T("|^*SIM*0.9.6*|^*SIM*0.9.7*")
-                               _T("|*SIM*Win32"),                        _T("SIM (Win32) old"),        _T("ClientIcons_Multiprotocols"),   IDI_SIM_WIN_OLD, MULTIPROTOCOL_CASE },
-   { "client_SIM_MacOS_old",   _T("|^*SIM*0.9.4*|^*SIM*0.9.5*")
-                               _T("|^*SIM*0.9.6*|^*SIM*0.9.7*")
-                               _T("|*SIM*MacOS"),                        _T("SIM (MacOS) old"),        _T("ClientIcons_Multiprotocols"),   IDI_SIM_MACOSX_OLD, MULTIPROTOCOL_CASE },
-   { "client_SIM_Linux_old",   _T("SIM*?.8.?"),                          _T("SIM (Linux) old"),        _T("ClientIcons_Multiprotocols"),   IDI_SIM_LINUX_OLD, MULTIPROTOCOL_CASE },
-   { "client_SIM_old",         _T("|^*SIM*0.9.4*|^*SIM*0.9.5*")
-                               _T("|^*SIM*0.9.6*|^*SIM*0.9.7*|^SIM")
-                               _T("|*SIM*Simp*|^*Simp*|*SIM*"),          _T("SIM (others) old"),       _T("ClientIcons_Multiprotocols"),   IDI_SIM_OLD, MULTIPROTOCOL_CASE },
-
-   { "client_SIM_Win32",       _T("|*SIM*Win32"),                        _T("SIM (Win32)"),            _T("ClientIcons_Multiprotocols"),   IDI_SIM_WIN, MULTIPROTOCOL_CASE },
-   { "client_SIM_MacOSX",      _T("|*SIM*MacOS"),                        _T("SIM (MacOS)"),            _T("ClientIcons_Multiprotocols"),   IDI_SIM_MACOSX, MULTIPROTOCOL_CASE },
-   { "client_SIM_Linux",       _T("SIM*?.9.?"),                          _T("SIM (Linux)"),            _T("ClientIcons_Multiprotocols"),   IDI_SIM_LINUX, MULTIPROTOCOL_CASE },
-   { "client_SIM",             _T("|*SIM*"),                             _T("SIM (others)"),           _T("ClientIcons_Multiprotocols"),   IDI_SIM, MULTIPROTOCOL_CASE },
-
-   { "client_BayanICQ",        _T("|*BayanICQ*|*barobin*"),              _T("BayanICQ"),               _T("ClientIcons_Multiprotocols"),   IDI_BAYANICQ, MULTIPROTOCOL_CASE },
-
-   { "client_Adium",           _T("Adium*"),                             _T("Adium"),                  _T("ClientIcons_Multiprotocols"),   IDI_ADIUM, MULTIPROTOCOL_CASE },
-   { "client_Trillian_Astra",  _T("Trillian*Astra*"),                    _T("Trillian Astra"),         _T("ClientIcons_Multiprotocols"),   IDI_TRILLIAN_ASTRA, MULTIPROTOCOL_CASE },
-   { "client_Trillian_Pro",    _T("Trillian*Pro*"),                      _T("Trillian Pro"),           _T("ClientIcons_Multiprotocols"),   IDI_TRILLIAN_PRO, MULTIPROTOCOL_CASE },
-   { "client_Trillian",        _T("|Trillian*|http://trillian.im/*"),    _T("Trillian"),               _T("ClientIcons_Multiprotocols"),   IDI_TRILLIAN, MULTIPROTOCOL_CASE },
-   { "client_Gaim",            _T("*gaim*"),                             _T("Gaim (libgaim)"),         _T("ClientIcons_Multiprotocols"),   IDI_GAIM, MULTIPROTOCOL_CASE },
-   { "client_Pidgin",          _T("|*Pidgin*|libpurple*|Purple*"),       _T("Pidgin (libpurple) (ex-Gaim)"), _T("ClientIcons_Multiprotocols"),   IDI_PIDGIN, MULTIPROTOCOL_CASE },
-   { "client_Pigeon",          _T("*PIGEON*"),                           _T("PIGEON!"),                _T("ClientIcons_Multiprotocols"),   IDI_PIGEON, MULTIPROTOCOL_CASE },
-   { "client_Kopete",          _T("|Kopete*|http://kopete.kde.org*"),    _T("Kopete"),                 _T("ClientIcons_Multiprotocols"),   IDI_KOPETE, MULTIPROTOCOL_CASE },
-   { "client_IM2",             _T("IM2*"),                               _T("IM2"),                    _T("ClientIcons_Multiprotocols"),   IDI_IM2, MULTIPROTOCOL_CASE },
-
-   { "client_CenterICQ",       _T("Centericq*"),                         _T("Centericq"),              _T("ClientIcons_Multiprotocols"),   IDI_CENTERICQ, MULTIPROTOCOL_CASE },
-   { "client_Meebo",           _T("Meebo*"),                             _T("Meebo"),                  _T("ClientIcons_Multiprotocols"),   IDI_MEEBO, MULTIPROTOCOL_CASE },
-
-   { "client_AgileMessenger",  _T("*Agile Messenger*"),                  _T("Agile Messenger"),        _T("ClientIcons_Multiprotocols"),   IDI_AGILE, MULTIPROTOCOL_CASE },
-   { "client_Prelude",         _T("Prelude*"),                           _T("Prelude"),                _T("ClientIcons_Multiprotocols"),   IDI_PRELUDE, MULTIPROTOCOL_CASE },
-   { "client_IMPlus",          _T("|IM+*|IMPLUS*|IM *"),                 _T("IM+"),                    _T("ClientIcons_Multiprotocols"),   IDI_IMPLUS, MULTIPROTOCOL_CASE },
-   { "client_uIM",             _T("uIM*"),                               _T("uIM"),                    _T("ClientIcons_Multiprotocols"),   IDI_UIM, MULTIPROTOCOL_CASE },
-   { "client_Inlux",           _T("*Inlux*"),                            _T("Inlux Messenger"),        _T("ClientIcons_Multiprotocols"),   IDI_INLUX, MULTIPROTOCOL_CASE },
-   { "client_Qnext",           _T("QNext*"),                             _T("Qnext"),                  _T("ClientIcons_Multiprotocols"),   IDI_QNEXT, MULTIPROTOCOL_CASE },
-   { "client_mChat",           _T("|mChat*|gsICQ*|http://mchat.mgslab.com*"),_T("mChat"),              _T("ClientIcons_Multiprotocols"),   IDI_MCHAT, MULTIPROTOCOL_CASE },
-   { "client_natSiemens",      _T("|SieJC*|NatICQ*|Siemens*Client*"),    _T("Siemens Native ICQ/Jabber Client"), _T("ClientIcons_Multiprotocols"), IDI_NATSIEMENS, MULTIPROTOCOL_CASE },
-   { "client_Fring",           _T("*fring*"),                            _T("Fring"),                  _T("ClientIcons_Multiprotocols"),   IDI_FRING, MULTIPROTOCOL_CASE },
-   { "client_eBuddy",          _T("|*eBuddy*|*eMessenger*"),             _T("eBuddy"),                 _T("ClientIcons_Multiprotocols"),   IDI_EBUDDY, MULTIPROTOCOL_CASE },
-   { "client_Meetro",          _T("Meetro*"),                            _T("Meetro"),                 _T("ClientIcons_Multiprotocols"),   IDI_MEETRO, MULTIPROTOCOL_CASE },
-   { "client_EasyMessage",     _T("Easy*Message*"),                      _T("Easy Message"),           _T("ClientIcons_Multiprotocols"),   IDI_EASYMESSAGE, MULTIPROTOCOL_CASE },
-   { "client_BitlBee",         _T("BitlBee*"),                           _T("BitlBee"),                _T("ClientIcons_Multiprotocols"),   IDI_BITLBEE, MULTIPROTOCOL_CASE },
-   { "client_Proteus",         _T("*Proteus*"),                          _T("Proteus"),                _T("ClientIcons_Multiprotocols"),   IDI_PROTEUS, MULTIPROTOCOL_CASE },
-   { "client_iChat",           _T("|iChat*")
-                               _T("|http://www.apple.com/ichat/caps*"),  _T("iChat"),                  _T("ClientIcons_Multiprotocols"),   IDI_ICHAT, MULTIPROTOCOL_CASE },
-   { "client_EKG2",            _T("*ekg*2*"),                            _T("EKG2"),                   _T("ClientIcons_Multiprotocols"),   IDI_EKG2, MULTIPROTOCOL_CASE },
-   { "client_Ayttm",           _T("*Ayttm*"),                            _T("Ayttm"),                  _T("ClientIcons_Multiprotocols"),   IDI_AYTTM, MULTIPROTOCOL_CASE },
-   { "client_qutIM",           _T("*qutIM*"),                            _T("qutIM"),                  _T("ClientIcons_Multiprotocols"),   IDI_QUTIM, MULTIPROTOCOL_CASE },
-   { "client_YamiGo",          _T("YamiGo*"),                            _T("YamiGo"),                 _T("ClientIcons_Multiprotocols"),   IDI_YAMIGO, MULTIPROTOCOL_CASE },
-   { "client_QIP_2012",        _T("|QIP 2012*|http://qip.ru/caps*"),     _T("QIP 2012"),               _T("ClientIcons_Multiprotocols"),   IDI_QIP_2012, MULTIPROTOCOL_CASE },
-   { "client_QIP_Infium",      _T("|QIP Infium*|http://qip*"),           _T("QIP Infium"),             _T("ClientIcons_Multiprotocols"),   IDI_QIP_INFIUM, MULTIPROTOCOL_CASE },
-   { "client_QIP_2010",        _T("|QIP 2010*|http://2010.qip.ru*"),     _T("QIP 2010"),               _T("ClientIcons_Multiprotocols"),   IDI_QIP_2010, MULTIPROTOCOL_CASE },
-   { "client_QIP_PDA",         _T("|QIP PDA*|http://pda.qip.ru/caps*")
-                               _T("|*QIP Mobile*"),                      _T("QIP Mobile"),             _T("ClientIcons_Multiprotocols"),   IDI_QIP_PDA, MULTIPROTOCOL_CASE },
-   { "client_CitronIM",        _T("*Citron IM*"),                        _T("Citron IM"),              _T("ClientIcons_Multiprotocols"),   IDI_CITRON, MULTIPROTOCOL_CASE },
-   { "client_Palringo",        _T("|*Palringo*|http://palringo.com/caps*"), _T("Palringo"),            _T("ClientIcons_Multiprotocols"),   IDI_PALRINGO, MULTIPROTOCOL_CASE },
-   { "client_ImoIm",           _T("|*imo.im*"),                          _T("Imo.im"),                 _T("ClientIcons_Multiprotocols"),   IDI_IMOIM, MULTIPROTOCOL_CASE },
-   { "client_OneTeam",         _T("*OneTeam*"),                          _T("OneTeam"),                _T("ClientIcons_Multiprotocols"),   IDI_ONETEAM, MULTIPROTOCOL_CASE },
-   { "client_Python",          _T("Py*t"),                               _T("Python transport clients"), _T("ClientIcons_Multiprotocols"), IDI_PYTHON, MULTIPROTOCOL_CASE },
-   { "client_Instantbird",     _T("*Instantbird*"),                      _T("Instantbird"),            _T("ClientIcons_Multiprotocols"),   IDI_INSTANTBIRD, MULTIPROTOCOL_CASE },
-   { "client_Jimm",            _T("|*Jimm*|mobicq*"),                    _T("Jimm"),                   _T("ClientIcons_Multiprotocols"),   IDI_JIMM, MULTIPROTOCOL_CASE },
-   { "client_Digsby",          _T("*Digsby*"),                           _T("Digsby"),                 _T("ClientIcons_Multiprotocols"),   IDI_DIGSBY, MULTIPROTOCOL_CASE },
-   { "client_Jasmine_IM",      _T("|Jasmine IM*|http://jasmineicq.ru/caps*"), _T("Jasmine IM"),        _T("ClientIcons_Multiprotocols"),   IDI_JASMINEIM, MULTIPROTOCOL_CASE },
-
-//#########################################################################################################################################
-//########################################################### Other ICQ clients ###########################################################
-//#########################################################################################################################################
-   { "client_QIP",             _T("QIP*"),                               _T("QIP"),                    _T("ClientIcons_ICQ"),   IDI_QIP, ICQ_UNOFF_CASE },
-   { "client_&RQ",             _T("&RQ*"),                               _T("&RQ"),                    _T("ClientIcons_ICQ"),   IDI_ANDRQ, ICQ_UNOFF_CASE },
-   { "client_R&Q",             _T("R&Q*"),                               _T("R&Q"),                    _T("ClientIcons_ICQ"),   IDI_RANDQ_NEW, ICQ_UNOFF_CASE },
-   { "client_TICQ",            _T("*TICQ*Client*"),                      _T("TICQ (Delphi lib)"),      _T("ClientIcons_ICQ"),   IDI_DELPHI, ICQ_UNOFF_CASE },
-   { "client_ICAT",            _T("IC@*"),                               _T("IC@"),                    _T("ClientIcons_ICQ"),   IDI_ICAT, ICQ_UNOFF_CASE },
-   { "client_StrICQ",          _T("StrICQ*"),                            _T("StrICQ"),                 _T("ClientIcons_ICQ"),   IDI_STRICQ, ICQ_UNOFF_CASE },
-   { "client_mICQ",            _T("mICQ*"),                              _T("mICQ"),                   _T("ClientIcons_ICQ"),   IDI_MICQ, ICQ_UNOFF_CASE },
-   { "client_VmICQ",           _T("VmICQ*"),                             _T("VmICQ"),                  _T("ClientIcons_ICQ"),   IDI_VMICQ, ICQ_UNOFF_CASE },
-   { "client_vICQ",            _T("vICQ*"),                              _T("vICQ"),                   _T("ClientIcons_ICQ"),   IDI_VICQ, ICQ_UNOFF_CASE },
-   { "client_YSM",             _T("YSM*"),                               _T("YSM"),                    _T("ClientIcons_ICQ"),   IDI_YSM, ICQ_UNOFF_CASE },
-   { "client_MIP",             _T("*MIP*"),                              _T("MIP"),                    _T("ClientIcons_ICQ"),   IDI_MIP, ICQ_UNOFF_CASE },
-   { "client_D[i]Chat",        _T("D[i]Chat*"),                          _T("D[i]Chat"),               _T("ClientIcons_ICQ"),   IDI_DICHAT, ICQ_UNOFF_CASE },
-   { "client_Corepager",       _T("Core*Pager*"),                        _T("Core Pager"),             _T("ClientIcons_ICQ"),   IDI_COREPAGER, ICQ_UNOFF_CASE },
-   { "client_LocID",           _T("LocID*"),                             _T("LocID"),                  _T("ClientIcons_ICQ"),   IDI_LOCID, ICQ_UNOFF_CASE },
-   { "client_Slick",           _T("Slick*"),                             _T("Slick"),                  _T("ClientIcons_ICQ"),   IDI_SLICK, ICQ_UNOFF_CASE },
-   { "client_Smaper",          _T("*SmapeR*"),                           _T("SmapeR"),                 _T("ClientIcons_ICQ"),   IDI_SMAPER, ICQ_UNOFF_CASE },
-   { "client_Anastasia",       _T("Anastasia*"),                         _T("Anastasia"),              _T("ClientIcons_ICQ"),   IDI_ANASTASIA, ICQ_UNOFF_CASE },
-   { "client_JICQ",            _T("*JICQ*"),                             _T("JICQ"),                   _T("ClientIcons_ICQ"),   IDI_JICQ, ICQ_UNOFF_CASE },
-   { "client_ICQ_2X",          _T("ICQ*2.x*"),                           _T("ICQ 2.x"),                _T("ClientIcons_ICQ"),   IDI_ICQ2X, ICQ_UNOFF_CASE },
-   { "client_nICQ",            _T("nICQ*"),                              _T("nICQ"),                   _T("ClientIcons_ICQ"),   IDI_NICQ, ICQ_UNOFF_CASE },
-   { "client_kxICQ",           _T("kxICQ*"),                             _T("KxICQ2"),                 _T("ClientIcons_ICQ"),   IDI_KXICQ, ICQ_UNOFF_CASE },
-   { "client_NanoICQ",         _T("*Nano*ICQ*"),                         _T("NanoICQ"),                _T("ClientIcons_ICQ"),   IDI_NANOICQ, ICQ_UNOFF_CASE },
-   { "client_Yeemp",           _T("Yeemp*"),                             _T("Yeemp"),                  _T("ClientIcons_ICQ"),   IDI_YEEMP, ICQ_UNOFF_CASE },
-   { "client_KM_Aska",         _T("*KM*Aska*"),                          _T("KM Aska"),                _T("ClientIcons_ICQ"),   IDI_KMASKA, ICQ_UNOFF_CASE },
-   { "client_1und1",           _T("|*Pocket*Web*|*1&1*|*1*und*1")
-                               _T("|*1*and*1"),                          _T("1&1"),                    _T("ClientIcons_ICQ"),   IDI_1UND1, ICQ_UNOFF_CASE },
-   { "client_WebICQ",          _T("WebICQ*"),                            _T("WebICQ"),                 _T("ClientIcons_ICQ"),   IDI_WEBICQ, ICQ_UNOFF_CASE },
-   { "client_alicq",           _T("alicq*"),                             _T("Alicq"),                  _T("ClientIcons_ICQ"),   IDI_ALICQ, ICQ_UNOFF_CASE },
-   { "client_Licq",            _T("Licq*"),                              _T("Licq"),                   _T("ClientIcons_ICQ"),   IDI_LICQ, ICQ_UNOFF_CASE },
-   { "client_GnomeICU",        _T("GnomeICU*"),                          _T("GnomeICU"),               _T("ClientIcons_ICQ"),   IDI_GNOMEICU, ICQ_UNOFF_CASE },
-   { "client_SmartICQ",        _T("SmartICQ*"),                          _T("SmartICQ (via mIRC)"),    _T("ClientIcons_ICQ"),   IDI_SMARTICQ, ICQ_UNOFF_CASE },
-   { "client_Sticq",           _T("stICQ*"),                             _T("stICQ"),                  _T("ClientIcons_ICQ"),   IDI_STICQ, ICQ_UNOFF_CASE },
-   { "client_GlICQ",           _T("GlICQ*"),                             _T("GlICQ"),                  _T("ClientIcons_ICQ"),   IDI_GLICQ, ICQ_UNOFF_CASE },
-   { "client_libicq2k",        _T("libicq2*"),                           _T("LibICQ/JIT"),             _T("ClientIcons_ICQ"),   IDI_LIBICQ2000, ICQ_UNOFF_CASE },
-   { "client_IMadering",       _T("*IMadering*"),                        _T("IMadering"),              _T("ClientIcons_ICQ"),   IDI_IMADERING, ICQ_UNOFF_CASE },
-   { "client_SpamBot",         _T("*Spam*Bot*"),                         _T("Spam Bot"),               _T("ClientIcons_ICQ"),   IDI_SPAMBOT, ICQ_UNOFF_CASE },
-   { "client_Virus",           _T("*Virus*"),                            _T("Virus (Stration worm)"),  _T("ClientIcons_ICQ"),   IDI_VIRUS, ICQ_UNOFF_CASE },
-
-//#########################################################################################################################################
-//############################################## Official ICQ clients #####################################################################
-//#########################################################################################################################################
-   { "client_ICQ_Rambler",     _T("ICQ*5*Rambler*"),                     _T("ICQ Rambler (Lite v5)"),           _T("ClientIcons_ICQ"),   IDI_ICQ_RAMBLER, ICQ_OFF_CASE, TRUE },
-   { "client_ICQ_BigMir",      _T("ICQ*bigmir*"),                        _T("ICQ bigmir.net (Lite v5)"),        _T("ClientIcons_ICQ"),   IDI_ICQ_BIGMIR, ICQ_OFF_CASE },
-   { "client_ICQ_NetVigator",  _T("ICQ*5*Netvigator*"),                  _T("ICQ Netvigator (Lite v5)"),        _T("ClientIcons_ICQ"),   IDI_ICQ_NETVIGATOR, ICQ_OFF_CASE, TRUE },
-   { "client_ICQ_Pro7",        _T("ICQ*Pro7*"),                          _T("ICQ ProSieben aka Pro7 (Lite v5)"),_T("ClientIcons_ICQ"),   IDI_ICQ_PRO7, ICQ_OFF_CASE, TRUE },
-   { "client_ICQ_Abv",         _T("ICQ*Abv*"),                           _T("ICQ ABV (Lite v5)"),               _T("ClientIcons_ICQ"),   IDI_ICQ_ABV, ICQ_OFF_CASE },
-   { "client_ICQ_Lite4",       _T("ICQ Lite v4*"),                       _T("ICQ Lite v4"),                     _T("ClientIcons_ICQ"),   IDI_ICQ_LITE4, ICQ_OFF_CASE, TRUE },
-   { "client_ICQ_Lite7",       _T("ICQ Lite v7*"),                       _T("ICQ Lite v7"),                     _T("ClientIcons_ICQ"),   IDI_ICQ_LITE7, ICQ_OFF_CASE, TRUE },
-   { "client_ICQ_6",           _T("|ICQ*6*|ICQ*7*"),                     _T("ICQ v6,ICQ v7"),                   _T("ClientIcons_ICQ"),   IDI_ICQ_6, ICQ_OFF_CASE },
-   { "client_ICQ_98-99",       _T("|^*Transport*|ICQ*98*|ICQ*99*|ICQ*2000*")
-                               _T("|ICQ*2001*|ICQ*2002*|ICQ*200?a*")
-                               _T("|ICQ*2003b*|ICQ*5*|ICQ Lite*|ICQ2Go!*"), _T("ICQ/ICQ2Go!"),                  _T("ClientIcons_ICQ"),   IDI_ICQ, ICQ_OFF_CASE },
-   { "client_ComPad",          _T("*ComPad*"),                           _T("ICQ ComPad"),                      _T("ClientIcons_ICQ"),   IDI_ICQ_COMPAD, ICQ_OFF_CASE },
-   { "client_ICQ4Mac",         _T("ICQ for Mac"),                        _T("ICQ for Mac"),                     _T("ClientIcons_ICQ"),   IDI_ICQ4MAC, ICQ_OFF_CASE, TRUE },
-   { "client_PocketPC",        _T("ICQ*Pocket*PC*"),                     _T("ICQ for PocketPC"),                _T("ClientIcons_ICQ"),   IDI_ICQ_POCKETPC, ICQ_OFF_CASE },
-
-//#########################################################################################################################################
-//#########################################################��#### Jabber BOTS #�###########################################################
-//#########################################################################################################################################
-   { "client_juick",           _T("*juick*"),                            _T("Juick"),                  _T("ClientIcons_Jabber"),   IDI_JUICK, JABBER_CASE },
-   { "client_jrudevels",       _T("*jrudevels*"),                        _T("Jrudevels"),              _T("ClientIcons_Jabber"),   IDI_JRUDEVELS, JABBER_CASE },
-   { "client_whoisbot",        _T("whoisbot"),                           _T("Swissjabber Whois Bot"),  _T("ClientIcons_Jabber"),   IDI_WHOISBOT, JABBER_CASE },
-   { "client_pjc",             _T("|*PJC*|http://pjc.googlecode.com/*"), _T("PHP Jabber Client"),      _T("ClientIcons_Jabber"),   IDI_PJC, JABBER_CASE },
-   { "client_jdisk",           _T("|*jdisk*|JabberDisk*"),               _T("Jabber disk"),            _T("ClientIcons_Jabber"),   IDI_JDISK, JABBER_CASE },
-   { "client_Teabot",          _T("|*teabot*|http://teabot.org/bot*|bot"), _T("Teabot"),               _T("ClientIcons_Jabber"),   IDI_TEABOT, JABBER_CASE },
-   { "client_Psto",            _T("*Psto*"),                             _T("Psto.net"),               _T("ClientIcons_Jabber"),   IDI_PSTO, JABBER_CASE },
-
-//#########################################################################################################################################
-//############################################################# Jabber clients ############################################################
-//#########################################################################################################################################
-   { "client_Psi",             _T("*Psi*"),                              _T("PSI"),                    _T("ClientIcons_Jabber"),   IDI_PSI, JABBER_CASE },
-   { "client_GTalk_Gadget",    _T("*TalkGadget*"),                       _T("GTalk Gadget"),           _T("ClientIcons_Jabber"),   IDI_GTALK_GADGET, JABBER_CASE },
-   { "client_orkut",           _T("orkut*"),                             _T("orkut"),                  _T("ClientIcons_Jabber"),   IDI_ORKUT, JABBER_CASE },
-   { "client_iGoogle",         _T("iGoogle*"),                           _T("iGoogle"),                _T("ClientIcons_Jabber"),   IDI_IGOOGLE, JABBER_CASE },
-   { "client_GMail",           _T("|*gmail.*|GMail*"),                   _T("GMail"),                  _T("ClientIcons_Jabber"),   IDI_GMAIL, JABBER_CASE },
-   { "client_GTalk",           _T("|*Talk.v*|*Google*Talk*|*Gtalk*|*-iPhon*"), _T("GoogleTalk aka GTalk"), _T("ClientIcons_Jabber"),   IDI_GTALK, JABBER_CASE },
-   { "client_Talkonaut",       _T("*Talkonaut*"),                        _T("Talkonaut"),              _T("ClientIcons_Jabber"),   IDI_TALKONAUT, JABBER_CASE },
-   { "client_Jajc",            _T("|*Jajc*|Just Another Jabber Client"), _T("JAJC"),                   _T("ClientIcons_Jabber"),   IDI_JAJC, JABBER_CASE },
-   { "client_Tkabber",         _T("|*Tkabber*|http://tkabber*"),         _T("Tkabber"),                _T("ClientIcons_Jabber"),   IDI_TKABBER, JABBER_CASE },
-   { "client_Exodus",          _T("*Exodus*"),                           _T("Exodus"),                 _T("ClientIcons_Jabber"),   IDI_EXODUS, JABBER_CASE },
-   { "client_Pandion",         _T("|*Pandion*|*�������*"),               _T("Pandion"),                _T("ClientIcons_Jabber"),   IDI_PANDION, JABBER_CASE },
-   { "client_Gush",            _T("*Gush*"),                             _T("Gush"),                   _T("ClientIcons_Jabber"),   IDI_GUSH, 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_Spark",           _T("*Spark*"),                            _T("Spark"),                  _T("ClientIcons_Jabber"),   IDI_SPARK, JABBER_CASE },
-   { "client_Beejive",         _T("*Beejive*"),                          _T("Beejive"),                _T("ClientIcons_Jabber"),   IDI_BEEJIVE, JABBER_CASE },
-
-   { "client_Jabbin",          _T("*Jabbin*"),                           _T("Jabbin"),                 _T("ClientIcons_Jabber"),   IDI_JABBIN, JABBER_CASE },
-   { "client_Papla",           _T("*Papla*"),                            _T("Papla"),                  _T("ClientIcons_Jabber"),   IDI_PAPLA, JABBER_CASE },
-   { "client_JabberZilla",     _T("*Zilla*"),                            _T("JabberZilla"),            _T("ClientIcons_Jabber"),   IDI_JABBERZILLA, JABBER_CASE },
-   { "client_BombusQD",        _T("|*Bombusmod-qd*|*bombusqd*"),         _T("BombusQD"),               _T("ClientIcons_Jabber"),   IDI_BOMBUSQD, JABBER_CASE },
-   { "client_BombusMod",       _T("|*Bombus*mod*|*bombusmod*"),          _T("BombusMod"),              _T("ClientIcons_Jabber"),   IDI_BOMBUSMOD, JABBER_CASE },
-   { "client_Bombus",          _T("*Bombus*"),                           _T("Bombus"),                 _T("ClientIcons_Jabber"),   IDI_BOMBUS, JABBER_CASE },
-   { "client_Wildfire",        _T("Wildfire*"),                          _T("Wildfire"),               _T("ClientIcons_Jabber"),   IDI_WILDFIRE, JABBER_CASE },
-   { "client_M8Jabber",        _T("*M8Jabber*"),                         _T("M8Jabber"),               _T("ClientIcons_Jabber"),   IDI_M8JABBER, JABBER_CASE },
-   { "client_EMess",           _T("*EMess*"),                            _T("EMess"),                  _T("ClientIcons_Jabber"),   IDI_EMESS, JABBER_CASE },
-
-   { "client_Colibry",         _T("Colibry*"),                           _T("Colibry"),                _T("ClientIcons_Jabber"),   IDI_COLIBRY, JABBER_CASE },
-
-   { "client_GoTalkMobile",    _T("*Go*Talk*Mobile*"),                   _T("GoTalkMobile"),           _T("ClientIcons_Jabber"),   IDI_GOTALKMOBILE, JABBER_CASE },
-   { "client_MGTalk",          _T("Mobile?\?\?\?\?\?\?\?"),              _T("MGTalk"),                 _T("ClientIcons_Jabber"),   IDI_MGTALK, JABBER_CASE },
-   { "client_Colloquy",        _T("Colloquy*"),                          _T("Colloquy"),               _T("ClientIcons_Jabber"),   IDI_COLLOQUY, JABBER_CASE },
-   { "client_WTW",             _T("|http://wtw.k2t.eu*|wtw*"),           _T("WTW"),                    _T("ClientIcons_Jabber"),   IDI_WTW, JABBER_CASE },
-   { "client_Spik",            _T("Spik*"),                              _T("Spik"),                   _T("ClientIcons_Jabber"),   IDI_SPIK, JABBER_CASE },
-   { "client_Konnekt",         _T("Konnekt*"),                           _T("Konnekt"),                _T("ClientIcons_Jabber"),   IDI_KONNEKT, JABBER_CASE },
-   { "client_Vacuum",          _T("*Vacuum*"),                           _T("Vacuum IM"),              _T("ClientIcons_Jabber"),   IDI_VACUUM, JABBER_CASE },
-
-   { "client_Neos",            _T("Neos*"),                              _T("Neos"),                   _T("ClientIcons_Jabber"),   IDI_NEOS, JABBER_CASE },
-   { "client_GOIM",            _T("*GOIM*"),                             _T("GOIM"),                   _T("ClientIcons_Jabber"),   IDI_GOIM, JABBER_CASE },
-
-   { "client_SoapBox",         _T("SoapBox*"),                           _T("SoapBox"),                _T("ClientIcons_Jabber"),   IDI_SOAPBOX, JABBER_CASE },
-
-   { "client_MozillaChat",     _T("*Mozilla*Chat*"),                     _T("MozillaChat"),            _T("ClientIcons_Jabber"),   IDI_MOZILLACHAT, JABBER_CASE },
-   { "client_WannaChat",       _T("Wanna*Chat*"),                        _T("WannaChat"),              _T("ClientIcons_Jabber"),   IDI_WANNACHAT, JABBER_CASE },
-   { "client_Nitro",           _T("Nitro*"),                             _T("Nitro"),                  _T("ClientIcons_Jabber"),   IDI_NITRO, JABBER_CASE },
-
-   { "client_JBother",         _T("*JBother*"),                          _T("JBother"),                _T("ClientIcons_Jabber"),   IDI_JBOTHER, JABBER_CASE },
-   { "client_gYaber",          _T("gYaber*"),                            _T("gYaber"),                 _T("ClientIcons_Jabber"),   IDI_GYABER, JABBER_CASE },
-
-   { "client_myJabber",        _T("myJabber*"),                          _T("myJabber"),               _T("ClientIcons_Jabber"),   IDI_MYJABBER, JABBER_CASE },
-
-   { "client_JabberMSNGR",     _T("Jabber Messenger*"),                  _T("Jabber Messenger"),       _T("ClientIcons_Jabber"),   IDI_JABBER_MESSENGER, JABBER_CASE },
-   { "client_Jabberwocky",     _T("Jabberwocky*"),                       _T("Jabberwocky (Amiga)"),    _T("ClientIcons_Jabber"),   IDI_JABBERWOCKY, JABBER_CASE },
-   { "client_TipicIM",         _T("Tipic*"),                             _T("TipicIM"),                _T("ClientIcons_Jabber"),   IDI_TIPICIM, JABBER_CASE },
-   { "client_Triple",          _T("Triple*"),                            _T("TripleSoftwareIM (TSIM)"),_T("ClientIcons_Jabber"),   IDI_TRIPLE_SOFTWARE, JABBER_CASE },
-   { "client_Leaf",            _T("*Leaf*"),                             _T("Leaf Messenger"),         _T("ClientIcons_Jabber"),   IDI_LEAF, JABBER_CASE },
-
-   { "client_Chatopus",        _T("*Chatopus*"),                         _T("Chatopus"),               _T("ClientIcons_Jabber"),   IDI_CHATOPUS, JABBER_CASE },
-   { "client_Akeni",           _T("*Akeni*"),                            _T("Akeni"),                  _T("ClientIcons_Jabber"),   IDI_AKENI, JABBER_CASE },
-   { "client_Coccinella",      _T("*Coccinella*"),                       _T("Coccinella"),             _T("ClientIcons_Jabber"),   IDI_COCCINELLA, 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_JabberFoX",       _T("*fox*"),                              _T("JabberFoX"),              _T("ClientIcons_Jabber"),   IDI_JABBERFOX, JABBER_CASE },
-
-   { "client_Gossip",          _T("*Gossip*"),                           _T("Gossip"),                 _T("ClientIcons_Jabber"),   IDI_GOSSIP, JABBER_CASE },
-   { "client_Fire",            _T("*Fire*"),                             _T("Fire"),                   _T("ClientIcons_Jabber"),   IDI_FIRE, JABBER_CASE },
-   { "client_Mercury",         _T("*Mercury*"),                          _T("Mercury Messenger"),      _T("ClientIcons_Jabber"),   IDI_MERCURY_MESSENGER, JABBER_CASE },
-   { "client_BitWise",         _T("*BitWise*"),                          _T("BitWise"),                _T("ClientIcons_Jabber"),   IDI_BITWISE, JABBER_CASE },
-   { "client_Iruka",           _T("*Iruka*"),                            _T("Iruka"),                  _T("ClientIcons_Jabber"),   IDI_IRUKA, JABBER_CASE },
-
-   { "client_Importal",        _T("*Importal*"),                         _T("Importal"),               _T("ClientIcons_Jabber"),   IDI_IMPORTAL, JABBER_CASE },
-   { "client_kf",              _T("*kf*"),                               _T("kf jabber"),              _T("ClientIcons_Jabber"),   IDI_KF, JABBER_CASE },
-   { "client_JClaim",          _T("*JClaim*"),                           _T("JClaim"),                 _T("ClientIcons_Jabber"),   IDI_JCLAIM, JABBER_CASE },
-
-   { "client_Nostromo",        _T("*USCSS*Nostromo*"),                   _T("USCSS Nostromo"),         _T("ClientIcons_Jabber"),   IDI_NOSTROMO, JABBER_CASE },
-   { "client_LLuna",           _T("LLuna*"),                             _T("LLuna"),                  _T("ClientIcons_Jabber"),   IDI_LLUNA, JABBER_CASE },
-
-   { "client_ChitChat",        _T("*Chit*Chat*"),                        _T("ChitChat"),               _T("ClientIcons_Jabber"),   IDI_CHITCHAT, JABBER_CASE },
-   { "client_WinJab",          _T("WinJab*"),                            _T("WinJab"),                 _T("ClientIcons_Jabber"),   IDI_WINJAB, JABBER_CASE },
-
-   { "client_JMC",             _T("JMC*"),                               _T("JMC (Jabber Mix Client)"),_T("ClientIcons_Jabber"),   IDI_JMC, JABBER_CASE },
-   { "client_BlackBerry",      _T("|*Berry*|*ICS?\?\?\?\?\?\?\?"),       _T("BlackBerry"),             _T("ClientIcons_Jabber"),   IDI_BLACKBERRY, JABBER_CASE },
-   { "client_mobber",          _T("*mobber*"),                           _T("mobber"),                 _T("ClientIcons_Jabber"),   IDI_MOBBER, JABBER_CASE },
-   { "client_MCabber",         _T("*mcabber*"),                          _T("MCabber"),                _T("ClientIcons_Jabber"),   IDI_MCABBER, JABBER_CASE },
-   { "client_Jeti",            _T("*Jeti*"),                             _T("Jeti"),                   _T("ClientIcons_Jabber"),   IDI_JETI, JABBER_CASE },
-   { "client_Gnome",           _T("*Gnome*"),                            _T("Gnome"),                  _T("ClientIcons_Jabber"),   IDI_GNOME, JABBER_CASE },
-   { "client_JabberBeOS",      _T("Jabber*BeOS*"),                       _T("Jabber (BeOS)"),          _T("ClientIcons_Jabber"),   IDI_JABBER_BEOS, JABBER_CASE },
-
-   { "client_JabberApplet",    _T("Jabber*Applet*"),                     _T("JabberApplet"),           _T("ClientIcons_Jabber"),   IDI_JABBER_APPLET, JABBER_CASE },
-   { "client_JabberNaut",      _T("*Jabber*Naut*"),                      _T("JabberNaut"),             _T("ClientIcons_Jabber"),   IDI_JABBERNAUT, JABBER_CASE },
-
-   { "client_moJab",           _T("moJab*"),                             _T("moJab"),                  _T("ClientIcons_Jabber"),   IDI_MOJAB, JABBER_CASE },
-   { "client_Chikka",          _T("*Chikka*"),                           _T("Chikka"),                 _T("ClientIcons_Jabber"),   IDI_CHIKKA, JABBER_CASE },
-
-   { "client_GreenThumb",      _T("gReeNtHumB*"),                        _T("GreenThumb"),             _T("ClientIcons_Jabber"),   IDI_GREENTHUMB, JABBER_CASE },
-
-   { "client_BellSouth",       _T("*BellSouth*"),                        _T("BellSouth"),              _T("ClientIcons_Jabber"),   IDI_BELLSOUTH, JABBER_CASE },
-
-   { "client_IMCom",           _T("*IMCom*"),                            _T("IMCom"),                  _T("ClientIcons_Jabber"),   IDI_IMCOM, JABBER_CASE },
-   { "client_BuddySpace",      _T("Buddy*Space*"),                       _T("BuddySpace"),             _T("ClientIcons_Jabber"),   IDI_BUDDYSPACE, JABBER_CASE },
-   { "client_Kadu",            _T("*Kadu*"),                             _T("Kadu"),                   _T("ClientIcons_Jabber"),   IDI_KADU, JABBER_CASE },
-
-   { "client_Xiffian",         _T("Xiffian*"),                           _T("Xiffian"),                _T("ClientIcons_Jabber"),   IDI_XIFFIAN, JABBER_CASE },
-   { "client_Mango",           _T("Mango*"),                             _T("Mango"),                  _T("ClientIcons_Jabber"),   IDI_MANGO, JABBER_CASE },
-   { "client_Sky_Messager",    _T("Sky*Mess*"),                          _T("Sky Messager"),           _T("ClientIcons_Jabber"),   IDI_SKYMESSAGER, JABBER_CASE },
-   { "client_QTJim",           _T("*QTJim*"),                            _T("QTJim"),                  _T("ClientIcons_Jabber"),   IDI_QTJIM, JABBER_CASE },
-   { "client_Tapioca",         _T("*Tapioca*"),                          _T("Tapioca"),                _T("ClientIcons_Jabber"),   IDI_TAPIOCA, JABBER_CASE },
-   { "client_Telepathy",       _T("*Telepathy*"),                        _T("Telepathy"),              _T("ClientIcons_Jabber"),   IDI_TELEPATHY, JABBER_CASE },
-   { "client_Landell",         _T("*Landell*"),                          _T("Landell"),                _T("ClientIcons_Jabber"),   IDI_LANDELL, JABBER_CASE },
-
-   { "client_Octro",           _T("*Octro*"),                            _T("Octro"),                  _T("ClientIcons_Jabber"),   IDI_OCTRO, JABBER_CASE },
-   { "client_Desyr",           _T("*Desyr*"),                            _T("Desyr Messenger"),        _T("ClientIcons_Jabber"),   IDI_DESYR, JABBER_CASE },
-   { "client_LinQ",            _T("*LinQ*"),                             _T("LinQ"),                   _T("ClientIcons_Jabber"),   IDI_LINQ, JABBER_CASE },
-   { "client_Xeus",            _T("*Xeus*"),                             _T("Xeus"),                   _T("ClientIcons_Jabber"),   IDI_XEUS, JABBER_CASE },
-   { "client_OM",              _T("OM*"),                                _T("OM aka Online Messenger"),_T("ClientIcons_Jabber"),   IDI_OM, JABBER_CASE },
-
-   { "client_Interaction",     _T("*Interaction*"),                      _T("Interaction"),            _T("ClientIcons_Jabber"),   IDI_INTERACTION, JABBER_CASE },
-   { "client_JWGC",            _T("|*JWGC*|Jabber *Gram*"),              _T("JWGC (Jabber WindowGram Client)"), _T("ClientIcons_Jabber"),   IDI_JWGC, JABBER_CASE },
-   { "client_SIP_Comm",        _T("*SIP*Communicator*"),                 _T("SIP Communicator"),       _T("ClientIcons_Jabber"),   IDI_SIP_COMM, JABBER_CASE },
-   { "client_Bowline",         _T("*Bow*line*"),                         _T("Bowline"),                _T("ClientIcons_Jabber"),   IDI_BOWLINE, JABBER_CASE },
-   { "client_Vayusphere",      _T("*Vayusphere*"),                       _T("Vayusphere"),             _T("ClientIcons_Jabber"),   IDI_VAYUSPHERE, JABBER_CASE },
-   { "client_TransactIM",      _T("*Transact*"),                         _T("TransactIM"),             _T("ClientIcons_Jabber"),   IDI_TRANSACTIM, JABBER_CASE },
-   { "client_laffer",          _T("*laffer*"),                           _T("Laffer"),                 _T("ClientIcons_Jabber"),   IDI_LAFFER, JABBER_CASE },
-
-   { "client_InstanT",         _T("*Instan-t*"),                         _T("Instan-t"),               _T("ClientIcons_Jabber"),   IDI_INSTANT, JABBER_CASE },
-   { "client_GCN",             _T("*GCN*"),                              _T("GCN"),                    _T("ClientIcons_Jabber"),   IDI_GCN, JABBER_CASE },
-
-   { "client_Conference",      _T("Conference*"),                        _T("Conference Bot (GMail)"), _T("ClientIcons_Jabber"),   IDI_CONFERENCE, JABBER_CASE, TRUE },
-
-   { "client_Paltalk",         _T("*Paltalk*"),                          _T("Paltalk"),                _T("ClientIcons_Jabber"),   IDI_PALTALK, JABBER_CASE },
-   { "client_Twitter",         _T("*Twitter*"),                          _T("Twitter"),                _T("ClientIcons_Jabber"),   IDI_TWITTER, JABBER_CASE },
-   { "client_SMTPTransport",   _T("smtp*transport*"),                    _T("SMTP Transport"),         _T("ClientIcons_Jabber"),   IDI_SMTP_TRANSPORT, JABBER_CASE },
-   { "client_studivz",         _T("*studivz*"),                          _T("StudiVZ"),                _T("ClientIcons_Jabber"),   IDI_STUDIVZ, JABBER_CASE },
-   { "client_schuelervz",      _T("*schuelervz*"),                       _T("SchulerVZ"),              _T("ClientIcons_Jabber"),   IDI_SCHULERVZ, JABBER_CASE },
-   { "client_meinvz",          _T("*meinvz*"),                           _T("MeinVZ"),                 _T("ClientIcons_Jabber"),   IDI_MEINVZ, JABBER_CASE },
-   { "client_jabbim",          _T("*jabbim*"),                           _T("Jabbim"),                 _T("ClientIcons_Jabber"),   IDI_JABBIM, JABBER_CASE },
-   { "client_yaonline",        _T("|*yandex*|*�.������*|*������*|*yaonline*"), _T("YA online"),        _T("ClientIcons_Jabber"),   IDI_YAONLINE, JABBER_CASE },
-   { "client_jabiru",          _T("|*Jabiru*|http://jabiru*"),           _T("Jabiru"),                 _T("ClientIcons_Jabber"),   IDI_JABIRU, JABBER_CASE },
-   { "client_SworIM",          _T("*SworIM*"),                           _T("SworIM"),                 _T("ClientIcons_Jabber"),   IDI_SWORIM, JABBER_CASE },
-   { "client_Yambi",           _T("*Yambi*"),                            _T("Yambi"),                  _T("ClientIcons_Jabber"),   IDI_YAMBI, JABBER_CASE },
-   { "client_Glu",             _T("|*glu*|http://glu.net/*"),            _T("Glu"),                    _T("ClientIcons_Jabber"),   IDI_GLU, JABBER_CASE },
-   { "client_Facebook",        _T("*Facebook*"),                         _T("Facebook"),               _T("ClientIcons_Jabber"),   IDI_FACEBOOK, JABBER_CASE },
-   { "client_WebEx",           _T("|http://webex.com/connect /*"),       _T("Cisco WebEx Connect"),    _T("ClientIcons_Jabber"),   IDI_WEBEX, JABBER_CASE },
-   { "client_JWChat",          _T("|jwchat*"),                           _T("JWChat"),                 _T("ClientIcons_Jabber"),   IDI_JWCHAT, JABBER_CASE },
-   { "client_Smack",           _T("|http://www.igniterealtime.org/projects/smack/*|*smack*"), _T("Smack"), _T("ClientIcons_Jabber"), IDI_SMACK, JABBER_CASE },
-   { "client_Android",         _T("Android *"),                          _T("Android"),                  _T("ClientIcons_Jabber"), IDI_ANDROID, JABBER_CASE },
-   { "client_PyICQ-t",         _T("|*PyICQ-t*|*pyICQ*|ICQ*Transport*"),  _T("PyICQ-t Jabber Transport"), _T("ClientIcons_Jabber"), IDI_PYICQT, JABBER_CASE },
-   { "client_PyAIM-t",         _T("|*PyAIM-t*|*pyAIM*"),                 _T("PyAIM-t Jabber Transport"), _T("ClientIcons_Jabber"), IDI_PYAIMT, JABBER_CASE },
-   { "client_PyMRA-t",         _T("|*PyMRA-t*|*pyMRA*|*DRQZ00fz5WP*")
-                               _T("|http://svn.xmpp.ru/repos/mrim*|Mrim*"), _T("PyMRA-t Jabber Transport"), _T("ClientIcons_Jabber"), IDI_PYMRAT, JABBER_CASE },
-   { "client_PyMSN-t",         _T("|*PyMSN-t*|*pyMSN*"),                 _T("PyMSN-t Jabber Transport"),  _T("ClientIcons_Jabber"), IDI_PYMSNT, JABBER_CASE },
-   { "client_PyIRC-t",         _T("|*PyIRC-t*|*pyIRC*"),                 _T("PyIRC-t Jabber Transport"),  _T("ClientIcons_Jabber"), IDI_PYIRCT, JABBER_CASE },
-   { "client_PyYIM-t",         _T("|*PyYIM-t*|*pyYIM*"),                 _T("PyYahoo-t Jabber Transport"),_T("ClientIcons_Jabber"), IDI_PYYAHOOT, JABBER_CASE },
-   { "client_GnuGadu",         _T("Gnu Gadu*"),                          _T("GNU Gadu"),               _T("ClientIcons_Jabber"),   IDI_GNUGADU, JABBER_CASE },
-   { "client_Eyeball",         _T("*Eye*ball*"),                         _T("Eyeball Chat"),           _T("ClientIcons_Jabber"),   IDI_EYEBALL_CHAT, JABBER_CASE },
-   { "client_iMov",            _T("*imov*"),                             _T("iMov"),                   _T("ClientIcons_Jabber"),   IDI_IMOV, JABBER_CASE },
-   { "client_iMeem",           _T("iMeem*"),                             _T("iMeem"),                  _T("ClientIcons_Jabber"),   IDI_IMEEM, JABBER_CASE },
-   { "client_AnothRSSBot",     _T("|*Anothrbot*|*Anothr Rss Bot*"),      _T("Anothr Rss Bot"),         _T("ClientIcons_Jabber"),   IDI_ANOTHRSSBOT, JABBER_CASE },
-   { "client_Imified",         _T("*someresource*"),                     _T("Imified"),                _T("ClientIcons_Jabber"),   IDI_IMIFIED, JABBER_CASE },
-   { "client_RenRen",          _T("|*WTalkProxy0_0*|*http://talk.xiaonei.com*"), _T("RenRen"),         _T("ClientIcons_Jabber"),   IDI_RENREN, JABBER_CASE },
-   { "client_Aqq",             _T("|http://aqq.eu*|aqq*"),                _T("Aqq"),                   _T("ClientIcons_Jabber"),   IDI_AQQ, JABBER_CASE },
-   { "client_LeechCraft",      _T("|http://leechcraft.org*|LeechCraft*"), _T("LeechCraft"),            _T("ClientIcons_Jabber"),   IDI_LEECHCRAFT, JABBER_CASE },
-   { "client_Emas",            _T("*.el*"),                               _T("Emacs"),                 _T("ClientIcons_Jabber"),   IDI_EMACS, JABBER_CASE },
-   { "client_jTalk",           _T("|http://jtalk*|jTalk*"),               _T("jTalk"),                 _T("ClientIcons_Jabber"),   IDI_JTALK, JABBER_CASE },
-   { "client_Thunderbird",     _T("Thunderbir*"),	                  _T("Thunderbird"),           _T("ClientIcons_Jabber"),   IDI_THUNDERBIRD, JABBER_CASE },
-
-//#########################################################################################################################################
-//############################################################### VoIP ####################################################################
-//#########################################################################################################################################
-   { "client_Gizmo",           _T("*Gizmo*"),                             _T("Gizmo"),                 _T("ClientIcons_VoIP"),   IDI_GIZMO, VOIP_CASE },
-   { "client_Zoep",            _T("*Zoep*"),                              _T("Zoep"),                  _T("ClientIcons_VoIP"),   IDI_ZOEP, VOIP_CASE },
-   { "client_WengoPhone",      _T("*Wengo*"),                             _T("WengoPhone"),            _T("ClientIcons_VoIP"),   IDI_WENGOPHONE, VOIP_CASE },
-
-//#########################################################################################################################################
-//################################################################## Tlen ##################################################################
-//#########################################################################################################################################
-   { "client_Tlen",            _T("*Tlen*"),                              _T("Tlen.pl"),               _T("ClientIcons_Tlen"),   IDI_TLEN, TLEN_CASE },
-
-//#########################################################################################################################################
-//################################################################## IRC ##################################################################
-//#########################################################################################################################################
-   { "client_KVIrc",           _T("*KVIrc*"),                             _T("KVIrc"),                 _T("ClientIcons_IRC"),   IDI_KVIRC, IRC_CASE },
-   { "client_mIRC",            _T("*mIRC*"),                              _T("mIRC"),                  _T("ClientIcons_IRC"),   IDI_MIRC, IRC_CASE },
-   { "client_Opera",           _T("*Opera*"),                             _T("Opera"),                 _T("ClientIcons_IRC"),   IDI_OPERA, IRC_CASE },
-   { "client_ChatZilla",       _T("*ChatZilla*"),                         _T("ChatZilla"),             _T("ClientIcons_IRC"),   IDI_CHATZILLA, IRC_CASE },
-   { "client_KSirc",           _T("*ksirk*"),                             _T("KSirc"),                 _T("ClientIcons_IRC"),   IDI_KSIRC, IRC_CASE },
-
-   { "client_xBitch",          _T("*xBitch*"),                            _T("xBitch"),                _T("ClientIcons_IRC"),   IDI_XBITCH, IRC_CASE },
-   { "client_xChat",           _T("*xChat*"),                             _T("xChat"),                 _T("ClientIcons_IRC"),   IDI_XCHAT, IRC_CASE },
-   { "client_Pirch",           _T("*Pirch*"),                             _T("Pirch"),                 _T("ClientIcons_IRC"),   IDI_PIRCH, IRC_CASE },
-   { "client_pIRC",            _T("*pIRC*"),                              _T("pIRC"),                  _T("ClientIcons_IRC"),   IDI_PIRC, IRC_CASE },
-   { "client_psyBNC",          _T("*psyBNC*"),                            _T("psyBNC"),                _T("ClientIcons_IRC"),   IDI_PSYBNC, IRC_CASE },
-
-   { "client_SysReset",        _T("*Sys*Reset*"),                         _T("SysReset"),              _T("ClientIcons_IRC"),   IDI_SYSRESET, IRC_CASE },
-   { "client_FChat",           _T("*FChat*"),                             _T("FChat"),                 _T("ClientIcons_IRC"),   IDI_FCHAT, IRC_CASE },
-
-   { "client_Konversation",    _T("*Konversation*"),                      _T("Konversation"),          _T("ClientIcons_IRC"),   IDI_KONVERSATION, IRC_CASE },
-   { "client_Conversation",    _T("*Conversation*"),                      _T("Conversation"),          _T("ClientIcons_IRC"),   IDI_CONVERSATION, IRC_CASE },
-
-   { "client_aMule",           _T("*aMule*"),                             _T("aMule"),                 _T("ClientIcons_IRC"),   IDI_AMULE, IRC_CASE },
-   { "client_eMuleMorphXT",    _T("eMule*MorphXT*"),                      _T("eMule MorphXT"),         _T("ClientIcons_IRC"),   IDI_EMULE_MORPHXT, IRC_CASE },
-   { "client_eMuleNeo",        _T("eMule*Neo*"),                          _T("eMule Neo"),             _T("ClientIcons_IRC"),   IDI_EMULE_NEO, IRC_CASE },
-   { "client_eMuleXtreme",     _T("eMule*Xtreme*"),                       _T("eMule Xtreme"),          _T("ClientIcons_IRC"),   IDI_EMULE_XTREME, IRC_CASE },
-   { "client_eMulePlus",       _T("|eMule*plus*|eMule*+*"),               _T("eMule+"),                _T("ClientIcons_IRC"),   IDI_EMULE_PLUS, IRC_CASE },
-   { "client_eMule",           _T("*eMule*"),                             _T("eMule"),                 _T("ClientIcons_IRC"),   IDI_EMULE, IRC_CASE },
-
-   { "client_EggdropRacBot",   _T("*Eggdrop*RacBot*"),                    _T("Eggdrop RacBot"),        _T("ClientIcons_IRC"),   IDI_EGGDROP_RACBOT, IRC_CASE },
-   { "client_Eggdrop",         _T("*Eggdrop*"),                           _T("Eggdrop"),               _T("ClientIcons_IRC"),   IDI_EGGDROP, IRC_CASE },
-
-   { "client_AmIRC",           _T("*AmIRC*"),                             _T("AmIRC"),                 _T("ClientIcons_IRC"),   IDI_AMIRC, IRC_CASE },
-   { "client_BersIRC",         _T("*BersIRC*"),                           _T("BersIRC"),               _T("ClientIcons_IRC"),   IDI_BERSIRC, IRC_CASE },
-   { "client_cbirc",           _T("*cbirc*"),                             _T("cbirc"),                 _T("ClientIcons_IRC"),   IDI_CBIRC, IRC_CASE },
-   { "client_dIRC",            _T("*dIRC*"),                              _T("dIRC"),                  _T("ClientIcons_IRC"),   IDI_DIRC, IRC_CASE },
-
-   { "client_GDPChat",         _T("*GDPChat*"),                           _T("GDP Web Chat"),          _T("ClientIcons_IRC"),   IDI_GDPCHAT, IRC_CASE },
-   { "client_IceChat7",        _T("*Ice*Chat*7*"),                        _T("IceChat 7"),             _T("ClientIcons_IRC"),   IDI_ICECHAT7, IRC_CASE },
-   { "client_IceChat5",        _T("*Ice*Chat*5*"),                        _T("IceChat 5"),             _T("ClientIcons_IRC"),   IDI_ICECHAT5, IRC_CASE },
-   { "client_IceChat",         _T("*Ice*Chat*"),                          _T("IceChat"),               _T("ClientIcons_IRC"),   IDI_ICECHAT, IRC_CASE },
-
-   { "client_piorun",          _T("*piorun*"),                            _T("Piorun"),                _T("ClientIcons_IRC"),   IDI_PIORUN, IRC_CASE },
-
-   { "client_ProChat",         _T("*Pro*Chat*"),                          _T("ProChat"),               _T("ClientIcons_IRC"),   IDI_PROCHAT, IRC_CASE },
-   { "client_SmartIRC",        _T("*Smart*IRC*"),                         _T("SmartIRC"),              _T("ClientIcons_IRC"),   IDI_SMART_IRC, IRC_CASE },
-
-   { "client_GoPowerTools",    _T("*Go*PowerTools*"),                     _T("GoPowerTools"),          _T("ClientIcons_IRC"),   IDI_GOPOWERTOOLS, IRC_CASE },
-   { "client_HydraIRC",        _T("*Hydra*IRC*"),                         _T("HydraIRC"),              _T("ClientIcons_IRC"),   IDI_HYDRA_IRC, IRC_CASE },
-
-   { "client_ircle",           _T("*ircle*"),                             _T("ircle"),                 _T("ClientIcons_IRC"),   IDI_IRCLE, IRC_CASE },
-   { "client_IRCXpro",         _T("*IRCXpro*"),                           _T("IRCXpro"),               _T("ClientIcons_IRC"),   IDI_IRCXPRO, IRC_CASE },
-   { "client_irssi",           _T("*irssi*"),                             _T("irssi"),                 _T("ClientIcons_IRC"),   IDI_IRSSI, IRC_CASE },
-   { "client_jircii",          _T("*jircii*"),                            _T("jircii"),                _T("ClientIcons_IRC"),   IDI_JIRCII, IRC_CASE },
-   { "client_jmIrc",           _T("*jmIrc*"),                             _T("jmIrc"),                 _T("ClientIcons_IRC"),   IDI_JMIRC, IRC_CASE },
-   { "client_Klient",          _T("*Klient*"),                            _T("Klient"),                _T("ClientIcons_IRC"),   IDI_KLIENT, IRC_CASE },
-
-   { "client_zsIRC",           _T("*zsIRC*"),                             _T("zsIRC"),                 _T("ClientIcons_IRC"),   IDI_ZSIRC, IRC_CASE },
-
-   { "client_NeoRaTrion",      _T("*NeoRa*Trion*"),                       _T("NeoRa Trion"),           _T("ClientIcons_IRC"),   IDI_NEORATRION, IRC_CASE },
-   { "client_Nettalk",         _T("*Nettalk*"),                           _T("Nettalk"),               _T("ClientIcons_IRC"),   IDI_NETTALK, IRC_CASE },
-   { "client_NoNameScript",    _T("*NoName*Script*"),                     _T("NoNameScript"),          _T("ClientIcons_IRC"),   IDI_NONAME_SCRIPT, IRC_CASE },
-   { "client_PJIRC",           _T("*PJIRC*"),                             _T("PJIRC"),                 _T("ClientIcons_IRC"),   IDI_PJIRC, IRC_CASE },
-   { "client_Snak",            _T("*Snak*"),                              _T("Snak"),                  _T("ClientIcons_IRC"),   IDI_SNAK, IRC_CASE },
-
-   { "client_VircaIRC",        _T("*VircaIRC*"),                          _T("VircaIRC"),              _T("ClientIcons_IRC"),   IDI_VIRCAIRC, IRC_CASE },
-   { "client_VisionIRC",       _T("*VisionIRC*"),                         _T("VisionIRC"),             _T("ClientIcons_IRC"),   IDI_VISIONIRC, IRC_CASE },
-   { "client_VisualIRC",       _T("*VisualIRC*"),                         _T("VisualIRC"),             _T("ClientIcons_IRC"),   IDI_VISUALIRC, IRC_CASE },
-   { "client_VortecIRC",       _T("*VortecIRC*"),                         _T("VortecIRC"),             _T("ClientIcons_IRC"),   IDI_VORTECIRC, IRC_CASE },
-
-   { "client_WeeChat",         _T("*WeeChat*"),                           _T("WeeChat"),               _T("ClientIcons_IRC"),   IDI_WEECHAT, IRC_CASE },
-   { "client_WLIrc",           _T("*WLIrc*"),                             _T("WLIrc"),                 _T("ClientIcons_IRC"),   IDI_WLIRC, IRC_CASE },
-   { "client_wmIRC",           _T("*wmIRC*"),                             _T("wmIRC"),                 _T("ClientIcons_IRC"),   IDI_WMIRC, IRC_CASE },
-
-   { "client_XChatAqua",       _T("*X*Chat*Aqua*"),                       _T("X-Chat Aqua"),           _T("ClientIcons_IRC"),   IDI_XCHATAQUA, IRC_CASE },
-
-   { "client_ZipTorrent",      _T("*ZipTorrent*"),                        _T("ZipTorrent"),            _T("ClientIcons_IRC"),   IDI_ZIPTORRENT, IRC_CASE },
-
-   { "client_Babbel",          _T("*Babbel*"),                            _T("Babbel"),                _T("ClientIcons_IRC"),   IDI_BABBEL, IRC_CASE },
-   { "client_Xirc",            _T("*Xirc*"),                              _T("Xirc"),                  _T("ClientIcons_IRC"),   IDI_XIRC, IRC_CASE },
-   { "client_savIRC",          _T("*savIRC*"),                            _T("savIRC"),                _T("ClientIcons_IRC"),   IDI_SAVIRC, IRC_CASE },
-   { "client_XiRCON",          _T("*XiRCON*"),                            _T("XiRCON"),                _T("ClientIcons_IRC"),   IDI_XIRCON, IRC_CASE },
-
-   { "client_MP3Script",       _T("*MP3*Script*"),                        _T("MP3 Script for mIRC"),   _T("ClientIcons_IRC"),   IDI_MP3_SCRIPT, IRC_CASE },
-   { "client_IRCUnknown",      _T("*IRC*"),                               _T("Unknown IRC client"),    _T("ClientIcons_IRC"),   IDI_IRC_UNKNOWN, IRC_CASE },
-
-//#########################################################################################################################################
-//################################################################## MSN ##################################################################
-//#########################################################################################################################################
-   { "client_WLM11",           _T("WLM*2011*"),                           _T("Windows Live 11"),       _T("ClientIcons_MSN"),   IDI_WLM_10, MSN_CASE },
-   { "client_WLM10",           _T("WLM*2010*"),                           _T("Windows Live 10"),       _T("ClientIcons_MSN"),   IDI_WLM_10, MSN_CASE },
-   { "client_WLM9",            _T("WLM*9*"),                              _T("Windows Live v9.x"),     _T("ClientIcons_MSN"),   IDI_WLM_9, MSN_CASE },
-   { "client_MSN8",            _T("|WLM*8.*|MSN*8.*"),                    _T("Windows Live v8.x"),     _T("ClientIcons_MSN"),   IDI_MSN_8, MSN_CASE },
-   { "client_MSN7x",           _T("MSN*7.*"),                             _T("MSN Messenger v7.x"),    _T("ClientIcons_MSN"),   IDI_MSN_7, MSN_CASE },
-   { "client_MSN6x",           _T("MSN*6.*"),                             _T("MSN Messenger v6.x"),    _T("ClientIcons_MSN"),   IDI_MSN_6, MSN_CASE },
-   { "client_MSN45",           _T("MSN*4.x-5.x"),                         _T("MSN Messenger v4.x-5.x"),_T("ClientIcons_MSN"),   IDI_MSN_45, MSN_CASE },
-   { "client_MSN4Mac",         _T("MSN*Mac*"),                            _T("MSN for Mac"),           _T("ClientIcons_MSN"),   IDI_MSN_MAC, MSN_CASE },
-   { "client_aMSN",            _T("*aMSN*"),                              _T("aMSN"),                  _T("ClientIcons_MSN"),   IDI_AMSN, MSN_CASE },
-   { "client_WebMessenger",    _T("WebMessenger*"),                       _T("WebMessenger"),          _T("ClientIcons_MSN"),   IDI_WEBMESSENGER, MSN_CASE },
-   { "client_MSN",             _T("|WLM*|MSN*|Windows Live*"),            _T("MSN"),                   _T("ClientIcons_MSN"),   IDI_MSN, MSN_CASE, TRUE },
-
-//#########################################################################################################################################
-//################################################################## AIM ##################################################################
-//#########################################################################################################################################
-   { "client_AIM_Triton",      _T("*AIM*Triton*"),                        _T("AIM Triton"),            _T("ClientIcons_AIM"),   IDI_AIM_TRITON, AIM_CASE },
-   { "client_Aim4",            _T("AIM*4.*"),                             _T("AIM v4.x"),              _T("ClientIcons_AIM"),   IDI_AIM_4, AIM_CASE },
-   { "client_Aim5",            _T("AIM*5.*"),                             _T("AIM v5.x"),              _T("ClientIcons_AIM"),   IDI_AIM_5, AIM_CASE },
-   { "client_AimMac",          _T("AIM*Mac*"),                            _T("AIM for MacOS"),         _T("ClientIcons_AIM"),   IDI_AIM_MAC, AIM_CASE },
-
-   { "client_AimMobile",       _T("|AIM*Mobile*|AIM*gprs*|Aim*sms*"),     _T("AIM Mobile"),            _T("ClientIcons_AIM"),   IDI_AIM_MOBILE, AIM_CASE },
-   { "client_Naim",            _T("*naim*"),                              _T("Naim"),                  _T("ClientIcons_AIM"),   IDI_NAIM, AIM_CASE },
-   { "client_miniaim",         _T("*miniaim*"),                           _T("miniaim"),               _T("ClientIcons_AIM"),   IDI_MINIAIM, AIM_CASE },
-   { "client_TerraIM",         _T("*Terra*"),                             _T("TerraIM"),               _T("ClientIcons_AIM"),   IDI_TERRAIM, AIM_CASE },
-   { "client_Aim",             _T("AIM*"),                                _T("AIM"),                   _T("ClientIcons_AIM"),   IDI_AIM, AIM_CASE },
-
-//#########################################################################################################################################
-//################################################################# Yahoo #################################################################
-//#########################################################################################################################################
-   { "client_libyahoo2",       _T("*libyahoo*"),                          _T("libyahoo2"),             _T("ClientIcons_Yahoo"),   IDI_LIBYAHOO2, YAHOO_CASE },
-   { "client_Yahoo5",          _T("*Yahoo*5*"),                           _T("Yahoo v5.x"),            _T("ClientIcons_Yahoo"),   IDI_YAHOO5, YAHOO_CASE },
-   { "client_Yahoo6",          _T("*Yahoo*6*"),                           _T("Yahoo v6.x"),            _T("ClientIcons_Yahoo"),   IDI_YAHOO6, YAHOO_CASE },
-   { "client_Yahoo7",          _T("*Yahoo*7*"),                           _T("Yahoo v7.x"),            _T("ClientIcons_Yahoo"),   IDI_YAHOO7, YAHOO_CASE },
-   { "client_Yahoo8",          _T("*Yahoo*8*"),                           _T("Yahoo v8.x"),            _T("ClientIcons_Yahoo"),   IDI_YAHOO8, YAHOO_CASE },
-   { "client_Yahoo9",          _T("*Yahoo*9*"),                           _T("Yahoo v9.x"),            _T("ClientIcons_Yahoo"),   IDI_YAHOO8, YAHOO_CASE },
-   { "client_Yahoo10",         _T("*Yahoo*10*"),                          _T("Yahoo v10.x"),           _T("ClientIcons_Yahoo"),   IDI_YAHOO10, YAHOO_CASE },
-   { "client_YahooGoMobile",   _T("|Yahoo*Go*|Yahoo*Mobile*"),            _T("Yahoo! Go Mobile"),      _T("ClientIcons_Yahoo"),   IDI_YAHOO_GO_MOBILE, YAHOO_CASE },
-   { "client_PingBox",         _T("*Yahoo*PingBox*"),                     _T("Yahoo PingBox"),         _T("ClientIcons_Yahoo"),   IDI_PINGBOX, YAHOO_CASE },
-   { "client_YahooWebMessenger",_T("*Yahoo*Web*Messenger"),               _T("Yahoo Web Messenger"),   _T("ClientIcons_Yahoo"),   IDI_YAHOO10, YAHOO_CASE },
-   { "client_Yahoo",           _T("*Yahoo*"),                             _T("Yahoo"),                 _T("ClientIcons_Yahoo"),   IDI_YAHOO, YAHOO_CASE },
-
-//#########################################################################################################################################
-//##################################################### Gadu-Gadu clients #################################################################
-//#########################################################################################################################################
-   { "client_Gadu_Gadu_7",     _T("Gadu-Gadu*7*"),                        _T("Gadu-Gadu v7.x"),        _T("ClientIcons_Gadu"),   IDI_GADU_GADU_7, GADU_CASE },
-   { "client_Gadu_Gadu_6",     _T("Gadu-Gadu*6*"),                        _T("Gadu-Gadu v6.x"),        _T("ClientIcons_Gadu"),   IDI_GADU_GADU_6, GADU_CASE },
-
-//#########################################################################################################################################
-//###################################################### Mail.Ru clients ##################################################################
-//#########################################################################################################################################
-   { "client_MailRu_official", _T("|magent*|Mail.ru Agent*official*|Mail.ru Agent*PC*")
-                               _T("|http://agent.mail.ru*"),              _T("Mail.Ru Agent (official client)"), _T("ClientIcons_MRA"),   IDI_MAIL_RU_OFFICIAL, 14 },
-   { "client_MailRu_Mobile",   _T("|wmagent*|MobileAgent*|sagent*|Mail.ru Agent*Symbian*")
-                               _T("|jagent*"),                            _T("Mail.Ru Mobile Agent"),            _T("ClientIcons_MRA"),   IDI_MAIL_RU_MOBILE, 14 },
-   { "client_MailRu_web_official", _T("Web Agent*"),                      _T("Mail.Ru Web Agent"),               _T("ClientIcons_MRA"),   IDI_MAIL_RU_WEBAGENT, 14 },
-   { "client_MailRu_unknown",   _T("Mail.ru Agent*"),                     _T("Mail.Ru (unknown client)"),        _T("ClientIcons_MRA"),   IDI_MAIL_RU_UNKNOWN, 14 },
-
-//#########################################################################################################################################
-//####################################################### Skype clients ###################################################################
-//#########################################################################################################################################
-   { "client_Skype3",           _T("*Skype*3.*"),                         _T("Skype v3.x"),            _T("ClientIcons_Skype"),   IDI_SKYPE3, SKYPE_CASE },
-   { "client_Skype2",           _T("*Skype*2.*"),                         _T("Skype v2.x"),            _T("ClientIcons_Skype"),   IDI_SKYPE2, SKYPE_CASE },
-   { "client_Skype1",           _T("*Skype*"),                            _T("Skype v1.x"),            _T("ClientIcons_Skype"),   IDI_SKYPE1, SKYPE_CASE },
-
-//#########################################################################################################################################
-//###################################################### Weather clients ##################################################################
-//#########################################################################################################################################
-   { "client_accu",             _T("*accuweather*"),                      _T("AccuWeather"),           _T("ClientIcons_Weather"),   IDI_ACCU, WEATHER_CASE, TRUE },
-   { "client_gismeteo",         _T("*gismeteo*"),                         _T("GisMeteo"),              _T("ClientIcons_Weather"),   IDI_GISMETEO, WEATHER_CASE, TRUE },
-   { "client_intelli",          _T("*intellicast*"),                      _T("Intellicast"),           _T("ClientIcons_Weather"),   IDI_INTELLI, WEATHER_CASE, TRUE },
-   { "client_meteogid",         _T("|*meteo-gid*|*meteogid*|*MeteoGid*"), _T("Meteo-Gid"),             _T("ClientIcons_Weather"),   IDI_METEOGID, WEATHER_CASE, TRUE },
-   { "client_meteonovosti",     _T("*meteonovosti*"),                     _T("Meteonovosti"),          _T("ClientIcons_Weather"),   IDI_METEONOVOSTI, WEATHER_CASE, TRUE },
-   { "client_noaa",             _T("*noaa*"),                             _T("NOAA Weather"),          _T("ClientIcons_Weather"),   IDI_NOAA, WEATHER_CASE, TRUE },
-   { "client_real",             _T("*realmeteo*"),                        _T("RealMeteo"),             _T("ClientIcons_Weather"),   IDI_REALMETEO, WEATHER_CASE, TRUE },
-   { "client_under",            _T("Weather Underground*"),               _T("Weather Underground"),   _T("ClientIcons_Weather"),   IDI_UNDERGROUND, WEATHER_CASE, TRUE },
-   { "client_weatherxml",       _T("*WeatherXML*"),                       _T("WeatherXML"),            _T("ClientIcons_Weather"),   IDI_WEATHERXML, WEATHER_CASE, TRUE },
-   { "client_wetter",           _T("*wetter*"),                           _T("Wetter"),                _T("ClientIcons_Weather"),   IDI_WETTER, WEATHER_CASE, TRUE },
-   { "client_yweather",         _T("*Yahoo Weather*"),                    _T("Yahoo Weather"),         _T("ClientIcons_Weather"),   IDI_YWEATHER, WEATHER_CASE, TRUE },
-   { "client_weather_cn",       _T("*weather.com.cn*"),                   _T("Weather CN"),            _T("ClientIcons_Weather"),   IDI_WEATHER_CN, WEATHER_CASE, TRUE },
-   { "client_weather",          _T("*weather*"),                          _T("Weather"),               _T("ClientIcons_Weather"),   IDI_WEATHER, WEATHER_CASE, TRUE },
-
-//#########################################################################################################################################
-//############################################################ RSS ########################################################################
-//#########################################################################################################################################
-   { "client_rss09x",           _T("*RSS*0.9*"),                          _T("RSS 0.9x"),              _T("ClientIcons_RSS"),   IDI_RSS09, RSS_CASE },
-   { "client_rss1",             _T("*RSS*1.*"),                           _T("RSS 1"),                 _T("ClientIcons_RSS"),   IDI_RSS1, RSS_CASE },
-   { "client_rss2",             _T("*RSS*2.*"),                           _T("RSS 2"),                 _T("ClientIcons_RSS"),   IDI_RSS2, RSS_CASE },
-   { "client_atom1",            _T("*Atom*1.*"),                          _T("Atom 1"),                _T("ClientIcons_RSS"),   IDI_ATOM1, RSS_CASE },
-   { "client_atom3",            _T("*Atom*3.*"),                          _T("Atom 3"),                _T("ClientIcons_RSS"),   IDI_ATOM3, RSS_CASE },
-
-//#########################################################################################################################################
-//############################################################ QQ #########################################################################
-//#########################################################################################################################################
-   { "client_MobileQQ",         _T("|Mobile*QQ*|iPhone*QQ*|QQ WAP*"),     _T("Mobile QQ"),             _T("ClientIcons_QQ"),   IDI_MOBILEQQ, QQ_CASE },
-   { "client_QQConcept",        _T("QQ*Concept*"),                        _T("QQ Concept"),            _T("ClientIcons_QQ"),   IDI_QQCONCEPT, QQ_CASE },
-   { "client_QQCRM",            _T("QQ*CRM*"),                            _T("QQ CRM"),                _T("ClientIcons_QQ"),   IDI_QQCRM, QQ_CASE },
-   { "client_QQSilver",         _T("QQ*Silverlight*"),                    _T("QQ Silverlight"),        _T("ClientIcons_QQ"),   IDI_QQSILVER, QQ_CASE },
-   { "client_TM2008",           _T("|TM2008*|TM2009*|TM2010*"),           _T("TM 2008 and >"),         _T("ClientIcons_QQ"),   IDI_TM2008, QQ_CASE },
-   { "client_TM",               _T("TM*"),                                _T("TM"),                    _T("ClientIcons_QQ"),   IDI_TM, QQ_CASE },
-   { "client_QQInt",            _T("QQ*International*"),                  _T("QQ International"),      _T("ClientIcons_QQ"),   IDI_QQINT, QQ_CASE },
-   { "client_YamQQ",            _T("YamQQ*"),                             _T("Yam QQ"),                _T("ClientIcons_QQ"),   IDI_YAMQQ, QQ_CASE },
-   { "client_WebQQ",            _T("WebQQ*"),                             _T("WebQQ"),                 _T("ClientIcons_QQ"),   IDI_WEBQQ, QQ_CASE },
-   { "client_QQ",               _T("QQ*"),                                _T("QQ"),                    _T("ClientIcons_QQ"),   IDI_QQ, QQ_CASE },
-
-   { "client_Notfound",         _T("Notfound"),                           _T("Not founded icon"),      _T(""),   IDI_NOTFOUND, OTHER_CASE, TRUE },
-   { "client_Unknown",          _T("|*Unknown*|..."),                     _T("Unknown client"),        _T(""),   IDI_UNKNOWN, OTHER_CASE, TRUE },
-   { "client_Undetected",       _T("?*"),                                 _T("Undetected client"),     _T(""),   IDI_UNDETECTED, OTHER_CASE, TRUE },
-};
-
-int DEFAULT_KN_FP_MASK_COUNT = SIZEOF(def_kn_fp_mask);
-
-//#########################################################################################################################################
-//######################################################### Overlays, layer #1 ############################################################
-//#########################################################################################################################################
-KN_FP_MASK def_kn_fp_overlays_mask[] =
-{//	IconName							Mask										Icon caption							NULL ICON_RESOURCE_ID
-//#########################################################################################################################################
-//#################################################### Miranda Packs ######################################################################
-//#########################################################################################################################################
-   { "client_HIEROS_",          _T("*HierOS*"),                    _T("HierOS"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_HIEROS, PACKS_CASE },
-   { "client_YAOL_",            _T("*yaol*"),                      _T("YAOL"),                        _T("ClientIcons_Packs"),   IDI_MIRANDA_YAOL, PACKS_CASE },
-   { "client_KDL_",             _T("|*KDL*|*���*"),                _T("KDL"),                         _T("ClientIcons_Packs"),   IDI_MIRANDA_KDL, PACKS_CASE },
-   { "client_ValeraVi_",        _T("*Valera*Vi*"),                 _T("ValeraVi"),                    _T("ClientIcons_Packs"),   IDI_MIRANDA_VALERAVI, PACKS_CASE },
-   { "client_Stalker_",         _T("*Stalker*"),                   _T("Stalker"),                     _T("ClientIcons_Packs"),   IDI_MIRANDA_STALKER, PACKS_CASE },
-   { "client_Kuzzman_",         _T("*kuzzman*"),                   _T("Kuzzman"),                     _T("ClientIcons_Packs"),   IDI_MIRANDA_KUZZMAN, PACKS_CASE },
-   { "client_AF_",              _T("*AF*Pack*"),                   _T("AF"),                          _T("ClientIcons_Packs"),   IDI_MIRANDA_AF, PACKS_CASE },
-   { "client_Kolich_",          _T("*Kolich*"),                    _T("Kolich"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_KOLICH, PACKS_CASE },
-   { "client_Umedon_",          _T("*Miranda*Umedon*"),            _T("Umedon"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_UMEDON, PACKS_CASE },
-   { "client_Se7ven_",          _T("|^*sss*|*[S7*pack]*|*[S7]*"),  _T("Se7ven"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_SE7VEN, PACKS_CASE },
-   { "client_SSS_",             _T("*sss*pack*"),                  _T("SSS build"),                   _T("ClientIcons_Packs"),   IDI_MIRANDA_SSS_MOD, PACKS_CASE },
-   { "client_Faith_",           _T("*Faith*Pack*"),                _T("Faith"),                       _T("ClientIcons_Packs"),   IDI_MIRANDA_FAITH, PACKS_CASE },
-   { "client_LexSys_",          _T("|*MirandaLS*|*LexSys*"),       _T("LexSys"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_LEXSYS, PACKS_CASE },
-   { "client_dmikos_",          _T("*dmikos*"),                    _T("Dmikos"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_DMIKOS, PACKS_CASE },
-   { "client_Tweety_",          _T("*tweety*"),                    _T("Tweety"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_TWEETY, PACKS_CASE },
-   { "client_ME_",              _T("*[Miranda ME]*"),              _T("Miranda ME"),                  _T("ClientIcons_Packs"),   IDI_MIRANDA_ME, PACKS_CASE },
-   { "client_BRI_",             _T("*bri*edition*"),               _T("Bri edition"),                 _T("ClientIcons_Packs"),   IDI_MIRANDA_BRI, PACKS_CASE },
-   { "client_ALFAMAR_",         _T("*AlfaMaR*"),                   _T("AlfaMaR"),                     _T("ClientIcons_Packs"),   IDI_MIRANDA_ALFAMAR, PACKS_CASE },
-   { "client_ZELEBOBA_",        _T("*zeleboba's*"),                _T("zeleboba's"),                  _T("ClientIcons_Packs"),   IDI_MIRANDA_ZELEBOBA, PACKS_CASE },
-   { "client_MD_",              _T("*MDpack*"),                    _T("MDpack"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_MD, PACKS_CASE },
-   { "client_PILOT_",           _T("*Pilot*"),                     _T("Pilot"),                       _T("ClientIcons_Packs"),   IDI_MIRANDA_PILOT, PACKS_CASE },
-   { "client_AMATORY_",         _T("*Amatory*"),                   _T("Amatory"),                     _T("ClientIcons_Packs"),   IDI_MIRANDA_AMATORY, PACKS_CASE },
-   { "client_RAZUNTER_",        _T("*Razunter's*"),                _T("Razunter's Pk"),               _T("ClientIcons_Packs"),   IDI_MIRANDA_RAZUNTER, PACKS_CASE },
-   { "client_GHOST_",           _T("*Ghost's*"),                   _T("Ghost's Pack"),                _T("ClientIcons_Packs"),   IDI_MIRANDA_GHOST, PACKS_CASE },
-   { "client_DAR_",             _T("*Dar_veter*"),                 _T("Dar_veter Pack"),              _T("ClientIcons_Packs"),   IDI_MIRANDA_DAR, PACKS_CASE },
-   { "client_MATAES_",          _T("*Mataes*"),                    _T("Mataes Pack"),                 _T("ClientIcons_Packs"),   IDI_MIRANDA_MATAES, PACKS_CASE },
-   { "client_FREIZE_",          _T("*Freize*"),                    _T("Freize"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_FREIZE, PACKS_CASE },
-   { "client_FR_",              _T("*FR*Pack*"),                   _T("Miranda FR"),                  _T("ClientIcons_Packs"),   IDI_MIRANDA_FR, PACKS_CASE },
-   { "client_Native_",          _T("*Native*"),                    _T("Native"),                      _T("ClientIcons_Packs"),   IDI_MIRANDA_NATIVE, PACKS_CASE },
-   { "client_E33_",             _T("*[E33]*"),                     _T("E33"),                         _T("ClientIcons_Packs"),   IDI_MIRANDA_E33, PACKS_CASE },
-   { "client_ROBYER_",          _T("*RobyerPack*"),                _T("Robyer Pack"),                 _T("ClientIcons_Packs"),   IDI_MIRANDA_ROBYER, PACKS_CASE },
-   { "client_New Style_",       _T("*New Style*"),                 _T("New Style"),                   _T("ClientIcons_Packs"),   IDI_MIRANDA_NEW_STYLE, PACKS_CASE },
-   { "client_SPELLHOWLER_",     _T("*Spellhowler*"),               _T("xSpellhowleRx Pack"),          _T("ClientIcons_Packs"),   IDI_MIRANDA_SPELLHOWLER, PACKS_CASE },
-   { "client_LESTAT_",          _T("*[Lpack]*"),                   _T("Lestat Pack"),                 _T("ClientIcons_Packs"),   IDI_MIRANDA_LESTAT, PACKS_CASE },
-   { "client_DEVILSUITE_",      _T("*6.6.6*"),                     _T("Devil Suite"),                 _T("ClientIcons_Packs"),   IDI_MIRANDA_DEVIL, PACKS_CASE },
-   { "client_FINAL",            _T("*[FinalPack]*"),               _T("Final Pack"),                  _T("ClientIcons_Packs"),   IDI_MIRANDA_FINAL, PACKS_CASE },
-   { "client_CAPPUCCINO",       _T("*[HotCoffee]*"),               _T("HotCoffee"),                   _T("ClientIcons_Packs"),   IDI_MIRANDA_CAPPUCCINO, PACKS_CASE },
-   { "client_WATCHER",          _T("*[WatcherPack]*"),             _T("Watcher Pack"),                _T("ClientIcons_Packs"),   IDI_MIRANDA_WATCHER, PACKS_CASE },
-   { "client_LENINPACK",        _T("*[Lenin Pack]*"),              _T("Lenin Pack"),                  _T("ClientIcons_Packs"),   IDI_MIRANDA_LENINPACK, PACKS_CASE },
-//#########################################################################################################################################
-//#########################################################################################################################################
-   { "client_AimOscar_over",    _T("Miranda*AIM*"),                _T("AIM"),                         _T("ClientIcons_General"),   IDI_AIMOSCAR_OVERLAY, OVER1_CASE },      //FIX
-   { "client_ICQJ_Plus_over",   _T("Miranda*ICQ*Plus*"),           _T("ICQJ Plus Mod"),               _T("ClientIcons_General"),   IDI_ICQJ_PLUS_MOD_OVERLAY, OVER1_CASE },
-   { "client_ICQJ_SIN_over",    _T("Miranda*ICQ*S!N*"),            _T("ICQJ S!N Mod"),                _T("ClientIcons_General"),   IDI_ICQJ_SIN_MOD_OVERLAY, OVER1_CASE },
-   { "client_ICQJ_over",        _T("Miranda*ICQ*0.*"),             _T("ICQJ"),                        _T("ClientIcons_General"),   IDI_ICQJ_OVERLAY, OVER1_CASE },
-   { "client_ICQ_Unknown_over", _T("Miranda*ICQ*"),                _T("ICQ unknown"),                 _T("ClientIcons_General"),   IDI_ICQJM_OVERLAY, OVER1_CASE },
-   { "client_IRC_over",         _T("Miranda*IRC*"),                _T("IRC"),                         _T("ClientIcons_General"),   IDI_IRC_OVERLAY, OVER1_CASE },
-   { "client_JGmail_over",      _T("Miranda*JGmail*"),             _T("JGmail"),                      _T("ClientIcons_General"),   IDI_GMAIL_OVERLAY, OVER1_CASE },
-   { "client_JGTalk_over",      _T("Miranda*JGTalk*"),             _T("JGTalk"),                      _T("ClientIcons_General"),   IDI_JGTALK_OVERLAY, OVER1_CASE },
-   { "client_JMeebo_over",      _T("Miranda*JMeebo*"),             _T("JMeebo"),                      _T("ClientIcons_General"),   IDI_JMEEBO_OVERLAY, OVER1_CASE },
-   { "client_Jabber_over",      _T("Miranda*Jabber*"),             _T("Jabber"),                      _T("ClientIcons_General"),   IDI_JABBER_OVERLAY, OVER1_CASE },
-   { "client_MailRu_over",      _T("|*Mail.ru*IM*|*MRA*"),         _T("MailRu Agent"),                _T("ClientIcons_General"),   IDI_MAILRU_OVERLAY, OVER1_CASE },
-   { "client_MSN_over",         _T("Miranda*MSN*"),                _T("MSN"),                         _T("ClientIcons_General"),   IDI_MSN_OVERLAY, OVER1_CASE },
-   { "client_QQ_over",          _T("|Miranda*QQ*|MIMQQ*"),         _T("QQ"),                          _T("ClientIcons_General"),   IDI_QQ_OVERLAY, OVER1_CASE },
-   { "client_Tlen_over",        _T("*tlen.pl"),                    _T("Tlen.pl"),                     _T("ClientIcons_General"),   IDI_TLEN_OVERLAY, OVER1_CASE },
-
-   { "client_Mira_010_over",    _T("*Miranda*0.10.*"),             _T("Miranda v0.10"),               _T("ClientIcons_General"),   IDI_MIRANDA_10, OVER1_CASE },
-   { "client_Mira_09_over",     _T("*Miranda*0.9.*"),              _T("Miranda v0.9"),                _T("ClientIcons_General"),   IDI_MIRANDA_9, OVER1_CASE },
-   { "client_Mira_08_over",     _T("*Miranda*0.8.*"),              _T("Miranda v0.8"),                _T("ClientIcons_General"),   IDI_MIRANDA_8, OVER1_CASE },
-   { "client_Mira_07_over",     _T("*Miranda*0.7.*"),              _T("Miranda v0.7"),                _T("ClientIcons_General"),   IDI_MIRANDA_7, OVER1_CASE },
-   { "client_Mira_06_over",     _T("*Miranda*0.6.*"),              _T("Miranda v0.6"),                _T("ClientIcons_General"),   IDI_MIRANDA_6, OVER1_CASE },
-   { "client_Mira_05_over",     _T("*Miranda*0.5.*"),              _T("Miranda v0.5"),                _T("ClientIcons_General"),   IDI_MIRANDA_5, OVER1_CASE },
-   { "client_Mira_04_over",     _T("*Miranda*0.4.*"),              _T("Miranda v0.4"),                _T("ClientIcons_General"),   IDI_MIRANDA_4, OVER1_CASE },
-
-   { "client_ICQ 2000",         _T("ICQ*2000*"),                   _T("ICQ 2000"),                    _T("ClientIcons_ICQ"),   IDI_CLIENTICQ2000, ICQ_OFF_CASE },
-   { "client_ICQ 2001b",        _T("ICQ*2001*"),                   _T("ICQ 2001"),                    _T("ClientIcons_ICQ"),   IDI_CLIENTICQ2001, ICQ_OFF_CASE },
-   { "client_ICQ 2002",         _T("ICQ*2002*"),                   _T("ICQ 2002/2003a"),              _T("ClientIcons_ICQ"),   IDI_CLIENTICQ2002, ICQ_OFF_CASE },
-   { "client_ICQ 2003",         _T("ICQ*2003*"),                   _T("ICQ 2003b"),                   _T("ClientIcons_ICQ"),   IDI_CLIENTICQ2003, ICQ_OFF_CASE },
-   { "client_ICQ v4",           _T("ICQ*4*"),                      _T("ICQ Lite v4"),                 _T("ClientIcons_ICQ"),   IDI_CLIENTICQLITE4, ICQ_OFF_CASE },
-   { "client_ICQ v5.1",         _T("ICQ*5.1*"),                    _T("ICQ v5.1"),                    _T("ClientIcons_ICQ"),   IDI_CLIENTICQLITE51, ICQ_OFF_CASE },
-   { "client_ICQ v5",           _T("|^*Transport*|ICQ*5*"),        _T("ICQ v5"),                      _T("ClientIcons_ICQ"),   IDI_CLIENTICQLITE5, ICQ_OFF_CASE },
-   { "client_ICQ v6",           _T("ICQ*6*"),                      _T("ICQ v6"),                      _T("ClientIcons_ICQ"),   IDI_CLIENTICQ6, ICQ_OFF_CASE },
-   { "client_ICQ v7",           _T("ICQ*7*"),                      _T("ICQ v7"),                      _T("ClientIcons_ICQ"),   IDI_CLIENTICQ7, ICQ_OFF_CASE },
-
-   { "client_Yahoo v5.x",       _T("*Yahoo 5*"),                   _T("Yahoo 5.x"),                   _T("ClientIcons_Yahoo"),   IDI_CLIENT_YAHOO5, YAHOO_CASE },
-   { "client_Yahoo v6.x",       _T("*Yahoo 6*"),                   _T("Yahoo 6.x"),                   _T("ClientIcons_Yahoo"),   IDI_CLIENT_YAHOO6, YAHOO_CASE },
-   { "client_Yahoo v7.x",       _T("*Yahoo 7*"),                   _T("Yahoo 7.x"),                   _T("ClientIcons_Yahoo"),   IDI_CLIENT_YAHOO7, YAHOO_CASE },
-   { "client_Yahoo v8.x",       _T("*Yahoo 8*"),                   _T("Yahoo 8.x"),                   _T("ClientIcons_Yahoo"),   IDI_CLIENT_YAHOO8, YAHOO_CASE },
-   { "client_Yahoo v9.x",       _T("*Yahoo 9*"),                   _T("Yahoo 9.x"),                   _T("ClientIcons_Yahoo"),   IDI_CLIENT_YAHOO9, YAHOO_CASE },
-   { "client_Yahoo v10.x",      _T("*Yahoo 10*"),                  _T("Yahoo 10.x"),                  _T("ClientIcons_Yahoo"),   IDI_CLIENT_YAHOO10, YAHOO_CASE },
-
-   { "client_QQ 2000",          _T("QQ2000*"),                     _T("QQ 2000"),                     _T("ClientIcons_QQ"),   IDI_CLIENT_QQ2000, QQ_CASE },
-   { "client_TM 1",             _T("TM 1.*"),                      _T("TM 1.x"),                      _T("ClientIcons_QQ"),   IDI_CLIENT_TM1, QQ_CASE },
-   { "client_TM 2",             _T("TM 2.*"),                      _T("TM 2.x"),                      _T("ClientIcons_QQ"),   IDI_CLIENT_TM2, QQ_CASE },
-   { "client_TMQQ 2003",        _T("|QQ2003*|TM 3.*"),             _T("TM 3.x, QQ 2003"),             _T("ClientIcons_QQ"),   IDI_CLIENT_TM_QQ2003, QQ_CASE },
-   { "client_QQ 2004",          _T("QQ2004*"),                     _T("QQ 2004"),                     _T("ClientIcons_QQ"),   IDI_CLIENT_QQ2004, QQ_CASE },
-   { "client_TM_QQ 2005",       _T("|QQ2005*|TM2005*"),            _T("TM/QQ 2005"),                  _T("ClientIcons_QQ"),   IDI_CLIENT_TM_QQ2005, QQ_CASE },
-   { "client_TM_QQ 2006",       _T("|QQ2006*|TM2006*"),            _T("TM/QQ 2006"),                  _T("ClientIcons_QQ"),   IDI_CLIENT_TM_QQ2006, QQ_CASE },
-   { "client_TM_QQ 2007",       _T("|QQ2007*|TM2007*"),            _T("TM/QQ 2007"),                  _T("ClientIcons_QQ"),   IDI_CLIENT_TM_QQ2007, QQ_CASE },
-   { "client_TM_QQ 2008",       _T("|QQ2008*|TM2008*"),            _T("TM/QQ 2008"),                  _T("ClientIcons_QQ"),   IDI_CLIENT_TM_QQ2008, QQ_CASE },
-   { "client_TM_QQ 2009",       _T("|QQ2009*|TM2009*"),            _T("TM/QQ 2009"),                  _T("ClientIcons_QQ"),   IDI_CLIENT_TM_QQ2009, QQ_CASE },
-   { "client_TM_QQ 2010",       _T("|QQ2010*|TM2010*"),            _T("TM/QQ 2010"),                  _T("ClientIcons_QQ"),   IDI_CLIENT_TM_QQ2010, QQ_CASE },
-   { "client_TM_QQ 2011",       _T("|QQ2011*|TM2011*"),            _T("TM/QQ 2011"),                  _T("ClientIcons_QQ"),   IDI_CLIENT_TM_QQ2011, QQ_CASE },
-
-   { "client_Tlen 5",           _T("Tlen Protocol 7"),             _T("Tlen 5.x"),                    _T("ClientIcons_Tlen"),   IDI_CLIENT_TLEN5, TLEN_CASE },
-   { "client_Tlen 6",           _T("Tlen Protocol 10"),            _T("Tlen 6.x"),                    _T("ClientIcons_Tlen"),   IDI_CLIENT_TLEN6, TLEN_CASE },
-   { "client_Tlen 7",           _T("Tlen Protocol 16"),            _T("Tlen 7.x"),                    _T("ClientIcons_Tlen"),   IDI_CLIENT_TLEN7, TLEN_CASE },
-
-   { "client_weather_over",     _T("*Weather*"),                   _T("Weather"),                     _T("ClientIcons_Weather"),   IDI_CLIENT_WEATHER, WEATHER_CASE },
-
-   { "client_on Win32",         _T("|*Win32*|*windows*|* WM *|wmagent*|*Vista*"),   _T("on Windows"), _T("ClientIcons_General"),   IDI_CLIENTWIN, PLATFORM_CASE },
-   { "client_on Mac",           _T("|* Mac *|*IPhone*"),           _T("on MacOS"),                    _T("ClientIcons_General"),   IDI_CLIENTMAC, PLATFORM_CASE },
-   { "client_on Linux",         _T("*Linux*"),                     _T("on Linux"),                    _T("ClientIcons_General"),   IDI_CLIENTLINUX, PLATFORM_CASE },
-   { "client_on Flash",         _T("*Flash*"),                     _T("on Flash"),                    _T("ClientIcons_General"),   IDI_CLIENTFLASH, PLATFORM_CASE },
-   { "client_on Java",          _T("|*Java*|jagent*|ICQ2Go!*"),    _T("on Java"),                     _T("ClientIcons_General"),   IDI_CLIENTJAVA, PLATFORM_CASE },
-   { "client_on Symbian",       _T("|*Symbian*|sagent*"),          _T("on Symbian"),                  _T("ClientIcons_General"),   IDI_CLIENTSYMBIAN, PLATFORM_CASE },
-   { "client_on Android",       _T("|* Android*|*/Android*"),      _T("on Android"),                  _T("ClientIcons_General"),   IDI_CLIENTANDROID, PLATFORM_CASE },
-};
-
-int DEFAULT_KN_FP_OVERLAYS_COUNT = SIZEOF(def_kn_fp_overlays_mask);
-
-//#########################################################################################################################################
-//######################################################### Overlays, layer #2 ############################################################
-//#########################################################################################################################################
-KN_FP_MASK def_kn_fp_overlays2_mask[] =
-{//   IconName                     Mask                              Icon caption                     NULL ICON_RESOURCE_ID
-   { "client_debug_overlay",       _T("*[*debug*]*"),               _T("[Debug]"),                    _T("ClientIcons_Jabber"),   IDI_DEBUG_OVERLAY, OVER2_CASE },
-   { "client_home_overlay",        _T("|*[*home*]*|*[*���*]*"),     _T("[Home]"),                     _T("ClientIcons_Jabber"),   IDI_HOME_OVERLAY, OVER2_CASE },
-   { "client_work_overlay",        _T("|*[*work*]*|*[*������*]*"),  _T("[Work]"),                     _T("ClientIcons_Jabber"),   IDI_WORK_OVERLAY, OVER2_CASE },
-   { "client_office_overlay",      _T("|*[*office*]*|*[*����*]*"),  _T("[Office]"),                   _T("ClientIcons_Jabber"),   IDI_OFFICE_OVERLAY, OVER2_CASE },
-   { "client_mobile_overlay",      _T("|*[*mobile*]*|*[*pda*]*"),   _T("[Mobile]"),                   _T("ClientIcons_Jabber"),   IDI_MOBILE_OVERLAY, OVER2_CASE },
-   { "client_notebook_overlay",    _T("|*[*note*]*|*[*portable*]*|*[*usb*]*")
-                                   _T("|*[*laptop*]*|*[*flash*]*"), _T("[Portable]"),                 _T("ClientIcons_Jabber"),   IDI_NOTEBOOK_OVERLAY, OVER2_CASE },
-   { "client_Miranda_010_overlay", _T("*Miranda*0.10.*"),           _T("Miranda v0.10"),              _T("ClientIcons_General"),  IDI_MIRANDA_10s, OVER2_CASE },
-   { "client_Miranda_09_overlay",  _T("*Miranda*0.9.*"),            _T("Miranda v0.9"),               _T("ClientIcons_General"),  IDI_MIRANDA_9s, OVER2_CASE },
-   { "client_Miranda_08_overlay",  _T("*Miranda*0.8.*"),            _T("Miranda v0.8"),               _T("ClientIcons_General"),  IDI_MIRANDA_8s, OVER2_CASE },
-   { "client_Miranda_07_overlay",  _T("*Miranda*0.7.*"),            _T("Miranda v0.7"),               _T("ClientIcons_General"),  IDI_MIRANDA_7s, OVER2_CASE },
-   { "client_Miranda_06_overlay",  _T("*Miranda*0.6.*"),            _T("Miranda v0.6"),               _T("ClientIcons_General"),  IDI_MIRANDA_6s, OVER2_CASE },
-   { "client_Miranda_05_overlay",  _T("*Miranda*0.5.*"),            _T("Miranda v0.5"),               _T("ClientIcons_General"),  IDI_MIRANDA_5s, OVER2_CASE },
-   { "client_Miranda_04_overlay",  _T("*Miranda*0.4.*"),            _T("Miranda v0.4"),               _T("ClientIcons_General"),  IDI_MIRANDA_4s, OVER2_CASE },
-};
-
-int DEFAULT_KN_FP_OVERLAYS2_COUNT = SIZEOF(def_kn_fp_overlays2_mask);
-
-//#########################################################################################################################################
-//######################################################### Overlays, layer #3 ############################################################
-//#########################################################################################################################################
-KN_FP_MASK def_kn_fp_overlays3_mask[] =
-{//   IconName                     Mask                              Icon caption                     NULL ICON_RESOURCE_ID
-   { "client_SecureIM_overlay",    _T("*Secure*IM*"),               _T("+SecureIM"),                  _T("ClientIcons_General"),   IDI_SECUREIM_OVERLAY, SECURITY_CASE },
-   { "client_SimpPro_overlay",     _T("*SimpPro*"),                 _T("+SimpPro"),                   _T("ClientIcons_General"),   IDI_SIMPPRO_OVERLAY, SECURITY_CASE },
-   { "client_SimpLite_overlay",    _T("*SimpLite*"),                _T("+SimpLite"),                  _T("ClientIcons_General"),   IDI_SIMPLITE_OVERLAY, SECURITY_CASE },
-   { "client_IMSecure_overlay",    _T("*IMSecure*"),                _T("+IMSecure"),                  _T("ClientIcons_General"),   IDI_IMSECURE_OVERLAY, SECURITY_CASE },
-};
-
-int DEFAULT_KN_FP_OVERLAYS3_COUNT = SIZEOF(def_kn_fp_overlays3_mask);
diff --git a/plugins/FingerPrintModPlus/src/options.cpp b/plugins/FingerPrintModPlus/src/options.cpp
deleted file mode 100644
index 2e710faaff..0000000000
--- a/plugins/FingerPrintModPlus/src/options.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda IM
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-//Start of header
-#include "global.h"
-
-struct _settingsInfo
-{
-	int idCtrl;
-	LPCSTR szSetName;
-}
-static settings [] =
-{
-	{IDC_OVERLAY1, "Overlay1"},
-	{IDC_OVERLAY2, "Overlay2"},
-	{IDC_OVERLAY3, "Overlay3"},
-	{IDC_VERSION, "ShowVersion"},
-
-	{IDC_GROUPMIRANDA, "GroupMiranda"},
-	{IDC_GROUPMULTI, "GroupMulti"},
-	{IDC_GROUPPACKS, "GroupPacks"},
-	{IDC_GROUPOTHERS, "GroupOtherProtos"},
-
-	{IDC_GROUPAIM, "GroupAim"},
-	{IDC_GROUPGADU, "GroupGadu"},
-	{IDC_GROUPICQ, "GroupIcq"},
-	{IDC_GROUPIRC, "GroupIrc"},
-	{IDC_GROUPJABBER, "GroupJabber"},
-	{IDC_GROUPMAIL, "GroupMail"},
-	{IDC_GROUPMSN, "GroupMsn"},
-	{IDC_GROUPQQ, "GroupQQ"},
-	{IDC_GROUPRSS, "GroupRSS"},
-	{IDC_GROUPSKYPE, "GroupSkype"},
-	{IDC_GROUPTLEN, "GroupTlen"},
-	{IDC_GROUPVOIP, "GroupVoIP"},
-	{IDC_GROUPWEATHER, "GroupWeather"},
-	{IDC_GROUPYAHOO, "GroupYahoo"}
-};
-
-static void OptDlgChanged(HWND hwndDlg, BOOL show)
-{
-	if (show)
-		ShowWindow(GetDlgItem(hwndDlg, IDC_OPTCHANGENOTE), SW_SHOW);
-	SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-}
-
-static void LoadDBCheckState(HWND hwndDlg, int idCtrl, LPCSTR szSetting, BYTE bDef)
-{
-	CheckDlgButton(hwndDlg, idCtrl, db_get_b(NULL, "Finger", szSetting, bDef));
-}
-
-static void StoreDBCheckState(HWND hwndDlg, int idCtrl, LPCSTR szSetting)
-{
-	db_set_b(NULL, "Finger", szSetting, (BYTE)IsDlgButtonChecked(hwndDlg, idCtrl));
-}
-
-static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	switch(msg) {
-	case WM_INITDIALOG:
-		{
-			TranslateDialogDefault(hwndDlg);
-			for (int i = 0; i < SIZEOF(settings); i++) {
-				if (lstrcmpA(settings[i].szSetName, "ShowVersion") == 0)
-					LoadDBCheckState(hwndDlg, settings[i].idCtrl, settings[i].szSetName, 0);
-				else
-					LoadDBCheckState(hwndDlg, settings[i].idCtrl, settings[i].szSetName, 1);
-			}
-
-			ShowWindow(GetDlgItem(hwndDlg, IDC_OPTCHANGENOTE), SW_HIDE);
-		}
-		break;
-
-	case WM_COMMAND:
-		switch(LOWORD(wParam)) {
-		case IDC_OVERLAY1:
-		case IDC_OVERLAY2:
-		case IDC_OVERLAY3:
-		case IDC_VERSION:
-			OptDlgChanged(hwndDlg, true);
-			break;
-
-		case IDC_GROUPMIRANDA:
-		case IDC_GROUPMULTI:
-		case IDC_GROUPPACKS:
-		case IDC_GROUPOTHERS:
-		case IDC_GROUPAIM:
-		case IDC_GROUPGADU:
-		case IDC_GROUPICQ:
-		case IDC_GROUPIRC:
-		case IDC_GROUPJABBER:
-		case IDC_GROUPMAIL:
-		case IDC_GROUPMSN:
-		case IDC_GROUPQQ:
-		case IDC_GROUPRSS:
-		case IDC_GROUPSKYPE:
-		case IDC_GROUPTLEN:
-		case IDC_GROUPVOIP:
-		case IDC_GROUPWEATHER:
-		case IDC_GROUPYAHOO:
-			OptDlgChanged(hwndDlg, false);
-			break;
-
-		default:
-			return 0;
-		}
-		break;
-
-	case WM_NOTIFY:
-		{
-			NMHDR *hdr = (NMHDR *)lParam;
-			if (hdr && hdr->code == PSN_APPLY) {
-				for (int i = 0; i < SIZEOF(settings); i++)
-					StoreDBCheckState(hwndDlg, settings[i].idCtrl, settings[i].szSetName);
-
-				ClearFI();
-				RegisterIcons();
-			}
-		}
-		break;
-	}
-	return FALSE;
-}
-
-int OnOptInitialise(WPARAM wParam, LPARAM lParam)
-{
-	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.cbSize = sizeof(odp);
-	odp.hInstance = g_hInst;
-	odp.ptszGroup = LPGENT("Customize");
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG);
-	odp.ptszTitle = LPGENT("Fingerprint");
-	odp.pfnDlgProc = DlgProcOptions;
-	odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;;
-	Options_AddPage(wParam, &odp);
-	return 0;
-}
diff --git a/plugins/FingerPrintModPlus/src/resource.h b/plugins/FingerPrintModPlus/src/resource.h
deleted file mode 100644
index aeed13978d..0000000000
--- a/plugins/FingerPrintModPlus/src/resource.h
+++ /dev/null
@@ -1,646 +0,0 @@
-#include "version.h"
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by resource.rc
-//##############################################################################################################
-//AIM
-#define IDI_AIM					10
-#define IDI_AIM_4				11
-#define IDI_AIM_5				12
-#define IDI_AIM_MAC				13
-#define IDI_AIM_MOBILE			14
-#define IDI_AIM_TRITON			15
-#define IDI_MINIAIM				16
-#define IDI_NAIM				17
-#define IDI_TERRAIM				18
-
-//##############################################################################################################
-//Gadu-Gadu clients
-#define IDI_GADU_GADU_6			30
-#define IDI_GADU_GADU_7			31
-
-//##############################################################################################################
-//Unofficial ICQ clients
-#define IDI_ANDRQ				50
-#define IDI_1UND1				51
-#define IDI_ALICQ				52
-#define IDI_ANASTASIA			53
-#define IDI_VIRUS				54
-#define IDI_COREPAGER			55
-#define IDI_DICHAT				56
-#define IDI_DELPHI				57
-#define IDI_GLICQ				58
-#define IDI_GNOMEICU			59
-#define IDI_ICAT				60
-#define IDI_ICQ2X				61
-#define IDI_IMADERING			62
-#define IDI_JICQ				63
-#define IDI_KMASKA				64
-#define IDI_KXICQ				65
-#define IDI_LIBICQ2000			66
-#define IDI_LICQ				67
-#define IDI_LOCID				68
-#define IDI_MICQ				69
-#define IDI_MIP					70
-#define IDI_NANOICQ				71
-#define IDI_NICQ				72
-#define IDI_QIP					73
-#define IDI_RANDQ_NEW			74
-#define IDI_SLICK				75
-#define IDI_SMAPER				76
-#define IDI_SMARTICQ			77
-#define IDI_SPAMBOT				78
-#define IDI_STICQ				79
-#define IDI_STRICQ				80
-#define IDI_VICQ				81
-#define IDI_VMICQ				82
-#define IDI_WEBICQ				83
-#define IDI_YEEMP				84
-#define IDI_YSM					85
-
-//##############################################################################################################
-//Official ICQ clients
-#define IDI_ICQ					100
-#define IDI_ICQ_6				101
-#define IDI_ICQ_ABV				102
-#define IDI_ICQ_BIGMIR			103
-#define IDI_ICQ_COMPAD			104
-#define IDI_ICQ4MAC				105
-#define IDI_ICQ_LITE4			106
-#define IDI_ICQ_LITE7			107
-#define IDI_ICQ_NETVIGATOR		108
-#define IDI_ICQ_PRO7			109
-#define IDI_ICQ_RAMBLER			110
-#define IDI_ICQ_POCKETPC		111
-
-//##############################################################################################################
-//Official ICQ overlays
-#define IDI_CLIENTICQLITE5		120
-#define IDI_CLIENTICQLITE51		121
-#define IDI_CLIENTICQ6			122
-#define IDI_CLIENTICQ7			123
-#define IDI_CLIENTICQ2000		124
-#define IDI_CLIENTICQ2001		125
-#define IDI_CLIENTICQ2002		126
-#define IDI_CLIENTICQ2003		127
-#define IDI_CLIENTICQLITE4		128
-
-//##############################################################################################################
-//IRC
-#define IDI_AMIRC				140
-#define IDI_AMULE				141
-#define IDI_BABBEL				142
-#define IDI_BERSIRC				143
-#define IDI_CBIRC				144
-#define IDI_CHATZILLA			145
-#define IDI_CONVERSATION		146
-#define IDI_DIRC				147
-#define IDI_EGGDROP				148
-#define IDI_EGGDROP_RACBOT		149
-#define IDI_EMULE				150
-#define IDI_EMULE_MORPHXT		151
-#define IDI_EMULE_NEO			152
-#define IDI_EMULE_PLUS			153
-#define IDI_EMULE_XTREME		154
-#define IDI_FCHAT				155
-#define IDI_GDPCHAT				156
-#define IDI_GOPOWERTOOLS		157
-#define IDI_HYDRA_IRC			158
-#define IDI_ICECHAT				159
-#define IDI_ICECHAT5			160
-#define IDI_ICECHAT7			161
-#define IDI_IRC_UNKNOWN			162
-#define IDI_IRCLE				163
-#define IDI_IRCXPRO				164
-#define IDI_IRSSI				165
-#define IDI_JIRCII				166
-#define IDI_JMIRC				167
-#define IDI_KLIENT				168
-#define IDI_KONVERSATION		169
-#define IDI_KSIRC				170
-#define IDI_KVIRC				171
-#define IDI_MIRC				172
-#define IDI_MP3_SCRIPT			173
-#define IDI_NEORATRION			174
-#define IDI_NETTALK				175
-#define IDI_NONAME_SCRIPT		176
-#define IDI_OPERA				177
-#define IDI_PIORUN				178
-#define IDI_PIRC				179
-#define IDI_PIRCH				180
-#define IDI_PJIRC				181
-#define IDI_PROCHAT				182
-#define IDI_PSYBNC				183
-#define IDI_SAVIRC				184
-#define IDI_SMART_IRC			185
-#define IDI_SNAK				186
-#define IDI_SYSRESET			187
-#define IDI_VIRCAIRC			188
-#define IDI_VISIONIRC			189
-#define IDI_VISUALIRC			190
-#define IDI_VORTECIRC			191
-#define IDI_WEECHAT				192
-#define IDI_WLIRC				193
-#define IDI_WMIRC				194
-#define IDI_XCHATAQUA			195
-#define IDI_XBITCH				196
-#define IDI_XCHAT				197
-#define IDI_XIRC				198
-#define IDI_XIRCON				199
-#define IDI_ZIPTORRENT			200
-#define IDI_ZSIRC				201
-
-//##############################################################################################################
-//Jabber clients
-#define IDI_AKENI				220
-#define IDI_ANDROID				221
-#define IDI_ANOTHRSSBOT			222
-#define IDI_AQQ					223
-#define IDI_BEEJIVE				224
-#define IDI_BELLSOUTH			225
-#define IDI_BITWISE				226
-#define IDI_BLACKBERRY			227
-#define IDI_BOMBUS				228
-#define IDI_BOMBUSMOD			229
-#define IDI_BOMBUSQD			230
-#define IDI_BOWLINE				231
-#define IDI_BUDDYSPACE			232
-#define IDI_CHATOPUS			233
-#define IDI_CHIKKA				234
-#define IDI_CHITCHAT			235
-#define IDI_COCCINELLA			236
-#define IDI_COLIBRY				237
-#define IDI_COLLOQUY			238
-#define IDI_DESYR				239
-#define IDI_EMACS				240
-#define IDI_EMESS				241
-#define IDI_EXODUS				242
-#define IDI_EYEBALL_CHAT		243
-#define IDI_FACEBOOK			244
-#define IDI_FIRE				245
-#define IDI_GABBER				246
-#define IDI_GAJIM				247
-#define IDI_GCN					248
-#define IDI_GLU					249
-#define IDI_GMAIL				250
-#define IDI_CONFERENCE			251
-#define IDI_GNOME				252
-#define IDI_GNUGADU				253
-#define IDI_GOIM				254
-#define IDI_GOSSIP				255
-#define IDI_GOTALKMOBILE		256
-#define IDI_GREENTHUMB			257
-#define IDI_GTALK				258
-#define IDI_GTALK_GADGET		259
-#define IDI_GUSH				260
-#define IDI_GYABER				261
-#define IDI_IGOOGLE				262
-#define IDI_IMCOM				263
-#define IDI_IMEEM				264
-#define IDI_IMIFIED				265
-#define IDI_IMOV				266
-#define IDI_IMPORTAL			267
-#define IDI_INSTANT				268
-#define IDI_INTERACTION			269
-#define IDI_IRUKA				270
-#define IDI_JABBER_BEOS			271
-#define IDI_JABBER_APPLET		272
-#define IDI_JABBERFOX			273
-#define IDI_JABBER_MESSENGER	274
-#define IDI_JABBERNAUT			275
-#define IDI_JABBERWOCKY			276
-#define IDI_JABBERZILLA			277
-#define IDI_JABBIM				278
-#define IDI_JABBIN				279
-#define IDI_JABIRU				280
-#define IDI_JAJC				281
-#define IDI_JBOTHER				282
-#define IDI_JCLAIM				283
-#define IDI_JDISK				284
-#define IDI_JETI				285
-#define IDI_JMC					286
-#define IDI_JRUDEVELS			287
-#define IDI_JTALK				288
-#define IDI_JUICK				289
-#define IDI_JWCHAT				290
-#define IDI_JWGC				291
-#define IDI_KADU				292
-#define IDI_KF					293
-#define IDI_KONNEKT				294
-#define IDI_LAFFER				295
-#define IDI_LANDELL				296
-#define IDI_LEAF				297
-#define IDI_LEECHCRAFT			298
-#define IDI_LINQ				299
-#define IDI_LLUNA				300
-#define IDI_M8JABBER			301
-#define IDI_MANGO				302
-#define IDI_MCABBER				303
-#define IDI_MEINVZ				304
-#define IDI_MERCURY_MESSENGER	305
-#define IDI_MGTALK				306
-#define IDI_MOBBER				307
-#define IDI_MOJAB				308
-#define IDI_MOZILLACHAT			309
-#define IDI_MYJABBER			310
-#define IDI_NEOS				311
-#define IDI_NITRO				312
-#define IDI_NOSTROMO			313
-#define IDI_OCTRO				314
-#define IDI_OM					315
-#define IDI_ORKUT				316
-#define IDI_PALTALK				317
-#define IDI_PANDION				318
-#define IDI_PAPLA				319
-#define IDI_PJC					320
-#define IDI_PSI					321
-#define IDI_PSTO				322
-#define IDI_PYAIMT				323
-#define IDI_PYICQT				324
-#define IDI_PYIRCT				325
-#define IDI_PYMRAT				326
-#define IDI_PYMSNT				327
-#define IDI_PYYAHOOT			328
-#define IDI_QTJIM				329
-#define IDI_RENREN				330
-#define IDI_SCHULERVZ			331
-#define IDI_SIP_COMM			332
-#define IDI_SKYMESSAGER			333
-#define IDI_SMACK				334
-#define IDI_SMTP_TRANSPORT		335
-#define IDI_SOAPBOX				336
-#define IDI_SPARK				337
-#define IDI_SPIK				338
-#define IDI_STUDIVZ				339
-#define IDI_SWORIM				340
-#define IDI_TALKONAUT			341
-#define IDI_TAPIOCA				342
-#define IDI_TEABOT				343
-#define IDI_TELEPATHY			344
-#define IDI_THUNDERBIRD                         345
-#define IDI_TIPICIM				346
-#define IDI_TKABBER				347
-#define IDI_TRANSACTIM			348
-#define IDI_TRIPLE_SOFTWARE		349
-#define IDI_TWITTER				350
-#define IDI_VACUUM				351
-#define IDI_VAYUSPHERE			352
-#define IDI_WANNACHAT			353
-#define IDI_WEBEX				354
-#define IDI_WHISPERIM			355
-#define IDI_WHOISBOT			356
-#define IDI_WIJA				357
-#define IDI_WILDFIRE			358
-#define IDI_WINJAB				359
-#define IDI_WTW					360
-#define IDI_XEUS				361
-#define IDI_XIFFIAN				362
-#define IDI_YAMBI				363
-#define IDI_YAONLINE			364
-
-//##############################################################################################################
-//VoIP clients
-#define IDI_GIZMO				380
-#define IDI_WENGOPHONE			381
-#define IDI_ZOEP				382
-
-//##############################################################################################################
-//Jabber resource overlays
-#define IDI_DEBUG_OVERLAY		400
-#define IDI_HOME_OVERLAY		401
-#define IDI_MOBILE_OVERLAY		402
-#define IDI_NOTEBOOK_OVERLAY	403
-#define IDI_OFFICE_OVERLAY		404
-#define IDI_WORK_OVERLAY		405
-
-//##############################################################################################################
-//Mail.Ru Agent clients
-#define IDI_MAIL_RU_MOBILE		410
-#define IDI_MAIL_RU_OFFICIAL	411
-#define IDI_MAIL_RU_UNKNOWN		412
-#define IDI_MAIL_RU_WEBAGENT	413
-
-//##############################################################################################################
-//MirandaIM clients
-#define IDI_MIRANDA_4			430
-#define IDI_MIRANDA_4s			431
-#define IDI_MIRANDA_5			432
-#define IDI_MIRANDA_5s			433
-#define IDI_MIRANDA_6			434
-#define IDI_MIRANDA_6s			435
-#define IDI_MIRANDA_7			436
-#define IDI_MIRANDA_7s			437
-#define IDI_MIRANDA_8			438
-#define IDI_MIRANDA_8s			439
-#define IDI_MIRANDA_9			440
-#define IDI_MIRANDA_9s			441
-#define IDI_MIRANDA_10			442
-#define IDI_MIRANDA_10s			443
-#define IDI_MIRANDA_04			444
-#define IDI_MIRANDA_05			445
-#define IDI_MIRANDA_05U			446
-#define IDI_MIRANDA_06			447
-#define IDI_MIRANDA_06U			448
-#define IDI_MIRANDA_07			449
-#define IDI_MIRANDA_07U			450
-#define IDI_MIRANDA_08			451
-#define IDI_MIRANDA_08U			452
-#define IDI_MIRANDA_09			453
-#define IDI_MIRANDA_09U			454
-#define IDI_MIRANDA_010			455
-#define IDI_MIRANDA_010U		456
-#define IDI_MIRANDA_666			457
-#define IDI_MIRANDA_U			458
-#define IDI_MIRANDA_UNKNOWN		459
-#define IDI_MIRANDA_NG			460
-
-//##############################################################################################################
-//Clients overlays
-#define IDI_AIMOSCAR_OVERLAY			481
-#define IDI_GMAIL_OVERLAY				482
-#define IDI_ICQJ_SIN_MOD_OVERLAY		483
-#define IDI_ICQJ_OVERLAY				484
-#define IDI_ICQJ_PLUS_MOD_OVERLAY		485
-#define IDI_ICQJM_OVERLAY				486
-#define IDI_IRC_OVERLAY					487
-#define IDI_JABBER_OVERLAY				488
-#define IDI_JGTALK_OVERLAY				489
-#define IDI_JMEEBO_OVERLAY				490
-#define IDI_MAILRU_OVERLAY				491
-#define IDI_MSN_OVERLAY					492
-#define IDI_QQ_OVERLAY					493
-#define IDI_TLEN_OVERLAY				494
-
-//##############################################################################################################
-//Platform
-#define IDI_CLIENTANDROID				510
-#define IDI_CLIENTFLASH					511
-#define IDI_CLIENTMAC					512
-#define IDI_CLIENTJAVA					513
-#define IDI_CLIENTLINUX					514
-#define IDI_CLIENTSYMBIAN				515
-#define IDI_CLIENTWIN					516
-
-//##############################################################################################################
-//Secure overlays
-#define IDI_IMSECURE_OVERLAY			520
-#define IDI_SECUREIM_OVERLAY			521
-#define IDI_SIMPLITE_OVERLAY			522
-#define IDI_SIMPPRO_OVERLAY				523
-
-//##############################################################################################################
-//Other
-#define IDI_BLANK						530
-#define IDI_NOTFOUND					531
-#define IDI_UNDETECTED					532
-#define IDI_UNKNOWN						533
-
-//##############################################################################################################
-//MSN
-#define IDI_AMSN						540
-#define IDI_MSN_MAC						541
-#define IDI_MSN_45						542
-#define IDI_MSN_6						543
-#define IDI_MSN_7						544
-#define IDI_MSN_8						545
-#define IDI_MSN							546
-#define IDI_WEBMESSENGER				547
-#define IDI_WLM_9						548
-#define IDI_WLM_10						549
-
-//##############################################################################################################
-//Multi-protocols clients
-#define IDI_ADIUM						560
-#define IDI_AGILE						561
-#define IDI_AYTTM						562
-#define IDI_BAYANICQ					563
-#define IDI_BITLBEE						564
-#define IDI_CENTERICQ					565
-#define IDI_CITRON						566
-#define IDI_DIGSBY						567
-#define IDI_EASYMESSAGE					568
-#define IDI_EBUDDY						569
-#define IDI_EKG2						570
-#define IDI_FRING						571
-#define IDI_GAIM						572
-#define IDI_ICHAT						573
-#define IDI_IMPLUS						574
-#define IDI_IM2							575
-#define IDI_IMOIM						576
-#define IDI_INLUX						577
-#define IDI_INSTANTBIRD					578
-#define IDI_JASMINEIM					579
-#define IDI_JIMM						580
-#define IDI_KOPETE						581
-#define IDI_MCHAT						582
-#define IDI_MEEBO						583
-#define IDI_MEETRO						584
-#define IDI_NATSIEMENS					585
-#define IDI_ONETEAM						586
-#define IDI_PALRINGO					587
-#define IDI_PIDGIN						588
-#define IDI_PIGEON						589
-#define IDI_PRELUDE						590
-#define IDI_PROTEUS						591
-#define IDI_PYTHON						592
-#define IDI_QIP_2010					593
-#define IDI_QIP_INFIUM					594
-#define IDI_QIP_PDA						595
-#define IDI_QNEXT						596
-#define IDI_QUTIM						597
-#define IDI_SIM							598
-#define IDI_SIM_LINUX					599
-#define IDI_SIM_LINUX_OLD				600
-#define IDI_SIM_MACOSX					601
-#define IDI_SIM_MACOSX_OLD				602
-#define IDI_SIM_OLD						603
-#define IDI_SIM_WIN						604
-#define IDI_SIM_WIN_OLD					605
-#define IDI_TRILLIAN					606
-#define IDI_TRILLIAN_ASTRA				607
-#define IDI_TRILLIAN_PRO				608
-#define IDI_UIM							609
-#define IDI_YAMIGO						610
-#define IDI_QIP_2012					611
-
-//##############################################################################################################
-//MirandaIM Packs
-#define IDI_MIRANDA_A0X					630
-#define IDI_MIRANDA_AF					631
-#define IDI_MIRANDA_ALFAMAR				632
-#define IDI_MIRANDA_AMATORY				633
-#define IDI_MIRANDA_BRI					634
-#define IDI_MIRANDA_CAPPUCCINO			635
-#define IDI_MIRANDA_DAR					636
-#define IDI_MIRANDA_DMIKOS				637
-#define IDI_MIRANDA_E33					638
-#define IDI_MIRANDA_FAITH				639
-#define IDI_MIRANDA_FINAL				640
-#define IDI_MIRANDA_FREIZE				641
-#define IDI_MIRANDA_GHOST				642
-#define IDI_MIRANDA_HIEROS				643
-#define IDI_MIRANDA_KDL					644
-#define IDI_MIRANDA_KOLICH				645
-#define IDI_MIRANDA_KUZZMAN				646
-#define IDI_MIRANDA_LESTAT				647
-#define IDI_MIRANDA_LEXSYS				648
-#define IDI_MIRANDA_MATAES				649
-#define IDI_MIRANDA_MD					650
-#define IDI_MIRANDA_FR					651
-#define IDI_MIRANDA_ME					652
-#define IDI_MIRANDA_NATIVE				653
-#define IDI_MIRANDA_NEW_STYLE			654
-#define IDI_MIRANDA_PILOT				655
-#define IDI_MIRANDA_RAZUNTER			656
-#define IDI_MIRANDA_ROBYER				657
-#define IDI_MIRANDA_SE7VEN				658
-#define IDI_MIRANDA_SSS_MOD				659
-#define IDI_MIRANDA_STALKER				660
-#define IDI_MIRANDA_TWEETY				661
-#define IDI_MIRANDA_UMEDON				662
-#define IDI_MIRANDA_VALERAVI			663
-#define IDI_MIRANDA_WATCHER				664
-#define IDI_MIRANDA_SPELLHOWLER			665
-#define IDI_MIRANDA_YAOL				666
-#define IDI_MIRANDA_ZELEBOBA			667
-#define IDI_MIRANDA_DEVIL				668
-#define IDI_MIRANDA_LENINPACK			669
-
-//##############################################################################################################
-//QQ clients
-#define IDI_MOBILEQQ					680
-#define IDI_QQ							681
-#define IDI_QQCONCEPT					682
-#define IDI_QQCRM						683
-#define IDI_QQINT						684
-#define IDI_QQSILVER					685
-#define IDI_TM							686
-#define IDI_TM2008						687
-#define IDI_WEBQQ						688
-#define IDI_YAMQQ						689
-
-//##############################################################################################################
-//QQ clients overlays
-#define IDI_CLIENT_QQ2000				700
-#define IDI_CLIENT_QQ2004				701
-#define IDI_CLIENT_TM1					702
-#define IDI_CLIENT_TM2					703
-#define IDI_CLIENT_TM_QQ2003			704
-#define IDI_CLIENT_TM_QQ2005			705
-#define IDI_CLIENT_TM_QQ2006			706
-#define IDI_CLIENT_TM_QQ2007			707
-#define IDI_CLIENT_TM_QQ2008			708
-#define IDI_CLIENT_TM_QQ2009			709
-#define IDI_CLIENT_TM_QQ2010			710
-#define IDI_CLIENT_TM_QQ2011			711
-
-//##############################################################################################################
-//RSS
-#define IDI_ATOM1						720
-#define IDI_ATOM3						721
-#define IDI_RSS09						722
-#define IDI_RSS1						723
-#define IDI_RSS2						724
-
-//##############################################################################################################
-//Skype clients
-#define IDI_SKYPE1						730
-#define IDI_SKYPE2						731
-#define IDI_SKYPE3						732
-
-//##############################################################################################################
-//Tlen clients
-#define IDI_TLEN						750
-
-//##############################################################################################################
-//Tlen clients overlays
-#define IDI_CLIENT_TLEN5				755
-#define IDI_CLIENT_TLEN6				756
-#define IDI_CLIENT_TLEN7				757
-
-//##############################################################################################################
-//Weather clients
-#define IDI_ACCU						770
-#define IDI_GISMETEO					771
-#define IDI_INTELLI						772
-#define IDI_REALMETEO					773
-#define IDI_WETTER						774
-#define IDI_UNDERGROUND					775
-#define IDI_WEATHER						776
-#define IDI_WEATHER_CN					777
-#define IDI_WEATHERXML					778
-#define IDI_METEOGID					779
-#define IDI_YWEATHER					780
-#define IDI_METEONOVOSTI				781
-#define IDI_NOAA						782
-
-//##############################################################################################################
-//Weather overlay
-#define IDI_CLIENT_WEATHER				790
-
-//##############################################################################################################
-//Yahoo
-#define IDI_LIBYAHOO2					800
-#define IDI_PINGBOX						801
-#define IDI_YAHOO						802
-#define IDI_YAHOO5						803
-#define IDI_YAHOO6						804
-#define IDI_YAHOO7						805
-#define IDI_YAHOO8						806
-#define IDI_YAHOO10						807
-#define IDI_YAHOO_GO_MOBILE				808
-
-//##############################################################################################################
-//Yahoo overlays
-#define IDI_CLIENT_YAHOO5				820
-#define IDI_CLIENT_YAHOO6				821
-#define IDI_CLIENT_YAHOO7				822
-#define IDI_CLIENT_YAHOO8				823
-#define IDI_CLIENT_YAHOO9				824
-#define IDI_CLIENT_YAHOO10				825
-
-
-//##############################################################################################################
-//resources
-#define IDD_DIALOG						10000
-#define IDC_OVERLAY1					10002
-#define IDC_OVERLAY2					10003
-#define IDC_OVERLAY3					10004
-#define IDC_VERSION						10005
-
-#define	IDC_GROUPMIRANDA				10025
-#define IDC_GROUPMULTI					10026
-#define IDC_GROUPPACKS					10027
-#define IDC_GROUPOTHERS					10028
-
-#define IDC_GROUPAIM					10029
-#define IDC_GROUPGADU					10030
-#define IDC_GROUPICQ					10031
-#define IDC_GROUPIRC					10032
-#define IDC_GROUPJABBER					10033
-#define IDC_GROUPMAIL					10034
-#define IDC_GROUPMSN					10035
-#define IDC_GROUPQQ						10036
-#define IDC_GROUPRSS					10037
-#define IDC_GROUPSKYPE					10038
-#define IDC_GROUPTLEN					10039
-#define IDC_GROUPVOIP					10040
-#define IDC_GROUPWEATHER				10041
-#define IDC_GROUPYAHOO					10042
-
-#define IDS_IDENTIFY					11001
-#define IDC_OPTCHANGENOTE				11002
-
-//##############################################################################################################
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        2000
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         7001
-#define _APS_NEXT_SYMED_VALUE           7000
-#endif
-#endif
diff --git a/plugins/FingerPrintModPlus/src/stdafx.cpp b/plugins/FingerPrintModPlus/src/stdafx.cpp
deleted file mode 100644
index b09d93b85a..0000000000
--- a/plugins/FingerPrintModPlus/src/stdafx.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright (C) 2012 Miranda NG team (http://miranda-ng.org)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation version 2
-of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "global.h"
-\ No newline at end of file
diff --git a/plugins/FingerPrintModPlus/src/utilities.cpp b/plugins/FingerPrintModPlus/src/utilities.cpp
deleted file mode 100644
index 5b623af54b..0000000000
--- a/plugins/FingerPrintModPlus/src/utilities.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda IM
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-//Start of header
-#include "global.h"
-
-LPWSTR make_unicode_string(LPCSTR utf8);
-LPWSTR make_unicode_string_static(LPCSTR utf8, LPWSTR unicode, size_t unicode_len);
-LPSTR make_utf8_string(LPCWSTR unicode);
-LPSTR make_utf8_string_static(LPCWSTR unicode, LPSTR utf8, size_t utf_size);
-
-LPVOID __fastcall SAFE_MALLOC(size_t size)
-{
-	LPVOID p = NULL;
-
-	if (size)
-	{
-		p = malloc(size);
-
-		if (p)
-			ZeroMemory(p, size);
-	}
-	return p;
-}
-
-size_t __fastcall strlennull(LPCSTR string)
-{
-	if (string)
-		return strlen(string);
-
-	return 0;
-}
-
-int null_snprintf(LPSTR buffer, size_t count, LPCSTR fmt, ...)
-{
-	va_list va;
-	int len;
-
-	ZeroMemory(buffer, count);
-	va_start(va, fmt);
-	len = _vsnprintf(buffer, count-1, fmt, va);
-	va_end(va);
-	return len;
-}
-
-LPSTR __fastcall TranslateUtfStatic(LPCSTR src, LPSTR buf, size_t bufsize)
-{ // this takes UTF-8 strings only!!!
-	if (strlennull(src))
-	{ // we can use unicode translate (0.5+)
-		LPWSTR usrc = make_unicode_string(src);
-
-		make_utf8_string_static(TranslateW(usrc), buf, bufsize);
-
-		SAFE_FREE(usrc);
-	}
-	else
-		buf[0] = '\0';
-
-	return buf;
-}
-
-//unsigned char *make_utf8_string_static(LPCWSTR unicode, unsigned char *utf8, size_t utf_size)
-LPSTR make_utf8_string_static(LPCWSTR unicode, LPSTR utf8, size_t utf_size)
-{
-	size_t index = 0;
-	size_t out_index = 0;
-	WORD c;
-
-	c = (WORD)unicode[index++];
-	while(c)
-	{
-		if (c < 0x080)
-		{
-			if (out_index + 1 >= utf_size) break;
-			utf8[out_index++] = (CHAR)c;
-		}
-		else if (c < 0x800) 
-		{
-			if (out_index + 2 >= utf_size) break;
-			utf8[out_index++] = 0xc0 | (c >> 6);
-			utf8[out_index++] = 0x80 | (c & 0x3f);
-		}
-		else
-		{
-			if (out_index + 3 >= utf_size) break;
-			utf8[out_index++] = 0xe0 | (c >> 12);
-			utf8[out_index++] = 0x80 | ((c >> 6) & 0x3f);
-			utf8[out_index++] = 0x80 | (c & 0x3f);
-		}
-		c = (WORD)unicode[index++];
-	}
-	utf8[out_index] = 0x00;
-
-	return utf8;
-}
-
-LPSTR make_utf8_string(LPCWSTR unicode)
-{
-	size_t size = 0;
-	size_t index = 0;
-	LPSTR out;
-	WORD c;
-
-	if (!unicode) return NULL;
-
-	/* first calculate the size of the target string */
-	c = (WORD)unicode[index++];
-	while(c)
-	{
-		if (c < 0x0080)
-			size++;
-		else if (c < 0x0800)
-			size += 2;
-		else
-			size += 3;
-		c = (WORD)unicode[index++];
-	}
-
-	//out = (unsigned char*)SAFE_MALLOC(size + 1);
-	out = (LPSTR)SAFE_MALLOC(size + 1);
-	if (out == NULL)
-		return NULL;
-	else
-		return make_utf8_string_static(unicode, out, size + 1);
-}
-
-LPWSTR make_unicode_string_static(LPCSTR utf8, LPWSTR unicode, size_t unicode_len)
-{
-	size_t index = 0;
-	size_t out_index = 0;
-	BYTE c;
-
-	c = (BYTE)utf8[index++];
-	while(c)
-	{
-		if (out_index + 1 >= unicode_len) break;
-		if ((c & 0x80) == 0)
-		{
-			unicode[out_index++] = c;
-		} 
-		else if ((c & 0xe0) == 0xe0)
-		{
-			unicode[out_index] = (c & 0x1F) << 12;
-			c = (BYTE)utf8[index++];
-			unicode[out_index] |= (c & 0x3F) << 6;
-			c = (BYTE)utf8[index++];
-			unicode[out_index++] |= (c & 0x3F);
-		}
-		else
-		{
-			unicode[out_index] = (c & 0x3F) << 6;
-			c = (BYTE)utf8[index++];
-			unicode[out_index++] |= (c & 0x3F);
-		}
-		c = (BYTE)utf8[index++];
-	}
-	unicode[out_index] = 0;
-
-	return unicode;
-}
-
-LPWSTR make_unicode_string(LPCSTR utf8)
-{
-	size_t size = 0, index = 0;
-	LPWSTR out;
-	BYTE c;
-
-	if (!utf8) return NULL;
-
-	/* first calculate the size of the target string */
-	c = (BYTE)utf8[index++];
-	while(c)
-	{
-		if ((c & 0x80) == 0)
-		{
-			index += 0;
-		}
-		else if ((c & 0xe0) == 0xe0)
-		{
-			index += 2;
-		}
-		else
-		{
-			index++;
-		}
-		size++;
-		c = (BYTE)utf8[index++];
-	}
-
-	out = (LPWSTR)SAFE_MALLOC((size + 1) * sizeof(WCHAR));
-	if (out == NULL)
-		return NULL;
-	else
-		return make_unicode_string_static(utf8, out, size + 1);
-}
-
-int UTF8_IsValid(LPCSTR pszInput)
-{
-	int nb, i;
-	LPCSTR c = pszInput;
-
-	if (!pszInput) return 0;
-
-	for(c = pszInput; *c; c += (nb + 1))
-	{
-		if (!(*c & 0x80)) nb = 0;
-		else if ((*c & 0xc0) == 0x80) return 0;
-		else if ((*c & 0xe0) == 0xc0) nb = 1;
-		else if ((*c & 0xf0) == 0xe0) nb = 2;
-		else if ((*c & 0xf8) == 0xf0) nb = 3;
-		else if ((*c & 0xfc) == 0xf8) nb = 4;
-		else if ((*c & 0xfe) == 0xfc) nb = 5;
-
-		for(i = 1; i <= nb; i++) // we this forward, do not cross end of string
-			if ((*(c + i) & 0xc0) != 0x80)
-				return 0;
-	}
-
-	return 1;
-}
-
-static BOOL bHasCP_UTF8 = FALSE;
-int utf8_decode_static(LPCSTR from, LPSTR to, int to_size)
-{
-	int nResult = 0;
-	// Validate the string
-	if (!UTF8_IsValid(from))
-		return 0;
-
-	// Use the native conversion routines when available
-	if (bHasCP_UTF8)
-	{
-		LPWSTR wszTemp = NULL;
-		size_t inlen = strlennull(from);
-
-		wszTemp = (LPWSTR)_alloca((inlen + 1) * sizeof(WCHAR));
-
-		// Convert the UTF-8 string to UCS
-		if (MultiByteToWideChar(CP_UTF8, 0, from, -1, wszTemp, (int)inlen + 1))
-		{
-			// Convert the UCS string to local ANSI codepage
-			if (WideCharToMultiByte(CP_ACP, 0, wszTemp, -1, to, to_size, NULL, NULL))
-			{
-				nResult = 1;
-			}
-		}
-	}
-	else
-	{
-		size_t chars = strlennull(from) + 1;
-		LPWSTR unicode = (LPWSTR)_alloca(chars * sizeof(WCHAR));
-    
-		make_unicode_string_static(from, unicode, chars);
-
-		WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, unicode, -1, to, to_size, NULL, NULL);
-
-		nResult = 1;
-	}
-
-	return nResult;
-}
-
-static LRESULT ControlAddStringUtf(HWND ctrl, DWORD msg, LPCSTR szString)
-{
-	char str[MAX_PATH];
-	LPSTR szItem = TranslateUtfStatic(szString, str, MAX_PATH);
-	LRESULT item = -1;
-
-	LPWSTR wItem = make_unicode_string(szItem);
-	item = SendMessageW(ctrl, msg, 0, (LPARAM)wItem);
-	SAFE_FREE(wItem);
-	return item;
-}
-
-static LRESULT ControlAddStringW(HWND ctrl, DWORD msg, LPCWSTR wszString)
-{
-	return SendMessageW(ctrl, msg, 0, (LPARAM)TranslateW(wszString));
-}
-
-LRESULT ComboBoxAddStringUtf(HWND hCombo, LPCSTR szString, DWORD data)
-{
-	LRESULT item = ControlAddStringUtf(hCombo, CB_ADDSTRING, szString);
-	SendMessage(hCombo, CB_SETITEMDATA, item, data);
-
-	return item;
-}
-
-LRESULT ComboBoxAddStringW(HWND hCombo, LPCWSTR wszString, DWORD data)
-{
-	LRESULT item = ControlAddStringW(hCombo, CB_ADDSTRING, wszString);
-	SendMessageW(hCombo, CB_SETITEMDATA, item, data);
-
-	return item;
-}
-
-LRESULT ListBoxAddStringUtf(HWND hList, LPCSTR szString)
-{
-	return ControlAddStringUtf(hList, LB_ADDSTRING, szString);
-}
-
-LRESULT ListBoxAddStringW(HWND hList, LPCWSTR wszString)
-{
-	return ControlAddStringW(hList, LB_ADDSTRING, wszString);
-}
diff --git a/plugins/FingerPrintModPlus/src/utilities.h b/plugins/FingerPrintModPlus/src/utilities.h
deleted file mode 100644
index bc748d9d51..0000000000
--- a/plugins/FingerPrintModPlus/src/utilities.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda IM
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-static LRESULT ControlAddStringUtf(HWND ctrl, DWORD msg, const char* szString);
-static LRESULT ControlAddStringW(HWND ctrl, DWORD msg, LPCWSTR szString);
-
-LRESULT ComboBoxAddStringUtf(HWND hCombo, const char* szString, DWORD data);
-LRESULT ComboBoxAddStringW(HWND hCombo, LPCWSTR szString, DWORD data);
-
-LRESULT ListBoxAddStringUtf(HWND hList, const char* szString);
-LRESULT ListBoxAddStringW(HWND hList, LPCWSTR szString);
-
-#define ControlAddString	ControlAddStringW
-#define ComboBoxAddString	ComboBoxAddStringW
-#define ListBoxAddString	ListBoxAddStringW
-
diff --git a/plugins/FingerPrintModPlus/src/version.h b/plugins/FingerPrintModPlus/src/version.h
deleted file mode 100644
index 19c859c524..0000000000
--- a/plugins/FingerPrintModPlus/src/version.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Fingerprint Mod+ (client version) icons module for Miranda IM
-
-Copyright � 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#define __MAJOR_VERSION				0
-#define __MINOR_VERSION				2
-#define __RELEASE_NUM				2
-#define __BUILD_NUM					4
-
-#define __FILEVERSION_STRING        __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-
-#define __STRINGIFY_IMPL(x)			#x
-#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)
-#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)
-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)
-
-
-#define __INTERNAL_NAME_STRING "Fingerprint Mod+"
-#define __PLUGIN_ID 4300
-#define __PLUGIN_ID_STR "4300"
-#define __BETA_FILE_TITLE "fingerprint"
-
-
-#define __LEGAL_COPYRIGHT_STRING "�2009-2010 HierOS, �2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer."
-
-// Fingerprint interface ID. Should be the same for ALL fingerprint plugins.
-// {FFF4B77A-CE40-11DB-A5CD-06A755D89593}
-#define MIID_FINGERPRINT	{0xFFF4B77A, 0xCE40, 0x11DB, { 0xA5, 0xCD, 0x06, 0xA7, 0x55, 0xD8, 0x95, 0x93}}
-#define MIID_THIS_PLUGIN	{0x687364af, 0x58b0, 0x4af2, { 0xa4, 0xee, 0x20, 0xf4, 0xa,  0x8d, 0x9a, 0xfb}}
author	Vadim Dashevskiy <watcherhd@gmail.com>	2012-12-02 20:51:46 +0000
committer	Vadim Dashevskiy <watcherhd@gmail.com>	2012-12-02 20:51:46 +0000
commit	4f0bbea5843f8ab3c0242f560ea60fdf23de3ed7 (patch)
tree	8a6c33f460a8f8273e00b2cfc90c759ba7c0c9eb /plugins/FingerPrintModPlus
parent	f12bf963f7d43af7d2c7f8779eeac9d122a72d57 (diff)