Merge "Fix missing icon for one-to-one convos" into rvc-dev