MS_SKIN_LOADICON & MS_SKIN_LOADPROTOICON replaced with direct function calls

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

37 files changed, 104 insertions, 104 deletions

diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index 98a20f17ea..96d413b8c3 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -109,7 +109,7 @@ void InitContactMenus()
 

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = -2000006000;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_EVENT_URL);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

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

 	mi.pszService = "FacebookProto/VisitProfile";

 	CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::VisitProfile>);

@@ -144,35 +144,35 @@ void InitContactMenus()
 	g_hContactMenuPoke = Menu_AddContactMenuItem(&mi);

 

 	mi.position = -2000006010;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);

 	mi.pszName = LPGEN("Cancel friendship");

 	mi.pszService = "FacebookProto/CancelFriendship";

 	CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::CancelFriendship>);

 	g_hContactMenuAuthRevoke = Menu_AddContactMenuItem(&mi);

 

 	mi.position = -2000006011;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);

 	mi.pszName = LPGEN("Cancel friendship request");

 	mi.pszService = "FacebookProto/CancelFriendshipRequest";

 	CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::OnCancelFriendshipRequest>);

 	g_hContactMenuAuthCancel = Menu_AddContactMenuItem(&mi);

 

 	mi.position = -2000006012;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	mi.pszName = LPGEN("Request friendship");

 	mi.pszService = "FacebookProto/RequestFriendship";

 	CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::RequestFriendship>);

 	g_hContactMenuAuthAsk = Menu_AddContactMenuItem(&mi);

 

 	mi.position = -2000006013;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);

 	mi.pszName = LPGEN("Approve friendship");

 	mi.pszService = "FacebookProto/ApproveFriendship";

 	CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::ApproveFriendship>);

 	g_hContactMenuAuthGrant = Menu_AddContactMenuItem(&mi);

 

 	mi.position = -2000006014;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);

 	mi.pszName = LPGEN("Deny friendship request");

 	mi.pszService = "FacebookProto/DenyFriendship";

 	CreateServiceFunction(mi.pszService, GlobalService<&FacebookProto::DenyFriendship>);

@@ -245,21 +245,21 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 	mir_strcpy(tDest, "/VisitProfile");

 	mi.flags = CMIF_CHILDPOPUP;

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

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_EVENT_URL);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

 	// TODO RM: remember and properly free in destructor?

 	/*m_hStatusMind = */Menu_AddProtoMenuItem(&mi);

 

 	//CreateProtoService("/VisitNotifications", &FacebookProto::VisitNotifications);

 	mir_strcpy(tDest, "/VisitNotifications");

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

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_EVENT_URL);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

 	Menu_AddProtoMenuItem(&mi);

 

 	// Services...

 	mi.pszName = LPGEN("Services...");

 	mir_strcpy(tDest, "/Services");

 	mi.flags = CMIF_CHILDPOPUP | (this->isOnline() ? 0 : CMIF_GRAYED);

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_HELP);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP);

 	m_hMenuServicesRoot = Menu_AddProtoMenuItem(&mi);

 

 	CreateProtoService("/RefreshBuddyList", &FacebookProto::RefreshBuddyList);

@@ -275,7 +275,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 	mir_strcpy(tDest, "/CheckFriendRequests");

 	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Check Friends Requests");

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	mi.hParentMenu = m_hMenuServicesRoot;

 	Menu_AddProtoMenuItem(&mi);

 

diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp
index c9407b2473..4cb99e7a47 100644
--- a/protocols/Gadu-Gadu/src/links.cpp
+++ b/protocols/Gadu-Gadu/src/links.cpp
@@ -68,7 +68,7 @@ static INT_PTR gg_parselink(WPARAM wParam, LPARAM lParam)
 		if (gg->m_iStatus > ID_STATUS_OFFLINE) {

 			++items;

 			mi.flags |= CMIM_ICON;

-			mi.hIcon = LoadSkinnedProtoIcon(gg->m_szModuleName, gg->m_iStatus);

+			mi.hIcon = Skin_LoadProtoIcon(gg->m_szModuleName, gg->m_iStatus);

 		}

 		else mi.flags |= CMIF_HIDDEN;

 

@@ -116,7 +116,7 @@ void gg_links_instancemenu_init()
 	tmi.cbSize = sizeof(tmi);

 	tmi.pszName = "Cancel";

 	tmi.position = 9999999;

-	tmi.hIcolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE);

+	tmi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

 	CallService(MO_ADDNEWMENUITEM, (WPARAM)hInstanceMenu, (LPARAM)&tmi);

 }

 

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index f90d18381f..c76371ffb6 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -56,7 +56,7 @@ void CIrcProto::InitMainMenus(void)
 	if (m_iStatus != ID_STATUS_OFFLINE) mi.flags |= CMIF_GRAYED;

 

 	mi.pszName = LPGEN("&Join channel");

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_CHAT_JOIN);//GetIconHandle(IDI_JOIN);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);//GetIconHandle(IDI_JOIN);

 	mir_strcpy(d, IRC_JOINCHANNEL);

 	mi.position = 201002;

 	hMenuJoin = Menu_AddProtoMenuItem(&mi);

diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index 184ac57d19..afe7cfedfb 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -119,7 +119,7 @@ void g_MenuInit(void)
 

 	mi.pszName = LPGEN("Request authorization");

 	mi.position = 1000030000;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	g_hContactMenuItems[ICMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);

 	

 	// "Grant authorization"

@@ -127,7 +127,7 @@ void g_MenuInit(void)
 

 	mi.pszName = LPGEN("Grant authorization");

 	mi.position = 1000029999;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);

 	g_hContactMenuItems[ICMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);

 	

 	// "Revoke authorization"

