Manually merging Beam's FontAwesome fixes for front end toolbar