Refactor icon inheritance.