- all icolib services removed;

- IcoLib_* functions are bound directly to the code

git-svn-id: http://svn.miranda-ng.org/main/trunk@14161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

47 files changed, 176 insertions, 190 deletions

diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index b9449f78fb..6d99b8d563 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -60,14 +60,14 @@ void InitIcons(void)
 	Icon_Register(hInstance, "Protocols/AIM/"LPGEN("Profile Editor"), iconList+14, 14, "AIM");

 }

 

-HICON LoadIconEx(const char* name, bool big)

+HICON LoadIconEx(const char *name, bool big)

 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "AIM_%s", name);

-	return Skin_GetIcon(szSettingName, big);

+	return IcoLib_GetIcon(szSettingName, big);

 }

 

-HANDLE GetIconHandle(const char* name)

+HANDLE GetIconHandle(const char *name)

 {

 	for (int i=0; i < SIZEOF(iconList); i++)

 		if ( !mir_strcmp(iconList[i].szName, name))

@@ -76,25 +76,19 @@ HANDLE GetIconHandle(const char* name)
 	return NULL;

 }

 

-void ReleaseIconEx(const char* name, bool big)

+void ReleaseIconEx(const char *name, bool big)

 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName ), "%s_%s", "AIM", name);

-	Skin_ReleaseIcon(szSettingName, big);

+	IcoLib_Release(szSettingName, big);

 }

 

-void WindowSetIcon(HWND hWnd, const char* name)

+void Window_SetIcon(HWND hWnd, const char* name)

 {

 	SendMessage(hWnd, WM_SETICON, ICON_BIG,   (LPARAM)LoadIconEx( name, true ));

 	SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIconEx( name ));

 }

 

-void WindowFreeIcon(HWND hWnd)

-{

-	Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_BIG, 0));

-	Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0));

-}

-

 /////////////////////////////////////////////////////////////////////////////////////////

 // Extra Icons

 

diff --git a/protocols/AimOscar/src/theme.h b/protocols/AimOscar/src/theme.h
index e2e6531174..70baf03d61 100644
--- a/protocols/AimOscar/src/theme.h
+++ b/protocols/AimOscar/src/theme.h
@@ -22,11 +22,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 void InitIcons(void);

 void InitExtraIcons(void);

 

-HICON  LoadIconEx(const char* name, bool big = false);

-HANDLE GetIconHandle(const char* name);

-void   ReleaseIconEx(const char* name, bool big = false);

-void   WindowSetIcon(HWND hWnd, const char* name);

-void   WindowFreeIcon(HWND hWnd);

+HICON  LoadIconEx(const char *name, bool big = false);

+HANDLE GetIconHandle(const char *name);

+void   ReleaseIconEx(const char *name, bool big = false);

+

+void   Window_SetIcon(HWND hWnd, const char *name);

 

 void   add_AT_icons(CAimProto* ppro);

 void   remove_AT_icons(CAimProto* ppro);

diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp
index 597501892f..4904e134eb 100644
--- a/protocols/AimOscar/src/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
@@ -1131,7 +1131,7 @@ INT_PTR CAimProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam)
 

 INT_PTR CALLBACK instant_idle_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	CAimProto* ppro = (CAimProto*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

+	CAimProto *ppro = (CAimProto*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 

 	switch (msg) {

 	case WM_INITDIALOG:

@@ -1140,7 +1140,7 @@ INT_PTR CALLBACK instant_idle_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 		ppro = (CAimProto*)lParam;

 		{

-			WindowSetIcon(hwndDlg, "idle");

+			Window_SetIcon(hwndDlg, "idle");

 			unsigned long it = ppro->getDword(AIM_KEY_IIT, 0);

 			unsigned long hours = it / 60;

 			unsigned long minutes = it % 60;

@@ -1154,7 +1154,7 @@ INT_PTR CALLBACK instant_idle_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		break;

 

 	case WM_DESTROY:

-		WindowFreeIcon(hwndDlg);

+		Window_FreeIcon_IcoLib(hwndDlg);

 		break;

 

 	case WM_COMMAND:

@@ -1201,7 +1201,7 @@ INT_PTR CALLBACK join_chat_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 		ppro = (CAimProto*)lParam;

-		WindowSetIcon(hwndDlg, "aol");

+		Window_SetIcon(hwndDlg, "aol");

 		break;

 

 	case WM_CLOSE:

@@ -1209,7 +1209,7 @@ INT_PTR CALLBACK join_chat_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		break;

 

 	case WM_DESTROY:

-		WindowFreeIcon(hwndDlg);

+		Window_FreeIcon_IcoLib(hwndDlg);

 		break;

 

 	case WM_COMMAND:

@@ -1310,7 +1310,7 @@ INT_PTR CALLBACK invite_to_chat_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 		param = (invite_chat_param*)lParam;

 

-		WindowSetIcon(hwndDlg, "aol");

+		Window_SetIcon(hwndDlg, "aol");

 		SetDlgItemTextA(hwndDlg, IDC_ROOMNAME, param->id);

 		SetDlgItemTextA(hwndDlg, IDC_MSG, Translate("Join me in this buddy chat!"));

 		break;

@@ -1320,7 +1320,7 @@ INT_PTR CALLBACK invite_to_chat_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		break;

 

 	case WM_NCDESTROY:

-		WindowFreeIcon(hwndDlg);

+		Window_FreeIcon_IcoLib(hwndDlg);

 		delete param;

 		break;

 

@@ -1399,7 +1399,7 @@ INT_PTR CALLBACK chat_request_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 		param = (invite_chat_req_param*)lParam;

 

-		WindowSetIcon(hwndDlg, "aol");

+		Window_SetIcon(hwndDlg, "aol");

 

 		SetDlgItemTextA(hwndDlg, IDC_ROOMNAME, strrchr(param->cnp->id, '-') + 1);

 		SetDlgItemTextA(hwndDlg, IDC_SCREENNAME, param->name);

@@ -1411,7 +1411,7 @@ INT_PTR CALLBACK chat_request_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		break;

 

 	case WM_DESTROY:

-		WindowFreeIcon(hwndDlg);

+		Window_FreeIcon_IcoLib(hwndDlg);

 		delete param;

 		break;

 

diff --git a/protocols/Dummy/src/dummy_options.cpp b/protocols/Dummy/src/dummy_options.cpp
index c667bd5fff..279140bc29 100644
--- a/protocols/Dummy/src/dummy_options.cpp
+++ b/protocols/Dummy/src/dummy_options.cpp
@@ -31,8 +31,8 @@ INT_PTR CALLBACK DummyAccountProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 		ppro = (CDummyProto*)lParam;
 		SetWindowLongPtr( hwndDlg, GWLP_USERDATA, lParam );
 
-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon, true));
-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon));
+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon, true));
+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon));
 		{
 			ptrA tszIdText(ppro->getStringA(DUMMY_ID_TEXT));
 			if (tszIdText != NULL)
@@ -72,8 +72,8 @@ INT_PTR CALLBACK DummyAccountProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 		break;
 
 	case WM_DESTROY:
-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));
-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));
 		break;
 	}
 
