Added icons for picklist field.
Merge branch 'develop' into topic-groups