Finish porting of new FontAwessome