Make icon definition in contenttypes.yml future-proof
Merge pull request #2009 from rarila/issue-1995

Make icon definition in contenttypes.yml future-proof