Refactor icon integration