Merge "Update icon shape for Sam" into rvc-dev