Added icon draw toggle
Merge branch 'master' of https://github.com/erisco/WindsorExpedition
Fixed icon flickering