Use font-awesome for icons - working on highlighting