Replace <i> with <span? for icon markup (fixes #953)