Cleanup and added Icon.