Refactor icon creation