rework site selection icons behavior