diff --git a/plugins/gtkgui/icons/stellar/ffc.png b/plugins/gtkgui/icons/stellar/chat.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/ffc.png
rename to plugins/gtkgui/icons/stellar/chat.png
diff --git a/plugins/gtkgui/icons/stellar/connecting.gif b/plugins/gtkgui/icons/stellar/connecting.gif
new file mode 100644
index 000000000..257108ba0
Binary files /dev/null and b/plugins/gtkgui/icons/stellar/connecting.gif differ
diff --git a/plugins/gtkgui/icons/stellar/perr.png b/plugins/gtkgui/icons/stellar/error.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/perr.png
rename to plugins/gtkgui/icons/stellar/error.png
diff --git a/plugins/gtkgui/icons/stellar/file.png b/plugins/gtkgui/icons/stellar/file.png
deleted file mode 100644
index be23a3548..000000000
Binary files a/plugins/gtkgui/icons/stellar/file.png and /dev/null differ
diff --git a/plugins/gtkgui/icons/stellar/groupclose.png b/plugins/gtkgui/icons/stellar/groupclose.png
deleted file mode 100644
index 6d27008e8..000000000
Binary files a/plugins/gtkgui/icons/stellar/groupclose.png and /dev/null differ
diff --git a/plugins/gtkgui/icons/stellar/groupempty.png b/plugins/gtkgui/icons/stellar/groupempty.png
deleted file mode 100644
index e45102e94..000000000
Binary files a/plugins/gtkgui/icons/stellar/groupempty.png and /dev/null differ
diff --git a/plugins/gtkgui/icons/stellar/groupopen.png b/plugins/gtkgui/icons/stellar/groupopen.png
deleted file mode 100644
index eb67c1b5e..000000000
Binary files a/plugins/gtkgui/icons/stellar/groupopen.png and /dev/null differ
diff --git a/plugins/gtkgui/icons/stellar/headline.png b/plugins/gtkgui/icons/stellar/headline.png
deleted file mode 100644
index 8e8511ae6..000000000
Binary files a/plugins/gtkgui/icons/stellar/headline.png and /dev/null differ
diff --git a/plugins/gtkgui/icons/stellar/icondef.xml b/plugins/gtkgui/icons/stellar/icondef.xml
deleted file mode 100644
index da977b739..000000000
--- a/plugins/gtkgui/icons/stellar/icondef.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?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/message.png b/plugins/gtkgui/icons/stellar/message.png
deleted file mode 100644
index d0fd3dd53..000000000
Binary files a/plugins/gtkgui/icons/stellar/message.png and /dev/null differ
diff --git a/plugins/gtkgui/icons/stellar/noauth.png b/plugins/gtkgui/icons/stellar/not_in_the_roster.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/noauth.png
rename to plugins/gtkgui/icons/stellar/not_in_the_roster.png
diff --git a/plugins/gtkgui/icons/stellar/ask.png b/plugins/gtkgui/icons/stellar/requested.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/ask.png
rename to plugins/gtkgui/icons/stellar/requested.png
diff --git a/plugins/gtkgui/icons/stellar/system.png b/plugins/gtkgui/icons/stellar/system.png
deleted file mode 100644
index f4ffb9f13..000000000
Binary files a/plugins/gtkgui/icons/stellar/system.png and /dev/null differ