Remove classes that are now in edsutil
Fix for spring 4
Use glyphs instead of images