GDIB-173: Added Font-Awesome icons
GDIB-173: cleaned up a bad merge
GDIB-173: cleaned up a bad merge 2