Refactored <i> to <span>