Index: pidgin/pidginstock.h
===================================================================
--- a/pidgin/pidginstock.h
+++ b/pidgin/pidginstock.h
@@ -165,11 +165,11 @@
 #define PIDGIN_STOCK_TRAY_INVISIBLE	  "pidgin-tray-invisible"
 #define PIDGIN_STOCK_TRAY_AWAY	  	  "pidgin-tray-away"
 #define PIDGIN_STOCK_TRAY_BUSY            "pidgin-tray-busy"
-#define PIDGIN_STOCK_TRAY_XA              "pidgin-tray-xa"
+#define PIDGIN_STOCK_TRAY_XA              "pidgin-tray-extended-away"
 #define PIDGIN_STOCK_TRAY_OFFLINE         "pidgin-tray-offline"
-#define PIDGIN_STOCK_TRAY_CONNECT         "pidgin-tray-connect"
-#define PIDGIN_STOCK_TRAY_PENDING         "pidgin-tray-pending"
-#define PIDGIN_STOCK_TRAY_EMAIL		  "pidgin-tray-email"
+#define PIDGIN_STOCK_TRAY_CONNECT         "pidgin-tray-connecting"
+#define PIDGIN_STOCK_TRAY_PENDING         "pidgin-tray-new-im"
+#define PIDGIN_STOCK_TRAY_EMAIL           "pidgin-tray-message"


 /*@}*/
============================================================
--- a/pidgin/pidginstock.h	34bd25eaf602d488c0298e2d13a6f39842f3e3f4
+++ b/pidgin/pidginstock.h	7ebe73500c08decce9d35ffe65ae5d854f5eab87
@@ -159,9 +159,10 @@
 #define PIDGIN_STOCK_TOOLBAR_VIDEO_CALL   "pidgin-video-call"
 #define PIDGIN_STOCK_TOOLBAR_AUDIO_VIDEO_CALL "pidgin-audio-video-call"
 #endif
+#define PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION	"pidgin-send-attention"

 /* Tray icons */
-#define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
+#define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-online"
 #define PIDGIN_STOCK_TRAY_INVISIBLE	  "pidgin-tray-invisible"
 #define PIDGIN_STOCK_TRAY_AWAY	  	  "pidgin-tray-away"
 #define PIDGIN_STOCK_TRAY_BUSY            "pidgin-tray-busy"