icon drawing now dependent on height of icon image, rather than a constant
Merge branch 'master' of https://github.com/craigthelinguist/KnightCapital