Merge "Controls UI - Icon updates, round 2" into rvc-dev