diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index 2e044a43e..91102caed 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -37,15 +37,17 @@ GTKGUI_GLADE='plugins/gtkgui/gtkgui.glade'
 class Preferences_window:
 	"""Class for Preferences window"""
 	
-	def on_delete_event(self, widget, event):
+	def on_preferences_window_delete_event(self, widget, event):
 		self.window.hide()
-		return True # do NOT destory the window
+		return True # do NOT destroy the window
 	
 	def on_close_button_clicked(self, widget):
-		self.window.hide()		
+		self.window.hide()	
+
+	def on_preferences_window_show(self, widget):
+		self.notebook.set_current_page(0)
 
 	def on_tray_icon_checkbutton_toggled(self, widget):
-		"""On Tray Icon Checkbutton Toggled"""
 		if widget.get_active():
 			self.plugin.config['trayicon'] = 1
 			self.plugin.show_systray()
@@ -56,14 +58,12 @@ class Preferences_window:
 		self.plugin.roster.draw_roster()
 	
 	def on_save_position_checkbutton_toggled(self, widget):
-		"""On Save Position Checkbutton Toggled"""
 		if widget.get_active():
 			self.plugin.config['saveposition'] = 1
 		else:
 			self.plugin.config['saveposition'] = 0
 	
 	def on_merge_checkbutton_toggled(self, widget):
-		"""On Merge Accounts Checkbutton Toggled"""
 		if widget.get_active():
 			self.plugin.config['mergeaccounts'] = 1
 		else:
@@ -71,9 +71,10 @@ class Preferences_window:
 		self.plugin.roster.regroup = self.plugin.config['mergeaccounts']
 		self.plugin.roster.draw_roster()
 	
-	def on_iconstyle_combobox_changed(self, widget, path):
+	def on_iconstyle_combobox_changed(self, widget):
 		model = widget.get_model()
-		icon_string = model[path][0]
+		active = widget.get_active()
+		icon_string = model[active][0]
 		self.plugin.config['iconstyle'] = icon_string
 		self.plugin.roster.mkpixbufs()
 		
@@ -175,7 +176,6 @@ class Preferences_window:
 		self.plugin.roster.draw_roster()
 	
 	def on_use_tabbed_chat_window_checkbutton_toggled(self, widget):
-		"""On Use Tabbed Chat Window Checkbutton Toggled"""
 		buf1 = {}
 		buf2 = {}
 		jids = {}
@@ -969,7 +969,7 @@ class Preferences_window:
 		self.msg_tree.get_model().connect('row-deleted', \
 			self.on_msg_treemodel_row_deleted)
 		
-		self.notebook.set_current_page(0)
+		#self.notebook.set_current_page(0)
 		self.xml.signal_autoconnect(self)
 
 class Account_modification_window:
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index 0079bc9ea..056a8230d 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -2893,7 +2893,8 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
-  <signal name="delete_event" handler="on_delete_event" last_modification_time="Fri, 25 Mar 2005 21:02:26 GMT"/>
+  <signal name="show" handler="on_preferences_window_show" last_modification_time="Tue, 29 Mar 2005 23:33:03 GMT"/>
+  <signal name="delete_event" handler="on_preferences_window_delete_event" last_modification_time="Tue, 29 Mar 2005 23:38:24 GMT"/>
 
   <child>
     <widget class="GtkVBox" id="vbox13">
