Fix checked state and icon/label updating
Follow-up for master