Fix oversized icons
refs #848
Fixed entry menu oversized icons
refs #848
Merge branch 'master' into symboler-short-circuit