better class names and icons (#16).