diff --git a/protocols/FacebookRM/src/captcha.cpp b/protocols/FacebookRM/src/captcha.cpp
index d526d06623..4ff4a2faa9 100644
--- a/protocols/FacebookRM/src/captcha.cpp
+++ b/protocols/FacebookRM/src/captcha.cpp
@@ -39,8 +39,8 @@ static INT_PTR CALLBACK CaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 	switch (msg) {
 	case WM_INITDIALOG: {
 		TranslateDialogDefault(hwndDlg);
-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(GetIconHandle("key"), TRUE));
-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(GetIconHandle("key")));
+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(GetIconHandle("key"), TRUE));
+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(GetIconHandle("key")));
 		params = (CAPTCHA_FORM_PARAMS*)lParam;
 
 		SetDlgItemText(hwndDlg, IDC_INSTRUCTION, TranslateT("Enter the text you see"));
@@ -96,8 +96,8 @@ static INT_PTR CALLBACK CaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 		break;
 
 	case WM_DESTROY:
-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, 0));
-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, 0));
 		break;
 	}
 	return FALSE;
diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp
index 210a449644..3610b5d19f 100644
--- a/protocols/FacebookRM/src/dialogs.cpp
+++ b/protocols/FacebookRM/src/dialogs.cpp
@@ -193,7 +193,7 @@ INT_PTR CALLBACK FBMindProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara
 	{
 		TranslateDialogDefault(hwnd);
 
-		SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(GetIconHandle("mind")));
+		SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(GetIconHandle("mind")));
 
 		data = reinterpret_cast<post_status_data*>(lparam);
 
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 1170c298be..c88b030eba 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -536,7 +536,7 @@ int FacebookProto::OnToolbarInit(WPARAM, LPARAM)
 
 	ttb.pszService = service;
 	ttb.pszTooltipUp = ttb.name = LPGEN("Share status...");
-	ttb.hIconHandleUp = Skin_GetIconByHandle(GetIconHandle("mind"));
+	ttb.hIconHandleUp = IcoLib_GetIconByHandle(GetIconHandle("mind"));
 	TopToolbar_AddButton(&ttb);
 
 	return 0;
@@ -995,7 +995,7 @@ void FacebookProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Client");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("facebook"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("facebook"));
 	ppc.colorBack = RGB(191, 0, 0); // red
 	ppc.colorText = RGB(255, 255, 255); // white
 	ppc.iSeconds = 0;
@@ -1006,7 +1006,7 @@ void FacebookProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Newsfeed");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("newsfeed"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("newsfeed"));
 	ppc.colorBack = RGB(255, 255, 255); // white
 	ppc.colorText = RGB(0, 0, 0); // black
 	ppc.iSeconds = 0;
@@ -1017,7 +1017,7 @@ void FacebookProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Notification");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("notification"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("notification"));
 	ppc.colorBack = RGB(59, 89, 152); // Facebook's blue
 	ppc.colorText = RGB(255, 255, 255); // white
 	ppc.iSeconds = 0;
@@ -1028,7 +1028,7 @@ void FacebookProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Other");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("facebook"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("facebook"));
 	ppc.colorBack = RGB(255, 255, 255); // white
 	ppc.colorText = RGB(0, 0, 0); // black
 	ppc.iSeconds = 0;
@@ -1039,7 +1039,7 @@ void FacebookProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Friendship");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("friendship"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("friendship"));
 	ppc.colorBack = RGB(47, 71, 122); // Facebook's darker blue
 	ppc.colorText = RGB(255, 255, 255); // white
 	ppc.iSeconds = 0;
@@ -1050,7 +1050,7 @@ void FacebookProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Ticker");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("newsfeed"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("newsfeed"));
 	ppc.colorBack = RGB(255, 255, 255); // white
 	ppc.colorText = RGB(0, 0, 0); // black
 	ppc.iSeconds = 0;
@@ -1061,7 +1061,7 @@ void FacebookProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "OnThisDay");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("newsfeed"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("newsfeed"));
 	ppc.colorBack = RGB(255, 255, 255); // white
 	ppc.colorText = RGB(0, 0, 0); // black
 	ppc.iSeconds = 0;
@@ -1129,7 +1129,7 @@ void FacebookProto::MessageRead(MCONTACT hContact)
 
 	StatusTextData st = { 0 };
 	st.cbSize = sizeof(st);
-	st.hIcon = Skin_GetIconByHandle(GetIconHandle("read"));
+	st.hIcon = IcoLib_GetIconByHandle(GetIconHandle("read"));
 
 	if (isChatRoom(hContact)) {
 		// Load readers names
diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj b/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj
index 9be0294100..25a5fd62fe 100644
--- a/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj
+++ b/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj
@@ -83,7 +83,6 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -112,7 +111,6 @@
       <PrecompiledHeaderFile>gg.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -143,7 +141,6 @@
       <PrecompiledHeaderFile>gg.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -177,7 +174,6 @@
       <PrecompiledHeaderFile>gg.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj b/protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj
index f0ee1e4275..e2c3e076ee 100644
--- a/protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj
+++ b/protocols/Gadu-Gadu/Gadu-Gadu_12.vcxproj
@@ -87,7 +87,6 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -117,7 +116,6 @@
       <PrecompiledHeaderFile>gg.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -148,7 +146,6 @@
       <PrecompiledHeaderFile>gg.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -181,7 +178,6 @@
       <PrecompiledHeaderFile>gg.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index c93923b8a4..a2b2525ef3 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -322,9 +322,9 @@ char *gg_avatarhash(char *param);
 

 /* IcoLib functions */

 void gg_icolib_init();

-HICON LoadIconEx(const char* name, BOOL big);

+HICON LoadIconEx(const char* name, bool big);

 HANDLE GetIconHandle(int iconId);

-void ReleaseIconEx(const char* name, BOOL big);

+void ReleaseIconEx(const char* name, bool big);

 void WindowSetIcon(HWND hWnd, const char* name);

 void WindowFreeIcon(HWND hWnd);

 

diff --git a/protocols/Gadu-Gadu/src/icolib.cpp b/protocols/Gadu-Gadu/src/icolib.cpp
index b50d305a5d..a0b9c291de 100644
--- a/protocols/Gadu-Gadu/src/icolib.cpp
+++ b/protocols/Gadu-Gadu/src/icolib.cpp
@@ -48,11 +48,11 @@ void gg_icolib_init()
 	Icon_Register(hInstance, "Protocols/" GGDEF_PROTO, iconList, SIZEOF(iconList), GGDEF_PROTO);

 }

 

-HICON LoadIconEx(const char* name, BOOL big)

+HICON LoadIconEx(const char* name, bool big)

 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", GGDEF_PROTO, name);

-	return Skin_GetIcon(szSettingName, big);

+	return IcoLib_GetIcon(szSettingName, big);

 }

 

 HANDLE GetIconHandle(int iconId)

@@ -63,11 +63,11 @@ HANDLE GetIconHandle(int iconId)
 	return NULL;

 }

 

-void ReleaseIconEx(const char* name, BOOL big)

+void ReleaseIconEx(const char* name, bool big)

 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", GGDEF_PROTO, name);

-	Skin_ReleaseIcon(szSettingName, big);

+	IcoLib_Release(szSettingName, big);

 }

 

 void WindowSetIcon(HWND hWnd, const char* name)

@@ -78,6 +78,6 @@ void WindowSetIcon(HWND hWnd, const char* name)
 

 void WindowFreeIcon(HWND hWnd)

 {

-	Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_BIG, 0));

-	Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0));

+	IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_BIG, 0));

+	IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0));

 }

diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp
index 637001281d..c9407b2473 100644
--- a/protocols/Gadu-Gadu/src/links.cpp
+++ b/protocols/Gadu-Gadu/src/links.cpp
@@ -74,7 +74,7 @@ static INT_PTR gg_parselink(WPARAM wParam, LPARAM lParam)
 

 		Menu_ModifyItem(gg->hInstanceMenuItem, &mi);

 		if (mi.hIcon)

-			Skin_ReleaseIcon(mi.hIcon);

+			IcoLib_ReleaseIcon(mi.hIcon);

 	}

 

 	if (items > 1) {

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 5bd7ac5427..5ca6da4826 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -214,7 +214,7 @@ HICON LoadIconEx(int iconId, bool big)
 {

 	for (int i = 0; i < SIZEOF(iconList); i++)

 		if (iconList[i].defIconID == iconId)

-			return Skin_GetIconByHandle(iconList[i].hIcolib, big);

+			return IcoLib_GetIconByHandle(iconList[i].hIcolib, big);

 

 	return NULL;

 }

@@ -231,7 +231,7 @@ HANDLE GetIconHandle(int iconId)
 void ReleaseIconEx(HICON hIcon)

 {

 	if (hIcon)

-		Skin_ReleaseIcon(hIcon);

+		IcoLib_ReleaseIcon(hIcon);

 }

 

 void WindowSetIcon(HWND hWnd, int iconId)

diff --git a/protocols/IcqOscarJ/src/icq_firstrun.cpp b/protocols/IcqOscarJ/src/icq_firstrun.cpp
index b223911eb4..cf065c1664 100644
--- a/protocols/IcqOscarJ/src/icq_firstrun.cpp
+++ b/protocols/IcqOscarJ/src/icq_firstrun.cpp
@@ -50,8 +50,8 @@ INT_PTR CALLBACK icq_FirstRunDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		ppro = (CIcqProto*)lParam;

 		SetWindowLongPtr( hwndDlg, GWLP_USERDATA, lParam );

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon, true));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon, true));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon));

 

 		SendDlgItemMessage(hwndDlg, IDC_PW, EM_LIMITTEXT, PASSWORDMAXLEN - 1, 0);

 

@@ -59,8 +59,8 @@ INT_PTR CALLBACK icq_FirstRunDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		return TRUE;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

 		break;

 

 	case WM_CLOSE:

diff --git a/protocols/IcqOscarJ/src/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp
index ae86931ce7..7c74c31169 100644
--- a/protocols/IcqOscarJ/src/icq_popups.cpp
+++ b/protocols/IcqOscarJ/src/icq_popups.cpp
@@ -248,7 +248,7 @@ int CIcqProto::ShowPopupMsg(MCONTACT hContact, const char *szTitle, const char *
 			return -1;

 		}

 		if (!getByte("PopupsSysIcons", DEFAULT_POPUPS_SYS_ICONS))

-			ppd.lchIcon = Skin_GetIconByHandle(m_hProtoIcon);

+			ppd.lchIcon = IcoLib_GetIconByHandle(m_hProtoIcon);

 		else

 			ppd.lchIcon = (HICON)LoadImage( NULL, rsIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED);

 		

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 0315bd3c01..0e040ddb91 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -165,7 +165,7 @@ HICON CIcqProto::getXStatusIcon(int bStatus, UINT flags)
 	HICON icon = NULL;

 

 	if (bStatus > 0 && bStatus <= XSTATUS_COUNT)

-		icon = Skin_GetIconByHandle(hXStatusIcons[bStatus-1], (flags & LR_BIGICON) != 0);

+		icon = IcoLib_GetIconByHandle(hXStatusIcons[bStatus-1], (flags & LR_BIGICON) != 0);

 

 	return (flags & LR_SHARED || !icon) ? icon : CopyIcon(icon);

 }

@@ -756,8 +756,8 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara
 				SAFE_FREE(&szValue);

 

 				if (dat->bXStatus) {

-					Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

-					Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

+					IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

+					IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

 				}

 			}

 			dat->ppro->updateServerCustomStatus(TRUE);

@@ -901,7 +901,7 @@ void InitXStatusIcons()
 		sid.pszName = szTemp;

 		sid.description.a = (LPSTR)nameXStatus[i];

 		sid.iDefaultIndex = -(IDI_XSTATUS1+i);

-		hXStatusIcons[i] = Skin_AddIcon(&sid);

+		hXStatusIcons[i] = IcoLib_AddIcon(&sid);

 	}

 

 	// initialize arrays for CList custom status icons

@@ -1120,7 +1120,7 @@ INT_PTR CIcqProto::RequestAdvStatusIconIdx(WPARAM wParam, LPARAM)
 				// mark icon index in the array as valid

 				bXStatusCListIconsValid[bXStatus-1] = TRUE;

 

-				Skin_ReleaseIcon(hXStatusIcon);

+				IcoLib_ReleaseIcon(hXStatusIcon);

 			}		

 		}

 

