diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index 2c84da854..0a6056532 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -737,7 +737,7 @@ class Preferences_window:
 		self.xml.get_widget('merge_checkbutton').set_active(st)
 
 		#iconset
-		list_style = os.listdir('plugins/gtkgui/icons/')
+		list_style = os.listdir('plugins/gtkgui/iconsets/')
 		model = gtk.ListStore(gobject.TYPE_STRING)
 		self.iconset_combobox.set_model(model)
 		l = []
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 995a9bac4..666992407 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -895,7 +895,7 @@ class plugin:
 		iconset = self.config['iconset']
 		if not iconset:
 			iconset = 'sun'
-		path = 'plugins/gtkgui/icons/' + iconset + '/'
+		path = 'plugins/gtkgui/iconsets/' + iconset + '/'
 		files = [path + 'online.gif', path + 'online.png', path + 'online.xpm']
 		pix = None
 		for fname in files:
diff --git a/plugins/gtkgui/icons/gossip/away.png b/plugins/gtkgui/iconsets/gossip/away.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/away.png
rename to plugins/gtkgui/iconsets/gossip/away.png
diff --git a/plugins/gtkgui/icons/gossip/chat.png b/plugins/gtkgui/iconsets/gossip/chat.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/chat.png
rename to plugins/gtkgui/iconsets/gossip/chat.png
diff --git a/plugins/gtkgui/icons/gossip/closed.xpm b/plugins/gtkgui/iconsets/gossip/closed.xpm
similarity index 100%
rename from plugins/gtkgui/icons/gossip/closed.xpm
rename to plugins/gtkgui/iconsets/gossip/closed.xpm
diff --git a/plugins/gtkgui/icons/gossip/connecting.png b/plugins/gtkgui/iconsets/gossip/connecting.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/connecting.png
rename to plugins/gtkgui/iconsets/gossip/connecting.png
diff --git a/plugins/gtkgui/icons/gossip/dnd.png b/plugins/gtkgui/iconsets/gossip/dnd.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/dnd.png
rename to plugins/gtkgui/iconsets/gossip/dnd.png
diff --git a/plugins/gtkgui/iconsets/gossip/invisible.png b/plugins/gtkgui/iconsets/gossip/invisible.png
new file mode 100644
index 000000000..807e61d70
Binary files /dev/null and b/plugins/gtkgui/iconsets/gossip/invisible.png differ
diff --git a/plugins/gtkgui/icons/gossip/message.png b/plugins/gtkgui/iconsets/gossip/message.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/message.png
rename to plugins/gtkgui/iconsets/gossip/message.png
diff --git a/plugins/gtkgui/icons/gossip/offline.png b/plugins/gtkgui/iconsets/gossip/offline.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/offline.png
rename to plugins/gtkgui/iconsets/gossip/offline.png
diff --git a/plugins/gtkgui/icons/gossip/online.png b/plugins/gtkgui/iconsets/gossip/online.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/online.png
rename to plugins/gtkgui/iconsets/gossip/online.png
diff --git a/plugins/gtkgui/icons/gossip/opened.xpm b/plugins/gtkgui/iconsets/gossip/opened.xpm
similarity index 100%
rename from plugins/gtkgui/icons/gossip/opened.xpm
rename to plugins/gtkgui/iconsets/gossip/opened.xpm
diff --git a/plugins/gtkgui/icons/gossip/typing.png b/plugins/gtkgui/iconsets/gossip/typing.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/typing.png
rename to plugins/gtkgui/iconsets/gossip/typing.png
diff --git a/plugins/gtkgui/icons/gossip/xa.png b/plugins/gtkgui/iconsets/gossip/xa.png
similarity index 100%
rename from plugins/gtkgui/icons/gossip/xa.png
rename to plugins/gtkgui/iconsets/gossip/xa.png
diff --git a/plugins/gtkgui/icons/icq/away.png b/plugins/gtkgui/iconsets/icq/away.png
similarity index 100%
rename from plugins/gtkgui/icons/icq/away.png
rename to plugins/gtkgui/iconsets/icq/away.png
diff --git a/plugins/gtkgui/icons/icq/chat.png b/plugins/gtkgui/iconsets/icq/chat.png
similarity index 100%
rename from plugins/gtkgui/icons/icq/chat.png
rename to plugins/gtkgui/iconsets/icq/chat.png
diff --git a/plugins/gtkgui/icons/icq/closed.xpm b/plugins/gtkgui/iconsets/icq/closed.xpm
similarity index 100%
rename from plugins/gtkgui/icons/icq/closed.xpm
rename to plugins/gtkgui/iconsets/icq/closed.xpm
diff --git a/plugins/gtkgui/icons/icq/connecting.png b/plugins/gtkgui/iconsets/icq/connecting.png
similarity index 100%
rename from plugins/gtkgui/icons/icq/connecting.png
rename to plugins/gtkgui/iconsets/icq/connecting.png
diff --git a/plugins/gtkgui/icons/icq/dnd.png b/plugins/gtkgui/iconsets/icq/dnd.png
similarity index 100%
rename from plugins/gtkgui/icons/icq/dnd.png
rename to plugins/gtkgui/iconsets/icq/dnd.png
diff --git a/plugins/gtkgui/icons/icq/invisible.png b/plugins/gtkgui/iconsets/icq/invisible.png
similarity index 100%
rename from plugins/gtkgui/icons/icq/invisible.png
rename to plugins/gtkgui/iconsets/icq/invisible.png
diff --git a/plugins/gtkgui/icons/icq/offline.png b/plugins/gtkgui/iconsets/icq/offline.png
similarity index 100%
rename from plugins/gtkgui/icons/icq/offline.png
rename to plugins/gtkgui/iconsets/icq/offline.png
diff --git a/plugins/gtkgui/icons/icq/online.png b/plugins/gtkgui/iconsets/icq/online.png
similarity index 100%
rename from plugins/gtkgui/icons/icq/online.png
rename to plugins/gtkgui/iconsets/icq/online.png
diff --git a/plugins/gtkgui/icons/icq/opened.xpm b/plugins/gtkgui/iconsets/icq/opened.xpm
similarity index 100%
rename from plugins/gtkgui/icons/icq/opened.xpm
rename to plugins/gtkgui/iconsets/icq/opened.xpm
diff --git a/plugins/gtkgui/icons/icq/xa.png b/plugins/gtkgui/iconsets/icq/xa.png
similarity index 100%
rename from plugins/gtkgui/icons/icq/xa.png
rename to plugins/gtkgui/iconsets/icq/xa.png
diff --git a/plugins/gtkgui/icons/msn/away.png b/plugins/gtkgui/iconsets/msn/away.png
similarity index 100%
rename from plugins/gtkgui/icons/msn/away.png
rename to plugins/gtkgui/iconsets/msn/away.png
diff --git a/plugins/gtkgui/icons/msn/closed.xpm b/plugins/gtkgui/iconsets/msn/closed.xpm
similarity index 100%
rename from plugins/gtkgui/icons/msn/closed.xpm
rename to plugins/gtkgui/iconsets/msn/closed.xpm
diff --git a/plugins/gtkgui/icons/msn/connecting.png b/plugins/gtkgui/iconsets/msn/connecting.png
similarity index 100%
rename from plugins/gtkgui/icons/msn/connecting.png
rename to plugins/gtkgui/iconsets/msn/connecting.png
diff --git a/plugins/gtkgui/icons/msn/dnd.png b/plugins/gtkgui/iconsets/msn/dnd.png
similarity index 100%
rename from plugins/gtkgui/icons/msn/dnd.png
rename to plugins/gtkgui/iconsets/msn/dnd.png
diff --git a/plugins/gtkgui/icons/msn/offline.png b/plugins/gtkgui/iconsets/msn/offline.png
similarity index 100%
rename from plugins/gtkgui/icons/msn/offline.png
rename to plugins/gtkgui/iconsets/msn/offline.png
diff --git a/plugins/gtkgui/icons/msn/online.png b/plugins/gtkgui/iconsets/msn/online.png
similarity index 100%
rename from plugins/gtkgui/icons/msn/online.png
rename to plugins/gtkgui/iconsets/msn/online.png
diff --git a/plugins/gtkgui/icons/msn/opened.xpm b/plugins/gtkgui/iconsets/msn/opened.xpm
similarity index 100%
rename from plugins/gtkgui/icons/msn/opened.xpm
rename to plugins/gtkgui/iconsets/msn/opened.xpm
diff --git a/plugins/gtkgui/icons/stellar/away.png b/plugins/gtkgui/iconsets/stellar/away.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/away.png
rename to plugins/gtkgui/iconsets/stellar/away.png
diff --git a/plugins/gtkgui/icons/stellar/chat.png b/plugins/gtkgui/iconsets/stellar/chat.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/chat.png
rename to plugins/gtkgui/iconsets/stellar/chat.png
diff --git a/plugins/gtkgui/icons/stellar/closed.xpm b/plugins/gtkgui/iconsets/stellar/closed.xpm
similarity index 100%
rename from plugins/gtkgui/icons/stellar/closed.xpm
rename to plugins/gtkgui/iconsets/stellar/closed.xpm
diff --git a/plugins/gtkgui/icons/stellar/connecting.gif b/plugins/gtkgui/iconsets/stellar/connecting.gif
similarity index 100%
rename from plugins/gtkgui/icons/stellar/connecting.gif
rename to plugins/gtkgui/iconsets/stellar/connecting.gif
diff --git a/plugins/gtkgui/icons/stellar/dnd.png b/plugins/gtkgui/iconsets/stellar/dnd.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/dnd.png
rename to plugins/gtkgui/iconsets/stellar/dnd.png
diff --git a/plugins/gtkgui/icons/stellar/error.png b/plugins/gtkgui/iconsets/stellar/error.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/error.png
rename to plugins/gtkgui/iconsets/stellar/error.png
diff --git a/plugins/gtkgui/icons/stellar/invisible.png b/plugins/gtkgui/iconsets/stellar/invisible.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/invisible.png
rename to plugins/gtkgui/iconsets/stellar/invisible.png
diff --git a/plugins/gtkgui/icons/stellar/message.gif b/plugins/gtkgui/iconsets/stellar/message.gif
similarity index 100%
rename from plugins/gtkgui/icons/stellar/message.gif
rename to plugins/gtkgui/iconsets/stellar/message.gif
diff --git a/plugins/gtkgui/icons/stellar/not_in_the_roster.png b/plugins/gtkgui/iconsets/stellar/not_in_the_roster.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/not_in_the_roster.png
rename to plugins/gtkgui/iconsets/stellar/not_in_the_roster.png
diff --git a/plugins/gtkgui/icons/stellar/offline.png b/plugins/gtkgui/iconsets/stellar/offline.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/offline.png
rename to plugins/gtkgui/iconsets/stellar/offline.png
diff --git a/plugins/gtkgui/icons/stellar/online.png b/plugins/gtkgui/iconsets/stellar/online.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/online.png
rename to plugins/gtkgui/iconsets/stellar/online.png
diff --git a/plugins/gtkgui/icons/stellar/opened.xpm b/plugins/gtkgui/iconsets/stellar/opened.xpm
similarity index 100%
rename from plugins/gtkgui/icons/stellar/opened.xpm
rename to plugins/gtkgui/iconsets/stellar/opened.xpm
diff --git a/plugins/gtkgui/icons/stellar/requested.png b/plugins/gtkgui/iconsets/stellar/requested.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/requested.png
rename to plugins/gtkgui/iconsets/stellar/requested.png
diff --git a/plugins/gtkgui/icons/stellar/xa.png b/plugins/gtkgui/iconsets/stellar/xa.png
similarity index 100%
rename from plugins/gtkgui/icons/stellar/xa.png
rename to plugins/gtkgui/iconsets/stellar/xa.png
diff --git a/plugins/gtkgui/icons/sun/away.xpm b/plugins/gtkgui/iconsets/sun/away.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/away.xpm
rename to plugins/gtkgui/iconsets/sun/away.xpm
diff --git a/plugins/gtkgui/icons/sun/chat.xpm b/plugins/gtkgui/iconsets/sun/chat.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/chat.xpm
rename to plugins/gtkgui/iconsets/sun/chat.xpm
diff --git a/plugins/gtkgui/icons/sun/closed.xpm b/plugins/gtkgui/iconsets/sun/closed.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/closed.xpm
rename to plugins/gtkgui/iconsets/sun/closed.xpm
diff --git a/plugins/gtkgui/icons/sun/connecting.gif b/plugins/gtkgui/iconsets/sun/connecting.gif
similarity index 100%
rename from plugins/gtkgui/icons/sun/connecting.gif
rename to plugins/gtkgui/iconsets/sun/connecting.gif
diff --git a/plugins/gtkgui/icons/sun/dnd.xpm b/plugins/gtkgui/iconsets/sun/dnd.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/dnd.xpm
rename to plugins/gtkgui/iconsets/sun/dnd.xpm
diff --git a/plugins/gtkgui/icons/sun/error.xpm b/plugins/gtkgui/iconsets/sun/error.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/error.xpm
rename to plugins/gtkgui/iconsets/sun/error.xpm
diff --git a/plugins/gtkgui/icons/sun/invisible.xpm b/plugins/gtkgui/iconsets/sun/invisible.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/invisible.xpm
rename to plugins/gtkgui/iconsets/sun/invisible.xpm
diff --git a/plugins/gtkgui/icons/sun/message.gif b/plugins/gtkgui/iconsets/sun/message.gif
similarity index 100%
rename from plugins/gtkgui/icons/sun/message.gif
rename to plugins/gtkgui/iconsets/sun/message.gif
diff --git a/plugins/gtkgui/icons/sun/not_in_the_roster.xpm b/plugins/gtkgui/iconsets/sun/not_in_the_roster.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/not_in_the_roster.xpm
rename to plugins/gtkgui/iconsets/sun/not_in_the_roster.xpm
diff --git a/plugins/gtkgui/icons/sun/offline.xpm b/plugins/gtkgui/iconsets/sun/offline.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/offline.xpm
rename to plugins/gtkgui/iconsets/sun/offline.xpm
diff --git a/plugins/gtkgui/icons/sun/online.xpm b/plugins/gtkgui/iconsets/sun/online.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/online.xpm
rename to plugins/gtkgui/iconsets/sun/online.xpm
diff --git a/plugins/gtkgui/icons/sun/opened.xpm b/plugins/gtkgui/iconsets/sun/opened.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/opened.xpm
rename to plugins/gtkgui/iconsets/sun/opened.xpm
diff --git a/plugins/gtkgui/icons/sun/requested.xpm b/plugins/gtkgui/iconsets/sun/requested.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/requested.xpm
rename to plugins/gtkgui/iconsets/sun/requested.xpm
diff --git a/plugins/gtkgui/icons/sun/xa.xpm b/plugins/gtkgui/iconsets/sun/xa.xpm
similarity index 100%
rename from plugins/gtkgui/icons/sun/xa.xpm
rename to plugins/gtkgui/iconsets/sun/xa.xpm
diff --git a/plugins/gtkgui/roster_window.py b/plugins/gtkgui/roster_window.py
index c44dd99eb..1e5ad8d49 100644
--- a/plugins/gtkgui/roster_window.py
+++ b/plugins/gtkgui/roster_window.py
@@ -1084,7 +1084,7 @@ class Roster_window:
 		iconset = self.plugin.config['iconset']
 		if not iconset:
 			iconset = 'sun'
-		self.path = 'plugins/gtkgui/icons/' + iconset + '/'
+		self.path = 'plugins/gtkgui/iconsets/' + iconset + '/'
 		self.pixbufs = {}
 		for state in ('connecting', 'online', 'chat', 'away', 'xa', 'dnd', \
 			'invisible', 'offline', 'error', 'requested', 'message', \