Replaced remaining i with span

On frontend, some remaining <i class="icon-* were left over, changed i to span. (Did not get a chance to do the same for backend- same issue there.)