Pulled support for font icons from SC Pull Request 964