Comment 2 for bug 2012961

This was a change I was intentionally trying out with the other changes to use a header bar. Since the header bar also has the window title in the center, on smaller screens there isn't much room for those toolbar icons unless they go on the other side, but that makes the main menu harder to find