duplicate popup icons moved into global skin

44 files changed, 90 insertions, 130 deletions

diff --git a/include/m_skin.h b/include/m_skin.h
index 3fb83846ec..522ead00b9 100644
--- a/include/m_skin.h
+++ b/include/m_skin.h
@@ -87,6 +87,8 @@
 #define SKINICON_AUTH_GRANT          245

 #define SKINICON_AUTH_REVOKE         246

 #define SKINICON_OTHER_GROUPADD      247

+#define SKINICON_OTHER_POPUP         248

+#define SKINICON_OTHER_NOPOPUP       249

 

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

 // Miranda skin

diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
index 82e599a3ae..277de6bc88 100644
--- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
+++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
@@ -54,7 +54,7 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_POPUPICON           ICON         "Popup.ico"

+

 IDI_COPYICON            ICON         "CopyToClipboard.ico"

 

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

diff --git a/plugins/ChangeKeyboardLayout/res/Popup.ico b/plugins/ChangeKeyboardLayout/res/Popup.ico
deleted file mode 100644
index c0cc313845..0000000000
--- a/plugins/ChangeKeyboardLayout/res/Popup.ico
+++ /dev/null
diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index 884182159e..acb11976be 100644
--- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
@@ -85,7 +85,7 @@ void RegPopupActions()
 

 int OnIconsChanged(WPARAM, LPARAM)

 {

-	hPopupIcon = IcoLib_GetIcon("ckl_popup_icon");

+	hPopupIcon = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 	hCopyIcon = IcoLib_GetIcon("ckl_copy_icon");

 	RegPopupActions();

 	return 0;

diff --git a/plugins/ChangeKeyboardLayout/src/main.cpp b/plugins/ChangeKeyboardLayout/src/main.cpp
index ca660047ae..51b09a88a8 100644
--- a/plugins/ChangeKeyboardLayout/src/main.cpp
+++ b/plugins/ChangeKeyboardLayout/src/main.cpp
@@ -19,7 +19,6 @@ HANDLE hOptionsInitialize;
 

 static IconItem iconList[] =

 {

-	{ LPGEN("Popup"), "ckl_popup_icon", IDI_POPUPICON },

 	{ LPGEN("Copy to clipboard"), "ckl_copy_icon", IDI_COPYICON }

 };

 

diff --git a/plugins/ChangeKeyboardLayout/src/resource.h b/plugins/ChangeKeyboardLayout/src/resource.h
index 8ca2e0e8be..737754fc59 100644
--- a/plugins/ChangeKeyboardLayout/src/resource.h
+++ b/plugins/ChangeKeyboardLayout/src/resource.h
@@ -4,7 +4,6 @@
 //

 #define IDD_MAIN_OPTION_FORM            101

 #define IDD_POPUP_OPTION_FORM           102

-#define IDI_POPUPICON                   103

 #define IDI_COPYICON                    104

 #define IDB_BITMAP_WIN                  110

 #define IDB_BITMAP_ALT                  111

diff --git a/plugins/NewEventNotify/res/popup.ico b/plugins/NewEventNotify/res/popup.ico
deleted file mode 100644
index 152171fc56..0000000000
--- a/plugins/NewEventNotify/res/popup.ico
+++ /dev/null
diff --git a/plugins/NewEventNotify/res/popup_no.ico b/plugins/NewEventNotify/res/popup_no.ico
deleted file mode 100644
index d86f9c68ac..0000000000
--- a/plugins/NewEventNotify/res/popup_no.ico
+++ /dev/null
diff --git a/plugins/NewEventNotify/res/resource.rc b/plugins/NewEventNotify/res/resource.rc
index 68fa73ed46..e8866f9698 100644
--- a/plugins/NewEventNotify/res/resource.rc
+++ b/plugins/NewEventNotify/res/resource.rc
@@ -175,15 +175,6 @@ BEGIN
 END

 #endif    // APSTUDIO_INVOKED

 

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_ENABLED             ICON                    "popup.ico"

-IDI_DISABLED            ICON                    "popup_no.ico"

 #endif    // English (U.S.) resources

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

 

diff --git a/plugins/NewEventNotify/src/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp
index eccf612334..c077bf25be 100644
--- a/plugins/NewEventNotify/src/menuitem.cpp
+++ b/plugins/NewEventNotify/src/menuitem.cpp
@@ -40,9 +40,9 @@ static INT_PTR MenuitemNotifyCmd(WPARAM, LPARAM)
 int MenuitemUpdate(BOOL bStatus)

 {

 	if (bStatus)

-		Menu_ModifyItem(hMenuitemNotify, MENUITEM_DISABLE, LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_ENABLED)));

+		Menu_ModifyItem(hMenuitemNotify, MENUITEM_DISABLE, Skin_LoadIcon(SKINICON_OTHER_POPUP));

 	else

-		Menu_ModifyItem(hMenuitemNotify, MENUITEM_ENABLE, LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_DISABLED)));

+		Menu_ModifyItem(hMenuitemNotify, MENUITEM_ENABLE, Skin_LoadIcon(SKINICON_OTHER_NOPOPUP));

 	return 0;

 }

 

@@ -56,7 +56,7 @@ int MenuitemInit(BOOL bStatus)
 	SET_UID(mi, 0x7aed93f7, 0x835, 0x4ff6, 0xb1, 0x34, 0xae, 0x0, 0x21, 0x2a, 0xd7, 0x81);

 	mi.root = hRoot;

 	mi.position = 1;

-	mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_ENABLED));

+	mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 	mi.pszService = MS_NEN_MENUNOTIFY;

 	mi.flags = 0;

 	hMenuitemNotify = Menu_AddMainMenuItem(&mi);