diff --git a/protocols/IcqOscarJ/src/loginpassword.cpp b/protocols/IcqOscarJ/src/loginpassword.cpp
index 6268f76665..c7a448b11f 100644
--- a/protocols/IcqOscarJ/src/loginpassword.cpp
+++ b/protocols/IcqOscarJ/src/loginpassword.cpp
@@ -36,8 +36,8 @@ INT_PTR CALLBACK LoginPasswdDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		ppro = (CIcqProto*)lParam;

 		SetWindowLongPtr( hwndDlg, GWLP_USERDATA, lParam );

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon, true));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon, true));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon));

 		{

 			DWORD dwUin = ppro->getContactUin(NULL);

 

@@ -52,8 +52,8 @@ INT_PTR CALLBACK LoginPasswdDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		break;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

 		break;

 

 	case WM_CLOSE:

diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 150b22e5d4..6c951d2cd7 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -360,7 +360,7 @@ void CJabberInfoFrame::PaintCompact(HDC hdc)
 

 		if (depth == 0) {

 			if (item.m_hIcolibIcon) {

-				HICON hIcon = Skin_GetIconByHandle(item.m_hIcolibIcon);

+				HICON hIcon = IcoLib_GetIconByHandle(item.m_hIcolibIcon);

 				if (hIcon) {

 					DrawIconEx(hdc, SZ_FRAMEPADDING, (rc.bottom-cy_icon)/2, hIcon, cx_icon, cy_icon, 0, NULL, DI_NORMAL);

 					g_ReleaseIcon(hIcon);

@@ -372,7 +372,7 @@ void CJabberInfoFrame::PaintCompact(HDC hdc)
 		}

 		else {

 			if (item.m_hIcolibIcon) {

-				HICON hIcon = Skin_GetIconByHandle(item.m_hIcolibIcon);

+				HICON hIcon = IcoLib_GetIconByHandle(item.m_hIcolibIcon);

 				if (hIcon) {

 					SetRect(&item.m_rcItem, cx, (rc.bottom-cy_icon)/2, cx+cx_icon, (rc.bottom-cy_icon)/2+cy_icon);

 					DrawIconEx(hdc, cx, (rc.bottom-cy_icon)/2, hIcon, cx_icon, cy_icon, 0, NULL, DI_NORMAL);

@@ -418,7 +418,7 @@ void CJabberInfoFrame::PaintNormal(HDC hdc)
 		SetRect(&item.m_rcItem, cx, cy, rc.right - SZ_FRAMEPADDING, cy + line_height);

 

 		if (item.m_hIcolibIcon) {

-			HICON hIcon = Skin_GetIconByHandle(item.m_hIcolibIcon);

+			HICON hIcon = IcoLib_GetIconByHandle(item.m_hIcolibIcon);

 			if (hIcon) {

 				DrawIconEx(hdc, cx, cy + (line_height-cy_icon)/2, hIcon, cx_icon, cy_icon, 0, NULL, DI_NORMAL);

 				cx += cx_icon + SZ_ICONSPACING;

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 6ce5f2385c..22e03e489f 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -94,7 +94,7 @@ CIconPool::CPoolItem::CPoolItem():
 CIconPool::CPoolItem::~CPoolItem()

 {

 	if (m_hIcolibItem && m_szIcolibName) {

-		CallService(MS_SKIN2_REMOVEICON, 0, (LPARAM)m_szIcolibName);

+		IcoLib_RemoveIcon(m_szIcolibName);

 		mir_free(m_szIcolibName);

 	}

 

@@ -126,7 +126,7 @@ void CIconPool::RegisterIcon(const char *name, TCHAR *filename, int iconid, TCHA
 	sid.description.t = szDescription;

 	sid.flags = SIDF_ALL_TCHAR;

 	sid.iDefaultIndex = iconid;

-	item->m_hIcolibItem = Skin_AddIcon(&sid);

+	item->m_hIcolibItem = IcoLib_AddIcon(&sid);

 

 	m_items.insert(item);

 }

@@ -150,7 +150,7 @@ char *CIconPool::GetIcolibName(const char *name)
 HICON CIconPool::GetIcon(const char *name, bool big)

 {

 	if (CPoolItem *item = FindItemByName(name))

-		return Skin_GetIconByHandle(item->m_hIcolibItem, big);

+		return IcoLib_GetIconByHandle(item->m_hIcolibItem, big);

 

 	return NULL;

 }

@@ -186,7 +186,7 @@ HICON CJabberProto::LoadIconEx(const char* name, bool big)
 		return result;

 

 	if (!mir_strcmp(name, "main"))

-		return Skin_GetIconByHandle(m_hProtoIcon, big);

+		return IcoLib_GetIconByHandle(m_hProtoIcon, big);

 

 	return NULL;

 }

@@ -292,9 +292,9 @@ static HICON LoadTransportIcon(char *filename,int i,char *IconName,TCHAR *SectNa
 		sid.defaultFile.a = szMyPath;

 		sid.iDefaultIndex = i;

 		sid.flags = SIDF_TCHAR;

-		Skin_AddIcon(&sid);

+		IcoLib_AddIcon(&sid);

 	}

-	return Skin_GetIcon(IconName);

+	return IcoLib_GetIcon(IconName);

 }

 

 static HICON LoadSmallIcon(HINSTANCE hInstance, LPCTSTR lpIconName)

@@ -558,13 +558,13 @@ HICON g_LoadIconEx(const char* name, bool big)
 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", GLOBAL_SETTING_PREFIX, name);

-	return Skin_GetIcon(szSettingName, big);

+	return IcoLib_GetIcon(szSettingName, big);

 }

 

 void g_ReleaseIcon(HICON hIcon)

 {

 	if (hIcon)

-		Skin_ReleaseIcon(hIcon);

+		IcoLib_ReleaseIcon(hIcon);

 }

 

 void ImageList_AddIcon_Icolib(HIMAGELIST hIml, HICON hIcon)

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index a51eefa6a2..4fe5a32f0c 100644
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -477,7 +477,7 @@ void CJabberProto::InitPopups(void)
 	ppc.iSeconds = 60;

 	m_hPopupClass = Popup_RegisterClass(&ppc);

 

-	Skin_ReleaseIcon(ppc.hIcon);

+	IcoLib_ReleaseIcon(ppc.hIcon);

 }

 

 void CJabberProto::MsgPopup(MCONTACT hContact, const TCHAR *szMsg, const TCHAR *szTitle)

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 7ac15547a1..9c09e5a415 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -323,7 +323,7 @@ static void sttFillAdvStatusInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM ht
 			mir_sntprintf(szText, _T("%s (%s)"), TranslateTS(szAdvStatusTitle), szAdvStatusText);
 		else
 			_tcsncpy_s(szText, TranslateTS(szAdvStatusTitle), _TRUNCATE);
-		sttFillInfoLine(hwndTree, htiRoot, Skin_GetIcon(szAdvStatusIcon), szTitle, szText, dwInfoLine);
+		sttFillInfoLine(hwndTree, htiRoot, IcoLib_GetIcon(szAdvStatusIcon), szTitle, szText, dwInfoLine);
 	}
 
 	mir_free(szAdvStatusIcon);
diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index 0bfe17d19b..ee4ca32b7c 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -53,7 +53,7 @@ HICON IconLibGetIconEx(HANDLE hIcon, DWORD dwFlags)
 {

 	HICON hiIcon = NULL;

 	if (hIcon) {

-		hiIcon = Skin_GetIconByHandle(hIcon);

+		hiIcon = IcoLib_GetIconByHandle(hIcon);

 		if ((dwFlags & LR_SHARED) == 0)

 			hiIcon = CopyIcon(hiIcon);

 	}

@@ -116,7 +116,7 @@ void InitXStatusIcons()
 		sid.description.t = (TCHAR*)lpcszXStatusNameDef[i];

 		sid.iDefaultIndex = -iCurIndex;

 

-		hXStatusAdvancedStatusIcons[i] = Skin_AddIcon(&sid);

+		hXStatusAdvancedStatusIcons[i] = IcoLib_AddIcon(&sid);

 	}

 }

 

@@ -126,7 +126,7 @@ void DestroyXStatusIcons()
 

 	for (DWORD i = 1; i < MRA_XSTATUS_COUNT+1; i++) {

 		mir_snprintf(szBuff, SIZEOF(szBuff), "mra_xstatus%ld", i);

-		Skin_RemoveIcon(szBuff);

+		IcoLib_RemoveIcon(szBuff);

 	}

 

 	memset(hXStatusAdvancedStatusIcons, 0, sizeof(hXStatusAdvancedStatusIcons));

diff --git a/protocols/MSN/src/msn_lists.cpp b/protocols/MSN/src/msn_lists.cpp
index 22c1f57fde..e16fc7ce19 100644
--- a/protocols/MSN/src/msn_lists.cpp
+++ b/protocols/MSN/src/msn_lists.cpp
@@ -501,7 +501,7 @@ INT_PTR CALLBACK DlgProcMsnServLists(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 			HICON hIcon = LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT);

 			ImageList_AddIcon(hIml, hIcon);

-			Skin_ReleaseIcon(hIcon);

+			IcoLib_ReleaseIcon(hIcon);

 

 			hIcon = LoadIconEx("list_lc");

 			ImageList_AddIcon(hIml, hIcon);

diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index bd94c90779..c5206af9ed 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
@@ -54,7 +54,7 @@ HICON LoadIconEx(const char* name, bool big)
 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "MSN_%s", name);

-	return Skin_GetIcon(szSettingName, big);

+	return IcoLib_GetIcon(szSettingName, big);

 }

 

 HANDLE GetIconHandle(int iconId)

@@ -70,7 +70,7 @@ void  ReleaseIconEx(const char* name, bool big)
 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "MSN_%s", name);

-	Skin_ReleaseIcon(szSettingName, big);

+	IcoLib_Release(szSettingName, big);

 }

 

 INT_PTR CALLBACK DlgProcMsnServLists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp
