Add new margins to labels.
Merge remote-tracking branch 'origin/hotfix/issue-64'