Re-add toolbar hover. Fix some button appearance issues.
Merge pull request #4552 from adobe/larz/toolbar-hover-squashed

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