Several refinements after fontawesome upgrade