Use fontawesome everywhere
Merge origin/master