diff --git a/plugins/NewEventNotify/src/resource.h b/plugins/NewEventNotify/src/resource.h
index 679a27ed70..07feaa4615 100644
--- a/plugins/NewEventNotify/src/resource.h
+++ b/plugins/NewEventNotify/src/resource.h
@@ -3,9 +3,6 @@
 // Used by ..\res\resource.rc

 //

 #define IDD_OPT                         101

-#define IDI_ENABLED                     106

-#define IDI_ICON2                       107

-#define IDI_DISABLED                    107

 #define IDC_PREVIEW                     1000

 #define IDC_CHKNOTIFY_MESSAGE           1001

 #define IDC_CHKNOTIFY_FILE              1003

diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc
index 30a324cbe3..8d02607d96 100644
--- a/plugins/NewXstatusNotify/res/resource.rc
+++ b/plugins/NewXstatusNotify/res/resource.rc
@@ -84,7 +84,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     CONTROL         "",IDC_INDSNDLIST,"CListControl",WS_TABSTOP | 0x1d0,5,5,290,170,WS_EX_CLIENTEDGE

     ICON            IDI_SOUND,IDC_SOUNDICON,8,178,21,20,SS_CENTERIMAGE

-    ICON            IDI_POPUP,IDC_POPUPICON,109,178,21,20,SS_CENTERIMAGE

+    ICON            IDC_STATIC,IDC_POPUPICON,109,178,21,20,SS_CENTERIMAGE

     LTEXT           "Sounds",IDC_STATIC,26,182,80,9

     LTEXT           "Popups",IDC_STATIC,127,182,80,9

     ICON            IDI_XSTATUS,IDC_XSTATUSICON,8,194,21,20,SS_CENTERIMAGE

@@ -357,7 +357,6 @@ END
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_RESET               ICON                    "reset.ico"

-IDI_POPUP               ICON                    "popup.ico"

 IDI_SOUND               ICON                    "sound.ico"

 IDI_NOTIFICATION_OFF    ICON                    "main_off.ico"

 IDI_NOTIFICATION_ON     ICON                    "main_on.ico"

diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp
index e1805da337..fc5b01d5e7 100644
--- a/plugins/NewXstatusNotify/src/indsnd.cpp
+++ b/plugins/NewXstatusNotify/src/indsnd.cpp
@@ -422,21 +422,21 @@ INT_PTR CALLBACK DlgProcFiltering(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)
 

 		HIMAGELIST hImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 3, 3);

 

-		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[2].hIcolib));

+		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[ICO_SOUND].hIcolib));

 		SendDlgItemMessage(hwndDlg, IDC_SOUNDICON, STM_SETICON, (WPARAM)ImageList_GetIcon(hImageList, EXTRA_IMAGE_SOUND, ILD_NORMAL), 0);

-		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[1].hIcolib));

+		ImageList_AddIcon(hImageList, Skin_LoadIcon(SKINICON_OTHER_POPUP));

 		SendDlgItemMessage(hwndDlg, IDC_POPUPICON, STM_SETICON, (WPARAM)ImageList_GetIcon(hImageList, EXTRA_IMAGE_POPUP, ILD_NORMAL), 0);

-		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[5].hIcolib));

+		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[ICO_XSTATUS].hIcolib));

 		SendDlgItemMessage(hwndDlg, IDC_XSTATUSICON, STM_SETICON, (WPARAM)ImageList_GetIcon(hImageList, EXTRA_IMAGE_XSTATUS, ILD_NORMAL), 0);

-		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[10].hIcolib));

+		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[ICO_LOGGING_XSTATUS].hIcolib));

 		SendDlgItemMessage(hwndDlg, IDC_XLOGGINGICON, STM_SETICON, (WPARAM)ImageList_GetIcon(hImageList, EXTRA_IMAGE_XLOGGING, ILD_NORMAL), 0);

-		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[9].hIcolib));

+		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[ICO_STATUS_MESSAGE].hIcolib));

 		SendDlgItemMessage(hwndDlg, IDC_SMSGICON, STM_SETICON, (WPARAM)ImageList_GetIcon(hImageList, EXTRA_IMAGE_STATUSMSG, ILD_NORMAL), 0);

-		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[11].hIcolib));

+		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[ICO_LOGGING_SMSG].hIcolib));

 		SendDlgItemMessage(hwndDlg, IDC_SMSGLOGGINGICON, STM_SETICON, (WPARAM)ImageList_GetIcon(hImageList, EXTRA_IMAGE_SMSGLOGGING, ILD_NORMAL), 0);

-		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[6].hIcolib));

+		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[ICO_DISABLEALL].hIcolib));

 		SendDlgItemMessage(hwndDlg, IDC_DISABLEALLICON, STM_SETICON, (WPARAM)ImageList_GetIcon(hImageList, EXTRA_IMAGE_DISABLEALL, ILD_NORMAL), 0);

-		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[7].hIcolib));

+		ImageList_AddIcon(hImageList, IcoLib_GetIconByHandle(iconList[ICO_ENABLEALL].hIcolib));

 		SendDlgItemMessage(hwndDlg, IDC_ENABLEALLICON, STM_SETICON, (WPARAM)ImageList_GetIcon(hImageList, EXTRA_IMAGE_ENABLEALL, ILD_NORMAL), 0);

 

 		ImageList_AddIcon(hImageList, Skin_LoadIcon(SKINICON_OTHER_SMALLDOT));

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index c2bfa62a6e..46c3e475a8 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -36,20 +36,19 @@ HWND SecretWnd;
 

 int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus);

 

