AGP-497: use overrideIconOverlay, remove unused code