Cleanup and better notification icon