208 files changed, 432 insertions, 425 deletions
diff --git a/protocols/IcqOscarJ/icqoscarj-translation.txt b/protocols/IcqOscarJ/docs/icqoscarj-translation.txt
index 520c8a1ce6..520c8a1ce6 100644
--- a/protocols/IcqOscarJ/icqoscarj-translation.txt
+++ b/protocols/IcqOscarJ/docs/icqoscarj-translation.txt
diff --git a/protocols/IcqOscarJ/icons_pack/ICONS.rc b/protocols/IcqOscarJ/icons_pack/ICONS.rc
deleted file mode 100644
index b0c7ea1b05..0000000000
--- a/protocols/IcqOscarJ/icons_pack/ICONS.rc
+++ /dev/null
@@ -1,132 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "../resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_XSTATUS1            ICON    DISCARDABLE     "../icos/xstatus01.ico"
-IDI_XSTATUS2            ICON    DISCARDABLE     "../icos/xstatus02.ico"
-IDI_XSTATUS3            ICON    DISCARDABLE     "../icos/xstatus03.ico"
-IDI_XSTATUS4            ICON    DISCARDABLE     "../icos/xstatus04.ico"
-IDI_XSTATUS5            ICON    DISCARDABLE     "../icos/xstatus05.ico"
-IDI_XSTATUS6            ICON    DISCARDABLE     "../icos/xstatus06.ico"
-IDI_XSTATUS7            ICON    DISCARDABLE     "../icos/xstatus07.ico"
-IDI_XSTATUS8            ICON    DISCARDABLE     "../icos/xstatus08.ico"
-IDI_XSTATUS9            ICON    DISCARDABLE     "../icos/xstatus09.ico"
-IDI_XSTATUS10           ICON    DISCARDABLE     "../icos/xstatus10.ico"
-IDI_XSTATUS11           ICON    DISCARDABLE     "../icos/xstatus11.ico"
-IDI_XSTATUS12           ICON    DISCARDABLE     "../icos/xstatus12.ico"
-IDI_XSTATUS13           ICON    DISCARDABLE     "../icos/xstatus13.ico"
-IDI_XSTATUS14           ICON    DISCARDABLE     "../icos/xstatus14.ico"
-IDI_XSTATUS15           ICON    DISCARDABLE     "../icos/xstatus15.ico"
-IDI_XSTATUS16           ICON    DISCARDABLE     "../icos/xstatus16.ico"
-IDI_XSTATUS17           ICON    DISCARDABLE     "../icos/xstatus17.ico"
-IDI_XSTATUS18           ICON    DISCARDABLE     "../icos/xstatus18.ico"
-IDI_XSTATUS19           ICON    DISCARDABLE     "../icos/xstatus19.ico"
-IDI_XSTATUS20           ICON    DISCARDABLE     "../icos/xstatus20.ico"
-IDI_XSTATUS21           ICON    DISCARDABLE     "../icos/xstatus21.ico"
-IDI_XSTATUS22           ICON    DISCARDABLE     "../icos/xstatus22.ico"
-IDI_XSTATUS23           ICON    DISCARDABLE     "../icos/xstatus23.ico"
-IDI_XSTATUS24           ICON    DISCARDABLE     "../icos/xstatus24.ico"
-IDI_XSTATUS25           ICON    DISCARDABLE     "../icos/xstatus25.ico"
-IDI_XSTATUS26           ICON    DISCARDABLE     "../icos/xstatus26.ico"
-IDI_XSTATUS27           ICON    DISCARDABLE     "../icos/xstatus27.ico"
-IDI_XSTATUS28           ICON    DISCARDABLE     "../icos/xstatus28.ico"
-IDI_XSTATUS29           ICON    DISCARDABLE     "../icos/xstatus29.ico"
-IDI_XSTATUS30           ICON    DISCARDABLE     "../icos/xstatus30.ico"
-IDI_XSTATUS31           ICON    DISCARDABLE     "../icos/xstatus31.ico"
-IDI_XSTATUS32           ICON    DISCARDABLE     "../icos/xstatus32.ico"
-IDI_XSTATUS33           ICON    DISCARDABLE     "../icos/xstatus33.ico"
-IDI_XSTATUS34           ICON    DISCARDABLE     "../icos/xstatus34.ico"
-IDI_XSTATUS35           ICON    DISCARDABLE     "../icos/xstatus35.ico"
-IDI_XSTATUS36           ICON    DISCARDABLE     "../icos/xstatus36.ico"
-IDI_XSTATUS37           ICON    DISCARDABLE     "../icos/xstatus37.ico"
-IDI_XSTATUS38           ICON    DISCARDABLE     "../icos/xstatus38.ico"
-IDI_XSTATUS39           ICON    DISCARDABLE     "../icos/xstatus39.ico"
-IDI_XSTATUS40           ICON    DISCARDABLE     "../icos/xstatus40.ico"
-IDI_XSTATUS41           ICON    DISCARDABLE     "../icos/xstatus41.ico"
-IDI_XSTATUS42           ICON    DISCARDABLE     "../icos/xstatus42.ico"
-IDI_XSTATUS43           ICON    DISCARDABLE     "../icos/xstatus43.ico"
-IDI_XSTATUS44           ICON    DISCARDABLE     "../icos/xstatus44.ico"
-IDI_XSTATUS45           ICON    DISCARDABLE     "../icos/xstatus45.ico"
-IDI_XSTATUS46           ICON    DISCARDABLE     "../icos/xstatus46.ico"
-IDI_XSTATUS47           ICON    DISCARDABLE     "../icos/xstatus47.ico"
-IDI_XSTATUS48           ICON    DISCARDABLE     "../icos/xstatus48.ico"
-IDI_XSTATUS49           ICON    DISCARDABLE     "../icos/xstatus49.ico"
-IDI_XSTATUS50           ICON    DISCARDABLE     "../icos/xstatus50.ico"
-IDI_XSTATUS51           ICON    DISCARDABLE     "../icos/xstatus51.ico"
-IDI_XSTATUS52           ICON    DISCARDABLE     "../icos/xstatus52.ico"
-IDI_XSTATUS53           ICON    DISCARDABLE     "../icos/xstatus53.ico"
-IDI_XSTATUS54           ICON    DISCARDABLE     "../icos/xstatus54.ico"
-IDI_XSTATUS55           ICON    DISCARDABLE     "../icos/xstatus55.ico"
-IDI_XSTATUS56           ICON    DISCARDABLE     "../icos/xstatus56.ico"
-IDI_XSTATUS57           ICON    DISCARDABLE     "../icos/xstatus57.ico"
-IDI_XSTATUS58           ICON    DISCARDABLE     "../icos/xstatus58.ico"
-IDI_XSTATUS59           ICON    DISCARDABLE     "../icos/xstatus59.ico"
-IDI_XSTATUS60           ICON    DISCARDABLE     "../icos/xstatus60.ico"
-IDI_XSTATUS61           ICON    DISCARDABLE     "../icos/xstatus61.ico"
-IDI_XSTATUS62           ICON    DISCARDABLE     "../icos/xstatus62.ico"
-IDI_XSTATUS63           ICON    DISCARDABLE     "../icos/xstatus63.ico"
-IDI_XSTATUS64           ICON    DISCARDABLE     "../icos/xstatus64.ico"
-IDI_XSTATUS65           ICON    DISCARDABLE     "../icos/xstatus65.ico"
-IDI_XSTATUS66           ICON    DISCARDABLE     "../icos/xstatus66.ico"
-IDI_XSTATUS67           ICON    DISCARDABLE     "../icos/xstatus67.ico"
-IDI_XSTATUS68           ICON    DISCARDABLE     "../icos/xstatus68.ico"
-IDI_XSTATUS69           ICON    DISCARDABLE     "../icos/xstatus69.ico"
-IDI_XSTATUS70           ICON    DISCARDABLE     "../icos/xstatus70.ico"
-IDI_XSTATUS71           ICON    DISCARDABLE     "../icos/xstatus71.ico"
-IDI_XSTATUS72           ICON    DISCARDABLE     "../icos/xstatus72.ico"
-IDI_XSTATUS73           ICON    DISCARDABLE     "../icos/xstatus73.ico"
-IDI_XSTATUS74           ICON    DISCARDABLE     "../icos/xstatus74.ico"
-IDI_XSTATUS75           ICON    DISCARDABLE     "../icos/xstatus75.ico"
-IDI_XSTATUS76           ICON    DISCARDABLE     "../icos/xstatus76.ico"
-IDI_XSTATUS77           ICON    DISCARDABLE     "../icos/xstatus77.ico"
-IDI_XSTATUS78           ICON    DISCARDABLE     "../icos/xstatus78.ico"
-IDI_XSTATUS79           ICON    DISCARDABLE     "../icos/xstatus79.ico"
-IDI_XSTATUS80           ICON    DISCARDABLE     "../icos/xstatus80.ico"
-IDI_XSTATUS81           ICON    DISCARDABLE     "../icos/xstatus81.ico"
-IDI_XSTATUS82           ICON    DISCARDABLE     "../icos/xstatus82.ico"
-IDI_XSTATUS83           ICON    DISCARDABLE     "../icos/xstatus83.ico"
-IDI_XSTATUS84           ICON    DISCARDABLE     "../icos/xstatus84.ico"
-IDI_XSTATUS85           ICON    DISCARDABLE     "../icos/xstatus85.ico"
-IDI_XSTATUS86           ICON    DISCARDABLE     "../icos/xstatus86.ico"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-   IDS_IDENTIFY            "# Custom Status Icons #"
-END
-
-
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
diff --git a/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj b/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj
index 8200455671..a4ef138a57 100644
--- a/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj
+++ b/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj
@@ -122,7 +122,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ResourceCompile Include="ICONS.rc" />
+    <ResourceCompile Include="res\ICONS.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/IcqOscarJ/icons_pack/res/ICONS.rc b/protocols/IcqOscarJ/icons_pack/res/ICONS.rc
new file mode 100644
index 0000000000..3c6fbe73e6
--- /dev/null
+++ b/protocols/IcqOscarJ/icons_pack/res/ICONS.rc
@@ -0,0 +1,132 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "..\src\resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_XSTATUS1            ICON         "xstatus01.ico"
+IDI_XSTATUS2            ICON         "xstatus02.ico"
+IDI_XSTATUS3            ICON         "xstatus03.ico"
+IDI_XSTATUS4            ICON         "xstatus04.ico"
+IDI_XSTATUS5            ICON         "xstatus05.ico"
+IDI_XSTATUS6            ICON         "xstatus06.ico"
+IDI_XSTATUS7            ICON         "xstatus07.ico"
+IDI_XSTATUS8            ICON         "xstatus08.ico"
+IDI_XSTATUS9            ICON         "xstatus09.ico"
+IDI_XSTATUS10           ICON         "xstatus10.ico"
+IDI_XSTATUS11           ICON         "xstatus11.ico"
+IDI_XSTATUS12           ICON         "xstatus12.ico"
+IDI_XSTATUS13           ICON         "xstatus13.ico"
+IDI_XSTATUS14           ICON         "xstatus14.ico"
+IDI_XSTATUS15           ICON         "xstatus15.ico"
+IDI_XSTATUS16           ICON         "xstatus16.ico"
+IDI_XSTATUS17           ICON         "xstatus17.ico"
+IDI_XSTATUS18           ICON         "xstatus18.ico"
+IDI_XSTATUS19           ICON         "xstatus19.ico"
+IDI_XSTATUS20           ICON         "xstatus20.ico"
+IDI_XSTATUS21           ICON         "xstatus21.ico"
+IDI_XSTATUS22           ICON         "xstatus22.ico"
+IDI_XSTATUS23           ICON         "xstatus23.ico"
+IDI_XSTATUS24           ICON         "xstatus24.ico"
+IDI_XSTATUS25           ICON         "xstatus25.ico"
+IDI_XSTATUS26           ICON         "xstatus26.ico"
+IDI_XSTATUS27           ICON         "xstatus27.ico"
+IDI_XSTATUS28           ICON         "xstatus28.ico"
+IDI_XSTATUS29           ICON         "xstatus29.ico"
+IDI_XSTATUS30           ICON         "xstatus30.ico"
+IDI_XSTATUS31           ICON         "xstatus31.ico"
+IDI_XSTATUS32           ICON         "xstatus32.ico"
+IDI_XSTATUS33           ICON         "xstatus33.ico"
+IDI_XSTATUS34           ICON         "xstatus34.ico"
+IDI_XSTATUS35           ICON         "xstatus35.ico"
+IDI_XSTATUS36           ICON         "xstatus36.ico"
+IDI_XSTATUS37           ICON         "xstatus37.ico"
+IDI_XSTATUS38           ICON         "xstatus38.ico"
+IDI_XSTATUS39           ICON         "xstatus39.ico"
+IDI_XSTATUS40           ICON         "xstatus40.ico"
+IDI_XSTATUS41           ICON         "xstatus41.ico"
+IDI_XSTATUS42           ICON         "xstatus42.ico"
+IDI_XSTATUS43           ICON         "xstatus43.ico"
+IDI_XSTATUS44           ICON         "xstatus44.ico"
+IDI_XSTATUS45           ICON         "xstatus45.ico"
+IDI_XSTATUS46           ICON         "xstatus46.ico"
+IDI_XSTATUS47           ICON         "xstatus47.ico"
+IDI_XSTATUS48           ICON         "xstatus48.ico"
+IDI_XSTATUS49           ICON         "xstatus49.ico"
+IDI_XSTATUS50           ICON         "xstatus50.ico"
+IDI_XSTATUS51           ICON         "xstatus51.ico"
+IDI_XSTATUS52           ICON         "xstatus52.ico"
+IDI_XSTATUS53           ICON         "xstatus53.ico"
+IDI_XSTATUS54           ICON         "xstatus54.ico"
+IDI_XSTATUS55           ICON         "xstatus55.ico"
+IDI_XSTATUS56           ICON         "xstatus56.ico"
+IDI_XSTATUS57           ICON         "xstatus57.ico"
+IDI_XSTATUS58           ICON         "xstatus58.ico"
+IDI_XSTATUS59           ICON         "xstatus59.ico"
+IDI_XSTATUS60           ICON         "xstatus60.ico"
+IDI_XSTATUS61           ICON         "xstatus61.ico"
+IDI_XSTATUS62           ICON         "xstatus62.ico"
+IDI_XSTATUS63           ICON         "xstatus63.ico"
+IDI_XSTATUS64           ICON         "xstatus64.ico"
+IDI_XSTATUS65           ICON         "xstatus65.ico"
+IDI_XSTATUS66           ICON         "xstatus66.ico"
+IDI_XSTATUS67           ICON         "xstatus67.ico"
+IDI_XSTATUS68           ICON         "xstatus68.ico"
+IDI_XSTATUS69           ICON         "xstatus69.ico"
+IDI_XSTATUS70           ICON         "xstatus70.ico"
+IDI_XSTATUS71           ICON         "xstatus71.ico"
+IDI_XSTATUS72           ICON         "xstatus72.ico"
+IDI_XSTATUS73           ICON         "xstatus73.ico"
+IDI_XSTATUS74           ICON         "xstatus74.ico"
+IDI_XSTATUS75           ICON         "xstatus75.ico"
+IDI_XSTATUS76           ICON         "xstatus76.ico"
+IDI_XSTATUS77           ICON         "xstatus77.ico"
+IDI_XSTATUS78           ICON         "xstatus78.ico"
+IDI_XSTATUS79           ICON         "xstatus79.ico"
+IDI_XSTATUS80           ICON         "xstatus80.ico"
+IDI_XSTATUS81           ICON         "xstatus81.ico"
+IDI_XSTATUS82           ICON         "xstatus82.ico"
+IDI_XSTATUS83           ICON         "xstatus83.ico"
+IDI_XSTATUS84           ICON         "xstatus84.ico"
+IDI_XSTATUS85           ICON         "xstatus85.ico"
+IDI_XSTATUS86           ICON         "xstatus86.ico"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+   IDS_IDENTIFY            "# Custom Status Icons #"
+END
+
+
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
diff --git a/protocols/IcqOscarJ/icos/Xstatus34.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus34.ico
index 38114d9acf..38114d9acf 100644
--- a/protocols/IcqOscarJ/icos/Xstatus34.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus34.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus35.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus35.ico
index c5c30aaeb7..c5c30aaeb7 100644
--- a/protocols/IcqOscarJ/icos/Xstatus35.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus35.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus36.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus36.ico
index dee0c22ca5..dee0c22ca5 100644
--- a/protocols/IcqOscarJ/icos/Xstatus36.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus36.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus38.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus38.ico
index afadf91c75..afadf91c75 100644
--- a/protocols/IcqOscarJ/icos/Xstatus38.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus38.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus39.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus39.ico
index b54a71dfe4..b54a71dfe4 100644
--- a/protocols/IcqOscarJ/icos/Xstatus39.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus39.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus40.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus40.ico
index ea17ad64eb..ea17ad64eb 100644
--- a/protocols/IcqOscarJ/icos/Xstatus40.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus40.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus41.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus41.ico
index 59782c42e0..59782c42e0 100644
--- a/protocols/IcqOscarJ/icos/Xstatus41.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus41.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus42.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus42.ico
index bb73d54be7..bb73d54be7 100644
--- a/protocols/IcqOscarJ/icos/Xstatus42.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus42.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus45.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus45.ico
index dbbd46b51b..dbbd46b51b 100644
--- a/protocols/IcqOscarJ/icos/Xstatus45.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus45.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus46.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus46.ico
index 377b5b7a1b..377b5b7a1b 100644
--- a/protocols/IcqOscarJ/icos/Xstatus46.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus46.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus47.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus47.ico
index f2333035af..f2333035af 100644
--- a/protocols/IcqOscarJ/icos/Xstatus47.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus47.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus48.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus48.ico
index af9bc70b11..af9bc70b11 100644
--- a/protocols/IcqOscarJ/icos/Xstatus48.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus48.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus49.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus49.ico
index 274eb57cc2..274eb57cc2 100644
--- a/protocols/IcqOscarJ/icos/Xstatus49.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus49.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus50.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus50.ico
index f86143e326..f86143e326 100644
--- a/protocols/IcqOscarJ/icos/Xstatus50.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus50.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus51.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus51.ico
index a0cd9fb014..a0cd9fb014 100644
--- a/protocols/IcqOscarJ/icos/Xstatus51.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus51.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus52.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus52.ico
index 47addb388a..47addb388a 100644
--- a/protocols/IcqOscarJ/icos/Xstatus52.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus52.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus53.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus53.ico
index d3ef8d1154..d3ef8d1154 100644
--- a/protocols/IcqOscarJ/icos/Xstatus53.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus53.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus54.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus54.ico
index 8cfb718724..8cfb718724 100644
--- a/protocols/IcqOscarJ/icos/Xstatus54.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus54.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus56.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus56.ico
index 60dbf31dc6..60dbf31dc6 100644
--- a/protocols/IcqOscarJ/icos/Xstatus56.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus56.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus57.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus57.ico
index cf58a2c4f9..cf58a2c4f9 100644
--- a/protocols/IcqOscarJ/icos/Xstatus57.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus57.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus58.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus58.ico
index e421d43285..e421d43285 100644
--- a/protocols/IcqOscarJ/icos/Xstatus58.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus58.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus59.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus59.ico
index 9ebab2cb61..9ebab2cb61 100644
--- a/protocols/IcqOscarJ/icos/Xstatus59.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus59.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus60.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus60.ico
index 44c7c56542..44c7c56542 100644
--- a/protocols/IcqOscarJ/icos/Xstatus60.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus60.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus61.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus61.ico
index 70751da56c..70751da56c 100644
--- a/protocols/IcqOscarJ/icos/Xstatus61.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus61.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus62.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus62.ico
index 1024cd9af3..1024cd9af3 100644
--- a/protocols/IcqOscarJ/icos/Xstatus62.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus62.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus63.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus63.ico
index ae1e0c8c87..ae1e0c8c87 100644
--- a/protocols/IcqOscarJ/icos/Xstatus63.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus63.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus65.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus65.ico
index 784978cc7b..784978cc7b 100644
--- a/protocols/IcqOscarJ/icos/Xstatus65.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus65.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus66.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus66.ico
index 46174f0280..46174f0280 100644
--- a/protocols/IcqOscarJ/icos/Xstatus66.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus66.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus67.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus67.ico
index 52cd285f23..52cd285f23 100644
--- a/protocols/IcqOscarJ/icos/Xstatus67.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus67.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus68.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus68.ico
index 72e77bbe24..72e77bbe24 100644
--- a/protocols/IcqOscarJ/icos/Xstatus68.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus68.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus69.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus69.ico
index f4c396f5e3..f4c396f5e3 100644
--- a/protocols/IcqOscarJ/icos/Xstatus69.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus69.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus70.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus70.ico
index 9c422ad470..9c422ad470 100644
--- a/protocols/IcqOscarJ/icos/Xstatus70.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus70.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus71.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus71.ico
index 4fc5b36117..4fc5b36117 100644
--- a/protocols/IcqOscarJ/icos/Xstatus71.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus71.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus72.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus72.ico
index f759dca12d..f759dca12d 100644
--- a/protocols/IcqOscarJ/icos/Xstatus72.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus72.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus73.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus73.ico
index 3a6edc17ce..3a6edc17ce 100644
--- a/protocols/IcqOscarJ/icos/Xstatus73.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus73.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus74.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus74.ico
index 52683e7266..52683e7266 100644
--- a/protocols/IcqOscarJ/icos/Xstatus74.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus74.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus75.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus75.ico
index 2ff37ebed6..2ff37ebed6 100644
--- a/protocols/IcqOscarJ/icos/Xstatus75.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus75.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus76.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus76.ico
index b4b1304d0a..b4b1304d0a 100644
--- a/protocols/IcqOscarJ/icos/Xstatus76.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus76.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus77.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus77.ico
index 4394522002..4394522002 100644
--- a/protocols/IcqOscarJ/icos/Xstatus77.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus77.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus78.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus78.ico
index e7681eaaa1..e7681eaaa1 100644
--- a/protocols/IcqOscarJ/icos/Xstatus78.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus78.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus79.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus79.ico
index 22b8bde3f3..22b8bde3f3 100644
--- a/protocols/IcqOscarJ/icos/Xstatus79.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus79.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus81.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus81.ico
index 658c06df23..658c06df23 100644
--- a/protocols/IcqOscarJ/icos/Xstatus81.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus81.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus82.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus82.ico
index 5a02cd4b0e..5a02cd4b0e 100644
--- a/protocols/IcqOscarJ/icos/Xstatus82.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus82.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus83.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus83.ico
index df1b96b669..df1b96b669 100644
--- a/protocols/IcqOscarJ/icos/Xstatus83.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus83.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus84.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus84.ico
index 59461759dc..59461759dc 100644
--- a/protocols/IcqOscarJ/icos/Xstatus84.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus84.ico
diff --git a/protocols/IcqOscarJ/icos/Xstatus86.ico b/protocols/IcqOscarJ/icons_pack/res/Xstatus86.ico
index 6a1c484040..6a1c484040 100644
--- a/protocols/IcqOscarJ/icos/Xstatus86.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/Xstatus86.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus01.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus01.ico
index 98e1a70a8c..98e1a70a8c 100644
--- a/protocols/IcqOscarJ/icos/xstatus01.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus01.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus02.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus02.ico
index 6153e0d4ab..6153e0d4ab 100644
--- a/protocols/IcqOscarJ/icos/xstatus02.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus02.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus03.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus03.ico
index 70796a2128..70796a2128 100644
--- a/protocols/IcqOscarJ/icos/xstatus03.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus03.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus04.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus04.ico
index 0c86d1a6b3..0c86d1a6b3 100644
--- a/protocols/IcqOscarJ/icos/xstatus04.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus04.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus05.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus05.ico
index a7f0bfc99e..a7f0bfc99e 100644
--- a/protocols/IcqOscarJ/icos/xstatus05.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus05.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus06.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus06.ico
index 7f565d4ac1..7f565d4ac1 100644
--- a/protocols/IcqOscarJ/icos/xstatus06.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus06.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus07.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus07.ico
index 46c7087662..46c7087662 100644
--- a/protocols/IcqOscarJ/icos/xstatus07.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus07.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus08.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus08.ico
index 63c385f9da..63c385f9da 100644
--- a/protocols/IcqOscarJ/icos/xstatus08.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus08.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus09.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus09.ico
index d7fdbd4bd5..d7fdbd4bd5 100644
--- a/protocols/IcqOscarJ/icos/xstatus09.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus09.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus10.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus10.ico
index baf014ec1c..baf014ec1c 100644
--- a/protocols/IcqOscarJ/icos/xstatus10.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus10.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus11.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus11.ico
index 2007ba936a..2007ba936a 100644
--- a/protocols/IcqOscarJ/icos/xstatus11.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus11.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus12.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus12.ico
index b0daef70f4..b0daef70f4 100644
--- a/protocols/IcqOscarJ/icos/xstatus12.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus12.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus13.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus13.ico
index b0ae976442..b0ae976442 100644
--- a/protocols/IcqOscarJ/icos/xstatus13.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus13.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus14.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus14.ico
index 17cfd90007..17cfd90007 100644
--- a/protocols/IcqOscarJ/icos/xstatus14.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus14.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus15.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus15.ico
index 702ba16f2d..702ba16f2d 100644
--- a/protocols/IcqOscarJ/icos/xstatus15.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus15.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus16.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus16.ico
index 853dc12fd2..853dc12fd2 100644
--- a/protocols/IcqOscarJ/icos/xstatus16.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus16.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus17.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus17.ico
index dd891cf169..dd891cf169 100644
--- a/protocols/IcqOscarJ/icos/xstatus17.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus17.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus18.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus18.ico
index a95d361dcd..a95d361dcd 100644
--- a/protocols/IcqOscarJ/icos/xstatus18.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus18.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus19.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus19.ico
index 8eb3821554..8eb3821554 100644
--- a/protocols/IcqOscarJ/icos/xstatus19.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus19.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus20.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus20.ico
index 0d90d8ba1c..0d90d8ba1c 100644
--- a/protocols/IcqOscarJ/icos/xstatus20.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus20.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus21.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus21.ico
index fa21d3a4e3..fa21d3a4e3 100644
--- a/protocols/IcqOscarJ/icos/xstatus21.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus21.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus22.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus22.ico
index ad8faded21..ad8faded21 100644
--- a/protocols/IcqOscarJ/icos/xstatus22.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus22.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus23.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus23.ico
index f6b92255b6..f6b92255b6 100644
--- a/protocols/IcqOscarJ/icos/xstatus23.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus23.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus24.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus24.ico
index 3ad736d73b..3ad736d73b 100644
--- a/protocols/IcqOscarJ/icos/xstatus24.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus24.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus25.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus25.ico
index 1c0214cd1a..1c0214cd1a 100644
--- a/protocols/IcqOscarJ/icos/xstatus25.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus25.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus26.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus26.ico
index b085157f52..b085157f52 100644
--- a/protocols/IcqOscarJ/icos/xstatus26.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus26.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus27.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus27.ico
index c3fb1e6678..c3fb1e6678 100644
--- a/protocols/IcqOscarJ/icos/xstatus27.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus27.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus28.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus28.ico
index e3cc32037e..e3cc32037e 100644
--- a/protocols/IcqOscarJ/icos/xstatus28.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus28.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus29.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus29.ico
index 3217396cbe..3217396cbe 100644
--- a/protocols/IcqOscarJ/icos/xstatus29.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus29.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus30.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus30.ico
index db97d2d4ea..db97d2d4ea 100644
--- a/protocols/IcqOscarJ/icos/xstatus30.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus30.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus31.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus31.ico
index 1176383b5b..1176383b5b 100644
--- a/protocols/IcqOscarJ/icos/xstatus31.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus31.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus32.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus32.ico
index c68ca5bd2a..c68ca5bd2a 100644
--- a/protocols/IcqOscarJ/icos/xstatus32.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus32.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus33.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus33.ico
index ed8632d5eb..ed8632d5eb 100644
--- a/protocols/IcqOscarJ/icos/xstatus33.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus33.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus37.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus37.ico
index 4bb33ec9ac..4bb33ec9ac 100644
--- a/protocols/IcqOscarJ/icos/xstatus37.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus37.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus43.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus43.ico
index 6f49a31dc4..6f49a31dc4 100644
--- a/protocols/IcqOscarJ/icos/xstatus43.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus43.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus44.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus44.ico
index 4644afa89f..4644afa89f 100644
--- a/protocols/IcqOscarJ/icos/xstatus44.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus44.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus55.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus55.ico
index 7ad6286985..7ad6286985 100644
--- a/protocols/IcqOscarJ/icos/xstatus55.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus55.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus64.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus64.ico
index 1144ba9b49..1144ba9b49 100644
--- a/protocols/IcqOscarJ/icos/xstatus64.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus64.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus80.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus80.ico
index 30f7dd2670..30f7dd2670 100644
--- a/protocols/IcqOscarJ/icos/xstatus80.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus80.ico
diff --git a/protocols/IcqOscarJ/icos/xstatus85.ico b/protocols/IcqOscarJ/icons_pack/res/xstatus85.ico
index b9db7058ba..b9db7058ba 100644
--- a/protocols/IcqOscarJ/icos/xstatus85.ico
+++ b/protocols/IcqOscarJ/icons_pack/res/xstatus85.ico
diff --git a/protocols/IcqOscarJ/icons_pack/src/resource.h b/protocols/IcqOscarJ/icons_pack/src/resource.h
new file mode 100644
index 0000000000..119ed41495
--- /dev/null
+++ b/protocols/IcqOscarJ/icons_pack/src/resource.h
@@ -0,0 +1,101 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by resources.rc
+//
+#define IDI_XSTATUS1                    201
+#define IDI_XSTATUS2                    202
+#define IDI_XSTATUS3                    203
+#define IDI_XSTATUS4                    204
+#define IDI_XSTATUS5                    205
+#define IDI_XSTATUS6                    206
+#define IDI_XSTATUS7                    207
+#define IDI_XSTATUS8                    208
+#define IDI_XSTATUS9                    209
+#define IDI_XSTATUS10                   210
+#define IDI_XSTATUS11                   211
+#define IDI_XSTATUS12                   212
+#define IDI_XSTATUS13                   213
+#define IDI_XSTATUS14                   214
+#define IDI_XSTATUS15                   215
+#define IDI_XSTATUS16                   216
+#define IDI_XSTATUS17                   217
+#define IDI_XSTATUS18                   218
+#define IDI_XSTATUS19                   219
+#define IDI_XSTATUS20                   220
+#define IDI_XSTATUS21                   221
+#define IDI_XSTATUS22                   222
+#define IDI_XSTATUS23                   223
+#define IDI_XSTATUS24                   224
+#define IDI_XSTATUS25                   225
+#define IDI_XSTATUS26                   226
+#define IDI_XSTATUS27                   227
+#define IDI_XSTATUS28                   228
+#define IDI_XSTATUS29                   229
+#define IDI_XSTATUS30                   230
+#define IDI_XSTATUS31                   231
+#define IDI_XSTATUS32                   232
+#define IDI_XSTATUS33                   233
+#define IDI_XSTATUS34                   234
+#define IDI_XSTATUS35                   235
+#define IDI_XSTATUS36                   236
+#define IDI_XSTATUS37                   237
+#define IDI_XSTATUS38                   238
+#define IDI_XSTATUS39                   239
+#define IDI_XSTATUS40                   240
+#define IDI_XSTATUS41                   241
+#define IDI_XSTATUS42                   242
+#define IDI_XSTATUS43                   243
+#define IDI_XSTATUS44                   244
+#define IDI_XSTATUS45                   245
+#define IDI_XSTATUS46                   246
+#define IDI_XSTATUS47                   247
+#define IDI_XSTATUS48                   248
+#define IDI_XSTATUS49                   249
+#define IDI_XSTATUS50                   250
+#define IDI_XSTATUS51                   251
+#define IDI_XSTATUS52                   252
+#define IDI_XSTATUS53                   253
+#define IDI_XSTATUS54                   254
+#define IDI_XSTATUS55                   255
+#define IDI_XSTATUS56                   256
+#define IDI_XSTATUS57                   257
+#define IDI_XSTATUS58                   258
+#define IDI_XSTATUS59                   259
+#define IDI_XSTATUS60                   260
+#define IDI_XSTATUS61                   261
+#define IDI_XSTATUS62                   262
+#define IDI_XSTATUS63                   263
+#define IDI_XSTATUS64                   264
+#define IDI_XSTATUS65                   265
+#define IDI_XSTATUS66                   266
+#define IDI_XSTATUS67                   267
+#define IDI_XSTATUS68                   268
+#define IDI_XSTATUS69                   269
+#define IDI_XSTATUS70                   270
+#define IDI_XSTATUS71                   271
+#define IDI_XSTATUS72                   272
+#define IDI_XSTATUS73                   273
+#define IDI_XSTATUS74                   274
+#define IDI_XSTATUS75                   275
+#define IDI_XSTATUS76                   276
+#define IDI_XSTATUS77                   277
+#define IDI_XSTATUS78                   278
+#define IDI_XSTATUS79                   279
+#define IDI_XSTATUS80                   280
+#define IDI_XSTATUS81                   281
+#define IDI_XSTATUS82                   282
+#define IDI_XSTATUS83                   283
+#define IDI_XSTATUS84                   284
+#define IDI_XSTATUS85                   285
+#define IDI_XSTATUS86                   286
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1026
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj b/protocols/IcqOscarJ/icqoscar8_10.vcxproj
index 00cbc0213f..b94751a495 100644
--- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj
+++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj
@@ -197,106 +197,102 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="capabilities.h" />
-    <ClInclude Include="channels.h" />
-    <ClInclude Include="cookies.h" />
-    <ClInclude Include="families.h" />
-    <ClInclude Include="guids.h" />
-    <ClInclude Include="i18n.h" />
-    <ClInclude Include="iconlib.h" />
-    <ClInclude Include="icq_advsearch.h" />
-    <ClInclude Include="icq_avatar.h" />
-    <ClInclude Include="icq_constants.h" />
-    <ClInclude Include="icq_direct.h" />
-    <ClInclude Include="icq_fieldnames.h" />
-    <ClInclude Include="icq_http.h" />
-    <ClInclude Include="icq_packet.h" />
-    <ClInclude Include="icq_proto.h" />
-    <ClInclude Include="icq_rates.h" />
-    <ClInclude Include="icq_server.h" />
-    <ClInclude Include="icq_servlist.h" />
-    <ClInclude Include="icqosc_svcs.h" />
-    <ClInclude Include="icqoscar.h" />
-    <ClInclude Include="init.h" />
-    <ClInclude Include="log.h" />
-    <ClInclude Include="oscar_filetransfer.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="stdpackets.h" />
-    <ClInclude Include="tlv.h" />
-    <ClInclude Include="utilities.h" />
-    <ClInclude Include="changeinfo\changeinfo.h" />
+    <ClInclude Include="src\capabilities.h" />
+    <ClInclude Include="src\channels.h" />
+    <ClInclude Include="src\cookies.h" />
+    <ClInclude Include="src\families.h" />
+    <ClInclude Include="src\guids.h" />
+    <ClInclude Include="src\i18n.h" />
+    <ClInclude Include="src\iconlib.h" />
+    <ClInclude Include="src\icq_advsearch.h" />
+    <ClInclude Include="src\icq_avatar.h" />
+    <ClInclude Include="src\icq_constants.h" />
+    <ClInclude Include="src\icq_direct.h" />
+    <ClInclude Include="src\icq_fieldnames.h" />
+    <ClInclude Include="src\icq_http.h" />
+    <ClInclude Include="src\icq_packet.h" />
+    <ClInclude Include="src\icq_proto.h" />
+    <ClInclude Include="src\icq_rates.h" />
+    <ClInclude Include="src\icq_server.h" />
+    <ClInclude Include="src\icq_servlist.h" />
+    <ClInclude Include="src\icqosc_svcs.h" />
+    <ClInclude Include="src\icqoscar.h" />
+    <ClInclude Include="src\init.h" />
+    <ClInclude Include="src\log.h" />
+    <ClInclude Include="src\oscar_filetransfer.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\stdpackets.h" />
+    <ClInclude Include="src\tlv.h" />
+    <ClInclude Include="src\utilities.h" />
+    <ClInclude Include="src\changeinfo\changeinfo.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="icos\icq.ico" />
-    <None Include="docs\icq-readme.txt" />
+    <ResourceCompile Include="res\resources.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resources.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="chan_01login.cpp" />
-    <ClCompile Include="chan_02data.cpp" />
-    <ClCompile Include="chan_03error.cpp" />
-    <ClCompile Include="chan_04close.cpp" />
-    <ClCompile Include="chan_05ping.cpp" />
-    <ClCompile Include="fam_01service.cpp" />
-    <ClCompile Include="fam_02location.cpp" />
-    <ClCompile Include="fam_03buddy.cpp" />
-    <ClCompile Include="fam_04message.cpp" />
-    <ClCompile Include="fam_09bos.cpp" />
-    <ClCompile Include="fam_0alookup.cpp" />
-    <ClCompile Include="fam_0bstatus.cpp" />
-    <ClCompile Include="fam_13servclist.cpp" />
-    <ClCompile Include="fam_15icqserver.cpp" />
-    <ClCompile Include="fam_17signon.cpp" />
-    <ClCompile Include="icq_direct.cpp" />
-    <ClCompile Include="icq_directmsg.cpp" />
-    <ClCompile Include="icq_filerequests.cpp" />
-    <ClCompile Include="icq_filetransfer.cpp" />
-    <ClCompile Include="icq_menu.cpp" />
-    <ClCompile Include="oscar_filetransfer.cpp" />
-    <ClCompile Include="icq_advsearch.cpp" />
-    <ClCompile Include="icq_db.cpp" />
-    <ClCompile Include="icq_popups.cpp" />
-    <ClCompile Include="icq_proto.cpp" />
-    <ClCompile Include="icq_xstatus.cpp" />
-    <ClCompile Include="icqosc_svcs.cpp" />
-    <ClCompile Include="init.cpp" />
-    <ClCompile Include="log.cpp" />
-    <ClCompile Include="UI\askauthentication.cpp" />
-    <ClCompile Include="icq_firstrun.cpp" />
-    <ClCompile Include="icq_opts.cpp" />
-    <ClCompile Include="icq_uploadui.cpp" />
-    <ClCompile Include="UI\loginpassword.cpp" />
-    <ClCompile Include="UI\userinfotab.cpp" />
-    <ClCompile Include="changeinfo\constants.cpp" />
-    <ClCompile Include="changeinfo\db.cpp" />
-    <ClCompile Include="changeinfo\dlgproc.cpp" />
-    <ClCompile Include="changeinfo\editlist.cpp" />
-    <ClCompile Include="changeinfo\editstring.cpp" />
-    <ClCompile Include="changeinfo\main.cpp" />
-    <ClCompile Include="changeinfo\upload.cpp" />
-    <ClCompile Include="capabilities.cpp" />
-    <ClCompile Include="cookies.cpp" />
-    <ClCompile Include="directpackets.cpp" />
-    <ClCompile Include="i18n.cpp" />
-    <ClCompile Include="iconlib.cpp" />
-    <ClCompile Include="icq_avatar.cpp" />
-    <ClCompile Include="icq_clients.cpp" />
-    <ClCompile Include="icq_fieldnames.cpp" />
-    <ClCompile Include="icq_http.cpp" />
-    <ClCompile Include="icq_infoupdate.cpp" />
-    <ClCompile Include="icq_packet.cpp" />
-    <ClCompile Include="icq_rates.cpp" />
-    <ClCompile Include="icq_server.cpp" />
-    <ClCompile Include="icq_servlist.cpp" />
-    <ClCompile Include="icq_xtraz.cpp" />
-    <ClCompile Include="icqoscar.cpp">
+    <ClCompile Include="src\chan_01login.cpp" />
+    <ClCompile Include="src\chan_02data.cpp" />
+    <ClCompile Include="src\chan_03error.cpp" />
+    <ClCompile Include="src\chan_04close.cpp" />
+    <ClCompile Include="src\chan_05ping.cpp" />
+    <ClCompile Include="src\fam_01service.cpp" />
+    <ClCompile Include="src\fam_02location.cpp" />
+    <ClCompile Include="src\fam_03buddy.cpp" />
+    <ClCompile Include="src\fam_04message.cpp" />
+    <ClCompile Include="src\fam_09bos.cpp" />
+    <ClCompile Include="src\fam_0alookup.cpp" />
+    <ClCompile Include="src\fam_0bstatus.cpp" />
+    <ClCompile Include="src\fam_13servclist.cpp" />
+    <ClCompile Include="src\fam_15icqserver.cpp" />
+    <ClCompile Include="src\fam_17signon.cpp" />
+    <ClCompile Include="src\icq_direct.cpp" />
+    <ClCompile Include="src\icq_directmsg.cpp" />
+    <ClCompile Include="src\icq_filerequests.cpp" />
+    <ClCompile Include="src\icq_filetransfer.cpp" />
+    <ClCompile Include="src\icq_menu.cpp" />
+    <ClCompile Include="src\oscar_filetransfer.cpp" />
+    <ClCompile Include="src\icq_advsearch.cpp" />
+    <ClCompile Include="src\icq_db.cpp" />
+    <ClCompile Include="src\icq_popups.cpp" />
+    <ClCompile Include="src\icq_proto.cpp" />
+    <ClCompile Include="src\icq_xstatus.cpp" />
+    <ClCompile Include="src\icqosc_svcs.cpp" />
+    <ClCompile Include="src\init.cpp" />
+    <ClCompile Include="src\log.cpp" />
+    <ClCompile Include="src\UI\askauthentication.cpp" />
+    <ClCompile Include="src\icq_firstrun.cpp" />
+    <ClCompile Include="src\icq_opts.cpp" />
+    <ClCompile Include="src\icq_uploadui.cpp" />
+    <ClCompile Include="src\UI\loginpassword.cpp" />
+    <ClCompile Include="src\UI\userinfotab.cpp" />
+    <ClCompile Include="src\changeinfo\constants.cpp" />
+    <ClCompile Include="src\changeinfo\db.cpp" />
+    <ClCompile Include="src\changeinfo\dlgproc.cpp" />
+    <ClCompile Include="src\changeinfo\editlist.cpp" />
+    <ClCompile Include="src\changeinfo\editstring.cpp" />
+    <ClCompile Include="src\changeinfo\main.cpp" />
+    <ClCompile Include="src\changeinfo\upload.cpp" />
+    <ClCompile Include="src\capabilities.cpp" />
+    <ClCompile Include="src\cookies.cpp" />
+    <ClCompile Include="src\directpackets.cpp" />
+    <ClCompile Include="src\i18n.cpp" />
+    <ClCompile Include="src\iconlib.cpp" />
+    <ClCompile Include="src\icq_avatar.cpp" />
+    <ClCompile Include="src\icq_clients.cpp" />
+    <ClCompile Include="src\icq_fieldnames.cpp" />
+    <ClCompile Include="src\icq_http.cpp" />
+    <ClCompile Include="src\icq_infoupdate.cpp" />
+    <ClCompile Include="src\icq_packet.cpp" />
+    <ClCompile Include="src\icq_rates.cpp" />
+    <ClCompile Include="src\icq_server.cpp" />
+    <ClCompile Include="src\icq_servlist.cpp" />
+    <ClCompile Include="src\icq_xtraz.cpp" />
+    <ClCompile Include="src\icqoscar.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="stdpackets.cpp" />
-    <ClCompile Include="tlv.cpp" />
-    <ClCompile Include="utilities.cpp" />
+    <ClCompile Include="src\stdpackets.cpp" />
+    <ClCompile Include="src\tlv.cpp" />
+    <ClCompile Include="src\utilities.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
index a7310551e1..3917331d49 100644
--- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
+++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
@@ -33,248 +33,240 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="capabilities.h">
+    <ClInclude Include="src\capabilities.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="channels.h">
+    <ClInclude Include="src\channels.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cookies.h">
+    <ClInclude Include="src\cookies.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="families.h">
+    <ClInclude Include="src\families.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="guids.h">
+    <ClInclude Include="src\guids.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="i18n.h">
+    <ClInclude Include="src\i18n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="iconlib.h">
+    <ClInclude Include="src\iconlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_advsearch.h">
+    <ClInclude Include="src\icq_advsearch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_avatar.h">
+    <ClInclude Include="src\icq_avatar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_constants.h">
+    <ClInclude Include="src\icq_constants.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_direct.h">
+    <ClInclude Include="src\icq_direct.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_fieldnames.h">
+    <ClInclude Include="src\icq_fieldnames.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_http.h">
+    <ClInclude Include="src\icq_http.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_packet.h">
+    <ClInclude Include="src\icq_packet.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_proto.h">
+    <ClInclude Include="src\icq_proto.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_rates.h">
+    <ClInclude Include="src\icq_rates.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_server.h">
+    <ClInclude Include="src\icq_server.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icq_servlist.h">
+    <ClInclude Include="src\icq_servlist.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icqosc_svcs.h">
+    <ClInclude Include="src\icqosc_svcs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icqoscar.h">
+    <ClInclude Include="src\icqoscar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="init.h">
+    <ClInclude Include="src\init.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="log.h">
+    <ClInclude Include="src\log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="oscar_filetransfer.h">
+    <ClInclude Include="src\oscar_filetransfer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdpackets.h">
+    <ClInclude Include="src\stdpackets.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="tlv.h">
+    <ClInclude Include="src\tlv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utilities.h">
+    <ClInclude Include="src\utilities.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="changeinfo\changeinfo.h">
+    <ClInclude Include="src\changeinfo\changeinfo.h">
       <Filter>Changeinfo</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="icos\icq.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="docs\icq-readme.txt">
