Upgrade Font awesome to 4.1

Follow up from PR https://github.com/oaeproject/3akai-ux/pull/3692
Badly resolved merge conflict