- Added missing icons, closes #4730 - Added high-contrast for cursors.
Rebased in new branch to cleanup commit history.