Fix to Toolbar widget to show both text and icon if both are provided
Fix to Toolbar widget to show both text and icon if both are provided

pllim/ginga,ejeschke/ginga,naojsoft/ginga,ejeschke/ginga,naojsoft/ginga,naojsoft/ginga,pllim/ginga,ejeschke/ginga,pllim/ginga