add font awesome
remove new and add icons
merge styling changes