99 files changed, 139 insertions, 66 deletions
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
index a00d82d3d5..87ac00bf4b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -94,7 +94,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -117,12 +117,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h" />
-    <ClInclude Include="icons_version.h" />
+    <ClInclude Include="src\icons.h" />
+    <ClInclude Include="src\icons_version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons.rc" />
-    <ResourceCompile Include="icons_version.rc" />
+    <ResourceCompile Include="res\icons.rc" />
+    <ResourceCompile Include="res\icons_version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj.filters b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj.filters
index 8b304d260d..d113f16f5b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj.filters
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
@@ -15,18 +11,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h">
+    <ClInclude Include="src\icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icons_version.h">
+    <ClInclude Include="src\icons_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons.rc">
+    <ResourceCompile Include="res\icons.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="icons_version.rc">
+    <ResourceCompile Include="res\icons_version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
index d1ee7631a1..5e49622b34 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -94,7 +94,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -117,12 +117,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h" />
-    <ClInclude Include="icons_version.h" />
+    <ClInclude Include="src\icons.h" />
+    <ClInclude Include="src\icons_version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons_version.rc" />
-    <ResourceCompile Include="icons_z2.rc" />
+    <ResourceCompile Include="res\icons_version.rc" />
+    <ResourceCompile Include="res\icons_z2.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj.filters b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj.filters
index 679dc605bd..ca2c9e7650 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj.filters
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
@@ -15,18 +11,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h">
+    <ClInclude Include="src\icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icons_version.h">
+    <ClInclude Include="src\icons_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons_version.rc">
+    <ResourceCompile Include="res\icons_version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="icons_z2.rc">
+    <ResourceCompile Include="res\icons_z2.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/UserInfoEx/IconPacks/ice/Anniversary.ico b/plugins/UserInfoEx/IconPacks/ice/res/Anniversary.ico
index 5ade05b164..5ade05b164 100644
--- a/plugins/UserInfoEx/IconPacks/ice/Anniversary.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/Anniversary.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/Search.ico b/plugins/UserInfoEx/IconPacks/ice/res/Search.ico
index 01c82c6970..01c82c6970 100644
--- a/plugins/UserInfoEx/IconPacks/ice/Search.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/Search.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/address.ico b/plugins/UserInfoEx/IconPacks/ice/res/address.ico
index b12d3bace8..b12d3bace8 100644
--- a/plugins/UserInfoEx/IconPacks/ice/address.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/address.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/AnnList.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/AnnList.ico
index 29f7ac620b..29f7ac620b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/AnnList.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/AnnList.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta0.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta0.ico
index 29f7ac620b..29f7ac620b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta0.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta0.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta1.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta1.ico
index 2028f0fa21..2028f0fa21 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta1.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta1.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta2.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta2.ico
index b287f5edc9..b287f5edc9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta2.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta2.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta3.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta3.ico
index 10880e39dc..10880e39dc 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta3.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta3.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta4.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta4.ico
index d3a791f264..d3a791f264 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta4.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta4.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta5.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta5.ico
index 816c1f7e73..816c1f7e73 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta5.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta5.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta6.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta6.ico
index 57698e51c1..57698e51c1 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta6.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta6.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta7.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta7.ico
index 272dcba4e2..272dcba4e2 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta7.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta7.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta8.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta8.ico
index 8114b38981..8114b38981 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta8.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta8.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta9.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta9.ico
index a76627e93a..a76627e93a 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta9.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta9.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dtax.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dtax.ico
index 1db4ae540f..1db4ae540f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dtax.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dtax.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/backup.ico b/plugins/UserInfoEx/IconPacks/ice/res/backup.ico
index be4f150bba..be4f150bba 100644
--- a/plugins/UserInfoEx/IconPacks/ice/backup.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/backup.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday.ico
index a826639236..a826639236 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb0.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb0.ico
index a826639236..a826639236 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb0.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb0.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb1.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb1.ico
index d01b8994cf..d01b8994cf 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb1.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb1.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb2.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb2.ico
index e299d640ae..e299d640ae 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb2.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb2.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb3.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb3.ico
index a5f6c8ef1a..a5f6c8ef1a 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb3.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb3.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb4.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb4.ico
index 5ebb2acf03..5ebb2acf03 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb4.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb4.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb5.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb5.ico
index 55ccefde29..55ccefde29 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb5.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb5.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb6.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb6.ico
index ec5789d521..ec5789d521 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb6.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb6.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb7.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb7.ico
index 58577f7594..58577f7594 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb7.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb7.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb8.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb8.ico
index fa718fc68c..fa718fc68c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb8.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb8.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb9.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb9.ico
index dfb98ad3ba..dfb98ad3ba 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb9.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb9.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtbX.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtbX.ico
index e3d87ec3c0..e3d87ec3c0 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtbX.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtbX.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnAdd.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnAdd.ico
index fa37e9357c..fa37e9357c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnAdd.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnAdd.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnApply.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnApply.ico
index 82a63473cc..82a63473cc 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnApply.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnApply.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnClose.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnClose.ico
index 9433c50698..9433c50698 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnClose.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnClose.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnDelete.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnDelete.ico
index 0509e4400f..0509e4400f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnDelete.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnDelete.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnDownarrow.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnDownarrow.ico
index fb3f085bc7..fb3f085bc7 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnDownarrow.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnDownarrow.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnEdit.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnEdit.ico
index b09cff0c9d..b09cff0c9d 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnEdit.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnEdit.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnGoto.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnGoto.ico
index 63c082b5d5..63c082b5d5 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnGoto.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnGoto.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnOk.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnOk.ico
index 5bf142d1f5..5bf142d1f5 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnOk.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnOk.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnUpdate.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnUpdate.ico
index a389a6798d..a389a6798d 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnUpdate.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnUpdate.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btneximport.ico b/plugins/UserInfoEx/IconPacks/ice/res/btneximport.ico
index 9c3a6c7b6d..9c3a6c7b6d 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btneximport.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btneximport.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/clock.ico b/plugins/UserInfoEx/IconPacks/ice/res/clock.ico
index 625d8c4c06..625d8c4c06 100644
--- a/plugins/UserInfoEx/IconPacks/ice/clock.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/clock.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/default.ico b/plugins/UserInfoEx/IconPacks/ice/res/default.ico
index 8b3af75f05..8b3af75f05 100644
--- a/plugins/UserInfoEx/IconPacks/ice/default.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/default.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/dlgDetails.ico b/plugins/UserInfoEx/IconPacks/ice/res/dlgDetails.ico
index e501ec7c4f..e501ec7c4f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/dlgDetails.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/dlgDetails.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/dlgMail.ico b/plugins/UserInfoEx/IconPacks/ice/res/dlgMail.ico
index 8d87fa5a3f..8d87fa5a3f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/dlgMail.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/dlgMail.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/dlgPhone.ico b/plugins/UserInfoEx/IconPacks/ice/res/dlgPhone.ico
index 3d13b10d46..3d13b10d46 100644
--- a/plugins/UserInfoEx/IconPacks/ice/dlgPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/dlgPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/export.ico b/plugins/UserInfoEx/IconPacks/ice/res/export.ico
index e2b5b596a8..e2b5b596a8 100644
--- a/plugins/UserInfoEx/IconPacks/ice/export.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/export.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/female.ico b/plugins/UserInfoEx/IconPacks/ice/res/female.ico
index fe1cbd2bce..fe1cbd2bce 100644
--- a/plugins/UserInfoEx/IconPacks/ice/female.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/female.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons.rc b/plugins/UserInfoEx/IconPacks/ice/res/icons.rc
index a018fb1382..7a7844370f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons.rc
+++ b/plugins/UserInfoEx/IconPacks/ice/res/icons.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "../icons.h"
+#include "..\src\icons.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_version.rc b/plugins/UserInfoEx/IconPacks/ice/res/icons_version.rc
index afcc2bb426..13c13aaee5 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_version.rc
+++ b/plugins/UserInfoEx/IconPacks/ice/res/icons_version.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "icons_version.h"
+#include "..\src\icons_version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -61,34 +61,3 @@ VS_VERSION_INFO VERSIONINFO
 
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-END
-
-#endif    // APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_z2.rc b/plugins/UserInfoEx/IconPacks/ice/res/icons_z2.rc
index b88784a6ac..6a8291a879 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_z2.rc
+++ b/plugins/UserInfoEx/IconPacks/ice/res/icons_z2.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "../icons.h"
+#include "..\src\icons.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/UserInfoEx/IconPacks/ice/import.ico b/plugins/UserInfoEx/IconPacks/ice/res/import.ico
index 900ccca6f4..900ccca6f4 100644
--- a/plugins/UserInfoEx/IconPacks/ice/import.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/import.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstCellular.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstCellular.ico
index 3d13b10d46..3d13b10d46 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstCellular.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstCellular.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstCustomPhone.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstCustomPhone.ico
index 3afc88a85f..3afc88a85f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstCustomPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstCustomPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstEmail.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstEmail.ico
index 7ae4607452..7ae4607452 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstEmail.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstEmail.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstFax.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstFax.ico
index 3d13b10d46..3d13b10d46 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstFax.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstFax.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstFolder.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstFolder.ico
index e1c1008fac..e1c1008fac 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstFolder.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstFolder.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstModules.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstModules.ico
index 8a9e089fa9..8a9e089fa9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstModules.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstModules.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstPhone.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstPhone.ico
index 3afc88a85f..3afc88a85f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/main.ico b/plugins/UserInfoEx/IconPacks/ice/res/main.ico
index 8d5d317df1..8d5d317df1 100644
--- a/plugins/UserInfoEx/IconPacks/ice/main.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/main.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/male.ico b/plugins/UserInfoEx/IconPacks/ice/res/male.ico
index ebd0420554..ebd0420554 100644
--- a/plugins/UserInfoEx/IconPacks/ice/male.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/male.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/marital.ico b/plugins/UserInfoEx/IconPacks/ice/res/marital.ico
index 23eae17734..23eae17734 100644
--- a/plugins/UserInfoEx/IconPacks/ice/marital.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/marital.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/miranda.ico b/plugins/UserInfoEx/IconPacks/ice/res/miranda.ico
index 8b04a3bb30..8b04a3bb30 100644
--- a/plugins/UserInfoEx/IconPacks/ice/miranda.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/miranda.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/password.ico b/plugins/UserInfoEx/IconPacks/ice/res/password.ico
index c598650631..c598650631 100644
--- a/plugins/UserInfoEx/IconPacks/ice/password.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/password.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeAbout.ICO b/plugins/UserInfoEx/IconPacks/ice/res/treeAbout.ICO
index 8a6347b2d3..8a6347b2d3 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeAbout.ICO
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeAbout.ICO
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeAdvanced.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeAdvanced.ico
index 07d0c449bb..07d0c449bb 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeAdvanced.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeAdvanced.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeCompany.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeCompany.ico
index a8b19b3ab6..a8b19b3ab6 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeCompany.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeCompany.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeContact.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeContact.ico
index 8a6347b2d3..8a6347b2d3 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeContact.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeContact.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeGeneral.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeGeneral.ico
index 1fa668ed49..1fa668ed49 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeGeneral.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeGeneral.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeNotes.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeNotes.ico
index e3b1dbc7d4..e3b1dbc7d4 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeNotes.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeNotes.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treePhoto.ICO b/plugins/UserInfoEx/IconPacks/ice/res/treePhoto.ICO
index 4b84b8e02b..4b84b8e02b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treePhoto.ICO
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treePhoto.ICO
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeProfile.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeProfile.ico
index 11e884ed0f..11e884ed0f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeProfile.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeProfile.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/aquarius.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/aquarius.ico
index 71e908f98f..71e908f98f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/aquarius.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/aquarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/aries.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/aries.ico
index a83c33f252..a83c33f252 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/aries.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/aries.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/cancer.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/cancer.ico
index 059cc16a1e..059cc16a1e 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/cancer.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/cancer.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/capricorn.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/capricorn.ico
index 50892bb347..50892bb347 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/capricorn.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/capricorn.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/gemini.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/gemini.ico
index 1d11882c1c..1d11882c1c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/gemini.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/gemini.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/leo.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/leo.ico
index 87daea39f6..87daea39f6 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/leo.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/leo.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/libra.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/libra.ico
index 728c428883..728c428883 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/libra.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/libra.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/pisces.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/pisces.ico
index 8e85ba4e52..8e85ba4e52 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/pisces.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/pisces.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/sagittarius.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/sagittarius.ico
index 5d82ba7828..5d82ba7828 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/sagittarius.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/sagittarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/scorpio.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/scorpio.ico
index 59f93e8dfd..59f93e8dfd 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/scorpio.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/scorpio.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/taurus.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/taurus.ico
index 4583f28bef..4583f28bef 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/taurus.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/taurus.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/virgo.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/virgo.ico
index f1d241fa4e..f1d241fa4e 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/virgo.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/virgo.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/aquarius.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/aquarius.ico
index 096e235168..096e235168 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/aquarius.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/aquarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/aries.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/aries.ico
index 5e2e36b4ed..5e2e36b4ed 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/aries.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/aries.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/cancer.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/cancer.ico
index e561cbcfb9..e561cbcfb9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/cancer.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/cancer.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/capricorn.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/capricorn.ico
index 364dae632c..364dae632c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/capricorn.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/capricorn.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/gemini.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/gemini.ico
index afa6b89d4c..afa6b89d4c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/gemini.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/gemini.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/leo.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/leo.ico
index fb288f0ec6..fb288f0ec6 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/leo.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/leo.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/libra.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/libra.ico
index a8277aa2ce..a8277aa2ce 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/libra.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/libra.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/pisces.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/pisces.ico
index 72cff46ea9..72cff46ea9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/pisces.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/pisces.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/sagittarius.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/sagittarius.ico
index 6a7cdbae94..6a7cdbae94 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/sagittarius.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/sagittarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/scorpio.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/scorpio.ico
index 0011bb066c..0011bb066c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/scorpio.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/scorpio.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/taurus.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/taurus.ico
index f98cf89eb9..f98cf89eb9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/taurus.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/taurus.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/virgo.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/virgo.ico
index 67a2a1077f..67a2a1077f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/virgo.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/virgo.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/src/icons.h b/plugins/UserInfoEx/IconPacks/ice/src/icons.h
new file mode 100644
index 0000000000..46871836bd
--- /dev/null
+++ b/plugins/UserInfoEx/IconPacks/ice/src/icons.h
@@ -0,0 +1,112 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by uinfoex_icons.rc
+//
+#define IDI_FIRST_ICON                  101
+
+// dialog inforbar
+#define IDI_DLG_DETAILS                 101
+#define IDI_DLG_PHONE                   102
+#define IDI_DLG_EMAIL                   103
+
+// dialog infobar & buttons
+#define IDI_ANNIVERSARY					104
+#define IDI_EXPORT						105
+#define IDI_IMPORT						106
+#define IDI_SEARCH						107
+
+// common icons of details dialog pages
+#define IDI_MIRANDA                     108
+#define IDI_PASSWORD                    109
+#define IDI_FEMALE                      110
+#define IDI_MALE                        111
+#define IDI_CLOCK                       112
+#define IDI_MARITAL                     113
+
+// commonly used buttons
+#define IDI_BTN_UPDATE                  114
+#define IDI_BTN_OK                      115
+#define IDI_BTN_CLOSE                   116
+#define IDI_BTN_APPLY                   117
+#define IDI_BTN_GOTO                    118
+#define IDI_BTN_PHONE                   119
+#define IDI_BTN_FAX                     120
+#define IDI_BTN_CELLULAR                121
+#define IDI_BTN_CUSTOMPHONE             122
+#define IDI_BTN_EMAIL                   123
+#define IDI_BTN_DOWNARROW               124
+#define IDI_BTN_ADD                     125
+#define IDI_BTN_EDIT                    126
+#define IDI_BTN_DELETE                  127
+#define IDI_BTN_EXIMPORT                128
+#define IDI_BTN_BIRTHDAY_BACKUP         129
+
+// details treeview icons
+#define IDI_TREE_GENERAL                130
+#define IDI_TREE_ADVANCED               131
+#define IDI_TREE_COMPANY                132
+#define IDI_TREE_CONTACT                133
+#define IDI_TREE_ABOUT                  134
+#define IDI_TREE_PHOTO                  135
+#define IDI_TREE_ADDRESS                136
+#define IDI_TREE_NOTES                  137
+#define IDI_TREE_PROFILE                138
+
+// export: choose modules
+#define IDI_LST_MODULES                 139
+#define IDI_LST_FOLDER                  140
+
+// zodiac icons
+#define IDI_ZOD_AQUARIUS                141
+#define IDI_ZOD_ARIES                   142
+#define IDI_ZOD_CANCER                  143
+#define IDI_ZOD_CAPRICORN               144
+#define IDI_ZOD_GEMINI                  145
+#define IDI_ZOD_LEO                     146
+#define IDI_ZOD_LIBRA                   147
+#define IDI_ZOD_PISCES                  148
+#define IDI_ZOD_SAGITTARIUS             149
+#define IDI_ZOD_SCORPIO                 150
+#define IDI_ZOD_TAURUS                  151
+#define IDI_ZOD_VIRGO                   152
+
+// reminder
+#define IDI_BIRTHDAY                    153
+#define IDI_RMD_DTB0                    154
+#define IDI_RMD_DTB1                    155
+#define IDI_RMD_DTB2                    156
+#define IDI_RMD_DTB3                    157
+#define IDI_RMD_DTB4                    158
+#define IDI_RMD_DTB5                    159
+#define IDI_RMD_DTB6                    160
+#define IDI_RMD_DTB7                    161
+#define IDI_RMD_DTB8                    162
+#define IDI_RMD_DTB9                    163
+#define IDI_RMD_DTBX                    164
+#define IDI_RMD_DTA0                    165
+#define IDI_RMD_DTA1                    166
+#define IDI_RMD_DTA2                    167
+#define IDI_RMD_DTA3                    168
+#define IDI_RMD_DTA4                    169
+#define IDI_RMD_DTA5                    170
+#define IDI_RMD_DTA6                    171
+#define IDI_RMD_DTA7                    172
+#define IDI_RMD_DTA8                    173
+#define IDI_RMD_DTA9                    174
+#define IDI_RMD_DTAX                    175
+
+#define IDI_LASTICON                    175
+
+// version text
+#define IDS_ICOPACKVERSION              1001
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        1002
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_version.h b/plugins/UserInfoEx/IconPacks/ice/src/icons_version.h
index 70cfcad517..70cfcad517 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_version.h
+++ b/plugins/UserInfoEx/IconPacks/ice/src/icons_version.h