Cleanup and better icons