-      <Filter>Documentation</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resources.rc">
+    <ResourceCompile Include="res\resources.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="chan_01login.cpp">
+    <ClCompile Include="src\chan_01login.cpp">
       <Filter>FLAP Channels</Filter>
     </ClCompile>
-    <ClCompile Include="chan_02data.cpp">
+    <ClCompile Include="src\chan_02data.cpp">
       <Filter>FLAP Channels</Filter>
     </ClCompile>
-    <ClCompile Include="chan_03error.cpp">
+    <ClCompile Include="src\chan_03error.cpp">
       <Filter>FLAP Channels</Filter>
     </ClCompile>
-    <ClCompile Include="chan_04close.cpp">
+    <ClCompile Include="src\chan_04close.cpp">
       <Filter>FLAP Channels</Filter>
     </ClCompile>
-    <ClCompile Include="chan_05ping.cpp">
+    <ClCompile Include="src\chan_05ping.cpp">
       <Filter>FLAP Channels</Filter>
     </ClCompile>
-    <ClCompile Include="fam_01service.cpp">
+    <ClCompile Include="src\fam_01service.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_02location.cpp">
+    <ClCompile Include="src\fam_02location.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_03buddy.cpp">
+    <ClCompile Include="src\fam_03buddy.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_04message.cpp">
+    <ClCompile Include="src\fam_04message.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_09bos.cpp">
+    <ClCompile Include="src\fam_09bos.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_0alookup.cpp">
+    <ClCompile Include="src\fam_0alookup.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_0bstatus.cpp">
+    <ClCompile Include="src\fam_0bstatus.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_13servclist.cpp">
+    <ClCompile Include="src\fam_13servclist.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_15icqserver.cpp">
+    <ClCompile Include="src\fam_15icqserver.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="fam_17signon.cpp">
+    <ClCompile Include="src\fam_17signon.cpp">
       <Filter>SNAC Families</Filter>
     </ClCompile>
