Fix: remember _icon on every update