UI Fixes

- Fixed #9404 
- Fixed #9359 
- Made dark theme highlight less obnoxious