Update Sample Data, Fix Icon update