@@ -135,7 +135,7 @@ void g_MenuInit(void)
 

 	mi.pszName = LPGEN("Revoke authorization");

 	mi.position = 1000029998;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);

 	g_hContactMenuItems[ICMI_AUTH_REVOKE] = Menu_AddContactMenuItem(&mi);

 	

 	// "Add to server list"

@@ -143,7 +143,7 @@ void g_MenuInit(void)
 

 	mi.pszName = LPGEN("Add to server list");

 	mi.position = -2049999999;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_ADD);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_ADD);

 	g_hContactMenuItems[ICMI_ADD_TO_SERVLIST] = Menu_AddContactMenuItem(&mi);

 	

 	// "Show custom status details"

@@ -213,7 +213,7 @@ int CIcqProto::OnPreBuildContactMenu(WPARAM hContact, LPARAM)
 		if (bXStatus > 0 && bXStatus <= XSTATUS_COUNT)

 			clmi.hIcon = getXStatusIcon(bXStatus, LR_SHARED);

 		else

-			clmi.hIcon = LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT);

+			clmi.hIcon = Skin_LoadIcon(SKINICON_OTHER_SMALLDOT);

 		Menu_ModifyItem(g_hContactMenuItems[ICMI_XSTATUS_DETAILS], &clmi);

 	}

 

diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index b6664bcb71..6a75105d87 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -282,7 +282,7 @@ void CJabberDlgBookmarks::OnInitDialog()
 

 	HIMAGELIST hIml = m_lvBookmarks.CreateImageList(LVSIL_SMALL);

 	ImageList_AddIcon_Icolib(hIml, m_proto->LoadIconEx("group"));

-	ImageList_AddIcon_Icolib(hIml, LoadSkinnedIcon(SKINICON_EVENT_URL));

+	ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_EVENT_URL));

 

 	m_lvBookmarks.AddColumn(0, TranslateT("Bookmark Name"),        m_proto->getWord("bookmarksWnd_cx0", 120));

 	m_lvBookmarks.AddColumn(1, TranslateT("Address (JID or URL)"), m_proto->getWord("bookmarksWnd_cx1", 210));

diff --git a/protocols/JabberG/src/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp
index 37fa7e3460..4e9bcc331c 100644
--- a/protocols/JabberG/src/jabber_captcha.cpp
+++ b/protocols/JabberG/src/jabber_captcha.cpp
@@ -44,8 +44,8 @@ INT_PTR CALLBACK JabberCaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 	switch (msg) {

 	case WM_INITDIALOG: {

 		TranslateDialogDefault(hwndDlg);

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIconBig(IDI_KEYS));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadSkinnedIcon(IDI_KEYS));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadIcon(IDI_KEYS, true));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_LoadIcon(IDI_KEYS));

 		params = (CAPTCHA_FORM_PARAMS*)lParam;

 

 		LPCTSTR hint = params->hint;

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 6ecdb6548b..e5cdc1e3e0 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -847,15 +847,15 @@ static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 			SendDlgItemMessage(hwndDlg, IDC_TXT_NICK, WM_SETFONT, (WPARAM)hfnt, TRUE);

 		}

 

-		SendDlgItemMessage(hwndDlg, IDC_BTN_AFFILIATION, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinnedIcon(SKINICON_EVENT_FILE));

+		SendDlgItemMessage(hwndDlg, IDC_BTN_AFFILIATION, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadIcon(SKINICON_EVENT_FILE));

 		SendDlgItemMessage(hwndDlg, IDC_BTN_AFFILIATION, BUTTONSETASFLATBTN, TRUE, 0);

 		SendDlgItemMessage(hwndDlg, IDC_BTN_AFFILIATION, BUTTONADDTOOLTIP, (WPARAM)"Apply", 0);

 

-		SendDlgItemMessage(hwndDlg, IDC_BTN_ROLE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinnedIcon(SKINICON_EVENT_FILE));

+		SendDlgItemMessage(hwndDlg, IDC_BTN_ROLE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadIcon(SKINICON_EVENT_FILE));

 		SendDlgItemMessage(hwndDlg, IDC_BTN_ROLE, BUTTONSETASFLATBTN, TRUE, 0);

 		SendDlgItemMessage(hwndDlg, IDC_BTN_ROLE, BUTTONADDTOOLTIP, (WPARAM)"Apply", 0);

 

-		SendDlgItemMessage(hwndDlg, IDC_ICO_STATUS, STM_SETICON, (WPARAM)LoadSkinnedProtoIcon(dat->ppro->m_szModuleName, dat->him->m_iStatus), 0);

+		SendDlgItemMessage(hwndDlg, IDC_ICO_STATUS, STM_SETICON, (WPARAM)Skin_LoadProtoIcon(dat->ppro->m_szModuleName, dat->him->m_iStatus), 0);

 

 		TCHAR buf[256];

 		mir_sntprintf(buf, TranslateT("%s from\n%s"), dat->him->m_tszResourceName, dat->item->jid);

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index b13aac36ff..75c5f08c8c 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -685,7 +685,7 @@ void CJabberDlgDiscovery::OnInitDialog()
 		else if (sttNodeIcons[i].iconName)

 			hIcon = m_proto->LoadIconEx(sttNodeIcons[i].iconName);

 		else if (sttNodeIcons[i].iconIndex)

-			hIcon = LoadSkinnedIcon(sttNodeIcons[i].iconIndex);

+			hIcon = Skin_LoadIcon(sttNodeIcons[i].iconIndex);

 		else continue;

 		sttNodeIcons[i].listIndex = TreeList_AddIcon(hwndList, hIcon, 0);

 		if (needDestroy) DestroyIcon(hIcon);

