Re-add toolbar hover. Fix some button appearance issues.

Squashed version of #4397.