Move icon logic into user class