Font awesome upgrade: icon -> fa

For font awesome upgrade, rest of code isn't ready yet, so hold on this for a bit.