Another pass on marker-icon, better grid fitting.