Add support for Font-awesome
Split the Font awesome marco in two to simply the logic