Clean up imports
Update icon