diff --git a/protocols/JabberG/src/jabber_filterlist.cpp b/protocols/JabberG/src/jabber_filterlist.cpp
index b9161fae54..5e769b42a5 100644
--- a/protocols/JabberG/src/jabber_filterlist.cpp
+++ b/protocols/JabberG/src/jabber_filterlist.cpp
@@ -262,7 +262,7 @@ LRESULT CCtrlFilterListView::CustomWndProc(UINT msg, WPARAM wParam, LPARAM lPara
 					rc.right - FILTER_BOX_HEIGHT + (FILTER_BOX_HEIGHT-16)/2 + 16, rc.top + (FILTER_BOX_HEIGHT-16)/2 + 16);

 

 				DrawIconEx(hdc, rc.left + (FILTER_BOX_HEIGHT-16)/2, rc.top + (FILTER_BOX_HEIGHT-16)/2, g_LoadIconEx("sd_filter_apply"), 16, 16, 0, NULL, DI_NORMAL);

-				DrawIconEx(hdc, rc.right - FILTER_BOX_HEIGHT + (FILTER_BOX_HEIGHT-16)/2, rc.top + (FILTER_BOX_HEIGHT-16)/2, LoadSkinnedIcon(SKINICON_OTHER_DELETE), 16, 16, 0, NULL, DI_NORMAL);

+				DrawIconEx(hdc, rc.right - FILTER_BOX_HEIGHT + (FILTER_BOX_HEIGHT-16)/2, rc.top + (FILTER_BOX_HEIGHT-16)/2, Skin_LoadIcon(SKINICON_OTHER_DELETE), 16, 16, 0, NULL, DI_NORMAL);

 

 				rc.left += 5*FILTER_BOX_HEIGHT/3;

 				rc.right -= 5*FILTER_BOX_HEIGHT/3;

diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 6c951d2cd7..127092a778 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -106,7 +106,7 @@ CJabberInfoFrame::CJabberInfoFrame(CJabberProto *proto):
 		UpdateInfoItem("$", proto->GetIconHandle(IDI_JABBER), proto->m_tszUserName);

 

 		CreateInfoItem("$/JID", true);

-		UpdateInfoItem("$/JID", LoadSkinnedIconHandle(SKINICON_OTHER_USERDETAILS), _T("Offline"));

+		UpdateInfoItem("$/JID", Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS), _T("Offline"));

 		SetInfoItemCallback("$/JID", &CJabberProto::InfoFrame_OnSetup);

 	}

 }

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 22e03e489f..3a5ba46a40 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -285,7 +285,7 @@ static HICON LoadTransportIcon(char *filename,int i,char *IconName,TCHAR *SectNa
 	if (hi && nf) DestroyIcon(hi);

 	if (IconName != NULL && SectName != NULL)  {

 		SKINICONDESC sid = { 0 };

-		sid.hDefaultIcon = (has_proto_icon) ? NULL : LoadSkinnedProtoIcon(0, -internalidx);

+		sid.hDefaultIcon = (has_proto_icon) ? NULL : Skin_LoadProtoIcon(0, -internalidx);

 		sid.section.t = SectName;

 		sid.pszName = IconName;

 		sid.description.t = Description;

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 21fdf9b5d6..f100a5afbf 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -190,7 +190,7 @@ void g_MenuInit(void)
 	TMO_MenuItem tmi = { sizeof(tmi) };

 	tmi.pszName = "Cancel";

 	tmi.position = 9999999;

-	tmi.hIcolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE);

+	tmi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

 	CallService(MO_ADDNEWMENUITEM, (WPARAM)hChooserMenu, (LPARAM)&tmi);

 

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

@@ -201,7 +201,7 @@ void g_MenuInit(void)
 	// "Request authorization"

 	mi.pszName = LPGEN("Request authorization");

 	mi.position = -2000001000;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	mi.pszService = "Jabber/ReqAuth";

 	g_hMenuRequestAuth = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, JabberMenuHandleRequestAuth);

@@ -210,7 +210,7 @@ void g_MenuInit(void)
 	mi.pszService = "Jabber/GrantAuth";

 	mi.pszName = LPGEN("Grant authorization");

 	mi.position = -2000001001;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);

 	g_hMenuGrantAuth = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, JabberMenuHandleGrantAuth);

 

@@ -218,7 +218,7 @@ void g_MenuInit(void)
 	mi.pszService = "Jabber/RevokeAuth";

 	mi.pszName = LPGEN("Revoke authorization");

 	mi.position = -2000001002;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);

 	g_hMenuRevokeAuth = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, JabberMenuRevokeAuth);

 

@@ -234,7 +234,7 @@ void g_MenuInit(void)
 	mi.pszService = "Jabber/AddToRoster";

 	mi.pszName = LPGEN("Add to roster");

 	mi.position = -1999901005;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_ADD);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_ADD);

 	g_hMenuRosterAdd = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, JabberMenuRosterAdd);

 

@@ -294,7 +294,7 @@ void g_MenuInit(void)
 		mi.ptszName = pcli->pfnGetStatusModeDescription(PresenceModeArray[i].mode, 0);

 		mi.position = -1999901000;

 		mi.hParentMenu = g_hMenuDirectPresence[0];

-		mi.icolibItem = LoadSkinnedIcon(PresenceModeArray[i].icon);

+		mi.icolibItem = Skin_LoadIcon(PresenceModeArray[i].icon);

 		g_hMenuDirectPresence[i+1] = Menu_AddContactMenuItem(&mi);

 		CreateServiceFunctionParam(mi.pszService, JabberMenuHandleDirectPresence, PresenceModeArray[i].mode);

 	}

@@ -371,7 +371,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
 	for (int i=0; i < SIZEOF(PresenceModeArray); i++) {

 		CLISTMENUITEM clmi = { sizeof(clmi) };

 		clmi.flags = CMIM_ICON | CMIM_FLAGS;

-		clmi.hIcon = (HICON)LoadSkinnedProtoIcon(m_szModuleName, PresenceModeArray[i].mode);

+		clmi.hIcon = (HICON)Skin_LoadProtoIcon(m_szModuleName, PresenceModeArray[i].mode);

 		Menu_ModifyItem(g_hMenuDirectPresence[i+1], &clmi);

 	}

 

