add font awesome
added icons
Fix conflict