Toolbar buttons too small: Closes bgo#723578

A partial revert of bgo#713837 (commit:a70d47) which was too
aggressive in removing extra space from toolbar buttons.