Added badge support and options for using badge icons as entry images