@@ -1162,7 +1162,7 @@ CJabberProto* JabberChooseInstance(bool bIsLink)
 			++nItems;

 			lastItemId = i + 1;

 			clmi.flags |= CMIM_ICON;

-			clmi.hIcon = LoadSkinnedProtoIcon(ppro->m_szModuleName, ppro->m_iStatus);

+			clmi.hIcon = Skin_LoadProtoIcon(ppro->m_szModuleName, ppro->m_iStatus);

 		}

 		else clmi.flags |= CMIF_HIDDEN;

 

diff --git a/protocols/JabberG/src/jabber_opttree.cpp b/protocols/JabberG/src/jabber_opttree.cpp
index 5eddddfb65..28422a81ab 100644
--- a/protocols/JabberG/src/jabber_opttree.cpp
+++ b/protocols/JabberG/src/jabber_opttree.cpp
@@ -97,13 +97,13 @@ void CCtrlTreeOpts::OnInit()
 	DeleteAllItems();

 

 	hImgLst = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_COLOR32 | ILC_MASK, 5, 1);

-	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

-	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_TICK));	// check on

-	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_NOTICK));	// check off

-	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_TICK));	// radio on

-	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_NOTICK));	// radio on

-	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_GROUPOPEN));

-	ImageList_AddIcon_Icolib(hImgLst, LoadSkinnedIcon(SKINICON_OTHER_GROUPSHUT));

+	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_MIRANDA));

+	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_TICK));	// check on

+	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_NOTICK));	// check off

+	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_TICK));	// radio on

+	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_NOTICK));	// radio on

+	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_GROUPOPEN));

+	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_GROUPSHUT));

 	SetImageList(hImgLst, TVSIL_NORMAL);

 

 	/* build options tree. based on code from IcoLib */

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 2b7309779f..558d70b028 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -782,7 +782,7 @@ void CJabberDlgPrivacyLists::OnInitDialog()
 	m_clcClist.SetExStyle(CLS_EX_DISABLEDRAGDROP|CLS_EX_TRACKSELECT);

 

 	HIMAGELIST hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 9, 9);

-	ImageList_AddIcon_Icolib(hIml, LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT));

+	ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_OTHER_SMALLDOT));

 	ImageList_AddIcon_Icolib(hIml, m_proto->LoadIconEx("pl_msg_allow"));

 	ImageList_AddIcon_Icolib(hIml, m_proto->LoadIconEx("pl_msg_deny"));

 	ImageList_AddIcon_Icolib(hIml, m_proto->LoadIconEx("pl_prin_allow"));

@@ -2136,7 +2136,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld)
 		m_privacyMenuServiceAllocated = i;

 	}

 	mi.position++;

-	mi.icolibItem = LoadSkinnedIconHandle(m_privacyListManager.GetActiveListName() ? SKINICON_OTHER_SMALLDOT : SKINICON_OTHER_EMPTYBLOB);

+	mi.icolibItem = Skin_GetIconHandle(m_privacyListManager.GetActiveListName() ? SKINICON_OTHER_SMALLDOT : SKINICON_OTHER_EMPTYBLOB);

 	mi.ptszName = LPGENT("<none>");

 	m_hPrivacyMenuItems.insert(Menu_AddProtoMenuItem(&mi));

 

@@ -2150,7 +2150,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld)
 		}

 

 		mi.position++;

-		mi.icolibItem = LoadSkinnedIconHandle(

+		mi.icolibItem = Skin_GetIconHandle(

 			mir_tstrcmp(m_privacyListManager.GetActiveListName(), pList->GetListName()) ? SKINICON_OTHER_SMALLDOT : SKINICON_OTHER_EMPTYBLOB);

 		mi.ptszName = pList->GetListName();

 		m_hPrivacyMenuItems.insert(Menu_AddProtoMenuItem(&mi));

diff --git a/protocols/JabberG/src/jabber_treelist.cpp b/protocols/JabberG/src/jabber_treelist.cpp
index 5a406e23a2..8736508387 100644
--- a/protocols/JabberG/src/jabber_treelist.cpp
+++ b/protocols/JabberG/src/jabber_treelist.cpp
@@ -136,9 +136,9 @@ void TreeList_Create(HWND hwnd)
 	ListView_SetImageList (hwnd, hIml, LVSIL_SMALL);

 

 	hIml = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 2, 1);

-	ImageList_AddIcon_Icolib(hIml, (HICON)CallService(MS_SKIN_LOADICON, SKINICON_OTHER_GROUPOPEN, 0));

-	ImageList_AddIcon_Icolib(hIml, (HICON)CallService(MS_SKIN_LOADICON, SKINICON_OTHER_GROUPSHUT, 0));

-	ImageList_AddIcon_Icolib(hIml, (HICON)CallService(MS_SKIN_LOADICON, SKINICON_OTHER_DOWNARROW, 0));

+	ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_OTHER_GROUPOPEN));

+	ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_OTHER_GROUPSHUT));

+	ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_OTHER_DOWNARROW));

 	ListView_SetImageList (hwnd, hIml, LVSIL_STATE);

 }

 

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 0ebaa064a3..14e275df5c 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -215,11 +215,11 @@ static void sttFillResourceInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM hti
 	pResourceStatus r = resource ? item->arResources[resource-1] : item->getTemp();
 
 	if (r->m_tszResourceName && *r->m_tszResourceName)
