Refactoring icons