more icons, clean classes