Added card icons and subtypes