-		htiResource = sttFillInfoLine(hwndTree, htiRoot, LoadSkinnedProtoIcon(ppro->m_szModuleName, r->m_iStatus),
+		htiResource = sttFillInfoLine(hwndTree, htiRoot, Skin_LoadProtoIcon(ppro->m_szModuleName, r->m_iStatus),
 			TranslateT("Resource"), r->m_tszResourceName, sttInfoLineId(resource, INFOLINE_NAME), true);
 
 	// StatusMsg
-	sttFillInfoLine(hwndTree, htiResource, NULL /*LoadSkinnedIcon(SKINICON_EVENT_MESSAGE)*/,
+	sttFillInfoLine(hwndTree, htiResource, NULL /*Skin_LoadIcon(SKINICON_EVENT_MESSAGE)*/,
 		TranslateT("Message"), r->m_tszStatusMessage ? r->m_tszStatusMessage : TranslateT("<not specified>"),
 		sttInfoLineId(resource, INFOLINE_MESSAGE));
 
@@ -439,8 +439,8 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		// lParam is hContact
 		TranslateDialogDefault(hwndDlg);
 
-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIconBig(SKINICON_OTHER_USERDETAILS));
-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS));
+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_USERDETAILS, true));
+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_USERDETAILS));
 
 		dat = (JabberUserInfoDlgData *)mir_alloc(sizeof(JabberUserInfoDlgData));
 		memset(dat, 0, sizeof(JabberUserInfoDlgData));
@@ -451,7 +451,7 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			MoveWindow(GetDlgItem(hwndDlg, IDC_TV_INFO), 5, 5, rc.right - 10, rc.bottom - 10, TRUE);
 
 			HIMAGELIST himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_COLOR32 | ILC_MASK, 5, 1);
-			ImageList_AddIcon_Icolib(himl, LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT));
+			ImageList_AddIcon_Icolib(himl, Skin_LoadIcon(SKINICON_OTHER_SMALLDOT));
 			TreeView_SetImageList(GetDlgItem(hwndDlg, IDC_TV_INFO), himl, TVSIL_NORMAL);
 
 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index ded31eb3ef..059015f155 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -734,10 +734,10 @@ static VOID CALLBACK sttRebuildInfoFrameApcProc(void* param)
 	if (!ppro->m_bJabberOnline) {

 		ppro->m_pInfoFrame->RemoveInfoItem("$/PEP");

 		ppro->m_pInfoFrame->RemoveInfoItem("$/Transports");

-		ppro->m_pInfoFrame->UpdateInfoItem("$/JID", LoadSkinnedIconHandle(SKINICON_OTHER_USERDETAILS), TranslateT("Offline"));

+		ppro->m_pInfoFrame->UpdateInfoItem("$/JID", Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS), TranslateT("Offline"));

 	}

 	else {

-		ppro->m_pInfoFrame->UpdateInfoItem("$/JID", LoadSkinnedIconHandle(SKINICON_OTHER_USERDETAILS), ppro->m_szJabberJID);

+		ppro->m_pInfoFrame->UpdateInfoItem("$/JID", Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS), ppro->m_szJabberJID);

 

 		if (!ppro->m_bPepSupported)

 			ppro->m_pInfoFrame->RemoveInfoItem("$/PEP");

@@ -748,11 +748,11 @@ static VOID CALLBACK sttRebuildInfoFrameApcProc(void* param)
 

 			ppro->m_pInfoFrame->CreateInfoItem("$/PEP/mood", true);

 			ppro->m_pInfoFrame->SetInfoItemCallback("$/PEP/mood", &CJabberProto::InfoFrame_OnUserMood);

-			ppro->m_pInfoFrame->UpdateInfoItem("$/PEP/mood", LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set mood..."));

+			ppro->m_pInfoFrame->UpdateInfoItem("$/PEP/mood", Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set mood..."));

 

 			ppro->m_pInfoFrame->CreateInfoItem("$/PEP/activity", true);

 			ppro->m_pInfoFrame->SetInfoItemCallback("$/PEP/activity", &CJabberProto::InfoFrame_OnUserActivity);

-			ppro->m_pInfoFrame->UpdateInfoItem("$/PEP/activity", LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set activity..."));

+			ppro->m_pInfoFrame->UpdateInfoItem("$/PEP/activity", Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set activity..."));

 		}

 

 		ppro->m_pInfoFrame->RemoveInfoItem("$/Transports/");

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index a6351238ba..61585a59f2 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -191,7 +191,7 @@ CJabberDlgPepSimple::CJabberDlgPepSimple(CJabberProto *proto, TCHAR *title):
 	m_cbModes.OnDropdown =

 	m_txtDescription.OnChange = Callback(this, &CJabberDlgPepSimple::global_OnChange);

 

-	m_modes.insert(new CStatusMode(-1, "<none>", LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT), TranslateT("None"), false));

+	m_modes.insert(new CStatusMode(-1, "<none>", Skin_LoadIcon(SKINICON_OTHER_SMALLDOT), TranslateT("None"), false));

 }

 

 CJabberDlgPepSimple::~CJabberDlgPepSimple()

@@ -609,7 +609,7 @@ CPepMood::CPepMood(CJabberProto *proto) :
 	m_text(NULL),

 	m_mode(-1)

 {

-	UpdateMenuItem(LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), LPGENT("Set mood..."));

+	UpdateMenuItem(Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), LPGENT("Set mood..."));

 }

 

 CPepMood::~CPepMood()

@@ -696,7 +696,7 @@ void CPepMood::SetMood(MCONTACT hContact, const TCHAR *szMood, const TCHAR *szTe
 		m_mode = mood;

 		replaceStrT(m_text, szText);

 

-		HANDLE hIcon = (mood >= 0) ? g_MoodIcons.GetIcolibHandle(g_arrMoods[mood].szTag) : LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT);

+		HANDLE hIcon = (mood >= 0) ? g_MoodIcons.GetIcolibHandle(g_arrMoods[mood].szTag) : Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT);

 		TCHAR title[128];

 

 		if (m_proto->m_pInfoFrame) {

@@ -706,7 +706,7 @@ void CPepMood::SetMood(MCONTACT hContact, const TCHAR *szMood, const TCHAR *szTe
 			}

 			else {

 				mir_tstrcpy(title, LPGENT("Set mood..."));

-				m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/mood", LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set mood..."));