index 4998a0b344..eb7b739c75 100644
--- a/protocols/Omegle/src/communication.cpp
+++ b/protocols/Omegle/src/communication.cpp
@@ -549,7 +549,7 @@ bool Omegle_client::events()
 			

 			StatusTextData st = { 0 };

 			st.cbSize = sizeof(st);

-			// st.hIcon = Skin_GetIconByHandle(GetIconHandle("typing_on")); // TODO: typing icon

+			// st.hIcon = IcoLib_GetIconByHandle(GetIconHandle("typing_on")); // TODO: typing icon

 

 			mir_sntprintf(st.tszText, SIZEOF(st.tszText), TranslateT("%s is typing."), TranslateT("Stranger"));

 

@@ -564,7 +564,7 @@ bool Omegle_client::events()
 			

 			StatusTextData st = { 0 };

 			st.cbSize = sizeof(st);

-			// st.hIcon = Skin_GetIconByHandle(GetIconHandle("typing_off")); // TODO: typing icon

+			// st.hIcon = IcoLib_GetIconByHandle(GetIconHandle("typing_off")); // TODO: typing icon

 

 			mir_sntprintf(st.tszText, SIZEOF(st.tszText), TranslateT("%s stopped typing."), TranslateT("Stranger"));

 

diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index a3824263dd..bf324f6528 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -105,18 +105,18 @@ HANDLE GetIconHandle(int iconId)
 	return NULL;

 }

 

-HICON LoadIconEx(const char* name, BOOL big)

+HICON LoadIconEx(const char* name, bool big)

 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", "SAMETIME", name);

-	return Skin_GetIcon(szSettingName, big);

+	return IcoLib_GetIcon(szSettingName, big);

 }

 

-void ReleaseIconEx(const char* name, BOOL big)

+void ReleaseIconEx(const char* name, bool big)

 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", "SAMETIME", name);

-	Skin_ReleaseIcon(szSettingName, big);

+	IcoLib_Release(szSettingName, big);

 }

 

 // Copied from MSN plugin - sent acks need to be from different thread

diff --git a/protocols/Sametime/src/sametime.h b/protocols/Sametime/src/sametime.h
index 22d07668e8..2458028af0 100644
--- a/protocols/Sametime/src/sametime.h
+++ b/protocols/Sametime/src/sametime.h
@@ -42,8 +42,8 @@ void mwResolve_handler_callback(mwServiceResolve* srvc, guint32 id, guint32 code
 

 void SametimeInitIcons(void);

 HANDLE GetIconHandle(int iconId);

-HICON LoadIconEx(const char* name, BOOL big);

-void ReleaseIconEx(const char* name, BOOL big);

+HICON LoadIconEx(const char* name, bool big);

+void ReleaseIconEx(const char* name, bool big);

 

 

 // services (async thread functions)

diff --git a/protocols/SkypeWeb/src/skype_events.cpp b/protocols/SkypeWeb/src/skype_events.cpp
index 8f1339f374..38141ca714 100644
--- a/protocols/SkypeWeb/src/skype_events.cpp
+++ b/protocols/SkypeWeb/src/skype_events.cpp
@@ -46,12 +46,12 @@ INT_PTR CSkypeProto::EventGetIcon(WPARAM wParam, LPARAM lParam)
 	case SKYPE_DB_EVENT_TYPE_CALL_INFO:

 	case SKYPE_DB_EVENT_TYPE_INCOMING_CALL:

 	{

-		icon = Skin_GetIconByHandle(GetIconHandle("inc_call"));

+		icon = IcoLib_GetIconByHandle(GetIconHandle("inc_call"));

 		break;

 	}

 	case SKYPE_DB_EVENT_TYPE_ACTION:

 	{

-		icon = Skin_GetIconByHandle(GetIconHandle("me_action"));

+		icon = IcoLib_GetIconByHandle(GetIconHandle("me_action"));

 		break;

 	}

 	default:

@@ -98,7 +98,7 @@ void CSkypeProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Call");

 	ppc.ptszDescription = desc;

 	ppc.pszName = name;

-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("inc_call"));

+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("inc_call"));

 	ppc.colorBack = RGB(255, 255, 255);

 	ppc.colorText = RGB(0, 0, 0);

 	ppc.iSeconds = 30;

@@ -109,7 +109,7 @@ void CSkypeProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Notification");

 	ppc.ptszDescription = desc;

 	ppc.pszName = name;

-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("notify"));

+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("notify"));

 	ppc.colorBack = RGB(255, 255, 255);

 	ppc.colorText = RGB(0, 0, 0);

 	ppc.iSeconds = 5;

@@ -119,7 +119,7 @@ void CSkypeProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Error");

 	ppc.ptszDescription = desc;

 	ppc.pszName = name;

-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("error"));

+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("error"));

 	ppc.colorBack = RGB(255, 255, 255);

 	ppc.colorText = RGB(0, 0, 0);

 	ppc.iSeconds = -1;

diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp
index 7c49c9adad..6dd88d4998 100644
--- a/protocols/SkypeWeb/src/skype_icons.cpp
+++ b/protocols/SkypeWeb/src/skype_icons.cpp
@@ -50,7 +50,7 @@ void CSkypeProto::InitIcons()
 

 		sid.description.t = Icons[i].Description;

 		sid.iDefaultIndex = -Icons[i].IconId;

-		Icons[i].Handle = Skin_AddIcon(&sid);

+		Icons[i].Handle = IcoLib_AddIcon(&sid);

 	}

 

 }

@@ -67,7 +67,7 @@ HANDLE CSkypeProto::GetSkinIconHandle(const char *name)
 {

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, name);

-	HANDLE hIcon = Skin_GetIconHandle(iconName);

+	HANDLE hIcon = IcoLib_GetIconHandle(iconName);

 	if (hIcon == NULL)

 		hIcon = GetIconHandle(name);

 	return hIcon;

@@ -76,5 +76,5 @@ HANDLE CSkypeProto::GetSkinIconHandle(const char *name)
 void CSkypeProto::UninitIcons()

 {

 	for (size_t i = 0; i < SIZEOF(Icons); i++)

-		Skin_RemoveIcon(Icons[i].Name);

+		IcoLib_RemoveIcon(Icons[i].Name);

 }
\ No newline at end of file
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp
index 2e0a6e27b1..72f1ded025 100644
--- a/protocols/SkypeWeb/src/skype_trouter.cpp
+++ b/protocols/SkypeWeb/src/skype_trouter.cpp
@@ -150,7 +150,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &)
 				cle.hContact = hContact;

 				cle.hDbEvent = hEvent;

 				cle.lParam = SKYPE_DB_EVENT_TYPE_INCOMING_CALL;

-				cle.hIcon = Skin_GetIconByHandle(GetIconHandle("inc_call"));

+				cle.hIcon = IcoLib_GetIconByHandle(GetIconHandle("inc_call"));

 

 				CMStringA service(FORMAT, "%s/IncomingCallCLE", GetContactProto(hContact));

 				cle.pszService = service.GetBuffer();

diff --git a/protocols/Steam/src/steam_dialogs.cpp b/protocols/Steam/src/steam_dialogs.cpp
index a201a80a44..39fb287cb3 100644
--- a/protocols/Steam/src/steam_dialogs.cpp
+++ b/protocols/Steam/src/steam_dialogs.cpp
@@ -11,8 +11,8 @@ void CSteamPasswordEditor::OnInitDialog()
 {

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, "main");

-	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIcon(iconName, 16));

-	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon(iconName, 32));

+	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(iconName, 16));

