-As per Ian's suggestion, changed the handling of no icon to being null