Refactoring IconBehavior