-IconItem iconList[] =

+IconItem iconList[ICO_MAXID] =

 {

-	{ LPGEN("Reset"), ICO_RESET, IDI_RESET },

-	{ LPGEN("Popups"), ICO_POPUP, IDI_POPUP },

-	{ LPGEN("Sounds"), ICO_SOUND, IDI_SOUND },

-	{ LPGEN("Notification enabled"), ICO_NOTIFICATION_OFF, IDI_NOTIFICATION_OFF },

-	{ LPGEN("Notification disabled"), ICO_NOTIFICATION_ON, IDI_NOTIFICATION_ON },

-	{ LPGEN("Extra status notify"), ICO_XSTATUS, IDI_XSTATUS },

-	{ LPGEN("Disable all"), ICO_DISABLEALL, IDI_DISABLEALL },

-	{ LPGEN("Enable all"), ICO_ENABLEALL, IDI_ENABLEALL },

-	{ LPGEN("Variables"), ICO_VARIABLES, IDI_VARIABLES },

-	{ LPGEN("Status message notify"), ICO_STATUS_MESSAGE, IDI_STATUS_MESSAGE },

-	{ LPGEN("Extra status logging"), ICO_LOGGING_XSTATUS, IDI_LOGGING_XSTATUS },

-	{ LPGEN("Status message logging"), ICO_LOGGING_SMSG, IDI_LOGGING_SMSG }

+	{ LPGEN("Reset"),                  "reset",                  IDI_RESET },

+	{ LPGEN("Sounds"),                 "sound",                  IDI_SOUND },

+	{ LPGEN("Notification enabled"),   "notification_off",       IDI_NOTIFICATION_OFF },

+	{ LPGEN("Notification disabled"),  "notification_on",        IDI_NOTIFICATION_ON },

+	{ LPGEN("Extra status notify"),    "xstatus",                IDI_XSTATUS },

+	{ LPGEN("Disable all"),            "disable_all",            IDI_DISABLEALL },

+	{ LPGEN("Enable all"),             "enable_all",             IDI_ENABLEALL },

+	{ LPGEN("Variables"),              "variables",              IDI_VARIABLES },

+	{ LPGEN("Status message notify"),  "status_message",         IDI_STATUS_MESSAGE },

+	{ LPGEN("Extra status logging"),   "logging_xstatus",        IDI_LOGGING_XSTATUS },

+	{ LPGEN("Status message logging"), "logging_status_message", IDI_LOGGING_SMSG }

 };

 

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

@@ -97,13 +96,6 @@ BYTE GetGender(MCONTACT hContact)
 	return GENDER_UNSPECIFIED;

 }

 

-HANDLE GetIconHandle(char *szIcon)

-{

-	char szSettingName[64];

-	mir_snprintf(szSettingName, "%s_%s", MODULENAME, szIcon);

-	return IcoLib_GetIconHandle(szSettingName);

-}

-

 static int __inline CheckStr(char *str, int not_empty, int empty)

 {

 	if (str == nullptr || str[0] == '\0')

@@ -1065,9 +1057,9 @@ INT_PTR EnableDisableMenuCommand(WPARAM, LPARAM)
 	g_plugin.setByte("TempDisable", opt.TempDisabled = !opt.TempDisabled);

 

 	if (opt.TempDisabled)

-		Menu_ModifyItem(hEnableDisableMenu, LPGENW("Enable status notification"), GetIconHandle(ICO_NOTIFICATION_OFF));

+		Menu_ModifyItem(hEnableDisableMenu, LPGENW("Enable status notification"), iconList[ICO_NOTIFICATION_OFF].hIcolib);

 	else

-		Menu_ModifyItem(hEnableDisableMenu, LPGENW("Disable status notification"), GetIconHandle(ICO_NOTIFICATION_ON));

+		Menu_ModifyItem(hEnableDisableMenu, LPGENW("Disable status notification"), iconList[ICO_NOTIFICATION_ON].hIcolib);

 

 	CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hToolbarButton, opt.TempDisabled ? 0 : TTBST_PUSHED);

 	return 0;

@@ -1101,8 +1093,8 @@ static int InitTopToolbar(WPARAM, LPARAM)
 	tbb.pszService = MS_STATUSCHANGE_MENUCOMMAND;

 	tbb.dwFlags = (opt.TempDisabled ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON;

 	tbb.name = LPGEN("Toggle status notification");

-	tbb.hIconHandleUp = iconList[3].hIcolib;

-	tbb.hIconHandleDn = iconList[4].hIcolib;

+	tbb.hIconHandleUp = iconList[ICO_NOTIFICATION_OFF].hIcolib;

+	tbb.hIconHandleDn = iconList[ICO_NOTIFICATION_ON].hIcolib;

 	tbb.pszTooltipUp = LPGEN("Enable status notification");

 	tbb.pszTooltipDn = LPGEN("Disable status notification");

 	hToolbarButton = g_plugin.addTTB(&tbb);

@@ -1171,7 +1163,7 @@ int CMPlugin::Load()
 	evtype.module = MODULENAME;

 	evtype.eventType = EVENTTYPE_STATUSCHANGE;

 	evtype.descr = LPGEN("Status change");

-	evtype.eventIcon = iconList[3].hIcolib;

+	evtype.eventIcon = iconList[ICO_NOTIFICATION_OFF].hIcolib;

 	evtype.flags = DETF_HISTORY | DETF_MSGWINDOW;

 	DbEvent_RegisterType(&evtype);

 

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index 0a1b11abf8..ea88177e06 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -545,10 +545,10 @@ INT_PTR CALLBACK DlgProcXPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 		// Buttons

 		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show available variables"), BATF_UNICODE);

-		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[8].hIcolib));