-    <ClCompile Include="icq_direct.cpp">
+    <ClCompile Include="src\icq_direct.cpp">
       <Filter>Direct Connection</Filter>
     </ClCompile>
-    <ClCompile Include="icq_directmsg.cpp">
+    <ClCompile Include="src\icq_directmsg.cpp">
       <Filter>Direct Connection</Filter>
     </ClCompile>
-    <ClCompile Include="icq_filerequests.cpp">
+    <ClCompile Include="src\icq_filerequests.cpp">
       <Filter>Direct Connection</Filter>
     </ClCompile>
-    <ClCompile Include="icq_filetransfer.cpp">
+    <ClCompile Include="src\icq_filetransfer.cpp">
       <Filter>Direct Connection</Filter>
     </ClCompile>
-    <ClCompile Include="oscar_filetransfer.cpp">
+    <ClCompile Include="src\oscar_filetransfer.cpp">
       <Filter>Direct Connection</Filter>
     </ClCompile>
-    <ClCompile Include="icq_advsearch.cpp">
+    <ClCompile Include="src\icq_advsearch.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
-    <ClCompile Include="icq_db.cpp">
+    <ClCompile Include="src\icq_db.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
-    <ClCompile Include="icq_popups.cpp">
+    <ClCompile Include="src\icq_popups.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
-    <ClCompile Include="icq_proto.cpp">
+    <ClCompile Include="src\icq_proto.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
-    <ClCompile Include="icq_xstatus.cpp">
+    <ClCompile Include="src\icq_xstatus.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
-    <ClCompile Include="icqosc_svcs.cpp">
+    <ClCompile Include="src\icqosc_svcs.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
-    <ClCompile Include="init.cpp">
+    <ClCompile Include="src\init.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
-    <ClCompile Include="log.cpp">
+    <ClCompile Include="src\log.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
-    <ClCompile Include="UI\askauthentication.cpp">
+    <ClCompile Include="src\UI\askauthentication.cpp">
       <Filter>UI</Filter>
     </ClCompile>
