Switched from i tags to span tags for Font Awesome icons