Merge "Use contrasted color icons" into rvc-dev