fix font-awesome assets
Merge branch 'dev'