Merge "Overflow button icon - plus instead of three dots" into rvc-dev