Merge "Controls UI - Icon updates, round 2" into rvc-dev am: a0caf8fad9 am: ec733dcca7

Change-Id: I6a09e7e43b28385ec8ed6fa969f523c5b380fc79