Merge "Finish Volume Panel styling" into main