diff --git a/iconsets/roster/AmiroseStar.html b/iconsets/roster/AmiroseStar.html
index b4c4456..f30a77c 100644
--- a/iconsets/roster/AmiroseStar.html
+++ b/iconsets/roster/AmiroseStar.html
@@ -3,7 +3,7 @@
Name: Amirose Star
Authors:
-TBrian Christensen (conversion) JID: brian@c-network.dk
+TBrian Christensen (conversion) XMPP: brian@c-network.dk
Amirose (icons) Email: amirose@op.pl
Example:

diff --git a/iconsets/roster/Android.html b/iconsets/roster/Android.html
index 60a4de3..833f5b2 100644
--- a/iconsets/roster/Android.html
+++ b/iconsets/roster/Android.html
@@ -3,7 +3,7 @@
Name: Android (Roster)
Authors:
-Disabler Email: dissy@isida-bot.com JID: dissy@isida-bot.com WWW: http://isida-bot.com
+Disabler Email: dissy@isida-bot.com XMPP: dissy@isida-bot.com WWW: http://isida-bot.com
Example:

Additional info (description, license, etc.):
diff --git a/iconsets/roster/Facebook.html b/iconsets/roster/Facebook.html
index 931e3e4..989e112 100644
--- a/iconsets/roster/Facebook.html
+++ b/iconsets/roster/Facebook.html
@@ -3,7 +3,7 @@
Name: Facebook (Roster)
Authors:
-Disabler Email: dissy@isida-bot.com JID: dissy@isida-bot.com WWW: http://isida-bot.com
+Disabler Email: dissy@isida-bot.com XMPP: dissy@isida-bot.com WWW: http://isida-bot.com
WWW: http://facebook.com
Example:

diff --git a/iconsets/roster/Oxygen-S.html b/iconsets/roster/Oxygen-S.html
index f624678..3287582 100644
--- a/iconsets/roster/Oxygen-S.html
+++ b/iconsets/roster/Oxygen-S.html
@@ -3,7 +3,7 @@
Name: Oxygen_scalable_theme
Authors:
-Rischio Cinico Email: rischiocinico@gmail.com JID: rischiocinico@jabber.systemli.org WWW: http://rischiocinico.altervista.org
+Rischio Cinico Email: rischiocinico@gmail.com XMPP: rischiocinico@jabber.systemli.org WWW: http://rischiocinico.altervista.org
Example:

Additional info (description, license, etc.):
diff --git a/iconsets/roster/amirosebulb.html b/iconsets/roster/amirosebulb.html
index 14330ae..57e8c5b 100644
--- a/iconsets/roster/amirosebulb.html
+++ b/iconsets/roster/amirosebulb.html
@@ -3,7 +3,7 @@
Name: Amirose Bulb
Authors:
-Tomasz Sterna (conversion) Email: tomek@smoczy.net JID: smoku@chrome.pl WWW: http://smoczy.net
+Tomasz Sterna (conversion) Email: tomek@smoczy.net XMPP: smoku@chrome.pl WWW: http://smoczy.net
amirose (icons) Email: amirose@op.pl
Example:

diff --git a/iconsets/roster/amiroseglobe.html b/iconsets/roster/amiroseglobe.html
index 608cf0e..73a818b 100644
--- a/iconsets/roster/amiroseglobe.html
+++ b/iconsets/roster/amiroseglobe.html
@@ -3,7 +3,7 @@
Name: Amirose Globe
Authors:
-Tomasz Sterna (conversion) Email: tomek@smoczy.net JID: smoku@chrome.pl WWW: http://smoczy.net
+Tomasz Sterna (conversion) Email: tomek@smoczy.net XMPP: smoku@chrome.pl WWW: http://smoczy.net
amirose (icons) Email: amirose@op.pl
Example:

