This commit just does the last 1% of work necessary to get rid of font-awesome fonts. fixes #1004 fixes #2639