-    <ClCompile Include="icq_firstrun.cpp">
+    <ClCompile Include="src\icq_firstrun.cpp">
       <Filter>UI</Filter>
     </ClCompile>
-    <ClCompile Include="icq_opts.cpp">
+    <ClCompile Include="src\icq_opts.cpp">
       <Filter>UI</Filter>
     </ClCompile>
-    <ClCompile Include="icq_uploadui.cpp">
+    <ClCompile Include="src\icq_uploadui.cpp">
       <Filter>UI</Filter>
     </ClCompile>
-    <ClCompile Include="UI\loginpassword.cpp">
+    <ClCompile Include="src\UI\loginpassword.cpp">
       <Filter>UI</Filter>
     </ClCompile>
-    <ClCompile Include="UI\userinfotab.cpp">
+    <ClCompile Include="src\UI\userinfotab.cpp">
       <Filter>UI</Filter>
     </ClCompile>
-    <ClCompile Include="changeinfo\constants.cpp">
+    <ClCompile Include="src\changeinfo\constants.cpp">
       <Filter>Changeinfo</Filter>
     </ClCompile>
-    <ClCompile Include="changeinfo\db.cpp">
+    <ClCompile Include="src\changeinfo\db.cpp">
       <Filter>Changeinfo</Filter>
     </ClCompile>
