Icons now correspond to class