Merge "Refactor how app pair icons draw" into main