+		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[ICO_VARIABLES].hIcolib));

 

 		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Reset all templates to default"), BATF_UNICODE);

-		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[0].hIcolib));

+		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[ICO_RESET].hIcolib));

 		return TRUE;

 

 	case WM_COMMAND:

@@ -671,10 +671,10 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 		// Buttons

 		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show available variables"), BATF_UNICODE);

-		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[8].hIcolib));

+		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[ICO_VARIABLES].hIcolib));

 

 		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Reset all templates to default"), BATF_UNICODE);

-		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[0].hIcolib));

+		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[ICO_RESET].hIcolib));

 

 		// proto list

 		{

@@ -882,10 +882,10 @@ INT_PTR CALLBACK DlgProcXLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 

 		// Buttons

 		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Show available variables"), BATF_UNICODE);

-		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[8].hIcolib));

+		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[ICO_VARIABLES].hIcolib));

 

 		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Reset all templates to default"), BATF_UNICODE);

-		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[0].hIcolib));

+		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[ICO_RESET].hIcolib));

 

 		SendMessage(hwndDlg, WM_USER + 2, (WPARAM)opt.XLogToFile || opt.XLogToDB, 0);

 		return TRUE;

@@ -1040,10 +1040,10 @@ INT_PTR CALLBACK DlgProcLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 		// Buttons

 		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Show available variables"), BATF_UNICODE);

-		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[8].hIcolib));

+		SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[ICO_VARIABLES].hIcolib));

 

 		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Reset all templates to default"), BATF_UNICODE);

-		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[0].hIcolib));

+		SendDlgItemMessage(hwndDlg, IDC_BT_RESET, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(iconList[ICO_RESET].hIcolib));

 

 		SendMessage(hwndDlg, WM_USER + 2, (WPARAM)opt.LogToFile || opt.LogToDB, 0);

 		SendMessage(hwndDlg, WM_USER + 3, (WPARAM)opt.SMsgLogToFile || opt.SMsgLogToDB, 0);

diff --git a/plugins/NewXstatusNotify/src/resource.h b/plugins/NewXstatusNotify/src/resource.h
index e827187708..3b10ffedce 100644
--- a/plugins/NewXstatusNotify/src/resource.h
+++ b/plugins/NewXstatusNotify/src/resource.h
@@ -13,7 +13,6 @@
 #define IDD_OPT_FILTERS                 114

 #define IDD_OPT_POPUP                   115

 #define IDD_OPT_XLOG                    116

-#define IDI_POPUP                       117

 #define IDD_OPT_SMPOPUP                 117

 #define IDI_SOUND                       118

 #define IDD_OPT_LOG                     118

diff --git a/plugins/NewXstatusNotify/src/stdafx.h b/plugins/NewXstatusNotify/src/stdafx.h
index 02e2fbeb43..86ddad6298 100644
--- a/plugins/NewXstatusNotify/src/stdafx.h
+++ b/plugins/NewXstatusNotify/src/stdafx.h
@@ -105,18 +105,21 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 #define COLOR_BG_NAVAILDEFAULT	RGB(255,189,189)

 #define COLOR_TX_DEFAULT		RGB(0,0,0)

 

-#define ICO_RESET				"reset"

-#define ICO_POPUP				"popup"

-#define ICO_SOUND				"sound"

-#define ICO_NOTIFICATION_OFF	"notification_off"

-#define ICO_NOTIFICATION_ON		"notification_on"

-#define ICO_XSTATUS				"xstatus"

-#define ICO_DISABLEALL			"disable_all"

-#define ICO_ENABLEALL			"enable_all"

-#define ICO_VARIABLES			"variables"

-#define ICO_STATUS_MESSAGE		"status_message"

-#define ICO_LOGGING_XSTATUS		"logging_xstatus"

-#define ICO_LOGGING_SMSG		"logging_status_message"

+enum

+{

+	ICO_RESET,

+	ICO_SOUND,

+	ICO_NOTIFICATION_OFF,

+	ICO_NOTIFICATION_ON,

+	ICO_XSTATUS,

+	ICO_DISABLEALL,

+	ICO_ENABLEALL,

+	ICO_VARIABLES,

+	ICO_STATUS_MESSAGE,

+	ICO_LOGGING_XSTATUS,

+	ICO_LOGGING_SMSG,

+	ICO_MAXID

+};

 

 #define JS_PARSE_XMPP_URI		"/ParseXmppURI"

 

@@ -165,7 +168,7 @@ extern TEMPLATES templates;
 extern HGENMENU hEnableDisableMenu;

 extern STATUS StatusList[STATUS_COUNT];

 extern STATUS StatusListEx[STATUSEX_COUNT];

-extern IconItem iconList[];

+extern IconItem iconList[ICO_MAXID];

 

 wchar_t* GetStr(STATUSMSGINFO *n, const wchar_t *tmplt);

 void LogSMsgToDB(STATUSMSGINFO *smi, const wchar_t *tmplt);

diff --git a/plugins/Popup/res/popup.ico b/plugins/Popup/res/popup.ico
deleted file mode 100644
index 5b3fe4e65b..0000000000
--- a/plugins/Popup/res/popup.ico
+++ /dev/null
diff --git a/plugins/Popup/res/resource.rc b/plugins/Popup/res/resource.rc
index 75cd04bd35..8beb28511f 100644
--- a/plugins/Popup/res/resource.rc
+++ b/plugins/Popup/res/resource.rc
@@ -26,10 +26,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_POPUP               ICON                    "popup.ico"

 IDI_PU_FULLSCREEN       ICON                    "popup_fs.ico"

 IDI_PU_FAVOURITE        ICON                    "popup_fav.ico"

