Changed to Font-Awesome icon fonts, minor fixes