Add icon
Cleanup and icons