library icons uploading + picture uploading refactoring