Fix broken subtype icon CRM-12054

There always seems to be some confusion about the fact that contact type names and labels are not interchangeable. In a demo environment they are always the same and therefore code that mixes them up will seem to work. It might be good to include with our sample data some mismatched names/labels so it can actually be unit-tested.