Merge "Controls - Custom icon/color issues"