Merge "Controls - Custom icon/color issues" into rvc-qpr-dev