Icon, refactoring