ExtraIcon, Favcontacts, FileAsMessage, FingerPrintModPlus: changed folder structure

git-svn-id: http://svn.miranda-ng.org/main/trunk@1006 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
author: Vadim Dashevskiy <watcherhd@gmail.com> 2012-07-18 06:59:36 +0000
committer: Vadim Dashevskiy <watcherhd@gmail.com> 2012-07-18 06:59:36 +0000
commit: 3634576b3903f8316b1dcdc396a70f40fa43f5f5 (patch)
tree: 55f87e6fccf45c3b2e5b7adf12a1e959f2d6f12e
parent: 7a65cbd15d4f808f973d782deea2a5e1a02accd6 (diff)
599 files changed, 651 insertions, 757 deletions
diff --git a/1.bat b/1.bat
new file mode 100644
index 0000000000..46af6c93de
--- /dev/null
+++ b/1.bat
@@ -0,0 +1 @@
+del /F /S /Q /A RHS *.sdf *.suo *.user
+\ No newline at end of file
diff --git a/plugins/ExtraIcons/extraicons-translation.txt b/plugins/ExtraIcons/Docs/extraicons-translation.txt
index e0d747baa0..e0d747baa0 100644
--- a/plugins/ExtraIcons/extraicons-translation.txt
+++ b/plugins/ExtraIcons/Docs/extraicons-translation.txt
diff --git a/plugins/ExtraIcons/extraicons.vcxproj b/plugins/ExtraIcons/extraicons.vcxproj
index 2977307d90..eb438635ba 100644
--- a/plugins/ExtraIcons/extraicons.vcxproj
+++ b/plugins/ExtraIcons/extraicons.vcxproj
@@ -86,7 +86,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -115,7 +114,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -143,7 +141,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x3EC20000</BaseAddress>
@@ -168,7 +165,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <BaseAddress>0x3EC20000</BaseAddress>
@@ -179,50 +175,38 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="BaseExtraIcon.h" />
-    <ClInclude Include="CallbackExtraIcon.h" />
-    <ClInclude Include="commons.h" />
-    <ClInclude Include="DefaultExtraIcons.h" />
-    <ClInclude Include="ExtraIcon.h" />
-    <ClInclude Include="ExtraIconGroup.h" />
-    <ClInclude Include="IcolibExtraIcon.h" />
+    <ClInclude Include="src\BaseExtraIcon.h" />
+    <ClInclude Include="src\CallbackExtraIcon.h" />
+    <ClInclude Include="src\commons.h" />
+    <ClInclude Include="src\DefaultExtraIcons.h" />
+    <ClInclude Include="src\ExtraIcon.h" />
+    <ClInclude Include="src\ExtraIconGroup.h" />
+    <ClInclude Include="src\IcolibExtraIcon.h" />
     <ClInclude Include="..\utils\mir_icons.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="usedIcons.h" />
-    <ClInclude Include="Version.h" />
+    <ClInclude Include="src\options.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\usedIcons.h" />
+    <ClInclude Include="src\Version.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\AlwaysVis.ico" />
-    <None Include="res\Chatchannel.ico" />
-    <None Include="res\empty.ico" />
-    <None Include="res\female.ico" />
-    <None Include="res\male.ico" />
-    <None Include="res\NeverVis.ico" />
-    <None Include="Docs\extraicons_changelog.txt" />
-    <None Include="Docs\extraicons_readme.txt" />
-    <None Include="Docs\extraicons_version.txt" />
-    <None Include="Docs\langpack_extraicons.txt" />
+    <ResourceCompile Include="res\resource.rc" />
+    <ResourceCompile Include="res\Version.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-    <ResourceCompile Include="Version.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="BaseExtraIcon.cpp" />
-    <ClCompile Include="CallbackExtraIcon.cpp" />
-    <ClCompile Include="DefaultExtraIcons.cpp" />
-    <ClCompile Include="ExtraIcon.cpp" />
-    <ClCompile Include="ExtraIconGroup.cpp" />
-    <ClCompile Include="extraicons.cpp">
+    <ClCompile Include="src\BaseExtraIcon.cpp" />
+    <ClCompile Include="src\CallbackExtraIcon.cpp" />
+    <ClCompile Include="src\DefaultExtraIcons.cpp" />
+    <ClCompile Include="src\ExtraIcon.cpp" />
+    <ClCompile Include="src\ExtraIconGroup.cpp" />
+    <ClCompile Include="src\extraicons.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="IcolibExtraIcon.cpp" />
+    <ClCompile Include="src\IcolibExtraIcon.cpp" />
     <ClCompile Include="..\utils\mir_icons.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="usedIcons.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\usedIcons.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/ExtraIcons/extraicons.vcxproj.filters b/plugins/ExtraIcons/extraicons.vcxproj.filters
index 3e4577b99b..1956c406eb 100644
--- a/plugins/ExtraIcons/extraicons.vcxproj.filters
+++ b/plugins/ExtraIcons/extraicons.vcxproj.filters
@@ -13,117 +13,82 @@
       <UniqueIdentifier>{d6b93e43-b221-4629-bb6e-19f9fa9373a0}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
-    <Filter Include="Docs">
-      <UniqueIdentifier>{d7ab53c3-5a13-4c10-bd27-60f5549a39cd}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BaseExtraIcon.h">
+    <ClInclude Include="src\BaseExtraIcon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CallbackExtraIcon.h">
+    <ClInclude Include="src\CallbackExtraIcon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="commons.h">
+    <ClInclude Include="src\commons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="DefaultExtraIcons.h">
+    <ClInclude Include="src\DefaultExtraIcons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ExtraIcon.h">
+    <ClInclude Include="src\ExtraIcon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ExtraIconGroup.h">
+    <ClInclude Include="src\ExtraIconGroup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="IcolibExtraIcon.h">
+    <ClInclude Include="src\IcolibExtraIcon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\utils\mir_icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="src\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="usedIcons.h">
+    <ClInclude Include="src\usedIcons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Version.h">
+    <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\AlwaysVis.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\Chatchannel.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\empty.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\female.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\male.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\NeverVis.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Docs\extraicons_changelog.txt">
-      <Filter>Docs</Filter>
-    </None>
-    <None Include="Docs\extraicons_readme.txt">
-      <Filter>Docs</Filter>
-    </None>
-    <None Include="Docs\extraicons_version.txt">
-      <Filter>Docs</Filter>
-    </None>
-    <None Include="Docs\langpack_extraicons.txt">
-      <Filter>Docs</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="res\resource.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="Version.rc">
+    <ResourceCompile Include="res\Version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BaseExtraIcon.cpp">
+    <ClCompile Include="src\BaseExtraIcon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CallbackExtraIcon.cpp">
+    <ClCompile Include="src\CallbackExtraIcon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="DefaultExtraIcons.cpp">
+    <ClCompile Include="src\DefaultExtraIcons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ExtraIcon.cpp">
+    <ClCompile Include="src\ExtraIcon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ExtraIconGroup.cpp">
+    <ClCompile Include="src\ExtraIconGroup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="extraicons.cpp">
+    <ClCompile Include="src\extraicons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="IcolibExtraIcon.cpp">
+    <ClCompile Include="src\IcolibExtraIcon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\utils\mir_icons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="usedIcons.cpp">
+    <ClCompile Include="src\usedIcons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/plugins/ExtraIcons/Version.rc b/plugins/ExtraIcons/res/Version.rc
index d1da5e8d6a..d741488c4f 100644
--- a/plugins/ExtraIcons/Version.rc
+++ b/plugins/ExtraIcons/res/Version.rc
@@ -5,7 +5,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
 
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/ExtraIcons/resource.rc b/plugins/ExtraIcons/res/resource.rc
index 22cbf020df..110c265871 100644
--- a/plugins/ExtraIcons/resource.rc
+++ b/plugins/ExtraIcons/res/resource.rc
@@ -1,13 +1,11 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
-
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 #include "winresrc.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -70,12 +68,12 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ALWAYSVIS           ICON    DISCARDABLE     "res\\AlwaysVis.ico"
-IDI_NEVERVIS            ICON    DISCARDABLE     "res\\NeverVis.ico"
-IDI_CHAT                ICON    DISCARDABLE     "res\\Chatchannel.ico"
-IDI_MALE                ICON    DISCARDABLE     "res\\male.ico"
-IDI_FEMALE              ICON    DISCARDABLE     "res\\female.ico"
-IDI_EMPTY               ICON    DISCARDABLE     "res\\empty.ico"
+IDI_ALWAYSVIS           ICON     "AlwaysVis.ico"
+IDI_NEVERVIS            ICON     "NeverVis.ico"
+IDI_CHAT                ICON     "Chatchannel.ico"
+IDI_MALE                ICON     "male.ico"
+IDI_FEMALE              ICON     "female.ico"
+IDI_EMPTY               ICON     "empty.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/ExtraIcons/BaseExtraIcon.cpp b/plugins/ExtraIcons/src/BaseExtraIcon.cpp
index f1aea5438c..f1aea5438c 100644
--- a/plugins/ExtraIcons/BaseExtraIcon.cpp
+++ b/plugins/ExtraIcons/src/BaseExtraIcon.cpp
diff --git a/plugins/ExtraIcons/BaseExtraIcon.h b/plugins/ExtraIcons/src/BaseExtraIcon.h
index e484dd2e4b..e484dd2e4b 100644
--- a/plugins/ExtraIcons/BaseExtraIcon.h
+++ b/plugins/ExtraIcons/src/BaseExtraIcon.h
diff --git a/plugins/ExtraIcons/CallbackExtraIcon.cpp b/plugins/ExtraIcons/src/CallbackExtraIcon.cpp
index 3f4d368f75..3f4d368f75 100644
--- a/plugins/ExtraIcons/CallbackExtraIcon.cpp
+++ b/plugins/ExtraIcons/src/CallbackExtraIcon.cpp
diff --git a/plugins/ExtraIcons/CallbackExtraIcon.h b/plugins/ExtraIcons/src/CallbackExtraIcon.h
index 7b46c88da9..7b46c88da9 100644
--- a/plugins/ExtraIcons/CallbackExtraIcon.h
+++ b/plugins/ExtraIcons/src/CallbackExtraIcon.h
diff --git a/plugins/ExtraIcons/DefaultExtraIcons.cpp b/plugins/ExtraIcons/src/DefaultExtraIcons.cpp
index 8839aa64ae..8839aa64ae 100644
--- a/plugins/ExtraIcons/DefaultExtraIcons.cpp
+++ b/plugins/ExtraIcons/src/DefaultExtraIcons.cpp
diff --git a/plugins/ExtraIcons/DefaultExtraIcons.h b/plugins/ExtraIcons/src/DefaultExtraIcons.h
index fba4602d41..fba4602d41 100644
--- a/plugins/ExtraIcons/DefaultExtraIcons.h
+++ b/plugins/ExtraIcons/src/DefaultExtraIcons.h
diff --git a/plugins/ExtraIcons/ExtraIcon.cpp b/plugins/ExtraIcons/src/ExtraIcon.cpp
index 1aaab01e2a..1aaab01e2a 100644
--- a/plugins/ExtraIcons/ExtraIcon.cpp
+++ b/plugins/ExtraIcons/src/ExtraIcon.cpp
diff --git a/plugins/ExtraIcons/ExtraIcon.h b/plugins/ExtraIcons/src/ExtraIcon.h
index 03b0177a08..03b0177a08 100644
--- a/plugins/ExtraIcons/ExtraIcon.h
+++ b/plugins/ExtraIcons/src/ExtraIcon.h
diff --git a/plugins/ExtraIcons/ExtraIconGroup.cpp b/plugins/ExtraIcons/src/ExtraIconGroup.cpp
index e5d785008a..e5d785008a 100644
--- a/plugins/ExtraIcons/ExtraIconGroup.cpp
+++ b/plugins/ExtraIcons/src/ExtraIconGroup.cpp
diff --git a/plugins/ExtraIcons/ExtraIconGroup.h b/plugins/ExtraIcons/src/ExtraIconGroup.h
index 906509962d..906509962d 100644
--- a/plugins/ExtraIcons/ExtraIconGroup.h
+++ b/plugins/ExtraIcons/src/ExtraIconGroup.h
diff --git a/plugins/ExtraIcons/IcolibExtraIcon.cpp b/plugins/ExtraIcons/src/IcolibExtraIcon.cpp
index f7dc03ca24..f7dc03ca24 100644
--- a/plugins/ExtraIcons/IcolibExtraIcon.cpp
+++ b/plugins/ExtraIcons/src/IcolibExtraIcon.cpp
diff --git a/plugins/ExtraIcons/IcolibExtraIcon.h b/plugins/ExtraIcons/src/IcolibExtraIcon.h
index 2f142f2607..2f142f2607 100644
--- a/plugins/ExtraIcons/IcolibExtraIcon.h
+++ b/plugins/ExtraIcons/src/IcolibExtraIcon.h
diff --git a/plugins/ExtraIcons/Version.h b/plugins/ExtraIcons/src/Version.h
index c14746132e..c14746132e 100644
--- a/plugins/ExtraIcons/Version.h
+++ b/plugins/ExtraIcons/src/Version.h
diff --git a/plugins/ExtraIcons/commons.h b/plugins/ExtraIcons/src/commons.h
index d52f4bad21..d52f4bad21 100644
--- a/plugins/ExtraIcons/commons.h
+++ b/plugins/ExtraIcons/src/commons.h
diff --git a/plugins/ExtraIcons/extraicons.cpp b/plugins/ExtraIcons/src/extraicons.cpp
index e468137300..e468137300 100644
--- a/plugins/ExtraIcons/extraicons.cpp
+++ b/plugins/ExtraIcons/src/extraicons.cpp
diff --git a/plugins/ExtraIcons/options.cpp b/plugins/ExtraIcons/src/options.cpp
index 8308ac444c..8308ac444c 100644
--- a/plugins/ExtraIcons/options.cpp
+++ b/plugins/ExtraIcons/src/options.cpp
diff --git a/plugins/ExtraIcons/options.h b/plugins/ExtraIcons/src/options.h
index 5d50348c0e..5d50348c0e 100644
--- a/plugins/ExtraIcons/options.h
+++ b/plugins/ExtraIcons/src/options.h
diff --git a/plugins/ExtraIcons/resource.h b/plugins/ExtraIcons/src/resource.h
index 42525157f8..42525157f8 100644
--- a/plugins/ExtraIcons/resource.h
+++ b/plugins/ExtraIcons/src/resource.h
diff --git a/plugins/ExtraIcons/usedIcons.cpp b/plugins/ExtraIcons/src/usedIcons.cpp
index de58069293..de58069293 100644
--- a/plugins/ExtraIcons/usedIcons.cpp
+++ b/plugins/ExtraIcons/src/usedIcons.cpp
diff --git a/plugins/ExtraIcons/usedIcons.h b/plugins/ExtraIcons/src/usedIcons.h
index ef3a0f0200..ef3a0f0200 100644
--- a/plugins/ExtraIcons/usedIcons.h
+++ b/plugins/ExtraIcons/src/usedIcons.h
diff --git a/plugins/FavContacts/favcontacts-translation.txt b/plugins/FavContacts/docs/favcontacts-translation.txt
index eb2da986ca..eb2da986ca 100644
--- a/plugins/FavContacts/favcontacts-translation.txt
+++ b/plugins/FavContacts/docs/favcontacts-translation.txt
diff --git a/plugins/FavContacts/favcontacts.vcxproj b/plugins/FavContacts/favcontacts.vcxproj
index 774d61b9d4..72c5c5ed22 100644
--- a/plugins/FavContacts/favcontacts.vcxproj
+++ b/plugins/FavContacts/favcontacts.vcxproj
@@ -89,7 +89,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
@@ -99,7 +99,6 @@
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
@@ -111,7 +110,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
@@ -135,7 +134,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
@@ -159,7 +158,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
@@ -181,11 +180,7 @@
     <ClInclude Include="src\http_api.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\favorite.ico" />
