ViewModel additions and icon changes for Core