Merge "Controls UI - Fix routine icons" into rvc-dev