+				m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/mood", Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set mood..."));

 			}

 		}

 

@@ -760,8 +760,8 @@ void CPepMood::ShowSetDialog(BYTE bQuiet)
 		}

 		else {

 			Retract();

-			UpdateMenuItem(LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), LPGENT("Set mood..."));

-			m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/mood", LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set mood..."));

+			UpdateMenuItem(Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), LPGENT("Set mood..."));

+			m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/mood", Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set mood..."));

 		}

 	}

 }

@@ -989,7 +989,7 @@ CPepActivity::CPepActivity(CJabberProto *proto):
 	m_text(NULL),

 	m_mode(-1)

 {

-	UpdateMenuItem(LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), LPGENT("Set activity..."));

+	UpdateMenuItem(Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), LPGENT("Set activity..."));

 }

 

 CPepActivity::~CPepActivity()

@@ -1084,7 +1084,7 @@ void CPepActivity::SetActivity(MCONTACT hContact, LPCTSTR szFirst, LPCTSTR szSec
 		m_mode = activity;

 		replaceStrT(m_text, szText);

 

-		HANDLE hIcon = (activity >= 0) ? g_ActivityIcons.GetIcolibHandle(returnActivity(activity)) : LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT);

+		HANDLE hIcon = (activity >= 0) ? g_ActivityIcons.GetIcolibHandle(returnActivity(activity)) : Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT);

 		TCHAR title[128];

 

 		if (m_proto->m_pInfoFrame) {

@@ -1094,7 +1094,7 @@ void CPepActivity::SetActivity(MCONTACT hContact, LPCTSTR szFirst, LPCTSTR szSec
 			}

 			else {

 				mir_tstrcpy(title, LPGENT("Set activity..."));

-				m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/activity", LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set activity..."));

+				m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/activity", Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set activity..."));

 			}

 		}

 

@@ -1133,9 +1133,9 @@ void CPepActivity::ShowSetDialog(BYTE)
 	}

 	else {

 		Retract();

-		UpdateMenuItem(LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), LPGENT("Set activity..."));

+		UpdateMenuItem(Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), LPGENT("Set activity..."));

 		if (m_proto->m_pInfoFrame)

-			m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/activity", LoadSkinnedIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set activity..."));

+			m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/activity", Skin_GetIconHandle(SKINICON_OTHER_SMALLDOT), TranslateT("Set activity..."));

 	}

 }

 

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

 			HIMAGELIST hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR32, 5, 5);

 

-			HICON hIcon = LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT);

+			HICON hIcon = Skin_LoadIcon(SKINICON_OTHER_SMALLDOT);

 			ImageList_AddIcon(hIml, hIcon);

 			IcoLib_ReleaseIcon(hIcon);

 

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 10a968681d..652bb0efcd 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -292,7 +292,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
 			cle.hContact = hContact;

 			cle.hDbEvent = 1;

 			cle.flags = CLEF_URGENT | CLEF_TCHAR;

-			cle.hIcon = LoadSkinnedIcon(SKINICON_OTHER_SENDEMAIL);

+			cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_SENDEMAIL);

 			cle.ptszTooltip = tBuffer2;

 			char buf[64];

 			mir_snprintf(buf, "%s%s", m_szModuleName, MS_GOTO_INBOX);

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index 4ce5d8a9e7..3899dc8cf8 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -445,7 +445,7 @@ void MSN_InitContactMenu(void)
 	hSendHotMail = CreateServiceFunction(servicefunction, MsnMenuSendHotmail);

 	mi.position = -2000010005;

 	mi.flags = CMIF_HIDDEN;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_SENDEMAIL);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);

 	mi.pszName = LPGEN("Open &Hotmail Inbox");

 	hOpenInboxMenuItem = Menu_AddContactMenuItem(&mi);

 

diff --git a/protocols/SkypeWeb/src/skype_events.cpp b/protocols/SkypeWeb/src/skype_events.cpp
index 38141ca714..66402d442a 100644
--- a/protocols/SkypeWeb/src/skype_events.cpp
+++ b/protocols/SkypeWeb/src/skype_events.cpp
@@ -56,7 +56,7 @@ INT_PTR CSkypeProto::EventGetIcon(WPARAM wParam, LPARAM lParam)
 	}

 	default:

 	{

-		icon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

+		icon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 		break;

 	}

 	}

diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp
index 6dd88d4998..2972273e33 100644
--- a/protocols/SkypeWeb/src/skype_icons.cpp
+++ b/protocols/SkypeWeb/src/skype_icons.cpp
@@ -63,7 +63,7 @@ HANDLE CSkypeProto::GetIconHandle(const char *name)
 	return 0;

 }

 

-HANDLE CSkypeProto::GetSkinIconHandle(const char *name)

+HANDLE CSkypeProto::Skin_GetIconHandle(const char *name)

 {

 	char iconName[100];

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

diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp
index 93c7add2a3..f845444451 100644
--- a/protocols/SkypeWeb/src/skype_menus.cpp
+++ b/protocols/SkypeWeb/src/skype_menus.cpp
@@ -67,7 +67,7 @@ void CSkypeProto::InitMenus()
 	mi.pszService = MODULE"/RequestAuth";

 	mi.ptszName = LPGENT("Request authorization");

 	mi.position = CMI_POSITION + CMI_AUTH_REQUEST;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	ContactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::OnRequestAuth>);

 

@@ -75,7 +75,7 @@ void CSkypeProto::InitMenus()
 	mi.pszService = MODULE"/GrantAuth";

 	mi.ptszName = LPGENT("Grant authorization");

 	mi.position = CMI_POSITION + CMI_AUTH_GRANT;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

+	mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);

 	ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::OnGrantAuth>);

 

