Some cleaning and new icon.