Merge "Make icon sizes consistent" into rvc-dev