Icon refactor