diff --git a/plugins/gtkgui/icons/gossip/away.png b/plugins/gtkgui/icons/gossip/away.png
new file mode 100644
index 000000000..ba9ed232a
Binary files /dev/null and b/plugins/gtkgui/icons/gossip/away.png differ
diff --git a/plugins/gtkgui/icons/gossip/busy.png b/plugins/gtkgui/icons/gossip/busy.png
new file mode 100644
index 000000000..190c5ae70
Binary files /dev/null and b/plugins/gtkgui/icons/gossip/busy.png differ
diff --git a/plugins/gtkgui/icons/gossip/group-message.png b/plugins/gtkgui/icons/gossip/group-message.png
new file mode 100644
index 000000000..368bdeb63
Binary files /dev/null and b/plugins/gtkgui/icons/gossip/group-message.png differ
diff --git a/plugins/gtkgui/icons/gossip/message.png b/plugins/gtkgui/icons/gossip/message.png
new file mode 100644
index 000000000..84c3cefff
Binary files /dev/null and b/plugins/gtkgui/icons/gossip/message.png differ
diff --git a/plugins/gtkgui/icons/gossip/offline.png b/plugins/gtkgui/icons/gossip/offline.png
new file mode 100644
index 000000000..528eae409
Binary files /dev/null and b/plugins/gtkgui/icons/gossip/offline.png differ
diff --git a/plugins/gtkgui/icons/gossip/online.png b/plugins/gtkgui/icons/gossip/online.png
new file mode 100644
index 000000000..c2d074f50
Binary files /dev/null and b/plugins/gtkgui/icons/gossip/online.png differ
diff --git a/plugins/gtkgui/icons/gossip/typing.png b/plugins/gtkgui/icons/gossip/typing.png
new file mode 100644
index 000000000..defad7b08
Binary files /dev/null and b/plugins/gtkgui/icons/gossip/typing.png differ
diff --git a/plugins/gtkgui/icons/gossip/xa.png b/plugins/gtkgui/icons/gossip/xa.png
new file mode 100644
index 000000000..59dbe08f8
Binary files /dev/null and b/plugins/gtkgui/icons/gossip/xa.png differ
diff --git a/plugins/gtkgui/icons/icq/away.png b/plugins/gtkgui/icons/icq/away.png
new file mode 100644
index 000000000..3c3904f94
Binary files /dev/null and b/plugins/gtkgui/icons/icq/away.png differ
diff --git a/plugins/gtkgui/icons/icq/chat.png b/plugins/gtkgui/icons/icq/chat.png
new file mode 100644
index 000000000..68b311c6a
Binary files /dev/null and b/plugins/gtkgui/icons/icq/chat.png differ
diff --git a/plugins/gtkgui/icons/icq/dnd.png b/plugins/gtkgui/icons/icq/dnd.png
new file mode 100644
index 000000000..00be6280d
Binary files /dev/null and b/plugins/gtkgui/icons/icq/dnd.png differ
diff --git a/plugins/gtkgui/icons/icq/icondef.xml b/plugins/gtkgui/icons/icq/icondef.xml
new file mode 100644
index 000000000..8d50ff6cb
--- /dev/null
+++ b/plugins/gtkgui/icons/icq/icondef.xml
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+	<meta>
+		<name>ICQ</name>
+		<version>1.1</version>
+		<description>Default ICQ iconset</description>
+		<creation>2003-07-17</creation>
+		<home>http://www.aol.com</home>
+		<author jid='mblsha@jabber.ru' email='mblsha@users.sourceforge.net' www='http://maz.sf.net'>Michail Pishchagin (not the icons, just this icondef.xml)</author>
+		<author jid='skazi@sredni.one.pl' email='skazi@skazi.prv.pl' www='http://www.skazi.prv.pl'>Jacek Tomasiak (small modifications)</author>
+		<author>ICQ artists</author>
+	</meta>
+
+	<icon>
+		<x xmlns='name'>status/online</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/chat</x>
+		<object mime='image/png'>chat.png</object> <!-- FIXME -->
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/invisible</x>
+		<object mime='image/png'>invisible.png</object> <!-- FIXME -->
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/offline</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/away</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/xa</x>
+		<object mime='image/png'>xa.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/dnd</x>
+		<object mime='image/png'>dnd.png</object>
+	</icon>
+</icondef>
diff --git a/plugins/gtkgui/icons/icq/invisible.png b/plugins/gtkgui/icons/icq/invisible.png
new file mode 100644
index 000000000..30595cbf3
Binary files /dev/null and b/plugins/gtkgui/icons/icq/invisible.png differ
diff --git a/plugins/gtkgui/icons/icq/offline.png b/plugins/gtkgui/icons/icq/offline.png
new file mode 100644
index 000000000..00d5404bd
Binary files /dev/null and b/plugins/gtkgui/icons/icq/offline.png differ
diff --git a/plugins/gtkgui/icons/icq/online.png b/plugins/gtkgui/icons/icq/online.png
new file mode 100644
index 000000000..abfa2cb44
Binary files /dev/null and b/plugins/gtkgui/icons/icq/online.png differ
diff --git a/plugins/gtkgui/icons/icq/xa.png b/plugins/gtkgui/icons/icq/xa.png
new file mode 100644
index 000000000..68fcdecdf
Binary files /dev/null and b/plugins/gtkgui/icons/icq/xa.png differ
diff --git a/plugins/gtkgui/icons/msn/away.png b/plugins/gtkgui/icons/msn/away.png
new file mode 100644
index 000000000..d9a615e6e
Binary files /dev/null and b/plugins/gtkgui/icons/msn/away.png differ
diff --git a/plugins/gtkgui/icons/msn/dnd.png b/plugins/gtkgui/icons/msn/dnd.png
new file mode 100644
index 000000000..f09c85c84
Binary files /dev/null and b/plugins/gtkgui/icons/msn/dnd.png differ
diff --git a/plugins/gtkgui/icons/msn/icondef.xml b/plugins/gtkgui/icons/msn/icondef.xml
new file mode 100644
index 000000000..e6197550a
--- /dev/null
+++ b/plugins/gtkgui/icons/msn/icondef.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+	<meta>
+		<name>MSN6</name>
+		<version>1.0</version>
+		<description>MSN6 Original Iconset</description>
+		<creation>2003-10-16</creation>
+		<author jid='remko@amessage.be' email='spike@kotnet.org' www='http://spike.ulyssis.org'>Remko Tronçon</author>
+	</meta>
+
+	<!-- Normal status icons -->
+	<icon>
+		<x xmlns='name'>status/online</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/offline</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/away</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/xa</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/dnd</x>
+		<object mime='image/png'>dnd.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/invisible</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/chat</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+</icondef>
diff --git a/plugins/gtkgui/icons/msn/offline.png b/plugins/gtkgui/icons/msn/offline.png
new file mode 100644
index 000000000..fff3fc906
Binary files /dev/null and b/plugins/gtkgui/icons/msn/offline.png differ
diff --git a/plugins/gtkgui/icons/msn/online.png b/plugins/gtkgui/icons/msn/online.png
new file mode 100644
index 000000000..676d275c6
Binary files /dev/null and b/plugins/gtkgui/icons/msn/online.png differ
diff --git a/plugins/gtkgui/icons/stellar/ask.png b/plugins/gtkgui/icons/stellar/ask.png
new file mode 100644
index 000000000..a1ffe3525
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/ask.png differ
diff --git a/plugins/gtkgui/icons/stellar/away.png b/plugins/gtkgui/icons/stellar/away.png
new file mode 100644
index 000000000..28cb3c963
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/away.png differ
diff --git a/plugins/gtkgui/icons/stellar/chat.png b/plugins/gtkgui/icons/stellar/chat.png
new file mode 100644
index 000000000..6226bc6b7
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/chat.png differ
diff --git a/plugins/gtkgui/icons/stellar/connect.png b/plugins/gtkgui/icons/stellar/connect.png
new file mode 100644
index 000000000..a09744623
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/connect.png differ
diff --git a/plugins/gtkgui/icons/stellar/dnd.png b/plugins/gtkgui/icons/stellar/dnd.png
new file mode 100644
index 000000000..6ea0b2dd7
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/dnd.png differ
diff --git a/plugins/gtkgui/icons/stellar/ffc.png b/plugins/gtkgui/icons/stellar/ffc.png
new file mode 100644
index 000000000..0427ebc51
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/ffc.png differ
diff --git a/plugins/gtkgui/icons/stellar/file.png b/plugins/gtkgui/icons/stellar/file.png
new file mode 100644
index 000000000..be23a3548
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/file.png differ
diff --git a/plugins/gtkgui/icons/stellar/groupclose.png b/plugins/gtkgui/icons/stellar/groupclose.png
new file mode 100644
index 000000000..6d27008e8
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/groupclose.png differ
diff --git a/plugins/gtkgui/icons/stellar/groupempty.png b/plugins/gtkgui/icons/stellar/groupempty.png
new file mode 100644
index 000000000..e45102e94
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/groupempty.png differ
diff --git a/plugins/gtkgui/icons/stellar/groupopen.png b/plugins/gtkgui/icons/stellar/groupopen.png
new file mode 100644
index 000000000..eb67c1b5e
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/groupopen.png differ
diff --git a/plugins/gtkgui/icons/stellar/headline.png b/plugins/gtkgui/icons/stellar/headline.png
new file mode 100644
index 000000000..8e8511ae6
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/headline.png differ
diff --git a/plugins/gtkgui/icons/stellar/icondef.xml b/plugins/gtkgui/icons/stellar/icondef.xml
new file mode 100644
index 000000000..da977b739
--- /dev/null
+++ b/plugins/gtkgui/icons/stellar/icondef.xml
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+	<meta>
+		<name>Stellar (default)</name>
+		<version>1.0</version>
+		<description>Default Psi 0.9.1 iconset</description>
+		<creation>2003-07-08</creation>
+		<home>http://psi.affinix.com</home>
+		<author email='jmkim@uci.edu'>Jason Kim</author>
+		<author jid='mblsha@jabber.ru' email='mblsha@users.sourceforge.net' www='http://maz.sf.net'>Michail Pishchagin (icondef.xml)</author>
+	</meta>
+
+	<!-- Normal status icons -->
+	<icon>
+		<x xmlns='name'>status/online</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/offline</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/away</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/xa</x>
+		<object mime='image/png'>xa.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/dnd</x>
+		<object mime='image/png'>dnd.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/invisible</x>
+		<object mime='image/png'>invisible.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/chat</x>
+		<object mime='image/png'>ffc.png</object>
+	</icon>
+
+	<!-- Special statuses -->
+	<icon>
+		<x xmlns='name'>status/ask</x>
+		<object mime='image/png'>ask.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/noauth</x>
+		<object mime='image/png'>noauth.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/error</x>
+		<object mime='image/png'>perr.png</object>
+	</icon>
+
+	<!-- Special icons -->
+	<icon>
+		<x xmlns='name'>psi/chat</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>chat.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/message</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>message.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/headline</x>
+		<object mime='image/png'>headline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/file</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>file.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/system</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>system.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/connect</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>connect.png</object>
+	</icon>
+	
+	<icon>
+		<x xmlns='name'>psi/groupClosed</x>
+		<object mime='image/png'>groupclose.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/groupEmpty</x>
+		<object mime='image/png'>groupempty.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>psi/groupOpen</x>
+		<object mime='image/png'>groupopen.png</object>
+	</icon>
+</icondef>
diff --git a/plugins/gtkgui/icons/stellar/invisible.png b/plugins/gtkgui/icons/stellar/invisible.png
new file mode 100644
index 000000000..4d959d700
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/invisible.png differ
diff --git a/plugins/gtkgui/icons/stellar/message.png b/plugins/gtkgui/icons/stellar/message.png
new file mode 100644
index 000000000..d0fd3dd53
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/message.png differ
diff --git a/plugins/gtkgui/icons/stellar/noauth.png b/plugins/gtkgui/icons/stellar/noauth.png
new file mode 100644
index 000000000..e209800ca
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/noauth.png differ
diff --git a/plugins/gtkgui/icons/stellar/offline.png b/plugins/gtkgui/icons/stellar/offline.png
new file mode 100644
index 000000000..dc5c573a9
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/offline.png differ
diff --git a/plugins/gtkgui/icons/stellar/online.png b/plugins/gtkgui/icons/stellar/online.png
new file mode 100644
index 000000000..575b73c92
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/online.png differ
diff --git a/plugins/gtkgui/icons/stellar/perr.png b/plugins/gtkgui/icons/stellar/perr.png
new file mode 100644
index 000000000..951203af7
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/perr.png differ
diff --git a/plugins/gtkgui/icons/stellar/system.png b/plugins/gtkgui/icons/stellar/system.png
new file mode 100644
index 000000000..f4ffb9f13
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/system.png differ
diff --git a/plugins/gtkgui/icons/stellar/xa.png b/plugins/gtkgui/icons/stellar/xa.png
new file mode 100644
index 000000000..e1a917d24
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/xa.png differ
diff --git a/plugins/gtkgui/pixmaps/transport/away.png b/plugins/gtkgui/pixmaps/transport/away.png
new file mode 100644
index 000000000..88b75b6ca
Binary files /dev/null and b/plugins/gtkgui/pixmaps/transport/away.png differ
diff --git a/plugins/gtkgui/pixmaps/transport/dnd.png b/plugins/gtkgui/pixmaps/transport/dnd.png
new file mode 100644
index 000000000..2366f16c6
Binary files /dev/null and b/plugins/gtkgui/pixmaps/transport/dnd.png differ
diff --git a/plugins/gtkgui/pixmaps/transport/icondef.xml b/plugins/gtkgui/pixmaps/transport/icondef.xml
new file mode 100644
index 000000000..cd1b63342
--- /dev/null
+++ b/plugins/gtkgui/pixmaps/transport/icondef.xml
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<icondef>
+	<meta>
+		<name>Stellar-Transport (default)</name>
+		<version>1.0</version>
+		<description>Default Psi 0.9.3 iconset</description>
+		<creation>2003-07-17</creation>
+		<home>http://psi.affinix.com</home>
+		<author email='jmkim@uci.edu'>Jason Kim</author>
+		<author jid='mblsha@jabber.ru' email='mblsha@users.sourceforge.net' www='http://maz.sf.net'>Michail Pishchagin (icondef.xml)</author>
+	</meta>
+
+	<icon>
+		<x xmlns='name'>status/online</x>
+		<object mime='image/png'>online.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/chat</x>
+		<object mime='image/png'>online.png</object> <!-- FIXME -->
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/invisible</x>
+		<object mime='image/png'>online.png</object> <!-- FIXME -->
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/offline</x>
+		<object mime='image/png'>offline.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/away</x>
+		<object mime='image/png'>away.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/xa</x>
+		<object mime='image/png'>xa.png</object>
+	</icon>
+
+	<icon>
+		<x xmlns='name'>status/dnd</x>
+		<object mime='image/png'>dnd.png</object>
+	</icon>
+</icondef>
diff --git a/plugins/gtkgui/pixmaps/transport/offline.png b/plugins/gtkgui/pixmaps/transport/offline.png
new file mode 100644
index 000000000..1cf5b53a6
Binary files /dev/null and b/plugins/gtkgui/pixmaps/transport/offline.png differ
diff --git a/plugins/gtkgui/pixmaps/transport/online.png b/plugins/gtkgui/pixmaps/transport/online.png
new file mode 100644
index 000000000..75511dc8f
Binary files /dev/null and b/plugins/gtkgui/pixmaps/transport/online.png differ
diff --git a/plugins/gtkgui/pixmaps/transport/xa.png b/plugins/gtkgui/pixmaps/transport/xa.png
new file mode 100644
index 000000000..53e8cb074
Binary files /dev/null and b/plugins/gtkgui/pixmaps/transport/xa.png differ