-    <ClCompile Include="changeinfo\dlgproc.cpp">
+    <ClCompile Include="src\changeinfo\dlgproc.cpp">
       <Filter>Changeinfo</Filter>
     </ClCompile>
-    <ClCompile Include="changeinfo\editlist.cpp">
+    <ClCompile Include="src\changeinfo\editlist.cpp">
       <Filter>Changeinfo</Filter>
     </ClCompile>
-    <ClCompile Include="changeinfo\editstring.cpp">
+    <ClCompile Include="src\changeinfo\editstring.cpp">
       <Filter>Changeinfo</Filter>
     </ClCompile>
-    <ClCompile Include="changeinfo\main.cpp">
+    <ClCompile Include="src\changeinfo\main.cpp">
       <Filter>Changeinfo</Filter>
     </ClCompile>
-    <ClCompile Include="changeinfo\upload.cpp">
+    <ClCompile Include="src\changeinfo\upload.cpp">
       <Filter>Changeinfo</Filter>
     </ClCompile>
-    <ClCompile Include="capabilities.cpp" />
-    <ClCompile Include="cookies.cpp" />
-    <ClCompile Include="directpackets.cpp" />
-    <ClCompile Include="i18n.cpp" />
-    <ClCompile Include="iconlib.cpp" />
-    <ClCompile Include="icq_avatar.cpp" />
-    <ClCompile Include="icq_clients.cpp" />
-    <ClCompile Include="icq_fieldnames.cpp" />
-    <ClCompile Include="icq_http.cpp" />
-    <ClCompile Include="icq_infoupdate.cpp" />
-    <ClCompile Include="icq_packet.cpp" />
-    <ClCompile Include="icq_rates.cpp" />
-    <ClCompile Include="icq_server.cpp" />
-    <ClCompile Include="icq_servlist.cpp" />
-    <ClCompile Include="icq_xtraz.cpp" />
-    <ClCompile Include="icqoscar.cpp" />
-    <ClCompile Include="stdpackets.cpp" />
-    <ClCompile Include="tlv.cpp" />
-    <ClCompile Include="utilities.cpp" />
-    <ClCompile Include="icq_menu.cpp">
+    <ClCompile Include="src\capabilities.cpp" />
+    <ClCompile Include="src\cookies.cpp" />
+    <ClCompile Include="src\directpackets.cpp" />
+    <ClCompile Include="src\i18n.cpp" />
+    <ClCompile Include="src\iconlib.cpp" />
+    <ClCompile Include="src\icq_avatar.cpp" />
+    <ClCompile Include="src\icq_clients.cpp" />
+    <ClCompile Include="src\icq_fieldnames.cpp" />
+    <ClCompile Include="src\icq_http.cpp" />
+    <ClCompile Include="src\icq_infoupdate.cpp" />
+    <ClCompile Include="src\icq_packet.cpp" />
+    <ClCompile Include="src\icq_rates.cpp" />
+    <ClCompile Include="src\icq_server.cpp" />
+    <ClCompile Include="src\icq_servlist.cpp" />
+    <ClCompile Include="src\icq_xtraz.cpp" />
+    <ClCompile Include="src\icqoscar.cpp" />
+    <ClCompile Include="src\stdpackets.cpp" />
+    <ClCompile Include="src\tlv.cpp" />
+    <ClCompile Include="src\utilities.cpp" />
+    <ClCompile Include="src\icq_menu.cpp">
       <Filter>Miranda Bits</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj b/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj
index de86e8248c..012196ddaf 100644
--- a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj
+++ b/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Proto_ICQ.rc" />
+    <ResourceCompile Include="res\Proto_ICQ.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj.filters b/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj.filters
index 12cfc7e376..6f24876932 100644
--- a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj.filters
+++ b/protocols/IcqOscarJ/proto_icq/Proto_ICQ.vcxproj.filters
@@ -11,12 +11,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Proto_ICQ.rc">
+    <ResourceCompile Include="res\Proto_ICQ.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Away.ico b/protocols/IcqOscarJ/proto_icq/res/Away.ico
index ec77463401..ec77463401 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Away.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Away.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/DND.ico b/protocols/IcqOscarJ/proto_icq/res/DND.ico
index 1e321b41e2..1e321b41e2 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/DND.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/DND.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/FFC.ico b/protocols/IcqOscarJ/proto_icq/res/FFC.ico
index 2bb381d6a3..2bb381d6a3 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/FFC.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/FFC.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Invisible.ico b/protocols/IcqOscarJ/proto_icq/res/Invisible.ico
index 9962090108..9962090108 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Invisible.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Invisible.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/NA.ico b/protocols/IcqOscarJ/proto_icq/res/NA.ico
index 6cb72f1510..6cb72f1510 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/NA.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/NA.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Occupied.ico b/protocols/IcqOscarJ/proto_icq/res/Occupied.ico
index 711bcd53e5..711bcd53e5 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Occupied.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Occupied.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Offline.ico b/protocols/IcqOscarJ/proto_icq/res/Offline.ico
index 3684dbc20b..3684dbc20b 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Offline.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Offline.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Online.ico b/protocols/IcqOscarJ/proto_icq/res/Online.ico
index 8c828871bb..8c828871bb 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Online.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Online.ico
diff --git a/protocols/IcqOscarJ/proto_icq/icos/Phone.ico b/protocols/IcqOscarJ/proto_icq/res/Phone.ico
index 476461a8d0..476461a8d0 100644
--- a/protocols/IcqOscarJ/proto_icq/icos/Phone.ico
+++ b/protocols/IcqOscarJ/proto_icq/res/Phone.ico
diff --git a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.rc b/protocols/IcqOscarJ/proto_icq/res/Proto_ICQ.rc
index 51337c2e4f..64c5e8b7bd 100644
--- a/protocols/IcqOscarJ/proto_icq/Proto_ICQ.rc
+++ b/protocols/IcqOscarJ/proto_icq/res/Proto_ICQ.rc
diff --git a/protocols/IcqOscarJ/proto_icq/resource.h b/protocols/IcqOscarJ/proto_icq/src/resource.h
index 51271432b6..51271432b6 100644
--- a/protocols/IcqOscarJ/proto_icq/resource.h
+++ b/protocols/IcqOscarJ/proto_icq/src/resource.h
diff --git a/protocols/IcqOscarJ/icos/auth_ask.ico b/protocols/IcqOscarJ/res/auth_ask.ico
index 1db6f7f23e..1db6f7f23e 100644
--- a/protocols/IcqOscarJ/icos/auth_ask.ico
+++ b/protocols/IcqOscarJ/res/auth_ask.ico
diff --git a/protocols/IcqOscarJ/icos/auth_grant.ico b/protocols/IcqOscarJ/res/auth_grant.ico
index 44d5b29a31..44d5b29a31 100644
--- a/protocols/IcqOscarJ/icos/auth_grant.ico
+++ b/protocols/IcqOscarJ/res/auth_grant.ico
diff --git a/protocols/IcqOscarJ/icos/auth_revoke.ico b/protocols/IcqOscarJ/res/auth_revoke.ico
index e483681727..e483681727 100644
--- a/protocols/IcqOscarJ/icos/auth_revoke.ico
+++ b/protocols/IcqOscarJ/res/auth_revoke.ico
diff --git a/protocols/IcqOscarJ/changeinfo/expandst.ico b/protocols/IcqOscarJ/res/expandst.ico
index 17367fe8d3..17367fe8d3 100644
--- a/protocols/IcqOscarJ/changeinfo/expandst.ico
+++ b/protocols/IcqOscarJ/res/expandst.ico
diff --git a/protocols/IcqOscarJ/icos/icq.ico b/protocols/IcqOscarJ/res/icq.ico
index 98a99aca1c..98a99aca1c 100644
--- a/protocols/IcqOscarJ/icos/icq.ico
+++ b/protocols/IcqOscarJ/res/icq.ico
diff --git a/protocols/IcqOscarJ/resources.rc b/protocols/IcqOscarJ/res/resources.rc
index 563f6eeb5e..d1dc830ab1 100644
--- a/protocols/IcqOscarJ/resources.rc
+++ b/protocols/IcqOscarJ/res/resources.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winres.h"
-#include "version.h"
+#include "..\src\version.h"
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -26,12 +26,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICQ                 ICON                    "icos/icq.ico"
-IDI_AUTH_ASK            ICON                    "icos/auth_ask.ico"
-IDI_AUTH_GRANT          ICON                    "icos/auth_grant.ico"
-IDI_AUTH_REVOKE         ICON                    "icos/auth_revoke.ico"
-IDI_SERVLIST_ADD        ICON                    "icos/srvlist_add.ico"
-IDI_EXPANDSTRINGEDIT    ICON                    "changeinfo/expandst.ico"
+IDI_ICQ                 ICON                    "icq.ico"
+IDI_AUTH_ASK            ICON                    "auth_ask.ico"
+IDI_AUTH_GRANT          ICON                    "auth_grant.ico"
+IDI_AUTH_REVOKE         ICON                    "auth_revoke.ico"
+IDI_SERVLIST_ADD        ICON                    "srvlist_add.ico"
+IDI_EXPANDSTRINGEDIT    ICON                    "expandst.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -522,13 +522,13 @@ END
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
 BEGIN
     "#include ""winres.h""\0"
