Fix @tanghus's complains in avatars and clean up cropper after closing with "x"