improved icon type code
Merge branch 'master' of https://github.com/elliotfiske/Storyboard