Change <i> to <span> for font-awesome elements
Improve the display for modification of chars