@@ -122,7 +122,7 @@ int CSkypeProto::OnInitStatusMenu()
 		mi.position = -1999901006;

 		mi.hParentMenu = HGENMENU_ROOT;

 		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

-		mi.icolibItem = GetSkinIconHandle("main");

+		mi.icolibItem = Skin_GetIconHandle("main");

 		hStatusMunuRoot = /*m_hMenuRoot = */Menu_AddProtoMenuItem(&mi);

 	}

 

diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index d65fd6d1e6..8c4ac80eac 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -152,7 +152,7 @@ private:
 	// icons

 	static IconInfo Icons[];

 	static HANDLE GetIconHandle(const char *name);

-	static HANDLE GetSkinIconHandle(const char *name);

+	static HANDLE Skin_GetIconHandle(const char *name);

 

 	// menus

 	static HGENMENU ContactMenuItems[CMI_MAX];

diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp
index 7417673315..58702f8aef 100644
--- a/protocols/SkypeWeb/src/skype_utils.cpp
+++ b/protocols/SkypeWeb/src/skype_utils.cpp
@@ -37,7 +37,7 @@ void CSkypeProto::SetSrmmReadStatus(MCONTACT hContact)
 

 	StatusTextData st = { 0 };

 	st.cbSize = sizeof(st);

-	st.hIcon = LoadSkinnedIcon(SKINICON_OTHER_HISTORY);

+	st.hIcon = Skin_LoadIcon(SKINICON_OTHER_HISTORY);

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

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

 }

diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp
index 08a5ca7c03..75c6db25e4 100644
--- a/protocols/Steam/src/steam_menus.cpp
+++ b/protocols/Steam/src/steam_menus.cpp
@@ -147,7 +147,7 @@ void CSteamProto::InitMenus()
 	mi.pszService = MODULE "/AuthRequest";

 	mi.ptszName = LPGENT("Request authorization");

 	mi.position = -201001000 + CMI_AUTH_REQUEST;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	contactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, GlobalService<&CSteamProto::AuthRequestCommand>);

 

@@ -155,7 +155,7 @@ void CSteamProto::InitMenus()
 	mi.pszService = MODULE "/Block";

 	mi.ptszName = LPGENT("Block");

 	mi.position = -201001001 + CMI_BLOCK;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	contactMenuItems[CMI_BLOCK] = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, GlobalService<&CSteamProto::BlockCommand>);

 

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index c96e67ea08..077b6a5933 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -333,7 +333,7 @@ void TlenProtocol::initMenuItems()
 	CreateProtoService(pSvcName, &TlenProtocol::ContactMenuHandleRequestAuth);

 	mi.pszName = LPGEN("Request authorization");

 	mi.position = -2000001001;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	hMenuContactRequestAuth = Menu_AddContactMenuItem(&mi);

 

 	// "Grant authorization"

@@ -341,7 +341,7 @@ void TlenProtocol::initMenuItems()
 	CreateProtoService(pSvcName, &TlenProtocol::ContactMenuHandleGrantAuth);

 	mi.pszName = LPGEN("Grant authorization");

 	mi.position = -2000001000;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);

 	hMenuContactGrantAuth = Menu_AddContactMenuItem(&mi);

 }

 

diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp
index 7a56fce4c8..85f2b427bd 100644
--- a/protocols/Tox/src/tox_icons.cpp
+++ b/protocols/Tox/src/tox_icons.cpp
@@ -52,7 +52,7 @@ HANDLE CToxProto::GetIconHandle(const char *name)
 	return NULL;

 }

 

-HANDLE CToxProto::GetSkinIconHandle(const char *name)

+HANDLE CToxProto::Skin_GetIconHandle(const char *name)

 {

 	char iconName[100];

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

diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp
index 95b37d9dcb..914920eb9d 100644
--- a/protocols/Tox/src/tox_menus.cpp
+++ b/protocols/Tox/src/tox_menus.cpp
@@ -48,7 +48,7 @@ void CToxProto::InitMenus()
 	mi.pszService = MODULE"/RequestAuth";

 	mi.ptszName = LPGENT("Request authorization");

 	mi.position = CMI_POSITION + CMI_AUTH_REQUEST;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

+	mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	ContactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnRequestAuth>);

 

@@ -56,7 +56,7 @@ void CToxProto::InitMenus()
 	mi.pszService = MODULE"/GrantAuth";

 	mi.ptszName = LPGENT("Grant authorization");

 	mi.position = CMI_POSITION + CMI_AUTH_GRANT;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

+	mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);

 	ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnGrantAuth>);

 

@@ -90,7 +90,7 @@ int CToxProto::OnInitStatusMenu()
 		mi.position = -1999901006;

 		mi.hParentMenu = HGENMENU_ROOT;

 		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

-		mi.icolibItem = GetSkinIconHandle("main");

+		mi.icolibItem = Skin_GetIconHandle("main");

 		hStatusMunuRoot = /*m_hMenuRoot = */Menu_AddProtoMenuItem(&mi);

 	}

 	/*else

@@ -116,7 +116,7 @@ int CToxProto::OnInitStatusMenu()
 	CreateProtoService(tDest, &CToxProto::OnCreateChatRoom);

 	mi.ptszName = LPGENT("Create group chat");

 	mi.position = SMI_POSITION + SMI_GROUPCHAT_CREATE;

-	mi.icolibItem = GetSkinIconHandle("conference");

+	mi.icolibItem = Skin_GetIconHandle("conference");

 	HGENMENU hCreateChatRoom = Menu_AddProtoMenuItem(&mi);*/

 

 	return 0;

diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index 85af8ca960..d5cc88a42c 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -375,9 +375,9 @@ void CToxOptionsNodeList::OnInitDialog()
 	m_nodes.SetExtendedListViewStyle(LVS_EX_SUBITEMIMAGES | LVS_EX_FULLROWSELECT | LVS_EX_LABELTIP);

 

 	HIMAGELIST hImageList = m_nodes.CreateImageList(LVSIL_SMALL);

