Today
Fixed merge with new iconrender flow, added editor tools to custom editor