-- icons refactoring