diff --git a/data/pixmaps/agents/http-ws.png b/data/pixmaps/agents/http-ws.png
new file mode 100644
index 000000000..0b2101814
Binary files /dev/null and b/data/pixmaps/agents/http-ws.png differ
diff --git a/data/pixmaps/agents/mail.png b/data/pixmaps/agents/mail.png
new file mode 100644
index 000000000..d6ec22bb5
Binary files /dev/null and b/data/pixmaps/agents/mail.png differ
diff --git a/data/pixmaps/agents/sms.png b/data/pixmaps/agents/sms.png
new file mode 100644
index 000000000..91809574c
Binary files /dev/null and b/data/pixmaps/agents/sms.png differ
diff --git a/data/pixmaps/agents/weather.png b/data/pixmaps/agents/weather.png
index 09b008592..84c74a215 100644
Binary files a/data/pixmaps/agents/weather.png and b/data/pixmaps/agents/weather.png differ
diff --git a/src/disco.py b/src/disco.py
index 46c6fea20..3302ac85d 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -76,34 +76,34 @@ GTKGUI_GLADE = 'gtkgui.glade'
 def _gen_agent_type_info():
 	return {
 		# Defaults
-		(0, 0):						(None, None),
+		(0, 0):							(None, None),
 		
 		# Jabber server
-		('server', 'im'):			(ToplevelAgentBrowser, 'jabber.png'),
+		('server', 'im'):				(ToplevelAgentBrowser, 'jabber.png'),
 		('services', 'jabber'):		(ToplevelAgentBrowser, 'jabber.png'),
 		
 		# Services
 		('conference', 'text'):		(MucBrowser, 'conference.png'),
-		('headline', 'rss'):		(AgentBrowser, 'rss.png'),
+		('headline', 'rss'):			(AgentBrowser, 'rss.png'),
 		('headline', 'weather'):	(False, 'weather.png'),
 		('gateway', 'weather'):		(False, 'weather.png'),
-		('_jid', 'weather'):		(False, 'weather.png'),
+		('_jid', 'weather'):			(False, 'weather.png'),
 		
 		# Transports
 		('conference', 'irc'):		(False, 'irc.png'),
-		('_jid', 'irc'):			(False, 'irc.png'),
+		('_jid', 'irc'):				(False, 'irc.png'),
 		('gateway', 'aim'):			(False, 'aim.png'),
-		('_jid', 'aim'):			(False, 'aim.png'),
+		('_jid', 'aim'):				(False, 'aim.png'),
 		('gateway', 'gadu-gadu'):	(False, 'gadu-gadu.png'),
 		('_jid', 'gadugadu'):		(False, 'gadu-gadu.png'),
-		('gateway', 'http-ws'):		(False, None),
+		('gateway', 'http-ws'):		(False, 'http-ws.png'),
 		('gateway', 'icq'):			(False, 'icq.png'),
-		('_jid', 'icq'):			(False, 'icq.png'),
+		('_jid', 'icq'):				(False, 'icq.png'),
 		('gateway', 'msn'):			(False, 'msn.png'),
-		('_jid', 'msn'):			(False, 'msn.png'),
-		('gateway', 'sms'):			(False, None),
-		('_jid', 'sms'):			(False, None),
-		('gateway', 'smtp'):		(False, None),
+		('_jid', 'msn'):				(False, 'msn.png'),
+		('gateway', 'sms'):			(False, 'sms.png'),
+		('_jid', 'sms'):				(False, 'sms.png'),
+		('gateway', 'smtp'):			(False, 'mail.png'),
 		('gateway', 'yahoo'):		(False, 'yahoo.png'),
 		('_jid', 'yahoo'):			(False, 'yahoo.png'),
 	}