Fix for #9404 and made dark theme highlight less obnoxious.
Fix for #9359.
Tweak.
Merge pull request #9438 from adobe/larz/ui-fixes

UI Fixes