Issue 7318 (Spacing of icons within toolbar buttons is incorrect)
https://code.google.com/p/fbug/issues/detail?id=7318

Part 1: Adjusted padding within the buttons
Fixed button display on OS X (related to issue 7318)
Merge branch 'issue7318'