-    <None Include="res\regular.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
+    <ResourceCompile Include="res\resource.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FavContacts/favcontacts.vcxproj.filters b/plugins/FavContacts/favcontacts.vcxproj.filters
index 81cec32c10..e11d680945 100644
--- a/plugins/FavContacts/favcontacts.vcxproj.filters
+++ b/plugins/FavContacts/favcontacts.vcxproj.filters
@@ -47,7 +47,7 @@
     <ClInclude Include="src\headers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\cserver.h">
@@ -61,15 +61,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\favorite.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="res\regular.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc">
+    <ResourceCompile Include="res\resource.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/FavContacts/res/favlist.ico b/plugins/FavContacts/res/favlist.ico
deleted file mode 100644
index 9b55cd0afa..0000000000
--- a/plugins/FavContacts/res/favlist.ico
+++ /dev/null
diff --git a/plugins/FavContacts/resource.rc b/plugins/FavContacts/res/resource.rc
index 1aa618c55d..a564cf90b7 100644
--- a/plugins/FavContacts/resource.rc
+++ b/plugins/FavContacts/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -28,8 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_FAVOURITE           ICON                    "res\\favorite.ico"
-IDI_REGULAR             ICON                    "res\\regular.ico"
+IDI_FAVOURITE           ICON                    "favorite.ico"
+IDI_REGULAR             ICON                    "regular.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FavContacts/res/userprefs.ico b/plugins/FavContacts/res/userprefs.ico
deleted file mode 100644
index 7028f10d03..0000000000
--- a/plugins/FavContacts/res/userprefs.ico
+++ /dev/null
diff --git a/plugins/FavContacts/src/headers.h b/plugins/FavContacts/src/headers.h
index 5e9771fd6e..12d91e847d 100644
--- a/plugins/FavContacts/src/headers.h
+++ b/plugins/FavContacts/src/headers.h
@@ -56,7 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_fontservice.h>
 #include <m_hotkeys.h>
 
