Icon refactoring