A bit robuster building of Icon.