RED-36592 First pass at making icon overlays more performant and reliable