-IDI_NOPOPUP             ICON                    "popup_no.ico"

 IDI_HISTORY             ICON                    "popup_history.ico"

 IDI_RELOAD              ICON                    "reload.ico"

 IDI_ACT_INFO            ICON                    "info.ico"

diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp
index de1de4b60f..c3aa00fab2 100644
--- a/plugins/Popup/src/icons.cpp
+++ b/plugins/Popup/src/icons.cpp
@@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 static IconItem iconList1[] =

 {

 	// common popup

-	{ LPGEN("Popups are enabled"), "enabled", IDI_POPUP },

-	{ LPGEN("Popups are disabled"), "disabled", IDI_NOPOPUP },

 	{ LPGEN("With \"favorite\" overlay"), "favourite", IDI_PU_FAVOURITE },

 	{ LPGEN("With \"fullscreen\" overlay"), "fullscreen", IDI_PU_FULLSCREEN },

 	{ LPGEN("Popup History"), "history", IDI_HISTORY },

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 6f7348bb01..f9d4ccbb78 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -109,7 +109,7 @@ static int IconsChanged(WPARAM, LPARAM)
 {

 	LoadActions();

 

-	HANDLE hIcon = Popup_Enabled() ? GetIconHandle(IDI_POPUP) : GetIconHandle(IDI_NOPOPUP);

+	HANDLE hIcon = Popup_Enabled() ? Skin_GetIconHandle(SKINICON_OTHER_POPUP) : Skin_GetIconHandle(SKINICON_OTHER_NOPOPUP);

 

 	Menu_ModifyItem(hMenuItem, nullptr, hIcon);

 	Menu_ModifyItem(hMenuRoot, nullptr, hIcon);

@@ -127,8 +127,8 @@ static int TTBLoaded(WPARAM, LPARAM)
 	if (Popup_Enabled())

 		ttb.dwFlags |= TTBBF_PUSHED;

 	ttb.name = LPGEN("Toggle Popups");

-	ttb.hIconHandleUp = GetIconHandle(IDI_NOPOPUP);

-	ttb.hIconHandleDn = GetIconHandle(IDI_POPUP);

+	ttb.hIconHandleUp = Skin_GetIconHandle(SKINICON_OTHER_NOPOPUP);

+	ttb.hIconHandleDn = Skin_GetIconHandle(SKINICON_OTHER_POPUP);

 	ttb.pszTooltipUp = LPGEN("Enable Popups");

 	ttb.pszTooltipDn = LPGEN("Disable Popups");

 	hTTButton = g_plugin.addTTB(&ttb);

@@ -143,19 +143,19 @@ INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM)
 		// The module is enabled.

 		// The action to do is "disable popups" (show disabled) and we must write "enable popup" in the new item.

 		Popup_Enable(false);

-		Menu_ModifyItem(hMenuItem, LPGENW("Enable Popups"), hIcon = GetIconHandle(IDI_NOPOPUP));

+		Menu_ModifyItem(hMenuItem, LPGENW("Enable Popups"), hIcon = Skin_GetIconHandle(SKINICON_OTHER_NOPOPUP));

 	}

 	else {

 		// The module is disabled.

 		// The action to do is enable popups (show enabled), then write "disable popup" in the new item.

 		Popup_Enable(true);

-		Menu_ModifyItem(hMenuItem, LPGENW("Disable Popups"), hIcon = GetIconHandle(IDI_POPUP));

+		Menu_ModifyItem(hMenuItem, LPGENW("Disable Popups"), hIcon = Skin_GetIconHandle(SKINICON_OTHER_POPUP));

 	}

 

 	Menu_ModifyItem(hMenuRoot, nullptr, hIcon);

 

 	if (hTTButton)

-		CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTTButton, (Popup_Enabled()) ? TTBST_PUSHED : 0);

+		CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTTButton, Popup_Enabled() ? TTBST_PUSHED : 0);

 

 	return 0;

 }

@@ -171,7 +171,7 @@ void InitMenuItems(void)
 	CMenuItem mi(&g_plugin);

 	mi.flags = CMIF_UNICODE;

 

-	HANDLE hIcon = GetIconHandle(Popup_Enabled() ? IDI_POPUP : IDI_NOPOPUP);

+	HANDLE hIcon = Skin_GetIconHandle(Popup_Enabled() ? SKINICON_OTHER_POPUP : SKINICON_OTHER_NOPOPUP);

 

 	// Build main menu

 	hMenuRoot = mi.root = g_plugin.addRootMenu(MO_MAIN, MODULNAME_PLUW, -1000000000, hIcon);

diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp
index 45418a6e6a..810e1f285c 100644
--- a/plugins/Popup/src/opt_skins.cpp
+++ b/plugins/Popup/src/opt_skins.cpp
@@ -43,7 +43,7 @@ void RegisterOptPrevBox()
 	wcl.hbrBackground = nullptr; // (HBRUSH)GetStockObject(LTGRAY_BRUSH);

 	wcl.lpszMenuName = nullptr;

 	wcl.lpszClassName = BOXPREVIEW_WNDCLASS;

-	wcl.hIconSm = (HICON)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);

