Corrected CSS classes for icons
Added field to generate classes for CSS icons
Merge branch 'feature_23'