Merge "Fixed an issue where icons could be stuck overlapping" into rvc-dev