CLC-2737 - CFV - Implement new icons for type

https://jira.media.berkeley.edu/jira/browse/CLC-2737