diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 1868512b..e6817dc6 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -1737,13 +1737,13 @@ mg_add_chan (session *sess)
 	switch (sess->type)
 	{
 	case SESS_CHANNEL:
-		icon = pix_channel;
+		icon = pix_tree_channel;
 		break;
 	case SESS_SERVER:
-		icon = pix_server;
+		icon = pix_tree_server;
 		break;
 	default:
-		icon = pix_dialog;
+		icon = pix_tree_dialog;
 	}
 
 	sess->res->tab = chanview_add (sess->gui->chanview, name, sess->server, sess,
@@ -2923,7 +2923,7 @@ mg_create_tabs (session_gui *gui)
 
 	/* if any one of these PNGs exist, the chanview will create
 	 * the extra column for icons. */
-	if (prefs.hex_gui_tab_icons && (pix_channel || pix_dialog || pix_server || pix_util))
+	if (prefs.hex_gui_tab_icons && (pix_tree_channel || pix_tree_dialog || pix_tree_server || pix_tree_util))
 	{
 		use_icons = TRUE;
 	}
@@ -3187,7 +3187,7 @@ mg_add_generic_tab (char *name, char *title, void *family, GtkWidget *box)
 	gtk_notebook_append_page (GTK_NOTEBOOK (mg_gui->note_book), box, NULL);
 	gtk_widget_show (box);
 
-	ch = chanview_add (mg_gui->chanview, name, NULL, box, TRUE, TAG_UTIL, pix_util);
+	ch = chanview_add (mg_gui->chanview, name, NULL, box, TRUE, TAG_UTIL, pix_tree_util);
 	chan_set_color (ch, plain_list);
 	/* FIXME: memory leak */
 	g_object_set_data (G_OBJECT (box), "title", strdup (title));
diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index 24439219..1a5add8c 100644
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -38,14 +38,14 @@ GdkPixbuf *pix_ulist_owner;
 GdkPixbuf *pix_ulist_founder;
 GdkPixbuf *pix_ulist_netop;
 
-GdkPixbuf *pix_tray_msg;
-GdkPixbuf *pix_tray_hilight;
-GdkPixbuf *pix_tray_file;
+GdkPixbuf *pix_tray_fileoffer;
+GdkPixbuf *pix_tray_highlight;
+GdkPixbuf *pix_tray_message;
 
-GdkPixbuf *pix_channel;
-GdkPixbuf *pix_dialog;
-GdkPixbuf *pix_server;
-GdkPixbuf *pix_util;
+GdkPixbuf *pix_tree_channel;
+GdkPixbuf *pix_tree_dialog;
+GdkPixbuf *pix_tree_server;
+GdkPixbuf *pix_tree_util;
 
 GdkPixbuf *pix_book;
 GdkPixbuf *pix_hexchat;
@@ -129,22 +129,22 @@ pixmaps_init (void)
 	pix_ulist_netop = load_pixmap ("ulist_netop", png_ulist_netop, 1);
 
 	/* tray icons, with inlined defaults */
-	pix_tray_msg = load_pixmap ("message", traymsgpng, 1);
-	pix_tray_hilight = load_pixmap ("highlight", trayhilightpng, 1);
-	pix_tray_file = load_pixmap ("fileoffer", trayfilepng, 1);
+	pix_tray_fileoffer = load_pixmap ("tray_fileoffer", png_tray_fileoffer, 1);
+	pix_tray_highlight = load_pixmap ("highlight", png_tray_highlight, 1);
+	pix_tray_message = load_pixmap ("message", png_tray_message, 1);
 
 #if 0
 	/* treeview icons, no defaults, load from disk only */
-	pix_channel = load_pixmap ("channel", NULL, 0);
-	pix_dialog = load_pixmap ("dialog", NULL, 0);
-	pix_server = load_pixmap ("server", NULL, 0);
-	pix_util = load_pixmap ("util", NULL, 0);
+	pix_tree_channel = load_pixmap ("tree_channel", NULL, 0);
+	pix_tree_dialog = load_pixmap ("tree_dialog", NULL, 0);
+	pix_tree_server = load_pixmap ("tree_server", NULL, 0);
+	pix_tree_util = load_pixmap ("tree_util", NULL, 0);
 #endif
 	/* provide inline defaults for these coz they are nice! */
-	pix_channel = load_pixmap ("channel", channelpng, 1);
-	pix_dialog = load_pixmap ("dialog", dialogpng, 1);
-	pix_server = load_pixmap ("server", serverpng, 1);
-	pix_util = load_pixmap ("util", utilpng, 1);
+	pix_tree_channel = load_pixmap ("tree_channel", png_tree_channel, 1);
+	pix_tree_dialog = load_pixmap ("tree_dialog", png_tree_dialog, 1);
+	pix_tree_server = load_pixmap ("tree_server", png_tree_server, 1);
+	pix_tree_util = load_pixmap ("tree_util", png_tree_util, 1);
 
 	/* non-replaceable book pixmap */
 	pix_book = gdk_pixbuf_new_from_inline (-1, png_book, FALSE, 0);
diff --git a/src/fe-gtk/pixmaps.h b/src/fe-gtk/pixmaps.h
index 8a364264..64607582 100644
--- a/src/fe-gtk/pixmaps.h
+++ b/src/fe-gtk/pixmaps.h
@@ -5,14 +5,14 @@ extern GdkPixbuf *pix_ulist_owner;
 extern GdkPixbuf *pix_ulist_founder;
 extern GdkPixbuf *pix_ulist_netop;
 
-extern GdkPixbuf *pix_tray_msg;
-extern GdkPixbuf *pix_tray_hilight;
-extern GdkPixbuf *pix_tray_file;
+extern GdkPixbuf *pix_tray_fileoffer;
+extern GdkPixbuf *pix_tray_highlight;
+extern GdkPixbuf *pix_tray_message;
 
-extern GdkPixbuf *pix_channel;
-extern GdkPixbuf *pix_dialog;
-extern GdkPixbuf *pix_server;
-extern GdkPixbuf *pix_util;
+extern GdkPixbuf *pix_tree_channel;
+extern GdkPixbuf *pix_tree_dialog;
+extern GdkPixbuf *pix_tree_server;
+extern GdkPixbuf *pix_tree_util;
 
 extern GdkPixbuf *pix_book;
 extern GdkPixbuf *pix_hexchat;
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index 489b4822..adbddf8f 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -52,9 +52,9 @@ typedef GdkPixbuf* TrayIcon;
 #define tray_icon_free(i) g_object_unref(i)
 
 #define ICON_NORMAL pix_hexchat
-#define ICON_MSG pix_tray_msg
-#define ICON_HILIGHT pix_tray_hilight
-#define ICON_FILE pix_tray_file
+#define ICON_MSG pix_tray_message
+#define ICON_HILIGHT pix_tray_highlight
+#define ICON_FILE pix_tray_fileoffer
 #define TIMEOUT 500
 
 static GtkStatusIcon *sticon;
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 3658c5d7..57ab72b5 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -6,17 +6,17 @@ LIST =		png_ulist_voice $(srcdir)/ulist_voice.png \
 			png_ulist_owner $(srcdir)/ulist_owner.png \
 			png_ulist_founder $(srcdir)/ulist_founder.png \
 			png_ulist_netop $(srcdir)/ulist_netop.png \
-			traymsgpng $(srcdir)/message.png \
-			trayhilightpng $(srcdir)/highlight.png \
-			trayfilepng $(srcdir)/fileoffer.png \
-			channelpng $(srcdir)/channel.png \
-			dialogpng $(srcdir)/dialog.png \
-			serverpng $(srcdir)/server.png \
-			utilpng $(srcdir)/util.png \
+			png_tray_fileoffer $(srcdir)/tray_fileoffer.png \
+			png_tray_highlight $(srcdir)/tray_highlight.png \
+			png_tray_message $(srcdir)/tray_message.png \
+			png_tree_channel $(srcdir)/tree_channel.png \
+			png_tree_dialog $(srcdir)/tree_dialog.png \
+			png_tree_server $(srcdir)/tree_server.png \
+			png_tree_util $(srcdir)/tree_util.png \
 			png_book $(srcdir)/book.png \
 			png_hexchat $(srcdir)/hexchat.png
 
-PNGS = ulist_voice.png ulist_halfop.png ulist_op.png ulist_owner.png ulist_founder.png ulist_netop.png message.png highlight.png fileoffer.png channel.png dialog.png server.png util.png book.png
+PNGS = ulist_voice.png ulist_halfop.png ulist_op.png ulist_owner.png ulist_founder.png ulist_netop.png tray_fileoffer.png tray_highlight.png tray_message.png tree_channel.png tree_dialog.png tree_server.png tree_util.png book.png
 noinst_HEADERS = inline_pngs.h
 CLEANFILES = $(noinst_HEADERS)
 EXTRA_DIST = $(PNGS)
diff --git a/src/pixmaps/pixmaps-xp.vcxproj b/src/pixmaps/pixmaps-xp.vcxproj
index 06a6615e..8f7538ab 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj
+++ b/src/pixmaps/pixmaps-xp.vcxproj
@@ -92,19 +92,19 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="user_voice.png" />
+    <None Include="ulist_voice.png" />
     <None Include="ulist_halfop.png" />
     <None Include="ulist_op.png" />
     <None Include="ulist_owner.png" />
     <None Include="ulist_founder.png" />
     <None Include="ulist_netop.png" />
-    <None Include="channel.png" />
-    <None Include="dialog.png" />
-    <None Include="fileoffer.png" />
-    <None Include="highlight.png" />
-    <None Include="message.png" />
-    <None Include="server.png" />
-    <None Include="util.png" />
+    <None Include="tray_fileoffer.png" />
+    <None Include="tray_highlight.png" />
+    <None Include="tray_message.png" />
+    <None Include="tree_channel.png" />
+    <None Include="tree_dialog.png" />
+    <None Include="tree_server.png" />
+    <None Include="tree_util.png" />
     <None Include="book.png" />
     <None Include="hexchat.png" />
   </ItemGroup>
diff --git a/src/pixmaps/pixmaps-xp.vcxproj.filters b/src/pixmaps/pixmaps-xp.vcxproj.filters
index bfc9366d..1351b32f 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj.filters
+++ b/src/pixmaps/pixmaps-xp.vcxproj.filters
@@ -25,25 +25,25 @@
     <None Include="ulist_netop.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="fileoffer.png">
+    <None Include="tray_fileoffer.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="highlight.png">
+    <None Include="tray_highlight.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="message.png">
+    <None Include="tray_message.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="channel.png">
+    <None Include="tree_channel.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="dialog.png">
+    <None Include="tree_dialog.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="server.png">
+    <None Include="tree_server.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="util.png">
+    <None Include="tree_util.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="book.png">
diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj
index b3943bce..a7df8989 100644
--- a/src/pixmaps/pixmaps.vcxproj
+++ b/src/pixmaps/pixmaps.vcxproj
@@ -89,19 +89,19 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="user_voice.png" />
+    <None Include="ulist_voice.png" />
     <None Include="ulist_halfop.png" />
     <None Include="ulist_op.png" />
     <None Include="ulist_owner.png" />
     <None Include="ulist_founder.png" />
     <None Include="ulist_netop.png" />
-    <None Include="channel.png" />
-    <None Include="dialog.png" />
-    <None Include="fileoffer.png" />
-    <None Include="highlight.png" />
-    <None Include="message.png" />
-    <None Include="server.png" />
-    <None Include="util.png" />
+    <None Include="tray_fileoffer.png" />
+    <None Include="tray_highlight.png" />
+    <None Include="tray_message.png" />
+    <None Include="tree_channel.png" />
+    <None Include="tree_dialog.png" />
+    <None Include="tree_server.png" />
+    <None Include="tree_util.png" />
     <None Include="book.png" />
     <None Include="hexchat.png" />
   </ItemGroup>
diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters
index bfc9366d..1351b32f 100644
--- a/src/pixmaps/pixmaps.vcxproj.filters
+++ b/src/pixmaps/pixmaps.vcxproj.filters
@@ -25,25 +25,25 @@
     <None Include="ulist_netop.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="fileoffer.png">
+    <None Include="tray_fileoffer.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="highlight.png">
+    <None Include="tray_highlight.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="message.png">
+    <None Include="tray_message.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="channel.png">
+    <None Include="tree_channel.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="dialog.png">
+    <None Include="tree_dialog.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="server.png">
+    <None Include="tree_server.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="util.png">
+    <None Include="tree_util.png">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="book.png">
diff --git a/src/pixmaps/fileoffer.png b/src/pixmaps/tray_fileoffer.png
similarity index 100%
rename from src/pixmaps/fileoffer.png
rename to src/pixmaps/tray_fileoffer.png
diff --git a/src/pixmaps/highlight.png b/src/pixmaps/tray_highlight.png
similarity index 100%
rename from src/pixmaps/highlight.png
rename to src/pixmaps/tray_highlight.png
diff --git a/src/pixmaps/message.png b/src/pixmaps/tray_message.png
similarity index 100%
rename from src/pixmaps/message.png
rename to src/pixmaps/tray_message.png
diff --git a/src/pixmaps/channel.png b/src/pixmaps/tree_channel.png
similarity index 100%
rename from src/pixmaps/channel.png
rename to src/pixmaps/tree_channel.png
diff --git a/src/pixmaps/dialog.png b/src/pixmaps/tree_dialog.png
similarity index 100%
rename from src/pixmaps/dialog.png
rename to src/pixmaps/tree_dialog.png
diff --git a/src/pixmaps/server.png b/src/pixmaps/tree_server.png
similarity index 100%
rename from src/pixmaps/server.png
rename to src/pixmaps/tree_server.png
diff --git a/src/pixmaps/util.png b/src/pixmaps/tree_util.png
similarity index 100%
rename from src/pixmaps/util.png
rename to src/pixmaps/tree_util.png
diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index 5d6f7e48..d212fbea 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -34,7 +34,7 @@
     <PythonOutput>hcpython</PythonOutput>
     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
-    <Pixmaps>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png"</Pixmaps>
+    <Pixmaps>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" png_tray_fileoffer "$(SolutionDir)\..\src\pixmaps\tray_fileoffer.png" png_tray_highlight "$(SolutionDir)\..\src\pixmaps\tray_highlight.png" png_tray_message "$(SolutionDir)\..\src\pixmaps\tray_message.png" png_tree_channel "$(SolutionDir)\..\src\pixmaps\tree_channel.png" png_tree_dialog "$(SolutionDir)\..\src\pixmaps\tree_dialog.png" png_tree_server "$(SolutionDir)\..\src\pixmaps\tree_server.png" png_tree_util "$(SolutionDir)\..\src\pixmaps\tree_util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png"</Pixmaps>
     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
     <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>
     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 947db34c..7ba51f53 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -36,7 +36,7 @@
     <PythonOutput>hcpython</PythonOutput>
     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
-    <Pixmaps>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png"</Pixmaps>
+    <Pixmaps>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" png_tray_fileoffer "$(SolutionDir)\..\src\pixmaps\tray_fileoffer.png" png_tray_highlight "$(SolutionDir)\..\src\pixmaps\tray_highlight.png" png_tray_message "$(SolutionDir)\..\src\pixmaps\tray_message.png" png_tree_channel "$(SolutionDir)\..\src\pixmaps\tree_channel.png" png_tree_dialog "$(SolutionDir)\..\src\pixmaps\tree_dialog.png" png_tree_server "$(SolutionDir)\..\src\pixmaps\tree_server.png" png_tree_util "$(SolutionDir)\..\src\pixmaps\tree_util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png"</Pixmaps>
     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
     <HexChatBuild>$(SolutionDir)build</HexChatBuild>
     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>