Merge "Controls UI - Update icons" into rvc-dev