Backported changes from work.

Still need to switch over to font-awesome.