-    "#include ""version.h""\0"
+    "#include ""..\\src\\version.h""\0"
 END
 
 3 TEXTINCLUDE 
diff --git a/protocols/IcqOscarJ/icos/srvlist_add.ico b/protocols/IcqOscarJ/res/srvlist_add.ico
index 18b12f8c38..18b12f8c38 100644
--- a/protocols/IcqOscarJ/icos/srvlist_add.ico
+++ b/protocols/IcqOscarJ/res/srvlist_add.ico
diff --git a/protocols/IcqOscarJ/UI/askauthentication.cpp b/protocols/IcqOscarJ/src/UI/askauthentication.cpp
index 818d5ce6de..818d5ce6de 100644
--- a/protocols/IcqOscarJ/UI/askauthentication.cpp
+++ b/protocols/IcqOscarJ/src/UI/askauthentication.cpp
diff --git a/protocols/IcqOscarJ/UI/icqoscar.h b/protocols/IcqOscarJ/src/UI/icqoscar.h
index 77283f6f7f..77283f6f7f 100644
--- a/protocols/IcqOscarJ/UI/icqoscar.h
+++ b/protocols/IcqOscarJ/src/UI/icqoscar.h
diff --git a/protocols/IcqOscarJ/UI/loginpassword.cpp b/protocols/IcqOscarJ/src/UI/loginpassword.cpp
index ab65212331..ab65212331 100644
--- a/protocols/IcqOscarJ/UI/loginpassword.cpp
+++ b/protocols/IcqOscarJ/src/UI/loginpassword.cpp
diff --git a/protocols/IcqOscarJ/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
index 91d28c0e04..91d28c0e04 100644
--- a/protocols/IcqOscarJ/UI/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
diff --git a/protocols/IcqOscarJ/capabilities.cpp b/protocols/IcqOscarJ/src/capabilities.cpp
index f994f861af..f994f861af 100644
--- a/protocols/IcqOscarJ/capabilities.cpp
+++ b/protocols/IcqOscarJ/src/capabilities.cpp
diff --git a/protocols/IcqOscarJ/capabilities.h b/protocols/IcqOscarJ/src/capabilities.h
index 3b6590dd09..3b6590dd09 100644
--- a/protocols/IcqOscarJ/capabilities.h
+++ b/protocols/IcqOscarJ/src/capabilities.h
diff --git a/protocols/IcqOscarJ/chan_01login.cpp b/protocols/IcqOscarJ/src/chan_01login.cpp
index 3c4c4febc6..3c4c4febc6 100644
--- a/protocols/IcqOscarJ/chan_01login.cpp
+++ b/protocols/IcqOscarJ/src/chan_01login.cpp
diff --git a/protocols/IcqOscarJ/chan_02data.cpp b/protocols/IcqOscarJ/src/chan_02data.cpp
index d55e0262e9..d55e0262e9 100644
--- a/protocols/IcqOscarJ/chan_02data.cpp
+++ b/protocols/IcqOscarJ/src/chan_02data.cpp
diff --git a/protocols/IcqOscarJ/chan_03error.cpp b/protocols/IcqOscarJ/src/chan_03error.cpp
index 71c6e2ea7c..71c6e2ea7c 100644
--- a/protocols/IcqOscarJ/chan_03error.cpp
+++ b/protocols/IcqOscarJ/src/chan_03error.cpp
diff --git a/protocols/IcqOscarJ/chan_04close.cpp b/protocols/IcqOscarJ/src/chan_04close.cpp
index 3c9ee46350..3c9ee46350 100644
--- a/protocols/IcqOscarJ/chan_04close.cpp
+++ b/protocols/IcqOscarJ/src/chan_04close.cpp
diff --git a/protocols/IcqOscarJ/chan_05ping.cpp b/protocols/IcqOscarJ/src/chan_05ping.cpp
index 2a2b843509..2a2b843509 100644
--- a/protocols/IcqOscarJ/chan_05ping.cpp
+++ b/protocols/IcqOscarJ/src/chan_05ping.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/changeinfo.h b/protocols/IcqOscarJ/src/changeinfo/changeinfo.h
index ecc4fc3106..ecc4fc3106 100644
--- a/protocols/IcqOscarJ/changeinfo/changeinfo.h
+++ b/protocols/IcqOscarJ/src/changeinfo/changeinfo.h
diff --git a/protocols/IcqOscarJ/changeinfo/constants.cpp b/protocols/IcqOscarJ/src/changeinfo/constants.cpp
index 92403a74f0..92403a74f0 100644
--- a/protocols/IcqOscarJ/changeinfo/constants.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/constants.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/db.cpp b/protocols/IcqOscarJ/src/changeinfo/db.cpp
index 643dcaa034..643dcaa034 100644
--- a/protocols/IcqOscarJ/changeinfo/db.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/db.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/dlgproc.cpp b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
index 404777aa97..404777aa97 100644
--- a/protocols/IcqOscarJ/changeinfo/dlgproc.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/editlist.cpp b/protocols/IcqOscarJ/src/changeinfo/editlist.cpp
index f2a1470fd3..f2a1470fd3 100644
--- a/protocols/IcqOscarJ/changeinfo/editlist.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/editlist.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/editstring.cpp b/protocols/IcqOscarJ/src/changeinfo/editstring.cpp
index 288351e8d3..288351e8d3 100644
--- a/protocols/IcqOscarJ/changeinfo/editstring.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/editstring.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/icqoscar.h b/protocols/IcqOscarJ/src/changeinfo/icqoscar.h
index 77283f6f7f..77283f6f7f 100644
--- a/protocols/IcqOscarJ/changeinfo/icqoscar.h
+++ b/protocols/IcqOscarJ/src/changeinfo/icqoscar.h
diff --git a/protocols/IcqOscarJ/changeinfo/main.cpp b/protocols/IcqOscarJ/src/changeinfo/main.cpp
index 22669be3aa..22669be3aa 100644
--- a/protocols/IcqOscarJ/changeinfo/main.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/main.cpp
diff --git a/protocols/IcqOscarJ/changeinfo/upload.cpp b/protocols/IcqOscarJ/src/changeinfo/upload.cpp
index a468dc9f2b..a468dc9f2b 100644
--- a/protocols/IcqOscarJ/changeinfo/upload.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/upload.cpp
diff --git a/protocols/IcqOscarJ/channels.h b/protocols/IcqOscarJ/src/channels.h
index ba10483b56..ba10483b56 100644
--- a/protocols/IcqOscarJ/channels.h
+++ b/protocols/IcqOscarJ/src/channels.h
diff --git a/protocols/IcqOscarJ/cookies.cpp b/protocols/IcqOscarJ/src/cookies.cpp
index 87ffb4bc07..87ffb4bc07 100644
--- a/protocols/IcqOscarJ/cookies.cpp
+++ b/protocols/IcqOscarJ/src/cookies.cpp
diff --git a/protocols/IcqOscarJ/cookies.h b/protocols/IcqOscarJ/src/cookies.h
index 05e0d170eb..05e0d170eb 100644
--- a/protocols/IcqOscarJ/cookies.h
+++ b/protocols/IcqOscarJ/src/cookies.h
diff --git a/protocols/IcqOscarJ/directpackets.cpp b/protocols/IcqOscarJ/src/directpackets.cpp
index 594f005675..594f005675 100644
--- a/protocols/IcqOscarJ/directpackets.cpp
+++ b/protocols/IcqOscarJ/src/directpackets.cpp
diff --git a/protocols/IcqOscarJ/fam_01service.cpp b/protocols/IcqOscarJ/src/fam_01service.cpp
index 9bc06f19ab..9bc06f19ab 100755..100644
--- a/protocols/IcqOscarJ/fam_01service.cpp
+++ b/protocols/IcqOscarJ/src/fam_01service.cpp
diff --git a/protocols/IcqOscarJ/fam_02location.cpp b/protocols/IcqOscarJ/src/fam_02location.cpp
index 2398cf18c6..2398cf18c6 100755..100644
--- a/protocols/IcqOscarJ/fam_02location.cpp
+++ b/protocols/IcqOscarJ/src/fam_02location.cpp
diff --git a/protocols/IcqOscarJ/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp
index caa41d966c..caa41d966c 100644
--- a/protocols/IcqOscarJ/fam_03buddy.cpp
+++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp
diff --git a/protocols/IcqOscarJ/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp
index 7d1bc6a829..7d1bc6a829 100644
--- a/protocols/IcqOscarJ/fam_04message.cpp
+++ b/protocols/IcqOscarJ/src/fam_04message.cpp
diff --git a/protocols/IcqOscarJ/fam_09bos.cpp b/protocols/IcqOscarJ/src/fam_09bos.cpp
index 327e045a96..327e045a96 100644
--- a/protocols/IcqOscarJ/fam_09bos.cpp
+++ b/protocols/IcqOscarJ/src/fam_09bos.cpp
diff --git a/protocols/IcqOscarJ/fam_0alookup.cpp b/protocols/IcqOscarJ/src/fam_0alookup.cpp
index da77295ecb..da77295ecb 100644
--- a/protocols/IcqOscarJ/fam_0alookup.cpp
+++ b/protocols/IcqOscarJ/src/fam_0alookup.cpp
diff --git a/protocols/IcqOscarJ/fam_0bstatus.cpp b/protocols/IcqOscarJ/src/fam_0bstatus.cpp
index 7a979007e2..7a979007e2 100644
--- a/protocols/IcqOscarJ/fam_0bstatus.cpp
+++ b/protocols/IcqOscarJ/src/fam_0bstatus.cpp
diff --git a/protocols/IcqOscarJ/fam_13servclist.cpp b/protocols/IcqOscarJ/src/fam_13servclist.cpp
index 5df30ee5ec..5df30ee5ec 100644
--- a/protocols/IcqOscarJ/fam_13servclist.cpp
+++ b/protocols/IcqOscarJ/src/fam_13servclist.cpp
diff --git a/protocols/IcqOscarJ/fam_15icqserver.cpp b/protocols/IcqOscarJ/src/fam_15icqserver.cpp
index 3f332e4f27..3f332e4f27 100644
--- a/protocols/IcqOscarJ/fam_15icqserver.cpp
+++ b/protocols/IcqOscarJ/src/fam_15icqserver.cpp
diff --git a/protocols/IcqOscarJ/fam_17signon.cpp b/protocols/IcqOscarJ/src/fam_17signon.cpp
index b35a432a48..b35a432a48 100644
--- a/protocols/IcqOscarJ/fam_17signon.cpp
+++ b/protocols/IcqOscarJ/src/fam_17signon.cpp
diff --git a/protocols/IcqOscarJ/families.h b/protocols/IcqOscarJ/src/families.h
index 61ac38f17a..61ac38f17a 100644
--- a/protocols/IcqOscarJ/families.h
+++ b/protocols/IcqOscarJ/src/families.h
diff --git a/protocols/IcqOscarJ/globals.h b/protocols/IcqOscarJ/src/globals.h
index c0d8326689..c0d8326689 100644
--- a/protocols/IcqOscarJ/globals.h
+++ b/protocols/IcqOscarJ/src/globals.h
diff --git a/protocols/IcqOscarJ/guids.h b/protocols/IcqOscarJ/src/guids.h
index 24073deec4..24073deec4 100644
--- a/protocols/IcqOscarJ/guids.h
+++ b/protocols/IcqOscarJ/src/guids.h
diff --git a/protocols/IcqOscarJ/i18n.cpp b/protocols/IcqOscarJ/src/i18n.cpp
index 535feebcdf..535feebcdf 100644
--- a/protocols/IcqOscarJ/i18n.cpp
+++ b/protocols/IcqOscarJ/src/i18n.cpp
diff --git a/protocols/IcqOscarJ/i18n.h b/protocols/IcqOscarJ/src/i18n.h
index eaeaad54f3..eaeaad54f3 100644
--- a/protocols/IcqOscarJ/i18n.h
+++ b/protocols/IcqOscarJ/src/i18n.h
diff --git a/protocols/IcqOscarJ/iconlib.cpp b/protocols/IcqOscarJ/src/iconlib.cpp
index 7c93bae17a..7c93bae17a 100644
--- a/protocols/IcqOscarJ/iconlib.cpp
+++ b/protocols/IcqOscarJ/src/iconlib.cpp
diff --git a/protocols/IcqOscarJ/iconlib.h b/protocols/IcqOscarJ/src/iconlib.h
index 3a7482f872..3a7482f872 100644
--- a/protocols/IcqOscarJ/iconlib.h
+++ b/protocols/IcqOscarJ/src/iconlib.h
diff --git a/protocols/IcqOscarJ/icq_advsearch.cpp b/protocols/IcqOscarJ/src/icq_advsearch.cpp
index 6c3a3ffa89..6c3a3ffa89 100644
--- a/protocols/IcqOscarJ/icq_advsearch.cpp
+++ b/protocols/IcqOscarJ/src/icq_advsearch.cpp
diff --git a/protocols/IcqOscarJ/icq_advsearch.h b/protocols/IcqOscarJ/src/icq_advsearch.h
index 83bf35af93..83bf35af93 100644
--- a/protocols/IcqOscarJ/icq_advsearch.h
+++ b/protocols/IcqOscarJ/src/icq_advsearch.h
diff --git a/protocols/IcqOscarJ/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index 6e61f2bc0d..6e61f2bc0d 100644
--- a/protocols/IcqOscarJ/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
diff --git a/protocols/IcqOscarJ/icq_avatar.h b/protocols/IcqOscarJ/src/icq_avatar.h
index 6bfcb65c45..6bfcb65c45 100644
--- a/protocols/IcqOscarJ/icq_avatar.h
+++ b/protocols/IcqOscarJ/src/icq_avatar.h
diff --git a/protocols/IcqOscarJ/icq_clients.cpp b/protocols/IcqOscarJ/src/icq_clients.cpp
index bb1ebb5621..bb1ebb5621 100644
--- a/protocols/IcqOscarJ/icq_clients.cpp
+++ b/protocols/IcqOscarJ/src/icq_clients.cpp
diff --git a/protocols/IcqOscarJ/icq_constants.h b/protocols/IcqOscarJ/src/icq_constants.h
index 4da90f1bc0..4da90f1bc0 100644
--- a/protocols/IcqOscarJ/icq_constants.h
+++ b/protocols/IcqOscarJ/src/icq_constants.h
diff --git a/protocols/IcqOscarJ/icq_db.cpp b/protocols/IcqOscarJ/src/icq_db.cpp
index f199860df8..f199860df8 100644
--- a/protocols/IcqOscarJ/icq_db.cpp
+++ b/protocols/IcqOscarJ/src/icq_db.cpp
diff --git a/protocols/IcqOscarJ/icq_db.h b/protocols/IcqOscarJ/src/icq_db.h
index 5bfc22d58b..5bfc22d58b 100644
--- a/protocols/IcqOscarJ/icq_db.h
+++ b/protocols/IcqOscarJ/src/icq_db.h
diff --git a/protocols/IcqOscarJ/icq_direct.cpp b/protocols/IcqOscarJ/src/icq_direct.cpp
index 7779f1bad7..7779f1bad7 100644
--- a/protocols/IcqOscarJ/icq_direct.cpp
+++ b/protocols/IcqOscarJ/src/icq_direct.cpp
diff --git a/protocols/IcqOscarJ/icq_direct.h b/protocols/IcqOscarJ/src/icq_direct.h
index 3cf91cb493..3cf91cb493 100644
--- a/protocols/IcqOscarJ/icq_direct.h
+++ b/protocols/IcqOscarJ/src/icq_direct.h
diff --git a/protocols/IcqOscarJ/icq_directmsg.cpp b/protocols/IcqOscarJ/src/icq_directmsg.cpp
index 89fbb7cea5..89fbb7cea5 100644
--- a/protocols/IcqOscarJ/icq_directmsg.cpp
+++ b/protocols/IcqOscarJ/src/icq_directmsg.cpp
diff --git a/protocols/IcqOscarJ/icq_fieldnames.cpp b/protocols/IcqOscarJ/src/icq_fieldnames.cpp
index d953a081cf..d953a081cf 100644
--- a/protocols/IcqOscarJ/icq_fieldnames.cpp
+++ b/protocols/IcqOscarJ/src/icq_fieldnames.cpp
diff --git a/protocols/IcqOscarJ/icq_fieldnames.h b/protocols/IcqOscarJ/src/icq_fieldnames.h
index cf15475299..cf15475299 100644
--- a/protocols/IcqOscarJ/icq_fieldnames.h
+++ b/protocols/IcqOscarJ/src/icq_fieldnames.h
diff --git a/protocols/IcqOscarJ/icq_filerequests.cpp b/protocols/IcqOscarJ/src/icq_filerequests.cpp
index d85de72580..d85de72580 100644
--- a/protocols/IcqOscarJ/icq_filerequests.cpp
+++ b/protocols/IcqOscarJ/src/icq_filerequests.cpp
diff --git a/protocols/IcqOscarJ/icq_filetransfer.cpp b/protocols/IcqOscarJ/src/icq_filetransfer.cpp
index 61484c3987..61484c3987 100644
--- a/protocols/IcqOscarJ/icq_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/icq_filetransfer.cpp
diff --git a/protocols/IcqOscarJ/icq_firstrun.cpp b/protocols/IcqOscarJ/src/icq_firstrun.cpp
index 1208d6d0ec..1208d6d0ec 100644
--- a/protocols/IcqOscarJ/icq_firstrun.cpp
+++ b/protocols/IcqOscarJ/src/icq_firstrun.cpp
diff --git a/protocols/IcqOscarJ/icq_http.cpp b/protocols/IcqOscarJ/src/icq_http.cpp
index 3e50db43ed..3e50db43ed 100644
--- a/protocols/IcqOscarJ/icq_http.cpp
+++ b/protocols/IcqOscarJ/src/icq_http.cpp
diff --git a/protocols/IcqOscarJ/icq_http.h b/protocols/IcqOscarJ/src/icq_http.h
index 017a5ea5fc..017a5ea5fc 100644
--- a/protocols/IcqOscarJ/icq_http.h
+++ b/protocols/IcqOscarJ/src/icq_http.h
diff --git a/protocols/IcqOscarJ/icq_infoupdate.cpp b/protocols/IcqOscarJ/src/icq_infoupdate.cpp
index 014df20e01..014df20e01 100644
--- a/protocols/IcqOscarJ/icq_infoupdate.cpp
+++ b/protocols/IcqOscarJ/src/icq_infoupdate.cpp
diff --git a/protocols/IcqOscarJ/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index f3dd072cde..f3dd072cde 100644
--- a/protocols/IcqOscarJ/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
diff --git a/protocols/IcqOscarJ/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index 44c1881d14..44c1881d14 100644
--- a/protocols/IcqOscarJ/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
diff --git a/protocols/IcqOscarJ/icq_packet.cpp b/protocols/IcqOscarJ/src/icq_packet.cpp
index 79241cf297..79241cf297 100644
--- a/protocols/IcqOscarJ/icq_packet.cpp
+++ b/protocols/IcqOscarJ/src/icq_packet.cpp
diff --git a/protocols/IcqOscarJ/icq_packet.h b/protocols/IcqOscarJ/src/icq_packet.h
index ccaeb91fcc..ccaeb91fcc 100644
--- a/protocols/IcqOscarJ/icq_packet.h
+++ b/protocols/IcqOscarJ/src/icq_packet.h
diff --git a/protocols/IcqOscarJ/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp
index 21ca36348d..21ca36348d 100644
--- a/protocols/IcqOscarJ/icq_popups.cpp
+++ b/protocols/IcqOscarJ/src/icq_popups.cpp
diff --git a/protocols/IcqOscarJ/icq_popups.h b/protocols/IcqOscarJ/src/icq_popups.h
index a42c230634..a42c230634 100644
--- a/protocols/IcqOscarJ/icq_popups.h
+++ b/protocols/IcqOscarJ/src/icq_popups.h
diff --git a/protocols/IcqOscarJ/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index d1490fac2e..d1490fac2e 100755..100644
--- a/protocols/IcqOscarJ/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
diff --git a/protocols/IcqOscarJ/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index aa903689ad..aa903689ad 100755..100644
--- a/protocols/IcqOscarJ/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
diff --git a/protocols/IcqOscarJ/icq_rates.cpp b/protocols/IcqOscarJ/src/icq_rates.cpp
index e7513ec148..e7513ec148 100644
--- a/protocols/IcqOscarJ/icq_rates.cpp
+++ b/protocols/IcqOscarJ/src/icq_rates.cpp
diff --git a/protocols/IcqOscarJ/icq_rates.h b/protocols/IcqOscarJ/src/icq_rates.h
index ab16e74007..ab16e74007 100644
--- a/protocols/IcqOscarJ/icq_rates.h
+++ b/protocols/IcqOscarJ/src/icq_rates.h
diff --git a/protocols/IcqOscarJ/icq_server.cpp b/protocols/IcqOscarJ/src/icq_server.cpp
index 63a5d63d84..63a5d63d84 100644
--- a/protocols/IcqOscarJ/icq_server.cpp
+++ b/protocols/IcqOscarJ/src/icq_server.cpp
diff --git a/protocols/IcqOscarJ/icq_server.h b/protocols/IcqOscarJ/src/icq_server.h
index eba3ecfa42..eba3ecfa42 100644
--- a/protocols/IcqOscarJ/icq_server.h
+++ b/protocols/IcqOscarJ/src/icq_server.h
diff --git a/protocols/IcqOscarJ/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index b2adc4831c..b2adc4831c 100644
--- a/protocols/IcqOscarJ/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
diff --git a/protocols/IcqOscarJ/icq_servlist.h b/protocols/IcqOscarJ/src/icq_servlist.h
index 76118ce3c0..76118ce3c0 100644
--- a/protocols/IcqOscarJ/icq_servlist.h
+++ b/protocols/IcqOscarJ/src/icq_servlist.h
diff --git a/protocols/IcqOscarJ/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp
index f5e5c937b3..f5e5c937b3 100644
--- a/protocols/IcqOscarJ/icq_uploadui.cpp
+++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp
diff --git a/protocols/IcqOscarJ/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 92ae0eea14..b567105dbe 100644
--- a/protocols/IcqOscarJ/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -29,6 +29,7 @@
 // -----------------------------------------------------------------------------
 #include "icqoscar.h"
 #include "m_extraicons.h"
