Code refactored
Changed icon