move icon logic to a more logical place, the SuccessCriteria model