Preliminary icon overlays. Needs refinement