consistent right margin on button icons
Merge branch 'master' into feature-portrait-single-pane