Tweak for #368.
Fix FontAwesome icon bit of #368.
Merge remote-tracking branch 'upstream/master'