+	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(iconName, 32));

 

 	SendMessage(m_password.GetHwnd(), EM_LIMITTEXT, 64, 0);

 

@@ -49,8 +49,8 @@ void CSteamGuardDialog::OnInitDialog()
 {

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, "main");

-	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIcon(iconName, 16));

-	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon(iconName, 32));

+	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(iconName, 16));

+	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(iconName, 32));

 

 	SendMessage(m_text.GetHwnd(), EM_LIMITTEXT, 5, 0);

 

@@ -96,8 +96,8 @@ void CSteamCaptchaDialog::OnInitDialog()
 {

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, "main");

-	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIcon(iconName, 16));

-	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon(iconName, 32));

+	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(iconName, 16));

+	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(iconName, 32));

 

 	SendMessage(m_text.GetHwnd(), EM_LIMITTEXT, 6, 0);

 

diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp
index 8841ce81ef..82f398ecb8 100644
--- a/protocols/Steam/src/steam_proto.cpp
+++ b/protocols/Steam/src/steam_proto.cpp
@@ -31,12 +31,12 @@ CSteamProto::CSteamProto(const char* protoName, const TCHAR* userName) :
 	sid.section.t = sectionName;
 	sid.description.t = LPGENT("Protocol icon");
 	sid.iDefaultIndex = -IDI_STEAM;
-	Skin_AddIcon(&sid);
+	IcoLib_AddIcon(&sid);
 
 	mir_snprintf(settingName, SIZEOF(settingName), "%s_%s", MODULE, "gaming");
 	sid.description.t = LPGENT("Gaming icon");
 	sid.iDefaultIndex = -IDI_GAMING;
-	Skin_AddIcon(&sid);
+	IcoLib_AddIcon(&sid);
 
 	// temporary DB settings
 	db_set_resident(m_szModuleName, "Status");
diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp
index df3dd31727..fa43e141b2 100644
--- a/protocols/Steam/src/steam_utils.cpp
+++ b/protocols/Steam/src/steam_utils.cpp
@@ -183,7 +183,7 @@ void CSteamProto::ShowNotification(const TCHAR *caption, const wchar_t *message,
 		ppd.lchContact = hContact;

 		wcsncpy(ppd.lpwzContactName, caption, MAX_CONTACTNAME);

 		wcsncpy(ppd.lpwzText, message, MAX_SECONDLINE);

-		ppd.lchIcon = Skin_GetIcon(MODULE"_main");

+		ppd.lchIcon = IcoLib_GetIcon(MODULE"_main");

 

 		if (!PUAddPopupT(&ppd))

 			return;

diff --git a/protocols/Steam/src/steam_xstatus.cpp b/protocols/Steam/src/steam_xstatus.cpp
index eee37f824a..d22cde9c88 100644
--- a/protocols/Steam/src/steam_xstatus.cpp
+++ b/protocols/Steam/src/steam_xstatus.cpp
@@ -22,7 +22,7 @@ void SetContactExtraIcon(MCONTACT hContact, int status)
 	char iconName[100];
 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, "gaming");
 
-	ExtraIcon_SetIcon(hExtraXStatus, hContact, (status > 0) ? Skin_GetIconHandle(iconName) : NULL);
+	ExtraIcon_SetIcon(hExtraXStatus, hContact, (status > 0) ? IcoLib_GetIconHandle(iconName) : NULL);
 }
 
 INT_PTR CSteamProto::OnGetXStatusEx(WPARAM wParam, LPARAM lParam)
@@ -98,7 +98,7 @@ HICON CSteamProto::GetXStatusIcon(int status, UINT flags)
 	char iconName[100];
 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, "gaming");
 
-	HICON icon = Skin_GetIcon(iconName, (flags & LR_BIGICON) ? 32 : 16);
+	HICON icon = IcoLib_GetIcon(iconName, (flags & LR_BIGICON) ? 32 : 16);
 	return (flags & LR_SHARED) ? icon : CopyIcon(icon);
 }
 
@@ -135,7 +135,7 @@ INT_PTR CSteamProto::OnRequestAdvStatusIconIdx(WPARAM wParam, LPARAM)
 				// mark icon index in the array as valid
 				xstatusIconsValid.push_back(status);
 
-				Skin_ReleaseIcon(hXStatusIcon);
+				IcoLib_ReleaseIcon(hXStatusIcon);
 			}
 		}
 
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 8ec5c7cb06..c96e67ea08 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -97,13 +97,13 @@ HICON GetIcolibIcon(int iconId)
 {

 	HANDLE handle = GetIconHandle(iconId);

 	if (handle != NULL)

-		return Skin_GetIconByHandle(handle);

+		return IcoLib_GetIconByHandle(handle);

 

 	return NULL;

 }

 

 void ReleaseIcolibIcon(HICON hIcon) {

-	Skin_ReleaseIcon(hIcon);

+	IcoLib_ReleaseIcon(hIcon);

 }

 

 static void TlenRegisterIcons()

diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp
index 10a228c626..7a56fce4c8 100644
--- a/protocols/Tox/src/tox_icons.cpp
+++ b/protocols/Tox/src/tox_icons.cpp
@@ -30,7 +30,7 @@ void CToxProto::InitIcons()
 

 		sid.description.t = Icons[i].Description;

 		sid.iDefaultIndex = -Icons[i].IconId;

-		Icons[i].Handle = Skin_AddIcon(&sid);

+		Icons[i].Handle = IcoLib_AddIcon(&sid);

 	}

 }

 

@@ -38,7 +38,7 @@ HICON CToxProto::GetIcon(const char *name, int size)
 {

 	for (size_t i = 0; i < SIZEOF(Icons); i++)

 		if (mir_strcmpi(Icons[i].Name, name) == 0)

-			return Skin_GetIconByHandle(Icons[i].Handle, size);

+			return IcoLib_GetIconByHandle(Icons[i].Handle, size);

 

 	return NULL;

 }

@@ -56,7 +56,7 @@ HANDLE CToxProto::GetSkinIconHandle(const char *name)
 {

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, name);

-	HANDLE hIcon = Skin_GetIconHandle(iconName);

+	HANDLE hIcon = IcoLib_GetIconHandle(iconName);

 	if (hIcon == NULL)

 		hIcon = GetIconHandle(name);

 

@@ -66,5 +66,5 @@ HANDLE CToxProto::GetSkinIconHandle(const char *name)
 void CToxProto::UninitIcons()

 {

 	for (size_t i = 0; i < SIZEOF(Icons); i++)

-		Skin_RemoveIcon(Icons[i].Name);

+		IcoLib_RemoveIcon(Icons[i].Name);

 }
\ No newline at end of file
diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp
index ff55177d1a..c9c9eb8246 100644
--- a/protocols/Tox/src/tox_multimedia.cpp
+++ b/protocols/Tox/src/tox_multimedia.cpp
@@ -28,8 +28,8 @@ void CToxCallDlgBase::SetIcon(const char *name)
 {

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, name);

-	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIcon(iconName, 16));

-	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon(iconName, 32));

+	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(iconName, 16));

+	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(iconName, 32));

 }

 

 void CToxCallDlgBase::SetTitle(const TCHAR *title)

@@ -314,7 +314,7 @@ INT_PTR CToxProto::OnRecvAudioCall(WPARAM hContact, LPARAM lParam)
 	cle.hContact = hContact;

 	cle.hDbEvent = hEvent;

 	cle.lParam = DB_EVENT_CALL;

-	cle.hIcon = Skin_GetIconByHandle(GetIconHandle("audio_ring"));

