2 files changed, 23 insertions, 24 deletions
diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index f52519591..843c2994e 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -1,7 +1,7 @@
-KDE
+KDE [icon=kde]
 	Graphical desktop/KDE
 
-Gnome
+Gnome [icon=gnome]
 	Graphical desktop/GNOME
 	Graphical desktop/Sawmill
 	+XFree86-75dpi-fonts
@@ -16,7 +16,7 @@ Other Graphical Desktops [icon=windowmanager]
 	+XFree86
 	+XFree86-75dpi-fonts
 
-Mail/WWW/News Tools [icon=networking]
+Internet Tools [icon=networking]
 	Networking/WWW
 	Networking/Mail
 	Networking/News
@@ -33,7 +33,7 @@ Office [icon=office]
 	Publishing
 	Archiving/Cd burning
 
-Multimedia Support [icon=multimedia]
+Multimedia [icon=multimedia]
 	Sound
 	Video
 
@@ -42,11 +42,9 @@ Graphics Manipulation [icon=graphics]
 
 Games [icon=amusement]
 	Games
-	Amusements/Games
 
 Documentation [icon=documentation]
 	Books
 
-Databases
+Databases [icon=database]
 	Databases
-	Applications/Databases
diff --git a/perl-install/share/compssUsers.desktop b/perl-install/share/compssUsers.desktop
index 7418f4ea3..b582b76e8 100644
--- a/perl-install/share/compssUsers.desktop
+++ b/perl-install/share/compssUsers.desktop
@@ -1,38 +1,39 @@
-Other Graphical Desktops (Gnome, IceWM)
-	Graphical desktop/GNOME
-	Graphical desktop/Sawmill
-	Graphical desktop/Icewm
-	+XFree86-75dpi-fonts
-	+fonts-ttf-west_european
+Office [icon=office]
+	Office
+
+Internet [icon=networking]
+	Networking
 
-Games
+Games [icon=amusement]
 	Games
 
-Multimedia - Graphics
+Multimedia - Graphics [icon=graphics]
 	Graphics
 
-Multimedia - Sound
+Multimedia - Sound [icon=multimedia]
 	Sound
 
-Multimedia - Video
+Multimedia - Video [icon=video]
 	Video
 
-Multimedia - CD Burning
+Multimedia - CD Burning [icon=cdburning]
 	Archiving/Cd burning
 
-Internet
-	Networking
+More Graphical Desktops (Gnome, IceWM) [icon=windowmanager]
+	Graphical desktop/GNOME
+	Graphical desktop/Sawmill
+	Graphical desktop/Icewm
+	+XFree86-75dpi-fonts
+	+fonts-ttf-west_european
 
-Personnal Information Management
+Personnal Information Management [icon=pim]
 	+jpilot
 	+pilot-link
 	+kde-pim
 	+gnome-pim
 	+gnome-pim-conduits
 
-Personnal Finance
+Personnal Finance [icon=money]
 	+gnucash
 	+MoneyDance
 
-Office productivity
-	Office