Refactor icons