Merge "Remove the border around the icon when in dark mode" into rvc-dev