BZ-12752 icon class
Merge branch 'Sprint74-CP' into integration