icon refactor