changed icon implementation to give views a type
Merge branch 'master' of https://github.com/philt5252/GoldenHorse