Revert to IconSupport build
Revert to IconSupport build