Improve the presentation of the toolbar button in icon+text mode