Final code cleaning and added new icon.