Resolve "Inconsistent spacing in the header bar"

As reported in issue #929 (closed), the Header bar looks odd because the space between some buttons (or group of widgets) vary.

Perhaps it was inheritance of the old toolbar, which has many more buttons, and grouping them made sense.

Additionally, we saved precious 30 pixels :-)

Closes #929 (closed)