Add icon, more ping refinements