-	HICON icon = LoadSkinnedIcon(SKINICON_OTHER_TYPING);

+	HICON icon = Skin_LoadIcon(SKINICON_OTHER_TYPING);

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

-	icon = LoadSkinnedIcon(SKINICON_OTHER_DELETE);

+	icon = Skin_LoadIcon(SKINICON_OTHER_DELETE);

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

 

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

diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 2afaae8347..b0e9ef17a7 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -125,7 +125,7 @@ private:
 	static IconInfo Icons[];

 	static HICON GetIcon(const char *name, int size = 0);

 	static HANDLE GetIconHandle(const char *name);

-	static HANDLE GetSkinIconHandle(const char *name);

+	static HANDLE Skin_GetIconHandle(const char *name);

 

 	// menus

 	static HGENMENU ContactMenuItems[CMI_MAX];

diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index 50237a2ce6..8dcf0c2069 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -37,7 +37,7 @@ static HANDLE hIconLibItem[SIZEOF(icons)];
 void InitIcons(void)

 {

 	Icon_Register(g_hInstance, "Protocols/Twitter", icons, SIZEOF(icons), "Twitter");

-	icons[SIZEOF(icons) - 1].hIcolib = LoadSkinnedIconHandle(SKINICON_EVENT_URL);

+	icons[SIZEOF(icons) - 1].hIcolib = Skin_GetIconHandle(SKINICON_EVENT_URL);

 }

 

 HANDLE GetIconHandle(const char* name)

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index af266530a7..5d4316e996 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -201,7 +201,7 @@ void CVkProto::InitMenus()
 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_CREATECHAT);

 	mi.pszService = szService;

 	mi.position = 10009 + PMI_CREATECHAT;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_CHAT_JOIN);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);

 	mi.pszName = LPGEN("Create new chat");

 	g_hProtoMenuItems[PMI_CREATECHAT] = Menu_AddProtoMenuItem(&mi);

 

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

 	ppc.ptszDescription = desc;

 	ppc.pszName = name;

-	ppc.hIcon = LoadSkinnedIcon(SKINICON_ERROR);

+	ppc.hIcon = Skin_LoadIcon(SKINICON_ERROR);

 	ppc.colorBack = RGB(191, 0, 0); //Red

 	ppc.colorText = RGB(255, 245, 225); //Yellow

 	ppc.iSeconds = 60;

diff --git a/protocols/WhatsApp/src/utils.cpp b/protocols/WhatsApp/src/utils.cpp
index 652a9c7c4a..6d7e77b15a 100644
--- a/protocols/WhatsApp/src/utils.cpp
+++ b/protocols/WhatsApp/src/utils.cpp
@@ -46,13 +46,13 @@ std::string getLastErrorMsg()
 void utils::setStatusMessage(MCONTACT hContact, const TCHAR *ptszMessage)

 {

 	if (ptszMessage != NULL) {

-		StatusTextData st = { 0 };
-		st.cbSize = sizeof(st);
-		st.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);
-		_tcsncpy_s(st.tszText, ptszMessage, _TRUNCATE);
-		CallService(MS_MSG_SETSTATUSTEXT, hContact, (LPARAM)&st);
-	}
-	else CallService(MS_MSG_SETSTATUSTEXT, hContact, NULL);
+		StatusTextData st = { 0 };

+		st.cbSize = sizeof(st);

+		st.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

+		_tcsncpy_s(st.tszText, ptszMessage, _TRUNCATE);

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

+	}

+	else CallService(MS_MSG_SETSTATUSTEXT, hContact, NULL);

 }

 

 BYTE* utils::md5string(const BYTE *data, int size, BYTE *digest)

diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp
index 58043f1aaa..fd13a4688c 100644
--- a/protocols/Xfire/src/options.cpp
+++ b/protocols/Xfire/src/options.cpp
@@ -610,7 +610,7 @@ static INT_PTR CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		dbces.lParam = (LPARAM)hwndDlg;
 		CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);
 
-		SendDlgItemMessage(hwndDlg, IDC_REMUSER, BM_SETIMAGE, IMAGE_ICON, (WPARAM)LoadSkinnedIcon(SKINICON_OTHER_DELETE));
+		SendDlgItemMessage(hwndDlg, IDC_REMUSER, BM_SETIMAGE, IMAGE_ICON, (WPARAM)Skin_LoadIcon(SKINICON_OTHER_DELETE));
 
 		mir_strcpy(inipath, XFireGetFoldersPath("IniFile"));
 		SetDlgItemTextA(hwndDlg, IDC_FILESSHOULDBE, inipath);
@@ -762,7 +762,7 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		//gamelist füllen
 		SendMessage(hwndDlg, WM_FILLGAMELIST, 0, 0);
 
-		//SendDlgItemMessage(hwndDlg, IDC_CREATETXTLIST), BM_SETIMAGE, IMAGE_ICON, (WPARAM)LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS));
+		//SendDlgItemMessage(hwndDlg, IDC_CREATETXTLIST), BM_SETIMAGE, IMAGE_ICON, (WPARAM)Skin_LoadIcon(SKINICON_OTHER_USERDETAILS));
 
 		return TRUE;
 	}
diff --git a/protocols/Yahoo/src/user_info.cpp b/protocols/Yahoo/src/user_info.cpp
index f7f4e47c82..bb96c73132 100644
--- a/protocols/Yahoo/src/user_info.cpp
+++ b/protocols/Yahoo/src/user_info.cpp
@@ -28,7 +28,7 @@ static INT_PTR CALLBACK YahooUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 		// lParam is hContact

 		TranslateDialogDefault(hwndDlg);

 

-		//SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS));

+		//SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_USERDETAILS));

 

 

 		break;