Checkboxradio state vs. icon classes. Issue #6548

See #6548