diff --git a/plugins/hextray/hextray.vcxproj b/plugins/hextray/hextray.vcxproj
index 884e3110..2215a7b4 100644
--- a/plugins/hextray/hextray.vcxproj
+++ b/plugins/hextray/hextray.vcxproj
@@ -96,15 +96,13 @@
-
-
-
-
+
+
-
-
+
+
-
+
diff --git a/plugins/hextray/hextray.vcxproj.filters b/plugins/hextray/hextray.vcxproj.filters
index 637a896d..b83dc813 100644
--- a/plugins/hextray/hextray.vcxproj.filters
+++ b/plugins/hextray/hextray.vcxproj.filters
@@ -27,31 +27,25 @@
Resource Files\bitmaps
-
+
Resource Files\icons
-
- Resource Files\icons
-
-
+
Resource Files\icons
Resource Files\icons
-
+
Resource Files\icons
-
- Resource Files\icons
-
-
+
Resource Files\icons
Resource Files\icons
-
+
Resource Files\icons
diff --git a/plugins/hextray/icons/ban.ico b/plugins/hextray/icons/ban.ico
new file mode 100644
index 00000000..72630e54
Binary files /dev/null and b/plugins/hextray/icons/ban.ico differ
diff --git a/plugins/hextray/icons/banned.ico b/plugins/hextray/icons/banned.ico
deleted file mode 100644
index fef8df8c..00000000
Binary files a/plugins/hextray/icons/banned.ico and /dev/null differ
diff --git a/plugins/hextray/icons/chan_msg.ico b/plugins/hextray/icons/chan_msg.ico
deleted file mode 100644
index 793d050e..00000000
Binary files a/plugins/hextray/icons/chan_msg.ico and /dev/null differ
diff --git a/plugins/hextray/icons/disconnect.ico b/plugins/hextray/icons/disconnect.ico
new file mode 100644
index 00000000..bb47ec8b
Binary files /dev/null and b/plugins/hextray/icons/disconnect.ico differ
diff --git a/plugins/hextray/icons/disconnected.ico b/plugins/hextray/icons/disconnected.ico
deleted file mode 100644
index 9063e7e3..00000000
Binary files a/plugins/hextray/icons/disconnected.ico and /dev/null differ
diff --git a/plugins/hextray/icons/highlight-1-3.ico b/plugins/hextray/icons/highlight-1-3.ico
deleted file mode 100644
index a759145b..00000000
Binary files a/plugins/hextray/icons/highlight-1-3.ico and /dev/null differ
diff --git a/plugins/hextray/icons/highlight.ico b/plugins/hextray/icons/highlight.ico
index 625cca9a..8e37c87d 100644
Binary files a/plugins/hextray/icons/highlight.ico and b/plugins/hextray/icons/highlight.ico differ
diff --git a/plugins/hextray/icons/kick.ico b/plugins/hextray/icons/kick.ico
new file mode 100644
index 00000000..a527430b
Binary files /dev/null and b/plugins/hextray/icons/kick.ico differ
diff --git a/plugins/hextray/icons/kicked.ico b/plugins/hextray/icons/kicked.ico
deleted file mode 100644
index 845a74e1..00000000
Binary files a/plugins/hextray/icons/kicked.ico and /dev/null differ
diff --git a/plugins/hextray/icons/message.ico b/plugins/hextray/icons/message.ico
new file mode 100644
index 00000000..a0df6567
Binary files /dev/null and b/plugins/hextray/icons/message.ico differ
diff --git a/plugins/hextray/icons/notice.ico b/plugins/hextray/icons/notice.ico
new file mode 100644
index 00000000..156fdf20
Binary files /dev/null and b/plugins/hextray/icons/notice.ico differ
diff --git a/plugins/hextray/icons/priv_msg-1-2-2.ico b/plugins/hextray/icons/priv_msg-1-2-2.ico
deleted file mode 100644
index 7941ff77..00000000
Binary files a/plugins/hextray/icons/priv_msg-1-2-2.ico and /dev/null differ
diff --git a/plugins/hextray/icons/server_notice.ico b/plugins/hextray/icons/server_notice.ico
deleted file mode 100644
index ff765d87..00000000
Binary files a/plugins/hextray/icons/server_notice.ico and /dev/null differ
diff --git a/plugins/hextray/resource.rc b/plugins/hextray/resource.rc
index eee51273..1d752fe3 100644
--- a/plugins/hextray/resource.rc
+++ b/plugins/hextray/resource.rc
@@ -279,13 +279,13 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
ICO_XCHAT ICON "icons\\hexchat.ico"
-ICO_BANNED ICON "icons\\banned.ico"
-ICO_CHANMSG ICON "icons\\chan_msg.ico"
+ICO_BANNED ICON "icons\\ban.ico"
+ICO_CHANMSG ICON "icons\\message.ico"
ICO_HIGHLIGHT ICON "icons\\highlight.ico"
-ICO_KICKED ICON "icons\\kicked.ico"
-ICO_PMSG ICON "icons\\priv_msg-1-2-2.ico"
-ICO_SNOTICE ICON "icons\\server_notice.ico"
-ICO_DISCONNECTED ICON "icons\\disconnected.ico"
+ICO_KICKED ICON "icons\\kick.ico"
+ICO_PMSG ICON "icons\\message.ico"
+ICO_SNOTICE ICON "icons\\notice.ico"
+ICO_DISCONNECTED ICON "icons\\disconnect.ico"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/hextray/xtray.cpp b/plugins/hextray/xtray.cpp
index 1958d89d..df4a5c89 100644
--- a/plugins/hextray/xtray.cpp
+++ b/plugins/hextray/xtray.cpp
@@ -49,7 +49,7 @@ HWND g_hXchatWnd;
HWND g_hHotkeyWnd;
HWND g_hPrefDlg;
HMENU g_hTrayMenu;
-HICON g_hIcons[11];
+HICON g_hIcons[24];
HANDLE g_hInstance;
/*****************************************************/
/***************** Preferences ***********************/
@@ -104,13 +104,13 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl
g_hPrefDlg = CreateDialog((HINSTANCE)g_hInstance, MAKEINTRESOURCE(IDD_PREF), g_hXchatWnd, (DLGPROC)PrefProc);
g_hIcons[0] = (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_XCHAT), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
- g_hIcons[1] = (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_CHANMSG), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
g_hIcons[2] = (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_HIGHLIGHT), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
g_hIcons[5] = (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_BANNED), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
g_hIcons[6] = (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_KICKED), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
g_hIcons[8] = (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_PMSG), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
g_hIcons[10]= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_SNOTICE), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
g_hIcons[11]= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_DISCONNECTED), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+ g_hIcons[22] = (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_CHANMSG), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
/***************************************************************************************************************************/
/************************* Add our icon to the tray ************************************************************************/
diff --git a/plugins/hextray/xtray.h b/plugins/hextray/xtray.h
index 56323cf2..7fa51ad3 100644
--- a/plugins/hextray/xtray.h
+++ b/plugins/hextray/xtray.h
@@ -24,7 +24,7 @@ extern HWND g_hXchatWnd;
extern HWND g_hHotkeyWnd;
extern HWND g_hPrefDlg;
extern HMENU g_hTrayMenu;
-extern HICON g_hIcons[11];
+extern HICON g_hIcons[24];
extern HANDLE g_hInstance;
extern unsigned int g_dwPrefs;
extern TCHAR g_szAway[512];
diff --git a/src/pixmaps/ban.png b/src/pixmaps/ban.png
new file mode 100644
index 00000000..84682bc7
Binary files /dev/null and b/src/pixmaps/ban.png differ
diff --git a/src/pixmaps/disconnect.png b/src/pixmaps/disconnect.png
new file mode 100644
index 00000000..0af58487
Binary files /dev/null and b/src/pixmaps/disconnect.png differ
diff --git a/src/pixmaps/kick.png b/src/pixmaps/kick.png
new file mode 100644
index 00000000..72ea9850
Binary files /dev/null and b/src/pixmaps/kick.png differ
diff --git a/src/pixmaps/notice.png b/src/pixmaps/notice.png
new file mode 100644
index 00000000..931497f8
Binary files /dev/null and b/src/pixmaps/notice.png differ