Validated everything, added an icon