Use 'icon' instead of 'subject.icon' in the new model.