+	wcl.hIconSm = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 	g_wndClass.cPopupPreviewBoxWndclass = RegisterClassEx(&wcl);

 	err = GetLastError();

 	if (!g_wndClass.cPopupPreviewBoxWndclass) {

@@ -545,7 +545,7 @@ static void BoxPreview_OnPaint(HWND hwnd, HDC mydc, int mode)
 			HFONT hfnt = (HFONT)SelectObject(mydc, fonts.title);

 			GetClientRect(hwnd, &rc);

 			FillRect(mydc, &rc, hbr);

-			DrawIconEx(mydc, 10, (rc.bottom - rc.top - 16) / 2, LoadIconEx(IDI_POPUP), 16, 16, 0, hbr, DI_NORMAL);

+			DrawIconEx(mydc, 10, (rc.bottom - rc.top - 16) / 2, Skin_LoadIcon(SKINICON_OTHER_POPUP), 16, 16, 0, hbr, DI_NORMAL);

 			SetBkMode(mydc, TRANSPARENT);

 			GetClientRect(hwnd, &rc);

 			rc.left += 30; //  10+16+4 -- icon

diff --git a/plugins/Popup/src/opttree.cpp b/plugins/Popup/src/opttree.cpp
index 9a6c61fd59..a1c827d81d 100644
--- a/plugins/Popup/src/opttree.cpp
+++ b/plugins/Popup/src/opttree.cpp
@@ -161,7 +161,7 @@ BOOL OptTree_ProcessMessage(HWND hwnd, UINT msg, WPARAM, LPARAM lparam, int *res
 		TreeView_DeleteAllItems(hwndTree);

 

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

-		ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED));

+		ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_POPUP));

 		ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_TICK));

 		ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_NOTICK));

 		ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_TICK));

diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp
index 6d86c83432..4a3d6a6f47 100644
--- a/plugins/Popup/src/popup_thread.cpp
+++ b/plugins/Popup/src/popup_thread.cpp
@@ -228,7 +228,7 @@ static unsigned __stdcall PopupThread(void *)
 	wcl.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH);

 	wcl.lpszMenuName = nullptr;

 	wcl.lpszClassName = L"PopupThreadManagerWnd";

-	wcl.hIconSm = (HICON)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);

+	wcl.hIconSm = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 	g_wndClass.cPopupThreadManagerWnd = RegisterClassExW(&wcl);

 	err = GetLastError();

 	if (!g_wndClass.cPopupThreadManagerWnd) {

diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index e2dcc6bfce..c3b0ab1db1 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -55,7 +55,7 @@ bool	LoadPopupWnd2()
 	wcl.hCursor = LoadCursor(nullptr, IDC_ARROW);

 	wcl.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH);

 	wcl.lpszClassName = POPUP_WNDCLASS;

-	wcl.hIconSm = (HICON)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);

+	wcl.hIconSm = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 	g_wndClass.cPopupWnd2 = RegisterClassEx(&wcl);

 	DWORD err = GetLastError();

 	if (!g_wndClass.cPopupWnd2) {

@@ -95,7 +95,7 @@ bool	LoadPopupWnd2()
 	wcl.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH);

 	wcl.lpszMenuName = nullptr;

 	wcl.lpszClassName = L"PopupMenuHostWnd";

-	wcl.hIconSm = (HICON)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);

+	wcl.hIconSm = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 	g_wndClass.cPopupMenuHostWnd = RegisterClassEx(&wcl);

 	err = GetLastError();

 	if (!g_wndClass.cPopupMenuHostWnd) {

diff --git a/plugins/Popup/src/resource.h b/plugins/Popup/src/resource.h
index e13b597fed..9609d49527 100644
--- a/plugins/Popup/src/resource.h
+++ b/plugins/Popup/src/resource.h
@@ -13,8 +13,6 @@
 #define IDD_POSITION                    109

 #define IDB_NOAVATAR                    110

 #define IDR_WHATSNEW                    111

-#define IDI_POPUP                       118

-#define IDI_NOPOPUP                     120

 #define IDI_HISTORY                     184

 #define IDI_RELOAD                      185

 #define IDI_MB_STOP                     189

diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp
index 62f1d1403a..633532f477 100644
--- a/plugins/Popup/src/srmm_menu.cpp
+++ b/plugins/Popup/src/srmm_menu.cpp
@@ -109,7 +109,7 @@ void SrmmMenu_Load()
 

 	sid.dwId = 0;

 	sid.szTooltip = LPGEN("Popup Mode: Auto");

-	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_POPUP);

+	sid.hIcon = sid.hIconDisabled = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 	Srmm_AddIcon(&sid, &g_plugin);

 

 	sid.dwId = 1;

@@ -124,7 +124,7 @@ void SrmmMenu_Load()
 

 	sid.dwId = 3;

 	sid.szTooltip = LPGEN("Popup Mode: Block contact");

-	sid.hIcon = sid.hIconDisabled = LoadIconEx(IDI_NOPOPUP);

+	sid.hIcon = sid.hIconDisabled = Skin_LoadIcon(SKINICON_OTHER_NOPOPUP);

 	Srmm_AddIcon(&sid, &g_plugin);

 

 	HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);

diff --git a/plugins/TabSRMM/res/res_TN/popup.ico b/plugins/TabSRMM/res/res_TN/popup.ico
deleted file mode 100644
index 35fd66b479..0000000000
--- a/plugins/TabSRMM/res/res_TN/popup.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/res/res_TN/popup_no.ico b/plugins/TabSRMM/res/res_TN/popup_no.ico
deleted file mode 100644
index 3360bb357c..0000000000
--- a/plugins/TabSRMM/res/res_TN/popup_no.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index 853b18dfbb..e1a33dedaa 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -837,15 +837,11 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_FEATURE_DISABLED    ICON                    "overlay_disabled.ico"

-

-IDI_ENABLED             ICON                    "res_TN\\popup.ico"

 

