Fix some problems with the class selector, remove some unnecessary class
options, create icons for each class