Merge "Make sure actions have icons" into rvc-dev