remove linebreak
finish replacing icons with font-awesome