+	cle.hIcon = IcoLib_GetIconByHandle(GetIconHandle("audio_ring"));

 

 	TCHAR szTooltip[MAX_PATH];

 	mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("Incoming call from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index 1e5d270231..85af8ca960 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -376,9 +376,9 @@ void CToxOptionsNodeList::OnInitDialog()
 

 	HIMAGELIST hImageList = m_nodes.CreateImageList(LVSIL_SMALL);

 	HICON icon = LoadSkinnedIcon(SKINICON_OTHER_TYPING);

-	ImageList_AddIcon(hImageList, icon); Skin_ReleaseIcon(icon);

+	ImageList_AddIcon(hImageList, icon); IcoLib_ReleaseIcon(icon);

 	icon = LoadSkinnedIcon(SKINICON_OTHER_DELETE);

-	ImageList_AddIcon(hImageList, icon); Skin_ReleaseIcon(icon);

+	ImageList_AddIcon(hImageList, icon); IcoLib_ReleaseIcon(icon);

 

 	m_nodes.AddColumn(0, _T("IPv4"), 100);

 	m_nodes.AddColumn(1, _T("IPv6"), 100);

diff --git a/protocols/Tox/src/tox_utils.cpp b/protocols/Tox/src/tox_utils.cpp
index ccacbc0422..b0f2b46b18 100644
--- a/protocols/Tox/src/tox_utils.cpp
+++ b/protocols/Tox/src/tox_utils.cpp
@@ -46,7 +46,7 @@ void CToxProto::ShowNotification(const TCHAR *caption, const TCHAR *message, int
 		ppd.lchContact = hContact;

 		wcsncpy(ppd.lpwzContactName, caption, MAX_CONTACTNAME);

 		wcsncpy(ppd.lpwzText, message, MAX_SECONDLINE);

-		ppd.lchIcon = Skin_GetIcon("Tox_main");

+		ppd.lchIcon = IcoLib_GetIcon("Tox_main");

 

 		if (!PUAddPopupT(&ppd))

 			return;

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 52731675b5..9d59f68017 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -740,7 +740,7 @@ void CVkProto::SetSrmmReadStatus(MCONTACT hContact)
 

 	StatusTextData st = { 0 };

 	st.cbSize = sizeof(st);

-	st.hIcon = Skin_GetIconByHandle(GetIconHandle(IDI_READMSG));

+	st.hIcon = IcoLib_GetIconByHandle(GetIconHandle(IDI_READMSG));

 	mir_sntprintf(st.tszText, SIZEOF(st.tszText), TranslateT("Message read: %s"), ttime);

 	CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)hContact, (LPARAM)&st);

 }

diff --git a/protocols/VKontakte/src/vk_captcha.cpp b/protocols/VKontakte/src/vk_captcha.cpp
index 5725adb0e2..0c0699900a 100644
--- a/protocols/VKontakte/src/vk_captcha.cpp
+++ b/protocols/VKontakte/src/vk_captcha.cpp
@@ -34,8 +34,8 @@ static INT_PTR CALLBACK CaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 	switch (msg) {

 	case WM_INITDIALOG: {

 		TranslateDialogDefault(hwndDlg);

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(GetIconHandle(IDI_KEYS), TRUE));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(GetIconHandle(IDI_KEYS)));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(GetIconHandle(IDI_KEYS), TRUE));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(GetIconHandle(IDI_KEYS)));

 		params = (CAPTCHA_FORM_PARAMS*)lParam;

 

 		SetDlgItemText(hwndDlg, IDC_INSTRUCTION, TranslateT("Enter the text you see"));

@@ -91,8 +91,8 @@ static INT_PTR CALLBACK CaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 		break;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, 0));

 		break;

 	}

 	return FALSE;

diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index a75d44213a..fcbaf37254 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -31,8 +31,8 @@ INT_PTR CALLBACK VKAccountProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 		ppro = (CVkProto*)lParam;

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon, 1));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon, 1));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon));

 		{

 			ptrT tszLogin(ppro->getTStringA("Login"));

 			if (tszLogin != NULL)

@@ -78,8 +78,8 @@ INT_PTR CALLBACK VKAccountProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 		break;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

 		break;

 	}

 

@@ -105,8 +105,8 @@ INT_PTR CALLBACK CVkProto::OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
 		ppro = (CVkProto*)lParam;

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon, 1));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon, 1));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon));

 		{

 			ptrT tszLogin(ppro->getTStringA("Login"));

 			if (tszLogin != NULL)

@@ -220,8 +220,8 @@ INT_PTR CALLBACK CVkProto::OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
 		break;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

 		break;

 	}

 

@@ -239,8 +239,8 @@ INT_PTR CALLBACK CVkProto::OptionsAdvProc(HWND hwndDlg, UINT uMsg, WPARAM wParam
 		ppro = (CVkProto*)lParam;

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon, 1));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon, 1));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon));

 

 		CheckDlgButton(hwndDlg, IDC_HIDECHATS, ppro->m_bHideChats ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_MESASUREAD, ppro->m_bMesAsUnread ? BST_CHECKED : BST_UNCHECKED);

@@ -340,8 +340,8 @@ INT_PTR CALLBACK CVkProto::OptionsAdvProc(HWND hwndDlg, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

 		break;

 	}

 

@@ -359,8 +359,8 @@ INT_PTR CALLBACK CVkProto::OptionsFeedsProc(HWND hwndDlg, UINT uMsg, WPARAM wPar
 		ppro = (CVkProto*)lParam;

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon, 1));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon, 1));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon));

 

 		CheckDlgButton(hwndDlg, IDC_NEWS_ENBL, ppro->m_bNewsEnabled ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_NOTIF_ENBL, ppro->m_bNotificationsEnabled ? BST_CHECKED : BST_UNCHECKED);

@@ -508,8 +508,8 @@ INT_PTR CALLBACK CVkProto::OptionsFeedsProc(HWND hwndDlg, UINT uMsg, WPARAM wPar
 		break;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

 		break;

 	}

 

@@ -527,8 +527,8 @@ INT_PTR CALLBACK CVkProto::OptionsViewProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
 		ppro = (CVkProto*)lParam;

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon, 1));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(ppro->m_hProtoIcon));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon, 1));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(ppro->m_hProtoIcon));

 

 		CheckDlgButton(hwndDlg, IDC_IMG_OFF, (ppro->m_iIMGBBCSupport == imgNo) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_IMG_FULLSIZE, (ppro->m_iIMGBBCSupport == imgFullSize) ? BST_CHECKED : BST_UNCHECKED);

@@ -610,8 +610,8 @@ INT_PTR CALLBACK CVkProto::OptionsViewProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
 		break;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0));

 		break;

 	}

 

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 37bf19cac7..af266530a7 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -208,28 +208,28 @@ void CVkProto::InitMenus()
 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_SETSTATUSMSG);

 	mi.pszService = szService;

 	mi.position = 10009 + PMI_SETSTATUSMSG;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_STATUS));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_STATUS));

 	mi.pszName = LPGEN("Status message");

 	g_hProtoMenuItems[PMI_SETSTATUSMSG] = Menu_AddProtoMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_WALLPOST);

 	mi.pszService = szService;

 	mi.position = 10009 + PMI_WALLPOST;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_WALL));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));

 	mi.pszName = LPGEN("Send message to my wall");

 	g_hProtoMenuItems[PMI_WALLPOST] = Menu_AddProtoMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_LOADVKNEWS);

 	mi.pszService = szService;

 	mi.position = 10009 + PMI_LOADVKNEWS;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

 	mi.pszName = LPGEN("Load news from VK");

 	g_hProtoMenuItems[PMI_LOADVKNEWS] = Menu_AddProtoMenuItem(&mi);

 	

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_VISITPROFILE);

 	mi.pszService = szService;

 	mi.position = 10009 + PMI_VISITPROFILE;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE));

 	mi.pszName = LPGEN("Visit profile");

 	g_hProtoMenuItems[PMI_VISITPROFILE] = Menu_AddProtoMenuItem(&mi);

 