+#include "..\icons_pack\src\resource.h"
 
 
 extern HANDLE hExtraXStatus;
diff --git a/protocols/IcqOscarJ/icq_xtraz.cpp b/protocols/IcqOscarJ/src/icq_xtraz.cpp
index 2b73274365..2b73274365 100644
--- a/protocols/IcqOscarJ/icq_xtraz.cpp
+++ b/protocols/IcqOscarJ/src/icq_xtraz.cpp
diff --git a/protocols/IcqOscarJ/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
index ee6dd1731c..ee6dd1731c 100755..100644
--- a/protocols/IcqOscarJ/icqosc_svcs.cpp
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
diff --git a/protocols/IcqOscarJ/icqosc_svcs.h b/protocols/IcqOscarJ/src/icqosc_svcs.h
index 844eecee51..844eecee51 100644
--- a/protocols/IcqOscarJ/icqosc_svcs.h
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.h
diff --git a/protocols/IcqOscarJ/icqoscar.cpp b/protocols/IcqOscarJ/src/icqoscar.cpp
index 5ce67145cd..5ce67145cd 100644
--- a/protocols/IcqOscarJ/icqoscar.cpp
+++ b/protocols/IcqOscarJ/src/icqoscar.cpp
diff --git a/protocols/IcqOscarJ/icqoscar.h b/protocols/IcqOscarJ/src/icqoscar.h
index ef0e32a6fd..ef0e32a6fd 100755..100644
--- a/protocols/IcqOscarJ/icqoscar.h
+++ b/protocols/IcqOscarJ/src/icqoscar.h
diff --git a/protocols/IcqOscarJ/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index 450ea73b16..450ea73b16 100644
--- a/protocols/IcqOscarJ/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
diff --git a/protocols/IcqOscarJ/init.h b/protocols/IcqOscarJ/src/init.h
index 0e93a8a89f..0e93a8a89f 100644
--- a/protocols/IcqOscarJ/init.h
+++ b/protocols/IcqOscarJ/src/init.h
diff --git a/protocols/IcqOscarJ/log.cpp b/protocols/IcqOscarJ/src/log.cpp
index 402863a456..402863a456 100644
--- a/protocols/IcqOscarJ/log.cpp
+++ b/protocols/IcqOscarJ/src/log.cpp
diff --git a/protocols/IcqOscarJ/log.h b/protocols/IcqOscarJ/src/log.h
index 6da25df0d7..6da25df0d7 100644
--- a/protocols/IcqOscarJ/log.h
+++ b/protocols/IcqOscarJ/src/log.h
diff --git a/protocols/IcqOscarJ/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
index 9630abc070..9630abc070 100644
--- a/protocols/IcqOscarJ/oscar_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
diff --git a/protocols/IcqOscarJ/oscar_filetransfer.h b/protocols/IcqOscarJ/src/oscar_filetransfer.h
index fa6ec9169e..fa6ec9169e 100644
--- a/protocols/IcqOscarJ/oscar_filetransfer.h
+++ b/protocols/IcqOscarJ/src/oscar_filetransfer.h
diff --git a/protocols/IcqOscarJ/resource.h b/protocols/IcqOscarJ/src/resource.h
index 2bdec69fe0..1dbd905dde 100644
--- a/protocols/IcqOscarJ/resource.h
+++ b/protocols/IcqOscarJ/src/resource.h
@@ -15,92 +15,6 @@
 #define IDI_AUTH_GRANT                  151
 #define IDI_AUTH_REVOKE                 152
 #define IDI_SERVLIST_ADD                160
