Maybe the toolbar could work like the windows taskbar.
Rather than having only the two options of all showing or all consolidated to one button, they could all be hidden (consolidated) by default with a check-tick option to always display selected ones