@@ -243,49 +243,49 @@ void CVkProto::InitMenus()
 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_WALLPOST);

 	mi.position = -200001000 + CMI_WALLPOST;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_WALL));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));

 	mi.ptszName = LPGENT("Send message to user\'s wall");

 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_WALLPOST] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_ADDASFRIEND);

 	mi.position = -200001000 + CMI_ADDASFRIEND;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_FRIENDADD));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDADD));

 	mi.ptszName = LPGENT("Add as friend");

 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_ADDASFRIEND] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_DELETEFRIEND);

 	mi.position = -200001000 + CMI_DELETEFRIEND;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));

 	mi.ptszName = LPGENT("Delete from friend list");

 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_DELETEFRIEND] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_BANUSER);

 	mi.position = -200001000 + CMI_BANUSER;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_BAN));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BAN));

 	mi.ptszName = LPGENT("Ban user");

 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_BANUSER] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_REPORTABUSE);

 	mi.position = -200001000 + CMI_REPORTABUSE;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_ABUSE));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_ABUSE));

 	mi.ptszName = LPGENT("Report abuse");

 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_REPORTABUSE] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_DESTROYKICKCHAT);

 	mi.position = -200001000 + CMI_DESTROYKICKCHAT;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));

 	mi.ptszName = LPGENT("Destroy room");

 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_DESTROYKICKCHAT] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_OPENBROADCAST);

 	mi.position = -200001000 + CMI_OPENBROADCAST;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_BROADCAST));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BROADCAST));

 	mi.ptszName = LPGENT("Open broadcast");

 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_OPENBROADCAST] = Menu_AddContactMenuItem(&mi);

@@ -293,14 +293,14 @@ void CVkProto::InitMenus()
 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_LOADVKNEWS);

 	mi.pszService = szService;

 	mi.position = -200001000 + CMI_LOADVKNEWS;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

 	mi.ptszName = LPGENT("Load news from VK");

 	g_hContactMenuItems[CMI_LOADVKNEWS] = Menu_AddContactMenuItem(&mi);

 

 	// Sync history menu

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORY);

 	mi.position = -200001000 + CMI_GETSERVERHISTORY;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.ptszName = LPGENT("Reload messages from vk.com...");

 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi);

@@ -310,42 +310,42 @@ void CVkProto::InitMenus()
 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST1DAY);

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST1DAY;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.ptszName = LPGENT("for last 1 day");

 	mi.pszService = szService;

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST1DAY] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST3DAY);

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST3DAY;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.ptszName = LPGENT("for last 3 days");

 	mi.pszService = szService;

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST3DAY] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST7DAY);

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST7DAY;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.ptszName = LPGENT("for last week");

 	mi.pszService = szService;

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST7DAY] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST30DAY);

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST30DAY;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.ptszName = LPGENT("for last 30 days");

 	mi.pszService = szService;

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST30DAY] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST90DAY);

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST90DAY;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.ptszName = LPGENT("for last 90 days");

 	mi.pszService = szService;

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST90DAY] = Menu_AddContactMenuItem(&mi);

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETALLSERVERHISTORY);

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETALLSERVERHISTORY;

-	mi.icolibItem = Skin_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.ptszName = LPGENT("for all time");

 	mi.pszService = szService;

 	g_hContactHistoryMenuItems[CHMI_GETALLSERVERHISTORY] = Menu_AddContactMenuItem(&mi);

@@ -408,7 +408,7 @@ void CVkProto::InitPopups(void)
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Notification");

 	ppc.ptszDescription = desc;

 	ppc.pszName = name;

-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

 	ppc.colorBack = RGB(190, 225, 255); //Blue

 	ppc.colorText = RGB(255, 255, 255); //White

 	ppc.iSeconds = 4;

diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index 4823119505..8dd01e8c35 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -404,7 +404,7 @@ void WhatsAppProto::NotifyEvent(const TCHAR *title, const TCHAR *info, MCONTACT
 			pd.colorText = colorText;

 			pd.iSeconds = timeout;

 			pd.lchContact = contact;

-			pd.lchIcon = Skin_GetIconByHandle(m_hProtoIcon); // TODO: Icon test

+			pd.lchIcon = IcoLib_GetIconByHandle(m_hProtoIcon); // TODO: Icon test

 			pd.PluginData = szUrl;

 			pd.PluginWindowProc = (WNDPROC)PopupDlgProc;

 			mir_tstrcpy(pd.lptzContactName, title);

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index a292edfa43..9a2e1f51f0 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1411,8 +1411,8 @@ INT_PTR TMLoadIcon(WPARAM wParam, LPARAM lParam)
 {

 	if (LOWORD(wParam) == PLI_PROTOCOL) {

 		if (wParam & PLIF_ICOLIB)

-			return (INT_PTR)Skin_GetIcon("XFIRE_main");

-		return (INT_PTR)CopyIcon(Skin_GetIcon("XFIRE_main"));

+			return (INT_PTR)IcoLib_GetIcon("XFIRE_main");

+		return (INT_PTR)CopyIcon(IcoLib_GetIcon("XFIRE_main"));

 	}

 	return NULL;

 }

diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp
index e499fab901..ebd202f4d7 100644
--- a/protocols/Xfire/src/tools.cpp
+++ b/protocols/Xfire/src/tools.cpp
@@ -94,9 +94,9 @@ int displayPopup(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType, HICON h
 		ppd.lchIcon = hicon;
 
 		if (bIconsNotLoaded) {
-			hicNotify = Skin_GetIcon("popup_notify");
-			hicWarning = Skin_GetIcon("popup_warning");
-			hicError = Skin_GetIcon("popup_error");
+			hicNotify = IcoLib_GetIcon("popup_notify");
+			hicWarning = IcoLib_GetIcon("popup_warning");
+			hicError = IcoLib_GetIcon("popup_error");
 			bIconsNotLoaded = FALSE;
 		}
 
diff --git a/protocols/Yahoo/src/icolib.cpp b/protocols/Yahoo/src/icolib.cpp
index 0734022277..85ec6ec28e 100644
--- a/protocols/Yahoo/src/icolib.cpp
+++ b/protocols/Yahoo/src/icolib.cpp
@@ -37,7 +37,7 @@ HICON CYahooProto::LoadIconEx(const char* name, bool big)
 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "YAHOO_%s", name);

-	return Skin_GetIcon(szSettingName, big);

+	return IcoLib_GetIcon(szSettingName, big);

 }

 

 HANDLE CYahooProto::GetIconHandle(int iconId)

@@ -53,5 +53,5 @@ void CYahooProto::ReleaseIconEx(const char* name, bool big)
 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "YAHOO_%s", name);

-	Skin_ReleaseIcon(szSettingName, big);

+	IcoLib_Release(szSettingName, big);

 }