Use square images
Merge branch 'master' into stable