Merge pull request #7662 from jordan-woyak/mapping-indicators-make-pretty ControllerEmu: Make mapping indicators pretty