-#include "../resource.h"
+#include "resource.h"
 
 struct Options
 {
diff --git a/plugins/FavContacts/resource.h b/plugins/FavContacts/src/resource.h
index 9466fd8859..9466fd8859 100644
--- a/plugins/FavContacts/resource.h
+++ b/plugins/FavContacts/src/resource.h
diff --git a/plugins/FileAsMessage/fileecho.vcxproj b/plugins/FileAsMessage/fileecho.vcxproj
index f56a0cb4d5..f85432de07 100644
--- a/plugins/FileAsMessage/fileecho.vcxproj
+++ b/plugins/FileAsMessage/fileecho.vcxproj
@@ -149,7 +149,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -167,24 +166,18 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="crc32.cpp" />
-    <ClCompile Include="dialog.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="optionsdlg.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dialog.h" />
-    <ClInclude Include="main.h" />
+    <ClCompile Include="src\crc32.cpp" />
+    <ClCompile Include="src\dialog.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\optionsdlg.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\abort.ico" />
-    <None Include="file.ico" />
-    <None Include="res\pause.ico" />
-    <None Include="res\play.ico" />
-    <None Include="res\refresh.ico" />
+    <ClInclude Include="src\dialog.h" />
+    <ClInclude Include="src\main.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resources.rc" />
+    <ResourceCompile Include="res\resources.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FileAsMessage/fileecho.vcxproj.filters b/plugins/FileAsMessage/fileecho.vcxproj.filters
index 68d28e0f7e..2668a9153b 100644
--- a/plugins/FileAsMessage/fileecho.vcxproj.filters
+++ b/plugins/FileAsMessage/fileecho.vcxproj.filters
@@ -15,24 +15,27 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dialog.cpp">
+    <ClCompile Include="src\dialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="optionsdlg.cpp">
+    <ClCompile Include="src\optionsdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crc32.cpp">
+    <ClCompile Include="src\crc32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="dialog.h">
+    <ClInclude Include="src\dialog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="main.h">
+    <ClInclude Include="src\main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/plugins/FileAsMessage/main.rc b/plugins/FileAsMessage/main.rc
deleted file mode 100644
index 73be51abff..0000000000
--- a/plugins/FileAsMessage/main.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "windows.h"
-#include "resource.h"
-IDD_OPTIONS DIALOGEX 0,0,210,164
-FONT 8,"MS Shell Dlg"
-STYLE 0x50000008
-EXSTYLE 0x00010000
-BEGIN
-  CONTROL "Hide delay",IDC_STATIC,"Static",0x50020002,15,135,88,8,0x00000000
-  CONTROL "",IDC_HIDEDELAY,"Edit",0x50010080,108,132,45,14,0x00000200
-  CONTROL "ms",IDC_STATIC,"Static",0x50020000,155,117,33,8,0x00000000
-  CONTROL "Show delay",IDC_STATIC,"Static",0x50020002,15,117,88,8,0x00000000
-  CONTROL "",IDC_SHOWDELAY,"Edit",0x50010080,108,114,45,14,0x00000200
-  CONTROL "ms",IDC_STATIC,"Static",0x50020000,155,135,40,8,0x00000000
-  CONTROL "Screen position",IDC_STATIC,"Button",0x50000007,7,6,198,90,0x00000000
-  CONTROL "",IDC_DISABLED,"MButtonClass",0x10010000,100,46,16,14,0x00000000
-  CONTROL "",IDC_LEFT,"MButtonClass",0x10010000,14,46,16,14,0x00000000
-  CONTROL "",IDC_UPLEFT,"MButtonClass",0x10010000,14,17,16,14,0x00000000
-  CONTROL "",IDC_DOWNLEFT,"MButtonClass",0x10010000,14,76,16,14,0x00000000
-  CONTROL "",IDC_RIGHT,"MButtonClass",0x10010000,182,46,16,14,0x00000000
-  CONTROL "",IDC_UPRIGHT,"MButtonClass",0x10010000,182,17,16,14,0x00000000
-  CONTROL "",IDC_DOWNRIGHT,"MButtonClass",0x10010000,182,76,16,14,0x00000000
-  CONTROL "Delays",IDC_STATIC,"Button",0x50000007,8,99,198,59,0x00000000
-END
-IDI_DISABLED ICON DISCARDABLE "res/Disabled.ico"
-IDI_LEFT ICON DISCARDABLE "res/Left.ico"
-IDI_RIGHT ICON DISCARDABLE "res/Right.ico"
-IDI_UPLEFT ICON DISCARDABLE "res/LeftUp.ico"
-IDI_UPRIGHT ICON DISCARDABLE "res/RightUp.ico"
-IDI_DOWNLEFT ICON DISCARDABLE "res/LeftDown.ico"
-IDI_DOWNRIGHT ICON DISCARDABLE "res/RightDown.ico"
diff --git a/plugins/FileAsMessage/resources.rc b/plugins/FileAsMessage/res/resources.rc
index cbca7fcacc..e9a89d8c8f 100644
--- a/plugins/FileAsMessage/resources.rc
+++ b/plugins/FileAsMessage/res/resources.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -134,11 +134,11 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_SMALLICON           ICON    DISCARDABLE     "res\\file.ico"
-IDI_STOP                ICON    DISCARDABLE     "res\\abort.ico"
-IDI_PAUSE               ICON    DISCARDABLE     "res\\pause.ico"
-IDI_PLAY                ICON    DISCARDABLE     "res\\play.ico"
-IDI_REFRESH             ICON    DISCARDABLE     "res\\refresh.ico"
+IDI_SMALLICON           ICON     "file.ico"
+IDI_STOP                ICON     "abort.ico"
+IDI_PAUSE               ICON     "pause.ico"
+IDI_PLAY                ICON     "play.ico"
+IDI_REFRESH             ICON     "refresh.ico"
 #endif    // Russian resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/FileAsMessage/crc32.cpp b/plugins/FileAsMessage/src/crc32.cpp
index ab34393f8d..ab34393f8d 100644
--- a/plugins/FileAsMessage/crc32.cpp
+++ b/plugins/FileAsMessage/src/crc32.cpp
diff --git a/plugins/FileAsMessage/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp
index f038b87a33..f038b87a33 100644
--- a/plugins/FileAsMessage/dialog.cpp
+++ b/plugins/FileAsMessage/src/dialog.cpp
diff --git a/plugins/FileAsMessage/dialog.h b/plugins/FileAsMessage/src/dialog.h
index 679742c2f6..679742c2f6 100644
--- a/plugins/FileAsMessage/dialog.h
+++ b/plugins/FileAsMessage/src/dialog.h
diff --git a/plugins/FileAsMessage/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 61dfdb512b..61dfdb512b 100644
--- a/plugins/FileAsMessage/main.cpp
+++ b/plugins/FileAsMessage/src/main.cpp
diff --git a/plugins/FileAsMessage/main.h b/plugins/FileAsMessage/src/main.h
index e21472e5a1..e21472e5a1 100644
--- a/plugins/FileAsMessage/main.h
+++ b/plugins/FileAsMessage/src/main.h
diff --git a/plugins/FileAsMessage/optionsdlg.cpp b/plugins/FileAsMessage/src/optionsdlg.cpp
index 748a118db5..748a118db5 100644
--- a/plugins/FileAsMessage/optionsdlg.cpp
+++ b/plugins/FileAsMessage/src/optionsdlg.cpp
diff --git a/plugins/FileAsMessage/resource.h b/plugins/FileAsMessage/src/resource.h
index b6a254dcf7..b6a254dcf7 100644
--- a/plugins/FileAsMessage/resource.h
+++ b/plugins/FileAsMessage/src/resource.h
diff --git a/plugins/FingerPrintModPlus/fingerprintmodplus-translation.txt b/plugins/FingerPrintModPlus/docs/fingerprintmodplus-translation.txt
index 8a4f7a12e4..8a4f7a12e4 100644
--- a/plugins/FingerPrintModPlus/fingerprintmodplus-translation.txt
+++ b/plugins/FingerPrintModPlus/docs/fingerprintmodplus-translation.txt
diff --git a/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj b/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj
index 54d3b237b8..9d7bd0c77b 100644
--- a/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj
+++ b/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj
@@ -74,8 +74,8 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FULL;_FULL;WIN32;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -92,15 +92,15 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
-      <PreprocessorDefinitions>FULL;_FULL;WIN32;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FULL;_FULL;WIN32;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -110,7 +110,7 @@
       <PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>FULL;_FULL;WIN32;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -126,16 +126,16 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <StringPooling>true</StringPooling>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>FULL;_FULL;WIN64;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>FULL;_FULL;WIN64;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -151,17 +151,16 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FULL;_FULL;WIN64;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>WIN64;FULL;_FULL;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -173,8 +172,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="res\resource.h" />
-    <ClInclude Include="res\version.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\version.h" />
     <ClInclude Include="src\fingerprints.h" />
     <ClInclude Include="src\finger_groups.h" />
     <ClInclude Include="src\global.h" />
diff --git a/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj.filters b/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj.filters
index c390f1f3ba..c052fa520c 100644
--- a/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj.filters
+++ b/plugins/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj.filters
@@ -24,10 +24,10 @@
     <ClInclude Include="src\utilities.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="res\resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="res\version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj
index ee10cd4dd9..2c844ac8df 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_AIM.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj
index 7884daeb5c..504464b74a 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_Gadu.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj
index f5dadb603e..8cc8bd2180 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_General.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj
index 4a1ff373d5..db6fbc72a5 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_ICQ.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj
index 4f8c9856fe..1182622491 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_IRC.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj
index 268290d0bb..ace42d400f 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj
@@ -22,7 +22,7 @@
     <ResourceCompile Include="..\res\icons_Jabber.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>ClientIcons_Jabber</ProjectName>
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj
index af538ca1d5..b48d7292ca 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_MRA.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj
index 26d8f46427..3b28789ef8 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_MSN.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj
index 716d666791..cf050a8ca1 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_Multiprotocols.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj
index c9981a15d0..2c89c463b0 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_Packs.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj
index b2b22fe446..fe775db2ab 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_QQ.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj
index fa8688af74..f703f87539 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_RSS.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj
index 0703f9806a..d689e42d6d 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_Skype.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj
index fc4949fc23..5cb4bf24b7 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_Tlen.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj
index 4eb3adbe33..450dfcba6e 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_VoIP.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj
index 198eaae4c0..7aed2c03da 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_Weather.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj
index cedf271b68..c1b81fff93 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj
@@ -107,7 +107,7 @@
     <ResourceCompile Include="..\res\icons_Yahoo.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\res\resource.h" />
+    <ClInclude Include="..\src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/FingerPrintModPlus/res/icons.rc b/plugins/FingerPrintModPlus/res/icons.rc
index c8e2881583..8276a03576 100644
--- a/plugins/FingerPrintModPlus/res/icons.rc
+++ b/plugins/FingerPrintModPlus/res/icons.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,9 +42,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //########################################### Other ############################################################
 //##############################################################################################################
-   IDI_NOTFOUND                   ICON    "..\\icons\\Other\\notfound.ico"
-   IDI_UNDETECTED                 ICON    "..\\icons\\Other\\undetected.ico"
-   IDI_UNKNOWN                    ICON    "..\\icons\\Other\\unknown.ico"
+   IDI_NOTFOUND                   ICON    "icons\\Other\\notfound.ico"
+   IDI_UNDETECTED                 ICON    "icons\\Other\\undetected.ico"
+   IDI_UNKNOWN                    ICON    "icons\\Other\\unknown.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/icons/AIM/AIM.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM.ico
index 2d7ba76b21..2d7ba76b21 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/AIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/AIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/AIM/AIM_4.x.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_4.x.ico
index f82188d57d..f82188d57d 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/AIM_4.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_4.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/AIM/AIM_5.x.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_5.x.ico
index 17c6907915..17c6907915 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/AIM_5.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_5.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/AIM/AIM_Mac.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mac.ico
index 7c7c073c56..7c7c073c56 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/AIM_Mac.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mac.ico
diff --git a/plugins/FingerPrintModPlus/icons/AIM/AIM_Mobile.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mobile.ico
index a37a19cbef..a37a19cbef 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/AIM_Mobile.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Mobile.ico
diff --git a/plugins/FingerPrintModPlus/icons/AIM/AIM_Triton.ico b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Triton.ico
index 8df93cc206..8df93cc206 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/AIM_Triton.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/AIM_Triton.ico
diff --git a/plugins/FingerPrintModPlus/icons/AIM/TerraIM.ico b/plugins/FingerPrintModPlus/res/icons/AIM/TerraIM.ico
index a1f32418fc..a1f32418fc 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/TerraIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/TerraIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/AIM/miniaim.ico b/plugins/FingerPrintModPlus/res/icons/AIM/miniaim.ico
index 7daf67f49f..7daf67f49f 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/miniaim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/miniaim.ico
diff --git a/plugins/FingerPrintModPlus/icons/AIM/naim.ico b/plugins/FingerPrintModPlus/res/icons/AIM/naim.ico
index 2098e69f67..2098e69f67 100644
--- a/plugins/FingerPrintModPlus/icons/AIM/naim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/AIM/naim.ico
diff --git a/plugins/FingerPrintModPlus/icons/Gadu-Gadu/Gadu_Gadu_6.ico b/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_6.ico
index 9ed0e8cb7a..9ed0e8cb7a 100644
--- a/plugins/FingerPrintModPlus/icons/Gadu-Gadu/Gadu_Gadu_6.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_6.ico
diff --git a/plugins/FingerPrintModPlus/icons/Gadu-Gadu/Gadu_Gadu_7.ico b/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_7.ico
index 59e50ec1a2..59e50ec1a2 100644
--- a/plugins/FingerPrintModPlus/icons/Gadu-Gadu/Gadu_Gadu_7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Gadu-Gadu/Gadu_Gadu_7.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/&RQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/&RQ.ico
index a420b5e8ed..a420b5e8ed 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/&RQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/&RQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/1&1.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/1&1.ico
index 994b8deb77..994b8deb77 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/1&1.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/1&1.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/Anastasia.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Anastasia.ico
index 1484d9534e..1484d9534e 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/Anastasia.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/Anastasia.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/D[i]Chat.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/D[i]Chat.ico
index 316feaf4c2..316feaf4c2 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/D[i]Chat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/D[i]Chat.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/Delphi.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Delphi.ico
index a00f558c1e..a00f558c1e 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/Delphi.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/Delphi.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/GLICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/GLICQ.ico
index 378d8de089..378d8de089 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/GLICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/GLICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/GnomeICU.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/GnomeICU.ico
index ef14568e9c..ef14568e9c 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/GnomeICU.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/GnomeICU.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/IC@.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/IC@.ico
index ff43ffdb01..ff43ffdb01 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/IC@.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/IC@.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/ICQ_2.x.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/ICQ_2.x.ico
index 7d82df796a..7d82df796a 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/ICQ_2.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/ICQ_2.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/IMadering.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/IMadering.ico
index 501ef90545..501ef90545 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/IMadering.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/IMadering.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/JICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/JICQ.ico
index 46c387fe98..46c387fe98 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/JICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/JICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/KM_Aska.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/KM_Aska.ico
index f05acbba54..f05acbba54 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/KM_Aska.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/KM_Aska.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/LibICQ2000.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/LibICQ2000.ico
index e3d26d8511..e3d26d8511 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/LibICQ2000.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/LibICQ2000.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/Licq.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Licq.ico
index 9090db1cca..9090db1cca 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/Licq.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/Licq.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/MIP.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/MIP.ico
index c63e4ac7ea..c63e4ac7ea 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/MIP.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/MIP.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/NanoICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/NanoICQ.ico
index 85524d7f85..85524d7f85 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/NanoICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/NanoICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/QIP.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/QIP.ico
index 251d6d2d0a..251d6d2d0a 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/QIP.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/QIP.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/R&Q.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/R&Q.ico
index aab46fa0c9..aab46fa0c9 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/R&Q.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/R&Q.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/SmartICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/SmartICQ.ico
index 14fb18c8bc..14fb18c8bc 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/SmartICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/SmartICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/Spambot.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Spambot.ico
index 824fd17156..824fd17156 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/Spambot.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/Spambot.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/StrICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/StrICQ.ico
index 662bee3232..662bee3232 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/StrICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/StrICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/WebICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/WebICQ.ico
index 157a6899a4..157a6899a4 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/WebICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/WebICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/YSM.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/YSM.ico
index 00e4207a67..00e4207a67 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/YSM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/YSM.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/Yeemp.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/Yeemp.ico
index a5f68d5b44..a5f68d5b44 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/Yeemp.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/Yeemp.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/alICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/alICQ.ico
index b33abe2ad3..b33abe2ad3 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/alICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/alICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/biohazard.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/biohazard.ico
index b0427a1498..b0427a1498 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/biohazard.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/biohazard.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/corepager.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/corepager.ico
index ab90b2e25c..ab90b2e25c 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/corepager.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/corepager.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/kxICQ2.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/kxICQ2.ico
index 9254f77a2b..9254f77a2b 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/kxICQ2.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/kxICQ2.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/locid.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/locid.ico
index a51040b703..a51040b703 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/locid.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/locid.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/mICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/mICQ.ico
index 53b337dfef..53b337dfef 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/mICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/mICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/nICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/nICQ.ico
index 4f2907e914..4f2907e914 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/nICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/nICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ for PocketPC.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ for PocketPC.ico
index fac72c3a84..fac72c3a84 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ for PocketPC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ for PocketPC.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ.ico
index f7243308f6..f7243308f6 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_6.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_6.ico
index 952a5675e9..952a5675e9 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_6.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_6.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_ABV.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_ABV.ico
index d345fedc0f..d345fedc0f 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_ABV.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_ABV.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Bigmir.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Bigmir.ico
index 153481e6af..153481e6af 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Bigmir.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Bigmir.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Compad.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Compad.ico
index 7d517906ea..7d517906ea 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Compad.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Compad.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Lite4.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite4.ico
index a075efb3a0..a075efb3a0 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Lite4.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite4.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Lite7.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite7.ico
index fc37f0d34f..fc37f0d34f 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Lite7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Lite7.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Netvigator.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Netvigator.ico
index cefaf9ad2f..cefaf9ad2f 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Netvigator.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Netvigator.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Pro7.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Pro7.ico
index c622909048..c622909048 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Pro7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Pro7.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Rambler.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Rambler.ico
index 8eb7a6d28a..8eb7a6d28a 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_Rambler.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_Rambler.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_iMac.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_iMac.ico
index fbaa66ce30..fbaa66ce30 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/ICQ_iMac.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/ICQ_iMac.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq 5.1.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.1.ico
index daed9c2c54..daed9c2c54 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq 5.1.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.1.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq 5.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.ico
index 002ec000e1..002ec000e1 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq 5.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 5.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq 6.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 6.ico
index 98b04863fe..98b04863fe 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq 6.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 6.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq 7.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 7.ico
index 389d0b5015..389d0b5015 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq 7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq 7.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq2000.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2000.ico
index f50be52bea..f50be52bea 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq2000.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2000.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq2001.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2001.ico
index 868ee4db69..868ee4db69 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq2001.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2001.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq2002.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2002.ico
index e2cc9b0ed5..e2cc9b0ed5 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq2002.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2002.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq2003.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2003.ico
index b22c02784d..b22c02784d 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/Icq2003.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/Icq2003.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/official/IcqLite 4.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/official/IcqLite 4.ico
index d56afea91c..d56afea91c 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/official/IcqLite 4.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/official/IcqLite 4.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/slick.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/slick.ico
index 3f0046f889..3f0046f889 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/slick.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/slick.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/smaper.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/smaper.ico
index 493bdf8f0b..493bdf8f0b 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/smaper.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/smaper.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/stICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/stICQ.ico
index 3ff3b16f91..3ff3b16f91 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/stICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/stICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/vICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/vICQ.ico
index 9a77d80faa..9a77d80faa 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/vICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/vICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/ICQ/vmICQ.ico b/plugins/FingerPrintModPlus/res/icons/ICQ/vmICQ.ico
index 0047d93b78..0047d93b78 100644
--- a/plugins/FingerPrintModPlus/icons/ICQ/vmICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/ICQ/vmICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/AmIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/AmIRC.ico
index 074acf8732..074acf8732 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/AmIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/AmIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Babbel.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Babbel.ico
index cd730a7e54..cd730a7e54 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Babbel.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Babbel.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/BersIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/BersIRC.ico
index 3190518a95..3190518a95 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/BersIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/BersIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/ChatZilla.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ChatZilla.ico
index 70efe0eac2..70efe0eac2 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/ChatZilla.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/ChatZilla.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Conversation.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Conversation.ico
index 028e927bd0..028e927bd0 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Conversation.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Conversation.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Eggdrop.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop.ico
index e02d41c6c0..e02d41c6c0 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Eggdrop.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Eggdrop_RacBot.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop_RacBot.ico
index c2f5222c19..c2f5222c19 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Eggdrop_RacBot.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Eggdrop_RacBot.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/FChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/FChat.ico
index 9de2c8b39f..9de2c8b39f 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/FChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/FChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/GDP Web Chat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/GDP Web Chat.ico
index 62730f82fd..62730f82fd 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/GDP Web Chat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/GDP Web Chat.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/GoPowerTools.ico b/plugins/FingerPrintModPlus/res/icons/IRC/GoPowerTools.ico
index 575ff82d03..575ff82d03 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/GoPowerTools.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/GoPowerTools.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/HydraIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/HydraIRC.ico
index 009ee95638..009ee95638 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/HydraIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/HydraIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/IRCXpro.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IRCXpro.ico
index 2c88e8d55c..2c88e8d55c 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/IRCXpro.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/IRCXpro.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/IRC_unknown.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IRC_unknown.ico
index 54a3b18f29..54a3b18f29 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/IRC_unknown.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/IRC_unknown.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/IceChat 5.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 5.ico
index 9b402b9f57..9b402b9f57 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/IceChat 5.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 5.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/IceChat 7.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 7.ico
index 8d18feaab7..8d18feaab7 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/IceChat 7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat 7.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/IceChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat.ico
index 76e729d2f7..76e729d2f7 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/IceChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/IceChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/KVIrc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/KVIrc.ico
index d0c199b463..d0c199b463 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/KVIrc.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/KVIrc.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Klient.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Klient.ico
index c686b77c7e..c686b77c7e 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Klient.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Klient.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Konversation.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Konversation.ico
index 4dfab48e8a..4dfab48e8a 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Konversation.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Konversation.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/NeoRa Trion.ico b/plugins/FingerPrintModPlus/res/icons/IRC/NeoRa Trion.ico
index 41e3799a42..41e3799a42 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/NeoRa Trion.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/NeoRa Trion.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Nettalk.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Nettalk.ico
index 9fdf9a5674..9fdf9a5674 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Nettalk.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Nettalk.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/NoNameScript.ico b/plugins/FingerPrintModPlus/res/icons/IRC/NoNameScript.ico
index da3fe7d929..da3fe7d929 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/NoNameScript.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/NoNameScript.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Opera.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Opera.ico
index 2d0390104f..2d0390104f 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Opera.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Opera.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/PJIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/PJIRC.ico
index d279e6e3db..d279e6e3db 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/PJIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/PJIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Pirch.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Pirch.ico
index 220d78069f..220d78069f 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Pirch.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Pirch.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/ProChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ProChat.ico
index c627e92b80..c627e92b80 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/ProChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/ProChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/SmartIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/SmartIRC.ico
index 17dc01c2f7..17dc01c2f7 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/SmartIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/SmartIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Snak.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Snak.ico
index f6f508b145..f6f508b145 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Snak.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Snak.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/SysReset.ico b/plugins/FingerPrintModPlus/res/icons/IRC/SysReset.ico
index f6cde31e8d..f6cde31e8d 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/SysReset.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/SysReset.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/VircaIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/VircaIRC.ico
index 90c28f6472..90c28f6472 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/VircaIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/VircaIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/VisionIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/VisionIRC.ico
index 9f55866ef4..9f55866ef4 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/VisionIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/VisionIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/VisualIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/VisualIRC.ico
index 73dd1a1a6b..73dd1a1a6b 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/VisualIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/VisualIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/VortecIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/VortecIRC.ico
index 49928fcaa7..49928fcaa7 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/VortecIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/VortecIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/WLIrc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/WLIrc.ico
index 474d8780df..474d8780df 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/WLIrc.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/WLIrc.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/WeeChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/WeeChat.ico
index 3b6b38b632..3b6b38b632 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/WeeChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/WeeChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/X-Chat Aqua.ico b/plugins/FingerPrintModPlus/res/icons/IRC/X-Chat Aqua.ico
index 258a6578ba..258a6578ba 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/X-Chat Aqua.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/X-Chat Aqua.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Xirc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Xirc.ico
index f9ce1a0d2f..f9ce1a0d2f 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Xirc.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Xirc.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/Xircon.ico b/plugins/FingerPrintModPlus/res/icons/IRC/Xircon.ico
index 608b8cba74..608b8cba74 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/Xircon.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/Xircon.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/ZipTorrent.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ZipTorrent.ico
index 93487f6939..93487f6939 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/ZipTorrent.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/ZipTorrent.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/aMule.ico b/plugins/FingerPrintModPlus/res/icons/IRC/aMule.ico
index 13d28001e0..13d28001e0 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/aMule.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/aMule.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/cbirc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/cbirc.ico
index 8055b6336e..8055b6336e 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/cbirc.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/cbirc.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/dIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/dIRC.ico
index 2c17d91dac..2c17d91dac 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/dIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/dIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/eMule.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule.ico
index cac21886ff..cac21886ff 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/eMule.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/eMule.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/eMule_MorphXT.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_MorphXT.ico
index cfa35f193c..cfa35f193c 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/eMule_MorphXT.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_MorphXT.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/eMule_Neo.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Neo.ico
index c52b7a0cb1..c52b7a0cb1 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/eMule_Neo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Neo.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/eMule_Xtreme.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Xtreme.ico
index 0e65fc0c51..0e65fc0c51 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/eMule_Xtreme.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_Xtreme.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/eMule_plus.ico b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_plus.ico
index 72dbdcb633..72dbdcb633 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/eMule_plus.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/eMule_plus.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/ircle.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ircle.ico
index 456a7feec4..456a7feec4 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/ircle.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/ircle.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/irssi.ico b/plugins/FingerPrintModPlus/res/icons/IRC/irssi.ico
index b8a7abea69..b8a7abea69 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/irssi.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/irssi.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/jircii.ico b/plugins/FingerPrintModPlus/res/icons/IRC/jircii.ico
index 5a38f9ecb1..5a38f9ecb1 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/jircii.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/jircii.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/jmIrc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/jmIrc.ico
index e576c402f3..e576c402f3 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/jmIrc.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/jmIrc.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/ksirc.ico b/plugins/FingerPrintModPlus/res/icons/IRC/ksirc.ico
index 70d057271b..70d057271b 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/ksirc.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/ksirc.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/mIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/mIRC.ico
index cd4020a8ca..cd4020a8ca 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/mIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/mIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/mp3script.ico b/plugins/FingerPrintModPlus/res/icons/IRC/mp3script.ico
index 964f2a2e61..964f2a2e61 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/mp3script.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/mp3script.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/pIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/pIRC.ico
index 1ef17e436c..1ef17e436c 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/pIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/pIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/piorun.ico b/plugins/FingerPrintModPlus/res/icons/IRC/piorun.ico
index f1037d52a3..f1037d52a3 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/piorun.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/piorun.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/psyBNC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/psyBNC.ico
index b04803c123..b04803c123 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/psyBNC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/psyBNC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/savIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/savIRC.ico
index c79fe7006c..c79fe7006c 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/savIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/savIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/wmIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/wmIRC.ico
index 21f5216c95..21f5216c95 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/wmIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/wmIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/xBitch.ico b/plugins/FingerPrintModPlus/res/icons/IRC/xBitch.ico
index 8f2ce34a7a..8f2ce34a7a 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/xBitch.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/xBitch.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/xChat.ico b/plugins/FingerPrintModPlus/res/icons/IRC/xChat.ico
index 792f37b5ca..792f37b5ca 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/xChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/xChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/IRC/zsIRC.ico b/plugins/FingerPrintModPlus/res/icons/IRC/zsIRC.ico
index 26875552f3..26875552f3 100644
--- a/plugins/FingerPrintModPlus/icons/IRC/zsIRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/IRC/zsIRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Akeni.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Akeni.ico
index 5dd2c6c926..5dd2c6c926 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Akeni.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Akeni.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Android.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Android.ico
index 1a6d688560..1a6d688560 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Android.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Android.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Anothr Rss Bot.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Anothr Rss Bot.ico
index 27d44e1a89..27d44e1a89 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Anothr Rss Bot.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Anothr Rss Bot.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Aqq.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Aqq.ico
index 40b26eed58..40b26eed58 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Aqq.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Aqq.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/BellSouth.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/BellSouth.ico
index 099fe07ecd..099fe07ecd 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/BellSouth.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/BellSouth.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/BitWise.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/BitWise.ico
index 2fba693e72..2fba693e72 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/BitWise.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/BitWise.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/BlackBerry.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/BlackBerry.ico
index d40cdb5036..d40cdb5036 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/BlackBerry.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/BlackBerry.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Bowline.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Bowline.ico
index 209eabf70c..209eabf70c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Bowline.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Bowline.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/BuddySpace.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/BuddySpace.ico
index ad3345ef24..ad3345ef24 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/BuddySpace.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/BuddySpace.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Chatopus.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Chatopus.ico
index c4ee122394..c4ee122394 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Chatopus.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Chatopus.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Chikka.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Chikka.ico
index 730154466c..730154466c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Chikka.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Chikka.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/ChitChat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/ChitChat.ico
index 1b2312ee49..1b2312ee49 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/ChitChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/ChitChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Coccinella.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Coccinella.ico
index 07f5a2ca87..07f5a2ca87 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Coccinella.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Coccinella.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Colibry.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Colibry.ico
index 9f72281c31..9f72281c31 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Colibry.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Colibry.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Colloquy.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Colloquy.ico
index c9634272dd..c9634272dd 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Colloquy.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Colloquy.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Desyr.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Desyr.ico
index 2427e48c6b..2427e48c6b 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Desyr.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Desyr.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Emacs.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Emacs.ico
index 71b7124194..71b7124194 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Emacs.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Emacs.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Exodus.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Exodus.ico
index c3e81b8e17..c3e81b8e17 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Exodus.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Exodus.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Eyeball Chat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Eyeball Chat.ico
index cd359a0870..cd359a0870 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Eyeball Chat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Eyeball Chat.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Facebook.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Facebook.ico
index eb23aac442..eb23aac442 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Facebook.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Facebook.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Fire.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Fire.ico
index 40ddc7b1ab..40ddc7b1ab 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Fire.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Fire.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/GCN.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GCN.ico
index 28cc5f698c..28cc5f698c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/GCN.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/GCN.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/GNU_Gadu.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GNU_Gadu.ico
index 40b9b219a8..40b9b219a8 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/GNU_Gadu.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/GNU_Gadu.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/GOIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GOIM.ico
index 0840fa46c9..0840fa46c9 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/GOIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/GOIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/GTalk Gadget.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk Gadget.ico
index f682046446..f682046446 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/GTalk Gadget.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk Gadget.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/GTalk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk.ico
index d0f10e9e69..d0f10e9e69 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/GTalk.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/GTalk.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Gabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gabber.ico
index 729bc9b0e0..729bc9b0e0 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Gabber.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Gabber.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Gajim.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gajim.ico
index 91ad77a053..91ad77a053 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Gajim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Gajim.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Gmail.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail.ico
index 09dcf65ce3..09dcf65ce3 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Gmail.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Gmail_Conference_Bot.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail_Conference_Bot.ico
index dbcc7d54fa..dbcc7d54fa 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Gmail_Conference_Bot.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Gmail_Conference_Bot.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Gnome.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gnome.ico
index ae58e8673c..ae58e8673c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Gnome.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Gnome.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/GoTalkMobile.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GoTalkMobile.ico
index d86299c12b..d86299c12b 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/GoTalkMobile.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/GoTalkMobile.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Gossip.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gossip.ico
index c0cdd46f0b..c0cdd46f0b 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Gossip.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Gossip.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/GreenThumb.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/GreenThumb.ico
index 4b298e3c31..4b298e3c31 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/GreenThumb.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/GreenThumb.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Gush.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Gush.ico
index 02c9bdbb19..02c9bdbb19 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Gush.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Gush.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/IMCom.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/IMCom.ico
index a0e3dc414e..a0e3dc414e 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/IMCom.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/IMCom.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Imified.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Imified.ico
index b958bf0ee5..b958bf0ee5 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Imified.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Imified.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Importal.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Importal.ico
index 49fd324f9d..49fd324f9d 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Importal.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Importal.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Instan-t.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Instan-t.ico
index 6e4c2744d4..6e4c2744d4 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Instan-t.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Instan-t.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Interaction.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Interaction.ico
index b651eb4435..b651eb4435 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Interaction.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Interaction.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JAJC.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JAJC.ico
index 13096e9849..13096e9849 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JAJC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JAJC.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JBother.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JBother.ico
index ac8656acf1..ac8656acf1 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JBother.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JBother.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JClaim.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JClaim.ico
index bd19a824be..bd19a824be 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JClaim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JClaim.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JMC.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JMC.ico
index 5161f07d5f..5161f07d5f 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JMC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JMC.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JWChat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JWChat.ico
index 96b6bd984b..96b6bd984b 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JWChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JWChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JWGC.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JWGC.ico
index 032bdd9a75..032bdd9a75 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JWGC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JWGC.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JabberApplet.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberApplet.ico
index 704b035510..704b035510 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JabberApplet.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberApplet.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JabberFoX.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberFoX.ico
index c87f28b49c..c87f28b49c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JabberFoX.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberFoX.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JabberMessenger.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberMessenger.ico
index 05ae27db71..05ae27db71 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JabberMessenger.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberMessenger.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JabberNaut.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberNaut.ico
index 30131ccf1f..30131ccf1f 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JabberNaut.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberNaut.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JabberWocky.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberWocky.ico
index 72e6bf47aa..72e6bf47aa 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JabberWocky.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberWocky.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/JabberZilla.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberZilla.ico
index 910f06315c..910f06315c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/JabberZilla.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/JabberZilla.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Jabber_BeOS.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabber_BeOS.ico
index 80ec6eaf75..80ec6eaf75 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Jabber_BeOS.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabber_BeOS.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Jabbin.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabbin.ico
index 8c5ef1376f..8c5ef1376f 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Jabbin.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabbin.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Jabiru.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabiru.ico
index f3ba55b573..f3ba55b573 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Jabiru.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Jabiru.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Jeti.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Jeti.ico
index c935ef7d77..c935ef7d77 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Jeti.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Jeti.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Konnekt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Konnekt.ico
index 48af506663..48af506663 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Konnekt.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Konnekt.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/LLuna.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/LLuna.ico
index a3e4de6785..a3e4de6785 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/LLuna.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/LLuna.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Laffer.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Laffer.ico
index f782a0ffcb..f782a0ffcb 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Laffer.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Laffer.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Leaf Messenger.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Leaf Messenger.ico
index f60ce37531..f60ce37531 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Leaf Messenger.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Leaf Messenger.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/LeechCraft.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/LeechCraft.ico
index ef54b8d264..ef54b8d264 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/LeechCraft.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/LeechCraft.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/LinQ.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/LinQ.ico
index cbebfe537e..cbebfe537e 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/LinQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/LinQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/M8Jabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/M8Jabber.ico
index b68951d5dd..b68951d5dd 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/M8Jabber.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/M8Jabber.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/MCabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/MCabber.ico
index 2041ace2ce..2041ace2ce 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/MCabber.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/MCabber.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/MGTalk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/MGTalk.ico
index 9bd4df764d..9bd4df764d 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/MGTalk.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/MGTalk.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Mango.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Mango.ico
index 807ceabc60..807ceabc60 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Mango.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Mango.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Mercury_Messenger.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Mercury_Messenger.ico
index 6fe30d0fcd..6fe30d0fcd 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Mercury_Messenger.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Mercury_Messenger.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/MozillaChat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/MozillaChat.ico
index afd5d692f9..afd5d692f9 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/MozillaChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/MozillaChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Neos.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Neos.ico
index 8389d7b9e4..8389d7b9e4 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Neos.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Neos.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Nitro.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Nitro.ico
index d72e39d3a7..d72e39d3a7 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Nitro.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Nitro.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Nostromo.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Nostromo.ico
index cdb7ca7d51..cdb7ca7d51 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Nostromo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Nostromo.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/OM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/OM.ico
index 4a6a5b6b92..4a6a5b6b92 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/OM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/OM.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Octro.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Octro.ico
index 70d67386c4..70d67386c4 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Octro.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Octro.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/PSI.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PSI.ico
index e71eca7465..e71eca7465 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/PSI.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/PSI.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Pandion.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Pandion.ico
index 2c8e063be9..2c8e063be9 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Pandion.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Pandion.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Papla.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Papla.ico
index 1b30efec3c..1b30efec3c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Papla.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Papla.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Psto.net.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Psto.net.ico
index ee1e35218e..ee1e35218e 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Psto.net.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Psto.net.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/PyAIMt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyAIMt.ico
index 68411ccc7d..68411ccc7d 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/PyAIMt.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/PyAIMt.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/PyICQt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyICQt.ico
index cd994f20a5..cd994f20a5 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/PyICQt.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/PyICQt.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/PyIRCt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyIRCt.ico
index fcaa822e35..fcaa822e35 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/PyIRCt.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/PyIRCt.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/PyMRAt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyMRAt.ico
index 1bd28dee69..1bd28dee69 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/PyMRAt.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/PyMRAt.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/PyMSNt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyMSNt.ico
index 6577a76fc2..6577a76fc2 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/PyMSNt.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/PyMSNt.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/PyYIMt.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/PyYIMt.ico
index 00c4cdbc00..00c4cdbc00 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/PyYIMt.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/PyYIMt.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/QTJim.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/QTJim.ico
index 20436f91f1..20436f91f1 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/QTJim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/QTJim.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/RenRen.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/RenRen.ico
index 2841cd9851..2841cd9851 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/RenRen.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/RenRen.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/SIP Communicator.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/SIP Communicator.ico
index 3aeabd542e..3aeabd542e 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/SIP Communicator.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/SIP Communicator.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Sky Messager.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Sky Messager.ico
index 710a4c866c..710a4c866c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Sky Messager.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Sky Messager.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Smack.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Smack.ico
index c5fbd3c9b4..c5fbd3c9b4 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Smack.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Smack.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/SoapBox.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/SoapBox.ico
index e3dbfbb8fa..e3dbfbb8fa 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/SoapBox.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/SoapBox.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Spark.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Spark.ico
index 50089266f3..50089266f3 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Spark.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Spark.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Spik.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Spik.ico
index 42e96964c1..42e96964c1 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Spik.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Spik.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/SworIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/SworIM.ico
index becf0d4013..becf0d4013 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/SworIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/SworIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Tapioca.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Tapioca.ico
index 7a37dbbd61..7a37dbbd61 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Tapioca.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Tapioca.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Teabot.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Teabot.ico
index b0174968a0..b0174968a0 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Teabot.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Teabot.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Telepathy.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Telepathy.ico
index b35d87d063..b35d87d063 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Telepathy.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Telepathy.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/TipicIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/TipicIM.ico
index f316201d7c..f316201d7c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/TipicIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/TipicIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Tkabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Tkabber.ico
index 4016d7af63..4016d7af63 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Tkabber.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Tkabber.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/TransactIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/TransactIM.ico
index e94e6e0f9f..e94e6e0f9f 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/TransactIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/TransactIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/TripleSoftwareIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/TripleSoftwareIM.ico
index e7181f8421..e7181f8421 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/TripleSoftwareIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/TripleSoftwareIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Vayusphere.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Vayusphere.ico
index 034fa7d690..034fa7d690 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Vayusphere.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Vayusphere.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/WTW.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WTW.ico
index 3a5b5ba4f1..3a5b5ba4f1 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/WTW.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/WTW.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/WannaChat.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WannaChat.ico
index bab246d551..bab246d551 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/WannaChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/WannaChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/WebEx.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WebEx.ico
index ebc1b1a16b..ebc1b1a16b 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/WebEx.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/WebEx.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/WhisperIM.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WhisperIM.ico
index 641e51fd50..641e51fd50 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/WhisperIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/WhisperIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/WhoisBot.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WhoisBot.ico
index 6e0849bd66..6e0849bd66 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/WhoisBot.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/WhoisBot.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Wildfire.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Wildfire.ico
index 89941a30e7..89941a30e7 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Wildfire.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Wildfire.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/WinJab.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/WinJab.ico
index 049d469984..049d469984 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/WinJab.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/WinJab.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Xiffian.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Xiffian.ico
index 4dd1f72a93..4dd1f72a93 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Xiffian.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Xiffian.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/Yambi.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/Yambi.ico
index 7cf0a8e5de..7cf0a8e5de 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/Yambi.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/Yambi.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/beejive.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/beejive.ico
index fe25acf392..fe25acf392 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/beejive.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/beejive.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/bombus.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/bombus.ico
index 0bc47f1030..0bc47f1030 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/bombus.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/bombus.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/bombusmod.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/bombusmod.ico
index 2801754430..2801754430 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/bombusmod.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/bombusmod.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/bombusqd.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/bombusqd.ico
index 1db263729f..1db263729f 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/bombusqd.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/bombusqd.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/emess.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/emess.ico
index 914b5f4212..914b5f4212 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/emess.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/emess.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/gYaber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/gYaber.ico
index 72f7b55491..72f7b55491 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/gYaber.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/gYaber.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/glu.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/glu.ico
index cca3bf4041..cca3bf4041 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/glu.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/glu.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/iGoogle.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/iGoogle.ico
index ee7c943abf..ee7c943abf 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/iGoogle.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/iGoogle.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/iMeem.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/iMeem.ico
index 8ad5587735..8ad5587735 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/iMeem.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/iMeem.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/iMov.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/iMov.ico
index e552e61418..e552e61418 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/iMov.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/iMov.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/iruka.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/iruka.ico
index 62c56814fe..62c56814fe 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/iruka.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/iruka.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/jTalk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/jTalk.ico
index 24e5898d6a..24e5898d6a 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/jTalk.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/jTalk.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/jabbim.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/jabbim.ico
index 0b87f542f8..0b87f542f8 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/jabbim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/jabbim.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/jdisk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/jdisk.ico
index 721202ac2a..721202ac2a 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/jdisk.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/jdisk.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/jrudevels.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/jrudevels.ico
index 6bb29faa8d..6bb29faa8d 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/jrudevels.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/jrudevels.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/juick.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/juick.ico
index 14cad3c4cd..14cad3c4cd 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/juick.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/juick.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/kadu.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/kadu.ico
index ed62e52e82..ed62e52e82 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/kadu.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/kadu.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/kf.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/kf.ico
index 9d00748a45..9d00748a45 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/kf.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/kf.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/landell.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/landell.ico
index 957d6775c8..957d6775c8 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/landell.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/landell.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/meinvz.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/meinvz.ico
index bda6d5348d..bda6d5348d 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/meinvz.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/meinvz.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/moJab.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/moJab.ico
index 1ea938faea..1ea938faea 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/moJab.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/moJab.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/mobber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/mobber.ico
index 2cb80ec49c..2cb80ec49c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/mobber.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/mobber.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/myJabber.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/myJabber.ico
index 661593e201..661593e201 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/myJabber.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/myJabber.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/orkut.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/orkut.ico
index 323a2e8cd3..323a2e8cd3 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/orkut.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/orkut.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/paltalk.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/paltalk.ico
index 4929d82c4d..4929d82c4d 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/paltalk.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/paltalk.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/pjc.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/pjc.ico
index ebf12bdf5b..ebf12bdf5b 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/pjc.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/pjc.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/schuelervz.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/schuelervz.ico
index a6069c911e..a6069c911e 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/schuelervz.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/schuelervz.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/smtp_transport.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/smtp_transport.ico
index bfe044db15..bfe044db15 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/smtp_transport.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/smtp_transport.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/studivz.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/studivz.ico
index 7749a07ec8..7749a07ec8 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/studivz.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/studivz.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/talkonaut.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/talkonaut.ico
index 6c7155f13c..6c7155f13c 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/talkonaut.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/talkonaut.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/twitter.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/twitter.ico
index e46ccc7548..e46ccc7548 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/twitter.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/twitter.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/vacuum.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/vacuum.ico
index b1d09122e4..b1d09122e4 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/vacuum.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/vacuum.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/wija.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/wija.ico
index fc69f43e2b..fc69f43e2b 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/wija.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/wija.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/xeus.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/xeus.ico
index 19c5b0824f..19c5b0824f 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/xeus.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/xeus.ico
diff --git a/plugins/FingerPrintModPlus/icons/Jabber/yaonline.ico b/plugins/FingerPrintModPlus/res/icons/Jabber/yaonline.ico
index cf75d455c5..cf75d455c5 100644
--- a/plugins/FingerPrintModPlus/icons/Jabber/yaonline.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Jabber/yaonline.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/MSN Mac.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN Mac.ico
index 44dabaeed0..44dabaeed0 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/MSN Mac.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/MSN Mac.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/MSN v4.5-v5.x.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v4.5-v5.x.ico
index a4540eaee6..a4540eaee6 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/MSN v4.5-v5.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v4.5-v5.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/MSN v6.x.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v6.x.ico
index 2fb63feb47..2fb63feb47 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/MSN v6.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v6.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/MSN v7.x.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v7.x.ico
index 3ec3f7e440..3ec3f7e440 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/MSN v7.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v7.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/MSN v8.x.ico b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v8.x.ico
index 8e4a3dc8a8..8e4a3dc8a8 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/MSN v8.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/MSN v8.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/WLM10-11.ico b/plugins/FingerPrintModPlus/res/icons/MSN/WLM10-11.ico
index 2c154ef5d8..2c154ef5d8 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/WLM10-11.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/WLM10-11.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/WLM9.ico b/plugins/FingerPrintModPlus/res/icons/MSN/WLM9.ico
index a2dfe8d6b5..a2dfe8d6b5 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/WLM9.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/WLM9.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/WebMessenger.ico b/plugins/FingerPrintModPlus/res/icons/MSN/WebMessenger.ico
index 9f2d38ce0b..9f2d38ce0b 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/WebMessenger.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/WebMessenger.ico
diff --git a/plugins/FingerPrintModPlus/icons/MSN/aMSN.ico b/plugins/FingerPrintModPlus/res/icons/MSN/aMSN.ico
index 07a95e539e..07a95e539e 100644
--- a/plugins/FingerPrintModPlus/icons/MSN/aMSN.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MSN/aMSN.ico
diff --git a/plugins/FingerPrintModPlus/icons/Mail.Ru/Mail.Ru_Mobile.ico b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_Mobile.ico
index 48f321e1fc..48f321e1fc 100644
--- a/plugins/FingerPrintModPlus/icons/Mail.Ru/Mail.Ru_Mobile.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_Mobile.ico
diff --git a/plugins/FingerPrintModPlus/icons/Mail.Ru/Mail.Ru_WebAgent.ico b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_WebAgent.ico
index 8e80a47002..8e80a47002 100644
--- a/plugins/FingerPrintModPlus/icons/Mail.Ru/Mail.Ru_WebAgent.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_WebAgent.ico
diff --git a/plugins/FingerPrintModPlus/icons/Mail.Ru/Mail.Ru_official.ico b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_official.ico
index 56da10df60..56da10df60 100644
--- a/plugins/FingerPrintModPlus/icons/Mail.Ru/Mail.Ru_official.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_official.ico
diff --git a/plugins/FingerPrintModPlus/icons/Mail.Ru/Mail.Ru_unknown.ico b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_unknown.ico
index 7d4d19b1b2..7d4d19b1b2 100644
--- a/plugins/FingerPrintModPlus/icons/Mail.Ru/Mail.Ru_unknown.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Mail.Ru/Mail.Ru_unknown.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/10.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/10.ico
index 3dc71f8086..3dc71f8086 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/10.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/10.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/10s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/10s.ico
index bb2b0bd10b..bb2b0bd10b 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/10s.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/10s.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/4.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/4.ico
index e1f14b8c47..e1f14b8c47 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/4.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/4.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/4s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/4s.ico
index af3cdef913..af3cdef913 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/4s.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/4s.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/5.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/5.ico
index 2ba6064762..2ba6064762 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/5.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/5.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/5s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/5s.ico
index f58fd94462..f58fd94462 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/5s.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/5s.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/6.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/6.ico
index ec58723af1..ec58723af1 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/6.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/6.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/6s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/6s.ico
index 89b77c92d2..89b77c92d2 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/6s.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/6s.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/7.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/7.ico
index 9aa81b69b1..9aa81b69b1 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/7.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/7s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/7s.ico
index a30e3c6308..a30e3c6308 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/7s.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/7s.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/8.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/8.ico
index 504c807977..504c807977 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/8.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/8.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/8s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/8s.ico
index d19c0b32f5..d19c0b32f5 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/8s.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/8s.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/9.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/9.ico
index f61e48c305..f61e48c305 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/9.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/9.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/9s.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/9s.ico
index 1f9b0d2025..1f9b0d2025 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/9s.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/9s.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_010.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010.ico
index b3f949735d..b3f949735d 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_010.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_010U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010U.ico
index c154c9ef94..c154c9ef94 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_010U.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_010U.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_04.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_04.ico
index 59ec76e2b0..59ec76e2b0 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_04.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_04.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_05.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05.ico
index ce8c786623..ce8c786623 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_05.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_05U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05U.ico
index ee2fc5e5f0..ee2fc5e5f0 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_05U.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_05U.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_06.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06.ico
index ae1e8b075f..ae1e8b075f 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_06.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_06U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06U.ico
index bcbd8ea62a..bcbd8ea62a 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_06U.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_06U.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_07.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07.ico
index f3393df560..f3393df560 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_07.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_07U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07U.ico
index 5fabd369a1..5fabd369a1 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_07U.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_07U.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_08.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08.ico
index 7be689b639..7be689b639 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_08.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_08U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08U.ico
index 30f58fbe5b..30f58fbe5b 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_08U.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_08U.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_09.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09.ico
index 7be689b639..7be689b639 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_09.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_09U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09U.ico
index 30f58fbe5b..30f58fbe5b 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_09U.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_09U.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_666.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_666.ico
index 157bd3edb6..157bd3edb6 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_666.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_666.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_U.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_U.ico
index c154c9ef94..c154c9ef94 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_U.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_U.ico
diff --git a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_unknown.ico b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_unknown.ico
index b3f949735d..b3f949735d 100644
--- a/plugins/FingerPrintModPlus/icons/MirandaIM/MirandaIM_unknown.ico
+++ b/plugins/FingerPrintModPlus/res/icons/MirandaIM/MirandaIM_unknown.ico
diff --git a/plugins/FingerPrintModPlus/icons/Other/notfound.ico b/plugins/FingerPrintModPlus/res/icons/Other/notfound.ico
index 020747cea8..020747cea8 100644
--- a/plugins/FingerPrintModPlus/icons/Other/notfound.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Other/notfound.ico
diff --git a/plugins/FingerPrintModPlus/icons/Other/undetected.ico b/plugins/FingerPrintModPlus/res/icons/Other/undetected.ico
index 322c62b943..322c62b943 100644
--- a/plugins/FingerPrintModPlus/icons/Other/undetected.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Other/undetected.ico
diff --git a/plugins/FingerPrintModPlus/icons/Other/unknown.ico b/plugins/FingerPrintModPlus/res/icons/Other/unknown.ico
index 55fb08edcc..55fb08edcc 100644
--- a/plugins/FingerPrintModPlus/icons/Other/unknown.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Other/unknown.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/Mobile QQ.ico b/plugins/FingerPrintModPlus/res/icons/QQ/Mobile QQ.ico
index 49240fec0e..49240fec0e 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/Mobile QQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/Mobile QQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/QQ 2000.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2000.ico
index c53bcd41dd..c53bcd41dd 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/QQ 2000.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2000.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/QQ 2004.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2004.ico
index 013f666ff3..013f666ff3 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/QQ 2004.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/QQ 2004.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/QQ CRM.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ CRM.ico
index 859bba24d5..859bba24d5 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/QQ CRM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/QQ CRM.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/QQ Concept.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ Concept.ico
index eddd5a5faa..eddd5a5faa 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/QQ Concept.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/QQ Concept.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/QQ International.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ International.ico
index a99a4fc558..a99a4fc558 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/QQ International.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/QQ International.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/QQ Silverlight.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ Silverlight.ico
index bbfd8fe31a..bbfd8fe31a 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/QQ Silverlight.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/QQ Silverlight.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/QQ.ico b/plugins/FingerPrintModPlus/res/icons/QQ/QQ.ico
index 38a1b1eada..38a1b1eada 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/QQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/QQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM 1.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM 1.ico
index 1ef0abe1c0..1ef0abe1c0 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM 1.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM 1.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM 2.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM 2.ico
index 85012dc0bc..85012dc0bc 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM 2.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM 2.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM 2008.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM 2008.ico
index 4b1685b09f..4b1685b09f 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM 2008.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM 2008.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM 3 QQ 2003.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM 3 QQ 2003.ico
index 6c07b7a1b0..6c07b7a1b0 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM 3 QQ 2003.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM 3 QQ 2003.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2005.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2005.ico
index 6b8450cf95..6b8450cf95 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2005.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2005.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2006.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2006.ico
index add255a825..add255a825 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2006.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2006.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2007.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2007.ico
index ef304c6793..ef304c6793 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2007.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2007.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2008.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2008.ico
index 58091c2168..58091c2168 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2008.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2008.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2009.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2009.ico
index f422cb907a..f422cb907a 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2009.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2009.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2010.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2010.ico
index b7670661c5..b7670661c5 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2010.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2010.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2011.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2011.ico
index ff36d17d88..ff36d17d88 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM QQ 2011.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM QQ 2011.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/TM.ico b/plugins/FingerPrintModPlus/res/icons/QQ/TM.ico
index c9b62cbd93..c9b62cbd93 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/TM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/TM.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/WebQQ.ico b/plugins/FingerPrintModPlus/res/icons/QQ/WebQQ.ico
index 51b3982eba..51b3982eba 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/WebQQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/WebQQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/QQ/Yam QQ.ico b/plugins/FingerPrintModPlus/res/icons/QQ/Yam QQ.ico
index e3cb6a9bdb..e3cb6a9bdb 100644
--- a/plugins/FingerPrintModPlus/icons/QQ/Yam QQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/QQ/Yam QQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/RSS/Atom 1.ico b/plugins/FingerPrintModPlus/res/icons/RSS/Atom 1.ico
index abfc7807c0..abfc7807c0 100644
--- a/plugins/FingerPrintModPlus/icons/RSS/Atom 1.ico
+++ b/plugins/FingerPrintModPlus/res/icons/RSS/Atom 1.ico
diff --git a/plugins/FingerPrintModPlus/icons/RSS/Atom 3.ico b/plugins/FingerPrintModPlus/res/icons/RSS/Atom 3.ico
index 52100ff1b6..52100ff1b6 100644
--- a/plugins/FingerPrintModPlus/icons/RSS/Atom 3.ico
+++ b/plugins/FingerPrintModPlus/res/icons/RSS/Atom 3.ico
diff --git a/plugins/FingerPrintModPlus/icons/RSS/RSS 0.9.ico b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 0.9.ico
index 38ca23ca9b..38ca23ca9b 100644
--- a/plugins/FingerPrintModPlus/icons/RSS/RSS 0.9.ico
+++ b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 0.9.ico
diff --git a/plugins/FingerPrintModPlus/icons/RSS/RSS 1.ico b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 1.ico
index d0c9475429..d0c9475429 100644
--- a/plugins/FingerPrintModPlus/icons/RSS/RSS 1.ico
+++ b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 1.ico
diff --git a/plugins/FingerPrintModPlus/icons/RSS/RSS 2.ico b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 2.ico
index fc51d5b147..fc51d5b147 100644
--- a/plugins/FingerPrintModPlus/icons/RSS/RSS 2.ico
+++ b/plugins/FingerPrintModPlus/res/icons/RSS/RSS 2.ico
diff --git a/plugins/FingerPrintModPlus/icons/Skype/Skype 1.x.ico b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 1.x.ico
index 6e764ef493..6e764ef493 100644
--- a/plugins/FingerPrintModPlus/icons/Skype/Skype 1.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 1.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/Skype/Skype 2.x.ico b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 2.x.ico
index 1ffe3a011f..1ffe3a011f 100644
--- a/plugins/FingerPrintModPlus/icons/Skype/Skype 2.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 2.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/Skype/Skype 3.x.ico b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 3.x.ico
index 07fbb024a5..07fbb024a5 100644
--- a/plugins/FingerPrintModPlus/icons/Skype/Skype 3.x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Skype/Skype 3.x.ico
diff --git a/plugins/FingerPrintModPlus/icons/Tlen/Tlen 5.ico b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 5.ico
index fe8af13dff..fe8af13dff 100644
--- a/plugins/FingerPrintModPlus/icons/Tlen/Tlen 5.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 5.ico
diff --git a/plugins/FingerPrintModPlus/icons/Tlen/Tlen 6.ico b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 6.ico
index 2afdd191cc..2afdd191cc 100644
--- a/plugins/FingerPrintModPlus/icons/Tlen/Tlen 6.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 6.ico
diff --git a/plugins/FingerPrintModPlus/icons/Tlen/Tlen 7.ico b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 7.ico
index 6c9831fb53..6c9831fb53 100644
--- a/plugins/FingerPrintModPlus/icons/Tlen/Tlen 7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen 7.ico
diff --git a/plugins/FingerPrintModPlus/icons/Tlen/Tlen.ico b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen.ico
index df6c175f9f..df6c175f9f 100644
--- a/plugins/FingerPrintModPlus/icons/Tlen/Tlen.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Tlen/Tlen.ico
diff --git a/plugins/FingerPrintModPlus/icons/VoIP/Gizmo.ico b/plugins/FingerPrintModPlus/res/icons/VoIP/Gizmo.ico
index 793ba48cc9..793ba48cc9 100644
--- a/plugins/FingerPrintModPlus/icons/VoIP/Gizmo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/VoIP/Gizmo.ico
diff --git a/plugins/FingerPrintModPlus/icons/VoIP/WengoPhone.ico b/plugins/FingerPrintModPlus/res/icons/VoIP/WengoPhone.ico
index c3c9b3a02e..c3c9b3a02e 100644
--- a/plugins/FingerPrintModPlus/icons/VoIP/WengoPhone.ico
+++ b/plugins/FingerPrintModPlus/res/icons/VoIP/WengoPhone.ico
diff --git a/plugins/FingerPrintModPlus/icons/VoIP/Zoep.ico b/plugins/FingerPrintModPlus/res/icons/VoIP/Zoep.ico
index 79556887a0..79556887a0 100644
--- a/plugins/FingerPrintModPlus/icons/VoIP/Zoep.ico
+++ b/plugins/FingerPrintModPlus/res/icons/VoIP/Zoep.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/accu.ico b/plugins/FingerPrintModPlus/res/icons/Weather/accu.ico
index 5c370e31f9..5c370e31f9 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/accu.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/accu.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/gismeteo.ico b/plugins/FingerPrintModPlus/res/icons/Weather/gismeteo.ico
index 212d5838f8..212d5838f8 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/gismeteo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/gismeteo.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/intelli.ico b/plugins/FingerPrintModPlus/res/icons/Weather/intelli.ico
index e6370e0538..e6370e0538 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/intelli.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/intelli.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/meteogid.ico b/plugins/FingerPrintModPlus/res/icons/Weather/meteogid.ico
index cddbdddeb5..cddbdddeb5 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/meteogid.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/meteogid.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/meteonovosti.ico b/plugins/FingerPrintModPlus/res/icons/Weather/meteonovosti.ico
index 46348fc70d..46348fc70d 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/meteonovosti.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/meteonovosti.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/noaa.ico b/plugins/FingerPrintModPlus/res/icons/Weather/noaa.ico
index 1d5206c330..1d5206c330 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/noaa.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/noaa.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/realmeteo.ico b/plugins/FingerPrintModPlus/res/icons/Weather/realmeteo.ico
index d385b816ef..d385b816ef 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/realmeteo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/realmeteo.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/underground.ico b/plugins/FingerPrintModPlus/res/icons/Weather/underground.ico
index 045c3988eb..045c3988eb 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/underground.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/underground.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/weather.ico b/plugins/FingerPrintModPlus/res/icons/Weather/weather.ico
index b907fc3c9c..b907fc3c9c 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/weather.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/weather.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/weather_cn.ico b/plugins/FingerPrintModPlus/res/icons/Weather/weather_cn.ico
index 41993241d5..41993241d5 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/weather_cn.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/weather_cn.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/weather_over.ico b/plugins/FingerPrintModPlus/res/icons/Weather/weather_over.ico
index e956eac7f7..e956eac7f7 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/weather_over.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/weather_over.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/weatherxml.ico b/plugins/FingerPrintModPlus/res/icons/Weather/weatherxml.ico
index ea1b4bbccd..ea1b4bbccd 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/weatherxml.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/weatherxml.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/wetter.ico b/plugins/FingerPrintModPlus/res/icons/Weather/wetter.ico
index 2036baa0a9..2036baa0a9 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/wetter.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/wetter.ico
diff --git a/plugins/FingerPrintModPlus/icons/Weather/yweather.ico b/plugins/FingerPrintModPlus/res/icons/Weather/yweather.ico
index c42698714c..c42698714c 100644
--- a/plugins/FingerPrintModPlus/icons/Weather/yweather.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Weather/yweather.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/PingBox.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/PingBox.ico
index 6e49570976..6e49570976 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/PingBox.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/PingBox.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 10.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 10.ico
index 14ce1900ea..14ce1900ea 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 10.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 10.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 5.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 5.ico
index 5a22be6fb8..5a22be6fb8 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 5.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 5.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 6.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 6.ico
index c6565cde4d..c6565cde4d 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 6.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 6.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 7.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 7.ico
index 531cc43748..531cc43748 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 7.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 8.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 8.ico
index 73cafdcb07..73cafdcb07 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo 8.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo 8.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo Go Mobile.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo Go Mobile.ico
index 196496d789..196496d789 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo Go Mobile.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo Go Mobile.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo.ico
index adaf64febb..adaf64febb 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_10.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_10.ico
index b575c5e6cb..b575c5e6cb 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_10.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_10.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_5.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_5.ico
index a3fe1e9f09..a3fe1e9f09 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_5.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_5.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_6.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_6.ico
index 00b6f25f04..00b6f25f04 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_6.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_6.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_7.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_7.ico
index ce09e47108..ce09e47108 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_7.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_7.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_8.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_8.ico
index 1323522c9a..1323522c9a 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_8.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_8.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_9.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_9.ico
index 4716d9c3d1..4716d9c3d1 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/Yahoo_9.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/Yahoo_9.ico
diff --git a/plugins/FingerPrintModPlus/icons/Yahoo/libyahoo2.ico b/plugins/FingerPrintModPlus/res/icons/Yahoo/libyahoo2.ico
index 1fab69de59..1fab69de59 100644
--- a/plugins/FingerPrintModPlus/icons/Yahoo/libyahoo2.ico
+++ b/plugins/FingerPrintModPlus/res/icons/Yahoo/libyahoo2.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Adium.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Adium.ico
index 7c7a3d247f..7c7a3d247f 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Adium.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Adium.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/AgileMobile.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/AgileMobile.ico
index d87a841f7b..d87a841f7b 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/AgileMobile.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/AgileMobile.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Ayttm.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Ayttm.ico
index 7fb3d10033..7fb3d10033 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Ayttm.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Ayttm.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/BayanICQ.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/BayanICQ.ico
index 3414210a9b..3414210a9b 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/BayanICQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/BayanICQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/BitlBee.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/BitlBee.ico
index 196f8efe87..196f8efe87 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/BitlBee.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/BitlBee.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Centericq.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Centericq.ico
index 36b6f30642..36b6f30642 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Centericq.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Centericq.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Citronim.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Citronim.ico
index 53825f29c4..53825f29c4 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Citronim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Citronim.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Digsby.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Digsby.ico
index 4257b5269d..4257b5269d 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Digsby.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Digsby.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/EKG2.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/EKG2.ico
index 72fba64294..72fba64294 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/EKG2.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/EKG2.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/EasyMessage.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/EasyMessage.ico
index 8b70f78a87..8b70f78a87 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/EasyMessage.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/EasyMessage.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Fring.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Fring.ico
index 1d070ba059..1d070ba059 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Fring.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Fring.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/GAIM.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/GAIM.ico
index 1b634b65b6..1b634b65b6 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/GAIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/GAIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/IM+.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM+.ico
index 84c86794fe..84c86794fe 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/IM+.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM+.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/IM2.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM2.ico
index 6949b09f7e..6949b09f7e 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/IM2.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/IM2.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Inlux Messenger.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Inlux Messenger.ico
index c3b31c5f96..c3b31c5f96 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Inlux Messenger.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Inlux Messenger.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Instantbird.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Instantbird.ico
index 082d0d869f..082d0d869f 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Instantbird.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Instantbird.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/JasmineIM.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/JasmineIM.ico
index dab1238e02..dab1238e02 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/JasmineIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/JasmineIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Jimm.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Jimm.ico
index 26491e3403..26491e3403 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Jimm.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Jimm.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Kopete.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Kopete.ico
index dd1f86cf57..dd1f86cf57 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Kopete.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Kopete.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Meetro.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Meetro.ico
index 840ef00211..840ef00211 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Meetro.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Meetro.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/NatSiemens.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/NatSiemens.ico
index 2a38ddf1f6..2a38ddf1f6 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/NatSiemens.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/NatSiemens.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/OneTeam.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/OneTeam.ico
index 5711775483..5711775483 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/OneTeam.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/OneTeam.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Palringo.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Palringo.ico
index b520f9b171..b520f9b171 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Palringo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Palringo.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Pidgin.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Pidgin.ico
index b3e6880afb..b3e6880afb 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Pidgin.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Pidgin.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Prelude.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Prelude.ico
index db00c912e0..db00c912e0 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Prelude.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Prelude.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Proteus.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Proteus.ico
index b4ee01981b..b4ee01981b 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Proteus.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Proteus.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/QIP 2010.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2010.ico
index 70e0241580..70e0241580 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/QIP 2010.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2010.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/QIP 2012.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2012.ico
index e4ec765b41..e4ec765b41 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/QIP 2012.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP 2012.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/QIP Infium.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP Infium.ico
index 70e0241580..70e0241580 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/QIP Infium.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP Infium.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/QIP PDA.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP PDA.ico
index 061a562f91..061a562f91 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/QIP PDA.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/QIP PDA.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Qnext.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Qnext.ico
index 6851be474d..6851be474d 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Qnext.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Qnext.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM.ico
index af988017e6..af988017e6 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_Linux.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux.ico
index 06eed2c444..06eed2c444 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_Linux.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_Linux_old.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux_old.ico
index f30e9dcce4..f30e9dcce4 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_Linux_old.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Linux_old.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_MacOSX.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX.ico
index afb6e3a1e8..afb6e3a1e8 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_MacOSX.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_MacOSX_old.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX_old.ico
index cc4c5fb62f..cc4c5fb62f 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_MacOSX_old.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_MacOSX_old.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_Win.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win.ico
index 31f9757c38..31f9757c38 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_Win.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_Win_old.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win_old.ico
index 331b3834d9..331b3834d9 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_Win_old.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_Win_old.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_other_old.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_other_old.ico
index 25baed70e7..25baed70e7 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/SIM_other_old.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/SIM_other_old.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Trillian Astra.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Astra.ico
index 42e02c7dfb..42e02c7dfb 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Trillian Astra.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Astra.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Trillian Pro.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Pro.ico
index 5888781e79..5888781e79 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Trillian Pro.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian Pro.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Trillian.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian.ico
index 70afe6d8d2..70afe6d8d2 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Trillian.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Trillian.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/Yamigo.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Yamigo.ico
index 6cbba7d241..6cbba7d241 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/Yamigo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/Yamigo.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/eBuddy.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/eBuddy.ico
index afc84a95d4..afc84a95d4 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/eBuddy.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/eBuddy.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/iChat.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/iChat.ico
index 72a1c32399..72a1c32399 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/iChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/iChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/imoim.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/imoim.ico
index c139b0c0a0..c139b0c0a0 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/imoim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/imoim.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/mChat.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/mChat.ico
index 4ebf39c24e..4ebf39c24e 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/mChat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/mChat.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/meebo.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/meebo.ico
index 433df7f464..433df7f464 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/meebo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/meebo.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/pigeon.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/pigeon.ico
index 333e0a8c0e..333e0a8c0e 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/pigeon.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/pigeon.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/python.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/python.ico
index 10549ee4e1..10549ee4e1 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/python.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/python.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/qutim.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/qutim.ico
index 8526a3dea5..8526a3dea5 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/qutim.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/qutim.ico
diff --git a/plugins/FingerPrintModPlus/icons/multi-protocol/uIM.ico b/plugins/FingerPrintModPlus/res/icons/multi-protocol/uIM.ico
index 8e8b27f8e6..8e8b27f8e6 100644
--- a/plugins/FingerPrintModPlus/icons/multi-protocol/uIM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/multi-protocol/uIM.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_AimOscar.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_AimOscar.ico
index 9c52652661..9c52652661 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_AimOscar.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_AimOscar.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_ICQJ.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ.ico
index 06fb768cc7..06fb768cc7 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_ICQJ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_ICQJ_Plus.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ_Plus.ico
index 97db43f146..97db43f146 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_ICQJ_Plus.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQJ_Plus.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_ICQM.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQM.ico
index 1e72ea45db..1e72ea45db 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_ICQM.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQM.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_ICQ_Sin.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQ_Sin.ico
index adcdcc4275..adcdcc4275 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_ICQ_Sin.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_ICQ_Sin.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_IRC.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_IRC.ico
index bae07272fc..bae07272fc 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_IRC.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_IRC.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_JGTalk.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JGTalk.ico
index 061653862e..061653862e 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_JGTalk.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JGTalk.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_JMeebo.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JMeebo.ico
index 4bb4e64f39..4bb4e64f39 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_JMeebo.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_JMeebo.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_Jabber.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Jabber.ico
index f55fb4583e..f55fb4583e 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_Jabber.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Jabber.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_MailRu.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_MailRu.ico
index c50cbb92c3..c50cbb92c3 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_MailRu.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_MailRu.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_QQ.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_QQ.ico
index f9e3912207..f9e3912207 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_QQ.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_QQ.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_Tlen.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Tlen.ico
index 44ecce6bbc..44ecce6bbc 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_Tlen.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_Tlen.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_gmail.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_gmail.ico
index ee4f45e1b5..ee4f45e1b5 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_gmail.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_gmail.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_msn.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_msn.ico
index 7bee4e6d5c..7bee4e6d5c 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Miranda client/overlay_msn.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Miranda client/overlay_msn.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Android.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Android.ico
index cc0f91559f..cc0f91559f 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Android.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Android.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Flash.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Flash.ico
index 36a24aae64..36a24aae64 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Flash.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Flash.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Java.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Java.ico
index 5641b558e5..5641b558e5 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Java.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Java.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Symbian.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Symbian.ico
index 74befa2749..74befa2749 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Symbian.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Symbian.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Windows.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Windows.ico
index 2ab31cd56c..2ab31cd56c 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_Windows.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_Windows.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_iMac.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_iMac.ico
index 0e11f643d4..0e11f643d4 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_iMac.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_iMac.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_linux.ico b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_linux.ico
index b605426c71..b605426c71 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/OS/overlay_linux.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/OS/overlay_linux.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Secure/overlay_IMsecure_arrow.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_IMsecure_arrow.ico
index 47ffb37058..47ffb37058 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Secure/overlay_IMsecure_arrow.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_IMsecure_arrow.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Secure/overlay_SecureIM_arrow.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SecureIM_arrow.ico
index 0e855dd172..0e855dd172 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Secure/overlay_SecureIM_arrow.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SecureIM_arrow.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Secure/overlay_SimpLite_arrow.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpLite_arrow.ico
index 8b4c9d3a9b..8b4c9d3a9b 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Secure/overlay_SimpLite_arrow.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpLite_arrow.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/Secure/overlay_SimpPro_arrow.ico b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpPro_arrow.ico
index 85544d349f..85544d349f 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/Secure/overlay_SimpPro_arrow.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/Secure/overlay_SimpPro_arrow.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/_blank.ico b/plugins/FingerPrintModPlus/res/icons/overlays/_blank.ico
index 74ae0e1255..74ae0e1255 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/_blank.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/_blank.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_debug.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_debug.ico
index 11a788c58c..11a788c58c 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_debug.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_debug.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_home.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_home.ico
index 36029b7589..36029b7589 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_home.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_home.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_mobile.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_mobile.ico
index 4ab82a4a77..4ab82a4a77 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_mobile.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_mobile.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_notebook.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_notebook.ico
index 7ead77c78d..7ead77c78d 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_notebook.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_notebook.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_office.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_office.ico
index b31a7cba16..b31a7cba16 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_office.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_office.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_work.ico b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_work.ico
index 95f77d9711..95f77d9711 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/overlay2/overlay_work.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/overlay2/overlay_work.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_666.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_666.ico
index c5d4596bf5..c5d4596bf5 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_666.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_666.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_AF.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_AF.ico
index 846513ebb7..846513ebb7 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_AF.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_AF.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Cappuccino.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Cappuccino.ico
index 5315c448b9..5315c448b9 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Cappuccino.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Cappuccino.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_FaithPack.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FaithPack.ico
index 3d44d86af9..3d44d86af9 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_FaithPack.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FaithPack.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_FinalPack.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FinalPack.ico
index 7f9f1e83a9..7f9f1e83a9 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_FinalPack.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_FinalPack.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_KDL.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_KDL.ico
index 1a2b1a7f73..1a2b1a7f73 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_KDL.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_KDL.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Kolich.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Kolich.ico
index a314b055c8..a314b055c8 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Kolich.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Kolich.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Lestat.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Lestat.ico
index 4c33f3d1b6..4c33f3d1b6 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Lestat.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Lestat.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_LexSys.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_LexSys.ico
index c8f8d1c4c8..c8f8d1c4c8 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_LexSys.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_LexSys.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Miranda_FR.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_FR.ico
index 1c371967f6..1c371967f6 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Miranda_FR.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_FR.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Miranda_ME.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_ME.ico
index 93d0dbf6ec..93d0dbf6ec 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Miranda_ME.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Miranda_ME.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_New_Style.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_New_Style.ico
index 2b85e1b905..2b85e1b905 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_New_Style.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_New_Style.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_RobyerPack.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_RobyerPack.ico
index f3b01cd8bf..f3b01cd8bf 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_RobyerPack.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_RobyerPack.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_SSS.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_SSS.ico
index 9507959186..9507959186 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_SSS.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_SSS.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Se7ven.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Se7ven.ico
index 409e3a9573..409e3a9573 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Se7ven.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Se7ven.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Stalker.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Stalker.ico
index 7ded7bfcf0..7ded7bfcf0 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Stalker.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Stalker.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_ValeraVi.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ValeraVi.ico
index 646a11b28b..646a11b28b 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_ValeraVi.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ValeraVi.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Yaol.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Yaol.ico
index 64dff745b2..64dff745b2 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_Yaol.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_Yaol.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_a0x.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_a0x.ico
index 17f5cc040b..17f5cc040b 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_a0x.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_a0x.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_alfamar.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_alfamar.ico
index 81ee5cf7cc..81ee5cf7cc 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_alfamar.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_alfamar.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_amatory.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_amatory.ico
index a87232910e..a87232910e 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_amatory.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_amatory.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_bri.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_bri.ico
index bdfb92c5a7..bdfb92c5a7 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_bri.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_bri.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_dar_veter.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dar_veter.ico
index 0b9b163b67..0b9b163b67 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_dar_veter.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dar_veter.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_dmikos.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dmikos.ico
index 8ca679a637..8ca679a637 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_dmikos.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_dmikos.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_e33.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_e33.ico
index adff0303fc..adff0303fc 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_e33.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_e33.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_freize.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_freize.ico
index 969e034447..969e034447 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_freize.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_freize.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_ghost.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ghost.ico
index a9b566d6d1..a9b566d6d1 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_ghost.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_ghost.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_hieros.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_hieros.ico
index b53e707612..b53e707612 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_hieros.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_hieros.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_kuzzman.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_kuzzman.ico
index cde20a9e13..cde20a9e13 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_kuzzman.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_kuzzman.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_leninpack.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_leninpack.ico
index d79e07d646..d79e07d646 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_leninpack.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_leninpack.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_mataes.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_mataes.ico
index 44677c40d9..44677c40d9 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_mataes.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_mataes.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_md.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_md.ico
index 314a9fb029..314a9fb029 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_md.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_md.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_native.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_native.ico
index 8381cbf2bf..8381cbf2bf 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_native.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_native.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_pilot.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_pilot.ico
index 267e644b69..267e644b69 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_pilot.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_pilot.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_razunter.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_razunter.ico
index ee7ef57085..ee7ef57085 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_razunter.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_razunter.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_tweety.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_tweety.ico
index ebef950336..ebef950336 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_tweety.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_tweety.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_umedon.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_umedon.ico
index e9ef5ad413..e9ef5ad413 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_umedon.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_umedon.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_watcher.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_watcher.ico
index a26cfab0cf..a26cfab0cf 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_watcher.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_watcher.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_xSpellhowleRx.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_xSpellhowleRx.ico
index a52c4ea4cc..a52c4ea4cc 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_xSpellhowleRx.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_xSpellhowleRx.ico
diff --git a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_zeleboba.ico b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_zeleboba.ico
index 37fb67b984..37fb67b984 100644
--- a/plugins/FingerPrintModPlus/icons/overlays/packs/overlay_packs_zeleboba.ico
+++ b/plugins/FingerPrintModPlus/res/icons/overlays/packs/overlay_packs_zeleboba.ico
diff --git a/plugins/FingerPrintModPlus/res/icons_AIM.rc b/plugins/FingerPrintModPlus/res/icons_AIM.rc
index 7f9661c0ee..ad083d37aa 100644
--- a/plugins/FingerPrintModPlus/res/icons_AIM.rc
+++ b/plugins/FingerPrintModPlus/res/icons_AIM.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,15 +42,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################# 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_Gadu.rc b/plugins/FingerPrintModPlus/res/icons_Gadu.rc
index b21d3e144d..b0079a9484 100644
--- a/plugins/FingerPrintModPlus/res/icons_Gadu.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Gadu.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,8 +42,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //########################################### Gadu-Gadu ########################################################
 //##############################################################################################################
-   IDI_GADU_GADU_6                ICON    "..\\icons\\Gadu-Gadu\\Gadu_Gadu_6.ico"
-   IDI_GADU_GADU_7                ICON    "..\\icons\\Gadu-Gadu\\Gadu_Gadu_7.ico"
+   IDI_GADU_GADU_6                ICON    "icons\\Gadu-Gadu\\Gadu_Gadu_6.ico"
+   IDI_GADU_GADU_7                ICON    "icons\\Gadu-Gadu\\Gadu_Gadu_7.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_General.rc b/plugins/FingerPrintModPlus/res/icons_General.rc
index a1083b96b9..05fdcc6ede 100644
--- a/plugins/FingerPrintModPlus/res/icons_General.rc
+++ b/plugins/FingerPrintModPlus/res/icons_General.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,36 +42,36 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################### 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_UNKNOWN     ICON    "..\\icons\\MirandaIM\\MirandaIM_unknown.ico"
+   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_UNKNOWN     ICON    "icons\\MirandaIM\\MirandaIM_unknown.ico"
 
 //##############################################################################################################
 //################################################## Overlays ##################################################
@@ -80,44 +80,44 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //##################################### 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"
+   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"
+   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"
+   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"
+   IDI_BLANK                      ICON    "icons\\overlays\\_blank.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_ICQ.rc b/plugins/FingerPrintModPlus/res/icons_ICQ.rc
index f57d73981a..1a730956ce 100644
--- a/plugins/FingerPrintModPlus/res/icons_ICQ.rc
+++ b/plugins/FingerPrintModPlus/res/icons_ICQ.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,58 +42,58 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //########################################## 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"
+   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"
+   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 ##################################################
@@ -103,15 +103,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //################################# 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_IRC.rc b/plugins/FingerPrintModPlus/res/icons_IRC.rc
index 5737349c61..311d20840e 100644
--- a/plugins/FingerPrintModPlus/res/icons_IRC.rc
+++ b/plugins/FingerPrintModPlus/res/icons_IRC.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,68 +42,68 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################ 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_Jabber.rc b/plugins/FingerPrintModPlus/res/icons_Jabber.rc
index a18ace95ea..78a27c02bc 100644
--- a/plugins/FingerPrintModPlus/res/icons_Jabber.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Jabber.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,150 +42,150 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################## 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_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"
+   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_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 ##################################################
@@ -195,12 +195,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //########################################### 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_MRA.rc b/plugins/FingerPrintModPlus/res/icons_MRA.rc
index c4cb62bd13..60e8b0c7d8 100644
--- a/plugins/FingerPrintModPlus/res/icons_MRA.rc
+++ b/plugins/FingerPrintModPlus/res/icons_MRA.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,10 +42,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //########################################### 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_MSN.rc b/plugins/FingerPrintModPlus/res/icons_MSN.rc
index cf98f3f38c..7259133b43 100644
--- a/plugins/FingerPrintModPlus/res/icons_MSN.rc
+++ b/plugins/FingerPrintModPlus/res/icons_MSN.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,16 +42,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################### 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc b/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc
index e352a022fc..465358cb24 100644
--- a/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Multiprotocols.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,58 +42,58 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //#################################### 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_Packs.rc b/plugins/FingerPrintModPlus/res/icons_Packs.rc
index f8e1aedd6a..baa6e55b35 100644
--- a/plugins/FingerPrintModPlus/res/icons_Packs.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Packs.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -46,46 +46,46 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //############################################## 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_QQ.rc b/plugins/FingerPrintModPlus/res/icons_QQ.rc
index d5d336ade1..11eaa23c9c 100644
--- a/plugins/FingerPrintModPlus/res/icons_QQ.rc
+++ b/plugins/FingerPrintModPlus/res/icons_QQ.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,32 +42,32 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //############################################QQ###############################################################
 //##############################################################################################################
-   IDI_MOBILEQQ			  ICON    "..\\icons\\QQ\\Mobile QQ.ico"
-   IDI_QQ				  ICON    "..\\icons\\QQ\\QQ.ico"
-   IDI_QQCONCEPT		  ICON    "..\\icons\\QQ\\QQ Concept.ico"
-   IDI_QQCRM			  ICON    "..\\icons\\QQ\\QQ CRM.ico"
-   IDI_QQINT			  ICON    "..\\icons\\QQ\\QQ International.ico"
-   IDI_QQSILVER			  ICON    "..\\icons\\QQ\\QQ Silverlight.ico"
-   IDI_TM				  ICON    "..\\icons\\QQ\\TM.ico"
-   IDI_TM2008			  ICON    "..\\icons\\QQ\\TM 2008.ico"
-   IDI_WEBQQ			  ICON    "..\\icons\\QQ\\WebQQ.ico"
-   IDI_YAMQQ			  ICON    "..\\icons\\QQ\\Yam QQ.ico"
+   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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_RSS.rc b/plugins/FingerPrintModPlus/res/icons_RSS.rc
index 6de09adb95..5f34b3cd7e 100644
--- a/plugins/FingerPrintModPlus/res/icons_RSS.rc
+++ b/plugins/FingerPrintModPlus/res/icons_RSS.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,11 +42,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //############################################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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_Skype.rc b/plugins/FingerPrintModPlus/res/icons_Skype.rc
index 4b8e87ca43..46f7e1ec86 100644
--- a/plugins/FingerPrintModPlus/res/icons_Skype.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Skype.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,9 +42,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //############################################# 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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_Tlen.rc b/plugins/FingerPrintModPlus/res/icons_Tlen.rc
index c43897934f..c7751d2602 100644
--- a/plugins/FingerPrintModPlus/res/icons_Tlen.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Tlen.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,14 +42,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################### Tlen #####################################################
 //##############################################################################################################
-   IDI_TLEN                ICON    "..\\icons\\Tlen\\Tlen.ico"
+   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"
+   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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_VoIP.rc b/plugins/FingerPrintModPlus/res/icons_VoIP.rc
index 9e36bbba38..72377b5508 100644
--- a/plugins/FingerPrintModPlus/res/icons_VoIP.rc
+++ b/plugins/FingerPrintModPlus/res/icons_VoIP.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,9 +42,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //######################################### VoIP clients #######################################################
 //##############################################################################################################
-   IDI_GIZMO               ICON    "..\\icons\\VoIP\\Gizmo.ico"
-   IDI_WENGOPHONE          ICON    "..\\icons\\VoIP\\WengoPhone.ico"
-   IDI_ZOEP                ICON    "..\\icons\\VoIP\\Zoep.ico"
+   IDI_GIZMO               ICON    "icons\\VoIP\\Gizmo.ico"
+   IDI_WENGOPHONE          ICON    "icons\\VoIP\\WengoPhone.ico"
+   IDI_ZOEP                ICON    "icons\\VoIP\\Zoep.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_Weather.rc b/plugins/FingerPrintModPlus/res/icons_Weather.rc
index 59f6d6fafb..cc2f04507a 100644
--- a/plugins/FingerPrintModPlus/res/icons_Weather.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Weather.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,19 +42,19 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //############################################# 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"
+   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 ##################################################
@@ -63,7 +63,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################# Weather overlays ###########################################################
 //##############################################################################################################
-   IDI_CLIENT_WEATHER      ICON    "..\\icons\\Weather\\weather_over.ico"
+   IDI_CLIENT_WEATHER      ICON    "icons\\Weather\\weather_over.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/icons_Yahoo.rc b/plugins/FingerPrintModPlus/res/icons_Yahoo.rc
index 7c4e253b3f..8cb3a061a5 100644
--- a/plugins/FingerPrintModPlus/res/icons_Yahoo.rc
+++ b/plugins/FingerPrintModPlus/res/icons_Yahoo.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 //
 // Generated from the TEXTINCLUDE 2 resource.
@@ -42,15 +42,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################################ Yahoo #######################################################
 //##############################################################################################################
-   IDI_LIBYAHOO2           ICON    "..\\icons\\Yahoo\\libyahoo2.ico"
-   IDI_PINGBOX	           ICON    "..\\icons\\Yahoo\\PingBox.ico"
-   IDI_YAHOO               ICON    "..\\icons\\Yahoo\\Yahoo.ico"
-   IDI_YAHOO5              ICON    "..\\icons\\Yahoo\\Yahoo 5.ico"
-   IDI_YAHOO6              ICON    "..\\icons\\Yahoo\\Yahoo 6.ico"
-   IDI_YAHOO7              ICON    "..\\icons\\Yahoo\\Yahoo 7.ico"
-   IDI_YAHOO8              ICON    "..\\icons\\Yahoo\\Yahoo 8.ico"
-   IDI_YAHOO10             ICON    "..\\icons\\Yahoo\\Yahoo 10.ico"
-   IDI_YAHOO_GO_MOBILE     ICON    "..\\icons\\Yahoo\\Yahoo Go Mobile.ico"
+   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 ##################################################
@@ -59,12 +59,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //##############################################################################################################
 //################################# Yahoo overlays #############################################################
 //##############################################################################################################
-   IDI_CLIENT_YAHOO5       ICON    "..\\icons\\Yahoo\\Yahoo_5.ico"
-   IDI_CLIENT_YAHOO6       ICON    "..\\icons\\Yahoo\\Yahoo_6.ico"
-   IDI_CLIENT_YAHOO7       ICON    "..\\icons\\Yahoo\\Yahoo_7.ico"
-   IDI_CLIENT_YAHOO8       ICON    "..\\icons\\Yahoo\\Yahoo_8.ico"
-   IDI_CLIENT_YAHOO9       ICON    "..\\icons\\Yahoo\\Yahoo_9.ico"
-   IDI_CLIENT_YAHOO10      ICON    "..\\icons\\Yahoo\\Yahoo_10.ico"
+   IDI_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"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/resource.rc b/plugins/FingerPrintModPlus/res/resource.rc
index 1318f68aa9..65ebf8141c 100644
--- a/plugins/FingerPrintModPlus/res/resource.rc
+++ b/plugins/FingerPrintModPlus/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/FingerPrintModPlus/res/version.rc b/plugins/FingerPrintModPlus/res/version.rc
index 73edefef46..6f15a7f17c 100644
--- a/plugins/FingerPrintModPlus/res/version.rc
+++ b/plugins/FingerPrintModPlus/res/version.rc
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif //APSTUDIO_INVOKED
 
 #include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/FingerPrintModPlus/res/resource.h b/plugins/FingerPrintModPlus/src/resource.h
index 1752072d86..1752072d86 100644
--- a/plugins/FingerPrintModPlus/res/resource.h
+++ b/plugins/FingerPrintModPlus/src/resource.h
diff --git a/plugins/FingerPrintModPlus/res/version.h b/plugins/FingerPrintModPlus/src/version.h
index 19c859c524..19c859c524 100644
--- a/plugins/FingerPrintModPlus/res/version.h
+++ b/plugins/FingerPrintModPlus/src/version.h
diff --git a/plugins/PackUpdater_new/PackUpdater_10.vcxproj.user b/plugins/PackUpdater_new/PackUpdater_10.vcxproj.user
deleted file mode 100644
index 695b5c78b9..0000000000
--- a/plugins/PackUpdater_new/PackUpdater_10.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
-\ No newline at end of file
diff --git a/plugins/PackUpdater_new/PackUpdater_10_new.vcxproj.user b/plugins/PackUpdater_new/PackUpdater_10_new.vcxproj.user
deleted file mode 100644
index 695b5c78b9..0000000000
--- a/plugins/PackUpdater_new/PackUpdater_10_new.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
-\ No newline at end of file
author	Vadim Dashevskiy <watcherhd@gmail.com>	2012-07-18 06:59:36 +0000
committer	Vadim Dashevskiy <watcherhd@gmail.com>	2012-07-18 06:59:36 +0000
commit	3634576b3903f8316b1dcdc396a70f40fa43f5f5 (patch)
tree	55f87e6fccf45c3b2e5b7adf12a1e959f2d6f12e
parent	7a65cbd15d4f808f973d782deea2a5e1a02accd6 (diff)