Index: src_plugins/lib_gtk_common/bu_icons.c
===================================================================
--- src_plugins/lib_gtk_common/bu_icons.c	(revision 8081)
+++ src_plugins/lib_gtk_common/bu_icons.c	(revision 8082)
@@ -90,7 +90,7 @@
 	return dest;
 }
 
-void pcb_gtk_icons_init(GdkWindow * top_window)
+void pcb_gtk_icons_init(GtkWindow * top_window)
 {
 	GdkPixbuf *icon;
 
@@ -99,6 +99,7 @@
 
 	icon = gdk_pixbuf_new_from_xpm_data((const gchar **) icon_bits);
 	gtk_window_set_default_icon(icon);
+	gtk_window_set_icon(top_window, icon);
 
 	XC_clock_source = pcb_gtk_cursor_from_xbm_data(rotateIcon_bits, rotateMask_bits, rotateIcon_width, rotateIcon_height);
 
Index: src_plugins/lib_gtk_common/bu_icons.h
===================================================================
--- src_plugins/lib_gtk_common/bu_icons.h	(revision 8081)
+++ src_plugins/lib_gtk_common/bu_icons.h	(revision 8082)
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
 /** Initializes icon pixbufs (cursor bits, pcb-rnd logo). */
-void pcb_gtk_icons_init(GdkWindow *top_window);
+void pcb_gtk_icons_init(GtkWindow *top_window);
 
 extern GdkPixbuf *XC_clock_source, *XC_hand_source, *XC_lock_source;
Index: src_plugins/lib_gtk_common/dlg_attribute.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_attribute.c	(revision 8081)
+++ src_plugins/lib_gtk_common/dlg_attribute.c	(revision 8082)
@@ -115,7 +115,7 @@
 																			 (GtkDialogFlags) (GTK_DIALOG_MODAL
 																												 | GTK_DIALOG_DESTROY_WITH_PARENT),
 																			 GTK_STOCK_CANCEL, GTK_RESPONSE_NONE, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
-	gtk_window_set_wmclass(GTK_WINDOW(dialog), "PCB_attribute_editor", "PCB");
+	gtk_window_set_role(GTK_WINDOW(dialog), "PCB_attribute_editor");
 
 	content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
Index: src_plugins/lib_gtk_common/dlg_command.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_command.c	(revision 8081)
+++ src_plugins/lib_gtk_common/dlg_command.c	(revision 8082)
@@ -272,7 +272,7 @@
 	command_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	g_signal_connect(G_OBJECT(command_window), "destroy", G_CALLBACK(command_destroy_cb), ctx);
 	gtk_window_set_title(GTK_WINDOW(command_window), _("pcb-rnd Command Entry"));
-	gtk_window_set_wmclass(GTK_WINDOW(command_window), "PCB_Command", "PCB");
+	gtk_window_set_role(GTK_WINDOW(command_window), "PCB_Command");
 	gtk_window_set_resizable(GTK_WINDOW(command_window), FALSE);
 
 	vbox = gtkc_vbox_new(FALSE, 0);
Index: src_plugins/lib_gtk_common/dlg_drc.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_drc.c	(revision 8081)
+++ src_plugins/lib_gtk_common/dlg_drc.c	(revision 8082)
@@ -732,7 +732,7 @@
 	g_signal_connect(G_OBJECT(drc_window), "destroy", G_CALLBACK(drc_destroy_cb), NULL);
 	g_signal_connect(G_OBJECT(drc_window), "configure_event", G_CALLBACK(drc_window_configure_event_cb), NULL);
 	gtk_window_set_title(GTK_WINDOW(drc_window), _("pcb-rnd DRC"));
-	gtk_window_set_wmclass(GTK_WINDOW(drc_window), "PCB_DRC", "PCB");
+	gtk_window_set_role(GTK_WINDOW(drc_window), "PCB_DRC");
 	gtk_window_set_default_size(GTK_WINDOW(drc_window), hid_gtk_wgeo.drc_width, hid_gtk_wgeo.drc_height);
 
 	vbox = gtkc_vbox_new(FALSE, 0);
Index: src_plugins/lib_gtk_common/dlg_export.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_export.c	(revision 8081)
+++ src_plugins/lib_gtk_common/dlg_export.c	(revision 8082)
@@ -65,7 +65,7 @@
 																																|
 																																GTK_DIALOG_DESTROY_WITH_PARENT),
 																							GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
