#16 Replaced <i> with <span>