Back to button style.

Partial manual revert of 168cb146eaec3c568527bbc5dcf06b4cb6e9bda8.
Please note that this does *not* contain any changes to the UI as
discussed; those will follow later.

References #41