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

Change-Id: I52de4df70a7d0bee96fdf4bbf92f4e0233e00092