More gradual icon transition, removed redundant cast