Fix gridbox button styling

If you use a button with both icon and text (like export/supply) then they didn't quite line up correctly. Fixed the styling on the gridbox buttons and refactored the toggling.

Pull also in private-extensions