-IDI_DISABLED            ICON                    "res_TN\\popup_no.ico"

+IDI_FEATURE_DISABLED    ICON                    "overlay_disabled.ico"

 

 IDI_FEATURE_ENABLED     ICON                    "overlay_enabled.ico"

 

-

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

 //

 // DESIGNINFO

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 75e826a44e..8df3dd9aa7 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -905,18 +905,6 @@ static int TSAPI SetupIconLibConfig()
 	sid.description.a = LPGEN("Feature enabled (used as overlay)");

 	sid.iDefaultIndex = -IDI_FEATURE_ENABLED;

 	g_plugin.addIcon(&sid);

-

-	sid.section.a = LPGEN("Message Sessions") "/" LPGEN("Popups");

-	sid.pszName = "tabSRMM_popups_disabled";

-	sid.description.a = LPGEN("Enable typing notification");

-	sid.iDefaultIndex = -IDI_DISABLED;

-	g_plugin.addIcon(&sid);

-

-	sid.pszName = "tabSRMM_popups_enabled";

-	sid.description.a = LPGEN("Disable typing notification");

-	sid.iDefaultIndex = -IDI_ENABLED;

-	g_plugin.addIcon(&sid);

-

 	return 1;

 }

 

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 4cb7204346..3c1ca3f16e 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -525,8 +525,6 @@
 #define IDI_STOP1                       30161

 #define IDI_START2                      30162

 #define IDI_STOP2                       30163

-#define IDI_ENABLED                     30164

-#define IDI_DISABLED                    30165

 #define IDD_OPT                         30166

 #define IDC_START                       30167

 #define IDC_STOP                        30168

diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 353d45f7cb..45a2105ab7 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -43,9 +43,9 @@ static INT_PTR EnableDisableMenuCommand(WPARAM, LPARAM)
 {

 	Disabled = !Disabled;

 	if (!Disabled)

-		Menu_ModifyItem(hDisableMenu, LPGENW("Disable &typing notification"), IcoLib_GetIcon("tabSRMM_popups_enabled"));

+		Menu_ModifyItem(hDisableMenu, LPGENW("Disable &typing notification"), Skin_LoadIcon(SKINICON_OTHER_POPUP));

 	else

-		Menu_ModifyItem(hDisableMenu, LPGENW("Enable &typing notification"), IcoLib_GetIcon("tabSRMM_popups_disabled"));

+		Menu_ModifyItem(hDisableMenu, LPGENW("Enable &typing notification"), Skin_LoadIcon(SKINICON_OTHER_NOPOPUP));

 

 	return 0;

 }

@@ -522,11 +522,11 @@ int TN_ModuleInit()
 		SET_UID(mi, 0xe18fd2cf, 0xcf90, 0x459e, 0xb6, 0xe6, 0x70, 0xec, 0xad, 0xc6, 0x73, 0xef);

 		if (!Disabled) {

 			mi.name.a = LPGEN("Disable &typing notification");

-			mi.hIcolibItem = IcoLib_GetIcon("tabSRMM_popups_enabled");

+			mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 		}

 		else {

 			mi.name.a = LPGEN("Enable &typing notification");

-			mi.hIcolibItem = IcoLib_GetIcon("tabSRMM_popups_disabled");

+			mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_NOPOPUP);

 		}

 		mi.pszService = "TypingNotify/EnableDisableMenuCommand";

 		mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Popups"), 0);

diff --git a/plugins/WhoUsesMyFiles/res/popup.ico b/plugins/WhoUsesMyFiles/res/popup.ico
deleted file mode 100644
index 152171fc56..0000000000
--- a/plugins/WhoUsesMyFiles/res/popup.ico
+++ /dev/null
diff --git a/plugins/WhoUsesMyFiles/res/popup_no.ico b/plugins/WhoUsesMyFiles/res/popup_no.ico
deleted file mode 100644
index d86f9c68ac..0000000000
--- a/plugins/WhoUsesMyFiles/res/popup_no.ico
+++ /dev/null
diff --git a/plugins/WhoUsesMyFiles/res/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc
index 6bad043bd4..ae02eca06a 100644
--- a/plugins/WhoUsesMyFiles/res/resource.rc
+++ b/plugins/WhoUsesMyFiles/res/resource.rc
@@ -132,9 +132,9 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_POPUP               ICON                    "popup.ico"

-IDI_NOPOPUP             ICON                    "popup_no.ico"

+

 IDI_DRIVE               ICON                    "drive.ico"

+

 #endif    // English (United States) resources

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

 

diff --git a/plugins/WhoUsesMyFiles/src/resource.h b/plugins/WhoUsesMyFiles/src/resource.h
index 31191a9918..54b8a30c84 100644
--- a/plugins/WhoUsesMyFiles/src/resource.h
+++ b/plugins/WhoUsesMyFiles/src/resource.h
@@ -3,8 +3,6 @@
 // Used by ..\res\resource.rc

 //

 #define IDD_OPTIONS                     101

-#define IDI_POPUP                       102

-#define IDI_NOPOPUP                     103

 #define IDI_DRIVE                       106

 #define IDD_CONNLIST                    107

 #define IDC_COLOR_SET                   1000

diff --git a/plugins/WhoUsesMyFiles/src/stdafx.h b/plugins/WhoUsesMyFiles/src/stdafx.h
index 31370ae51b..6a97ddac78 100644
--- a/plugins/WhoUsesMyFiles/src/stdafx.h
+++ b/plugins/WhoUsesMyFiles/src/stdafx.h
@@ -10,6 +10,7 @@
 #include <m_options.h>

 #include <m_langpack.h>

 #include <m_clist.h>

