Switch from i to span for Accessibility