This makes it look better and more in line with the other GNOME applications, and simplifies the code a bit.
CC @aday @bertob @jimmac as it's a UI change.