Fixed display of toolbar buttons (related to issue 7082)