CLC-1521 - Canvas - select icons for type
https://jira.media.berkeley.edu/jira/browse/CLC-1521
Merge pull request #861 from christianv/CLC-1521

CLC-1521 - Canvas - select icons for type