-#define IDI_XSTATUS1                    201
-#define IDI_XSTATUS2                    202
-#define IDI_XSTATUS3                    203
-#define IDI_XSTATUS4                    204
-#define IDI_XSTATUS5                    205
-#define IDI_XSTATUS6                    206
-#define IDI_XSTATUS7                    207
-#define IDI_XSTATUS8                    208
-#define IDI_XSTATUS9                    209
-#define IDI_XSTATUS10                   210
-#define IDI_XSTATUS11                   211
-#define IDI_XSTATUS12                   212
-#define IDI_XSTATUS13                   213
-#define IDI_XSTATUS14                   214
-#define IDI_XSTATUS15                   215
-#define IDI_XSTATUS16                   216
-#define IDI_XSTATUS17                   217
-#define IDI_XSTATUS18                   218
-#define IDI_XSTATUS19                   219
-#define IDI_XSTATUS20                   220
-#define IDI_XSTATUS21                   221
-#define IDI_XSTATUS22                   222
-#define IDI_XSTATUS23                   223
-#define IDI_XSTATUS24                   224
-#define IDI_XSTATUS25                   225
-#define IDI_XSTATUS26                   226
-#define IDI_XSTATUS27                   227
-#define IDI_XSTATUS28                   228
-#define IDI_XSTATUS29                   229
-#define IDI_XSTATUS30                   230
-#define IDI_XSTATUS31                   231
-#define IDI_XSTATUS32                   232
-#define IDI_XSTATUS33                   233
-#define IDI_XSTATUS34                   234
-#define IDI_XSTATUS35                   235
-#define IDI_XSTATUS36                   236
-#define IDI_XSTATUS37                   237
-#define IDI_XSTATUS38                   238
-#define IDI_XSTATUS39                   239
-#define IDI_XSTATUS40                   240
-#define IDI_XSTATUS41                   241
-#define IDI_XSTATUS42                   242
-#define IDI_XSTATUS43                   243
-#define IDI_XSTATUS44                   244
-#define IDI_XSTATUS45                   245
-#define IDI_XSTATUS46                   246
-#define IDI_XSTATUS47                   247
-#define IDI_XSTATUS48                   248
-#define IDI_XSTATUS49                   249
-#define IDI_XSTATUS50                   250
-#define IDI_XSTATUS51                   251
-#define IDI_XSTATUS52                   252
-#define IDI_XSTATUS53                   253
-#define IDI_XSTATUS54                   254
-#define IDI_XSTATUS55                   255
-#define IDI_XSTATUS56                   256
-#define IDI_XSTATUS57                   257
-#define IDI_XSTATUS58                   258
-#define IDI_XSTATUS59                   259
-#define IDI_XSTATUS60                   260
-#define IDI_XSTATUS61                   261
-#define IDI_XSTATUS62                   262
-#define IDI_XSTATUS63                   263
-#define IDI_XSTATUS64                   264
-#define IDI_XSTATUS65                   265
-#define IDI_XSTATUS66                   266
-#define IDI_XSTATUS67                   267
-#define IDI_XSTATUS68                   268
-#define IDI_XSTATUS69                   269
-#define IDI_XSTATUS70                   270
-#define IDI_XSTATUS71                   271
-#define IDI_XSTATUS72                   272
-#define IDI_XSTATUS73                   273
-#define IDI_XSTATUS74                   274
-#define IDI_XSTATUS75                   275
-#define IDI_XSTATUS76                   276
-#define IDI_XSTATUS77                   277
-#define IDI_XSTATUS78                   278
-#define IDI_XSTATUS79                   279
-#define IDI_XSTATUS80                   280
-#define IDI_XSTATUS81                   281
-#define IDI_XSTATUS82                   282
-#define IDI_XSTATUS83                   283
-#define IDI_XSTATUS84                   284
-#define IDI_XSTATUS85                   285
-#define IDI_XSTATUS86                   286
 #define IDD_INFO_ICQ                    240
 #define IDD_ICQADVANCEDSEARCH           242
 #define IDD_ICQUPLOADLIST               253
diff --git a/protocols/IcqOscarJ/stdpackets.cpp b/protocols/IcqOscarJ/src/stdpackets.cpp
index 3bc9502560..3bc9502560 100644
--- a/protocols/IcqOscarJ/stdpackets.cpp
+++ b/protocols/IcqOscarJ/src/stdpackets.cpp
diff --git a/protocols/IcqOscarJ/stdpackets.h b/protocols/IcqOscarJ/src/stdpackets.h
index b656d713c6..b656d713c6 100644
--- a/protocols/IcqOscarJ/stdpackets.h
+++ b/protocols/IcqOscarJ/src/stdpackets.h
diff --git a/protocols/IcqOscarJ/tlv.cpp b/protocols/IcqOscarJ/src/tlv.cpp
index 7c4eafca3a..7c4eafca3a 100644
--- a/protocols/IcqOscarJ/tlv.cpp
+++ b/protocols/IcqOscarJ/src/tlv.cpp
diff --git a/protocols/IcqOscarJ/tlv.h b/protocols/IcqOscarJ/src/tlv.h
index 5cee00c7c4..5cee00c7c4 100644
--- a/protocols/IcqOscarJ/tlv.h
+++ b/protocols/IcqOscarJ/src/tlv.h
diff --git a/protocols/IcqOscarJ/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp
index 70f7547108..70f7547108 100644
--- a/protocols/IcqOscarJ/utilities.cpp
+++ b/protocols/IcqOscarJ/src/utilities.cpp
diff --git a/protocols/IcqOscarJ/utilities.h b/protocols/IcqOscarJ/src/utilities.h
index 962ecce15f..962ecce15f 100644
--- a/protocols/IcqOscarJ/utilities.h
+++ b/protocols/IcqOscarJ/src/utilities.h
diff --git a/protocols/IcqOscarJ/version.h b/protocols/IcqOscarJ/src/version.h
index 0231d7a7ea..0231d7a7ea 100644
--- a/protocols/IcqOscarJ/version.h
+++ b/protocols/IcqOscarJ/src/version.h