Merge pull request #1480 from etimberg/fix/retina-scale-issue

Fixes some retina issues introduced into the v2 codeline