Handle icons of other entity types; add cover support