diff --git a/iconsets/roster/archlinux.html b/iconsets/roster/archlinux.html
index 404acf1..2d8a14d 100644
--- a/iconsets/roster/archlinux.html
+++ b/iconsets/roster/archlinux.html
@@ -3,7 +3,7 @@
Name: Archlinux
Authors:
-bull (Icons and Package) Email: bull@jabber.cz JID: bull@jabber.cz WWW: http://psi.affinix.com
+bull (Icons and Package) Email: bull@jabber.cz XMPP: bull@jabber.cz WWW: http://psi.affinix.com
Example:

Additional info (description, license, etc.):
diff --git a/iconsets/roster/bctango_roster.html b/iconsets/roster/bctango_roster.html
index 8a89e40..bb90f0f 100644
--- a/iconsets/roster/bctango_roster.html
+++ b/iconsets/roster/bctango_roster.html
@@ -4,7 +4,7 @@
Name: BC Tango (Roster)
Authors:
Tango Project WWW: http://www.tango-project.org
-BeCe Email: boski_cinek@o2.pl JID: wonttell@nowhere.pl WWW: http://boskastrona.ovh.org
+BeCe Email: boski_cinek@o2.pl XMPP: wonttell@nowhere.pl WWW: http://boskastrona.ovh.org
Example:

Additional info (description, license, etc.):
diff --git a/iconsets/roster/berlin.html b/iconsets/roster/berlin.html
index 0cc794e..ffc78ec 100644
--- a/iconsets/roster/berlin.html
+++ b/iconsets/roster/berlin.html
@@ -3,7 +3,7 @@
Name: Berlin Traffic Lights
Authors:
-Robert Martinez Email: robertmartinez@web.de JID: mray@jabber.org WWW: http://www.mray.de
+Robert Martinez Email: robertmartinez@web.de XMPP: mray@jabber.org WWW: http://www.mray.de
Example:

Additional info (description, license, etc.):
diff --git a/iconsets/roster/boss.html b/iconsets/roster/boss.html
index 4c395df..5ac3c0e 100644
--- a/iconsets/roster/boss.html
+++ b/iconsets/roster/boss.html
@@ -3,7 +3,7 @@
Name: boss iconset ;)
Authors:
-Robert Martinez Email: robertmartinez@web.de JID: mray@jabber.org WWW: http://www.mray.de
+Robert Martinez Email: robertmartinez@web.de XMPP: mray@jabber.org WWW: http://www.mray.de
Example:

Additional info (description, license, etc.):
diff --git a/iconsets/roster/debian.html b/iconsets/roster/debian.html
index 954166e..a07b54f 100644
--- a/iconsets/roster/debian.html
+++ b/iconsets/roster/debian.html
@@ -3,7 +3,7 @@
Name: Debian
Authors:
-bull (Icons and Package) Email: bull@jabber.cz JID: bull@jabber.cz WWW: http://psi.affinix.com
+bull (Icons and Package) Email: bull@jabber.cz XMPP: bull@jabber.cz WWW: http://psi.affinix.com
Example:

Additional info (description, license, etc.):
diff --git a/iconsets/roster/dictionary.html b/iconsets/roster/dictionary.html
index c3d97be..a90c99c 100644
--- a/iconsets/roster/dictionary.html
+++ b/iconsets/roster/dictionary.html
@@ -3,7 +3,7 @@
Name: Dictionary
Authors:
-Maciej Niedzielski JID: machekku@chrome.pl WWW: http://uaznia.skawsoft.com.pl/~machekku
+Maciej Niedzielski XMPP: machekku@chrome.pl WWW: http://uaznia.skawsoft.com.pl/~machekku
Example:

Additional info (description, license, etc.):
diff --git a/iconsets/roster/email.html b/iconsets/roster/email.html
index d5be064..45ae710 100644
--- a/iconsets/roster/email.html
+++ b/iconsets/roster/email.html
@@ -3,7 +3,7 @@
Name: E-Mail
Authors:
-Tomasz Sterna Email: tomek@smoczy.net JID: smoku@chrome.pl WWW: http://smoczy.net
+Tomasz Sterna Email: tomek@smoczy.net XMPP: smoku@chrome.pl WWW: http://smoczy.net
Example:

Additional info (description, license, etc.):