diff -r cbf89a92d224 -r f8a87f89c735 pidgin/win32/gtkdocklet-win32.c
--- a/pidgin/win32/gtkdocklet-win32.c	Thu Oct 19 22:20:34 2017 -0500
+++ b/pidgin/win32/gtkdocklet-win32.c	Thu Oct 19 22:31:46 2017 -0500
@@ -36,7 +36,7 @@
 #include "MinimizeToTray.h"
 #include "gtkwin32dep.h"
 #include "gtkdocklet.h"
-#include "pidginstock.h"
+#include "pidginicon.h"
 
 /*
  *  DEFINES, MACROS & DATA TYPES
@@ -518,33 +518,15 @@
 	/* Look up and cache the HICON if we don't already have it */
 	if (cached_icons[icon_index] == NULL) {
 		const gchar *icon_name = NULL;
-		switch (status) {
-			case PURPLE_STATUS_OFFLINE:
-				icon_name = PIDGIN_STOCK_TRAY_OFFLINE;
-				break;
-			case PURPLE_STATUS_AWAY:
-				icon_name = PIDGIN_STOCK_TRAY_AWAY;
-				break;
-			case PURPLE_STATUS_UNAVAILABLE:
-				icon_name = PIDGIN_STOCK_TRAY_BUSY;
-				break;
-			case PURPLE_STATUS_EXTENDED_AWAY:
-				icon_name = PIDGIN_STOCK_TRAY_XA;
-				break;
-			case PURPLE_STATUS_INVISIBLE:
-				icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
-				break;
-			default:
-				icon_name = PIDGIN_STOCK_TRAY_AVAILABLE;
-				break;
-		}
+
+		icon_name = pidgin_status_icon_from_primitive(status);
 
 		if (flags & PIDGIN_DOCKLET_EMAIL_PENDING)
-			icon_name = PIDGDIN_STOCK_TRAY_EMAIL;
+			icon_name = PIDGDIN_ICON_MAIL_NEW;
 		else if (flags & PIDGIN_DOCKLET_CONV_PENDING)
-			icon_name = PIDGIN_STOCK_TRAY_PENDING;
+			icon_name = PIDGIN_ICON_MESSAGE_NEW;
 		else if (flags & PIDGIN_DOCKLET_CONNECTING)
-			icon_name = PIDGIN_STOCK_TRAY_CONNECT;
+			icon_name = PIDGIN_ICON_CONNECT;
 
 		g_return_if_fail(icon_name != NULL);