Group icons ^^
Refactoring