+#include <m_skin.h>

 #include <m_utils.h>

 #include <m_popup.h>

 #include <win2k.h>

diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
index b454001979..d1c15bafac 100644
--- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp
+++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
@@ -187,11 +187,11 @@ static INT_PTR WumfMenuCommand(WPARAM, LPARAM)
 {

 	if (WumfOptions.PopupsEnabled == TRUE) {

 		WumfOptions.PopupsEnabled = FALSE;

-		Menu_ModifyItem(hMenuItem, LPGENW("Enable WUMF popups"), LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_NOPOPUP)));

+		Menu_ModifyItem(hMenuItem, LPGENW("Enable WUMF popups"), Skin_LoadIcon(SKINICON_OTHER_NOPOPUP));

 	}

 	else {

 		WumfOptions.PopupsEnabled = TRUE;

-		Menu_ModifyItem(hMenuItem, LPGENW("Disable WUMF popups"), LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP)));

+		Menu_ModifyItem(hMenuItem, LPGENW("Disable WUMF popups"), Skin_LoadIcon(SKINICON_OTHER_POPUP));

 	}

 

 	g_plugin.setByte(POPUPS_ENABLED, (BYTE)WumfOptions.PopupsEnabled);

@@ -224,11 +224,11 @@ int CMPlugin::Load()
 	mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Popups"), 1999990000);

 	if (WumfOptions.PopupsEnabled == FALSE) {

 		mi.name.a = LPGEN("Enable WUMF popups");

-		mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_NOPOPUP));

+		mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_NOPOPUP);

 	}

 	else {

 		mi.name.a = LPGEN("Disable WUMF popups");

-		mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_POPUP));

+		mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_POPUP);

 	}

 	mi.pszService = MS_WUMF_SWITCHPOPUP;

 	hMenuItem = Menu_AddMainMenuItem(&mi);

diff --git a/plugins/NewXstatusNotify/res/popup.ico b/src/mir_app/res/icon_popup.ico
index 5b3fe4e65b..5b3fe4e65b 100644
--- a/plugins/NewXstatusNotify/res/popup.ico
+++ b/src/mir_app/res/icon_popup.ico
diff --git a/plugins/Popup/res/popup_no.ico b/src/mir_app/res/icon_popup_no.ico
index cac10ab068..cac10ab068 100644
--- a/plugins/Popup/res/popup_no.ico
+++ b/src/mir_app/res/icon_popup_no.ico
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index 4a77645959..daf0af8b8d 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -1142,6 +1142,8 @@ IDI_LOADED              ICON                    "icon_loaded.ico"
 IDI_LOADED_GRAY         ICON                    "icon_loaded_gray.ico"

 IDI_NOTLOADED           ICON                    "icon_notloaded.ico"

 IDI_NOTLOADED_GRAY      ICON                    "icon_notloaded_gray.ico"

+IDI_POPUP               ICON                    "icon_popup.ico"

+IDI_NOPOPUP             ICON                    "icon_popup_no.ico"

 IDI_FRAME               ICON                    "icon_frame.ico"

 IDI_MFATAL              ICON                    "icon_fatal.ico"

 IDI_MERROR              ICON                    "icon_error.ico"

diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 3b30327ac1..3572ea28a7 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -18,11 +18,13 @@
 #define IDD_OPT_PROTOCOLORDER           109

 #define IDD_OPT_ICOLIB                  110

 #define IDD_ICOLIB_IMPORT               111

+#define IDI_POPUP                       112

 #define IDI_LOADED_GRAY                 113

 #define IDI_NOTLOADED_GRAY              114

 #define IDD_ADDED                       115

 #define IDD_ENTER_STRING                116

 #define IDI_ADDGROUP                    117

+#define IDI_NOPOPUP                     118

 #define IDD_AUTHREQ                     121

 #define IDD_DETAILS                     125

 #define IDD_HISTORY                     127

diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp
index c8ac4a39d2..7ed66af300 100644
--- a/src/mir_app/src/skinicons.cpp
+++ b/src/mir_app/src/skinicons.cpp
@@ -67,8 +67,8 @@ static struct StandardIconDescription mainIcons[] =
 	{ SKINICON_OTHER_EMPTYBLOB,       LPGEN("Empty blob"),            -IDI_EMPTYBLOB,      0, nullptr }, // 26

 	{ SKINICON_OTHER_UNICODE,         LPGEN("Unicode plugin"),        -IDI_UNICODE,        0, nullptr }, // 27

 	{ SKINICON_OTHER_ANSI,            LPGEN("ANSI plugin"),           -IDI_ANSI,           0, nullptr }, // 28

-	{ -1,                             LPGEN("Unused"),                0,                   0, nullptr }, // 29

-	{ -1,                             LPGEN("Unused"),                0,                   0, nullptr }, // 30

+	{ SKINICON_OTHER_POPUP,           LPGEN("Popups are enabled"),    -IDI_POPUP,          0, nullptr }, // 29

+	{ SKINICON_OTHER_NOPOPUP,         LPGEN("Popups are disabled"),   -IDI_NOPOPUP,        0, nullptr }, // 30

 	{ SKINICON_OTHER_UNDO, 	          LPGEN("Undo"),                  -IDI_UNDO,           0, nullptr }, // 31

 	{ SKINICON_OTHER_WINDOW,          LPGEN("Window"),                -IDI_WINDOW,         0, nullptr }, // 32

 	{ SKINICON_OTHER_WINDOWS,         LPGEN("System"),                -IDI_WINDOWS,        0, nullptr }, // 33