-	gtk_window_set_wmclass(GTK_WINDOW(export_dialog), "PCB_Export", "PCB");
+	gtk_window_set_role(GTK_WINDOW(export_dialog), "PCB_Export");
 
 	content_area = gtk_dialog_get_content_area(GTK_DIALOG(export_dialog));
 
Index: src_plugins/lib_gtk_common/dlg_netlist.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_netlist.c	(revision 8081)
+++ src_plugins/lib_gtk_common/dlg_netlist.c	(revision 8082)
@@ -645,7 +645,7 @@
 	netlist_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	g_signal_connect(G_OBJECT(netlist_window), "destroy", G_CALLBACK(netlist_destroy_cb), NULL);
 	gtk_window_set_title(GTK_WINDOW(netlist_window), _("pcb-rnd Netlist"));
-	gtk_window_set_wmclass(GTK_WINDOW(netlist_window), "PCB_Netlist", "PCB");
+	gtk_window_set_role(GTK_WINDOW(netlist_window), "PCB_Netlist");
 	g_signal_connect(G_OBJECT(netlist_window), "configure_event", G_CALLBACK(netlist_window_configure_event_cb), NULL);
 	gtk_window_set_default_size(GTK_WINDOW(netlist_window), -1, hid_gtk_wgeo.netlist_height);
 
Index: src_plugins/lib_gtk_common/dlg_pinout.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_pinout.c	(revision 8081)
+++ src_plugins/lib_gtk_common/dlg_pinout.c	(revision 8082)
@@ -61,7 +61,7 @@
 	top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(top_window), title);
 	g_free(title);
-	gtk_window_set_wmclass(GTK_WINDOW(top_window), "PCB_Pinout", "PCB");
+	gtk_window_set_role(GTK_WINDOW(top_window), "PCB_Pinout");
 	gtk_container_set_border_width(GTK_CONTAINER(top_window), 4);
 
 	vbox = gtkc_vbox_new(FALSE, 0);
Index: src_plugins/lib_gtk_common/dlg_topwin.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_topwin.c	(revision 8081)
+++ src_plugins/lib_gtk_common/dlg_topwin.c	(revision 8082)
@@ -529,7 +529,7 @@
 	ghid_install_accel_groups(GTK_WINDOW(tw->com->top_window), tw);
 	ghid_update_toggle_flags(tw);
 
-	pcb_gtk_icons_init(gtk_widget_get_window(tw->com->top_window));
+	pcb_gtk_icons_init(GTK_WINDOW(tw->com->top_window));
 	pcb_crosshair_set_mode(PCB_MODE_ARROW);
 	ghid_mode_buttons_update();
 }
Index: src_plugins/lib_gtk_config/gui-config.c
===================================================================
--- src_plugins/lib_gtk_config/gui-config.c	(revision 8081)
+++ src_plugins/lib_gtk_config/gui-config.c	(revision 8082)
@@ -2689,7 +2689,7 @@
 	g_signal_connect(G_OBJECT(config_window), "delete_event", G_CALLBACK(config_destroy_cb), NULL);
 
 	gtk_window_set_title(GTK_WINDOW(config_window), _("pcb-rnd Preferences"));
-	gtk_window_set_wmclass(GTK_WINDOW(config_window), "Pcb_Conf", "PCB");
+	gtk_window_set_role(GTK_WINDOW(config_window), "Pcb_Conf");
 	gtk_container_set_border_width(GTK_CONTAINER(config_window), 2);
 
 	config_hbox = gtk_hpaned_new();