refactor icons