Fixes the toolbar button sizes for Linux, and Mac.
Merge branch 'origin/dev'