Updated Icons and Heat Map