Merge "Update controls icon" into sc-v2-dev