From d0800f7661f13fabe7bb6f4aa0ea50764f106405 Mon Sep 17 00:00:00 2001
From: kontrollanten <6680299+kontrollanten@users.noreply.github.com>
Date: Mon, 28 Feb 2022 08:34:43 +0100
Subject: Implement avatar miniatures (#4639)

* client: remove unused file

* refactor(client/my-actor-avatar): size from input

Read size from component input instead of scss, to make it possible to
use smaller avatar images when implemented.

* implement avatar miniatures

close #4560

* fix(test): max file size

* fix(search-index): normalize res acc to avatarMini

* refactor avatars to an array

* client/search: resize channel avatar to 120

* refactor(client/videos): remove unused function

* client(actor-avatar): set default size

* fix tests and avatars full result

When findOne is used only an array containting one avatar is returned.

* update migration version and version notations

* server/search: harmonize normalizing

* Cleanup avatar miniature PR

Co-authored-by: Chocobozzz <me@florianbigard.com>
---
 .../account-video-channels.component.html          |   7 +-
 .../account-video-channels.component.scss          |   1 -
 client/src/app/+accounts/accounts.component.html   |   2 +-
 .../instance-account-blocklist.component.html      |  56 --
 .../video-comment-list.component.html              |   2 +-
 .../video-channel-update.component.ts              |   4 +-
 .../my-account-settings.component.ts               |   2 +-
 .../my-video-channels.component.html               |   2 +-
 .../my-video-channels.component.scss               |   1 -
 .../my-follows/my-followers.component.html         |   2 +-
 .../my-follows/my-followers.component.scss         |   2 +-
 .../my-follows/my-subscriptions.component.html     |   2 +-
 .../my-accept-ownership.component.ts               |   4 +-
 .../my-ownership/my-ownership.component.html       |   2 +-
 .../my-video-playlist-create.component.ts          |   4 +-
 .../my-video-playlist-update.component.ts          |   4 +-
 client/src/app/+search/search.component.html       |   2 +-
 client/src/app/+search/search.component.scss       |   4 -
 .../+video-channels/video-channels.component.html  |   4 +-
 .../+video-channels/video-channels.component.scss  |   4 -
 .../+video-edit/video-add-components/video-send.ts |   4 +-
 .../+videos/+video-edit/video-update.resolver.ts   |   4 +-
 .../shared/comment/video-comment.component.html    |   2 +-
 .../shared/comment/video-comment.component.scss    |   9 -
 .../metadata/video-avatar-channel.component.html   |   6 +-
 .../metadata/video-avatar-channel.component.scss   |   9 -
 .../metadata/video-avatar-channel.component.ts     |   4 -
 .../overview/video-overview.component.html         |   2 +-
 .../overview/video-overview.component.scss         |   1 -
 client/src/app/core/users/user.model.ts            |   4 +-
 client/src/app/core/users/user.service.ts          |   2 +-
 client/src/app/helpers/utils/channel.ts            |   7 +-
 .../modal/account-setup-warning-modal.component.ts |   2 +-
 .../abuse-list-table.component.html                |   2 +-
 .../actor-avatar-edit.component.ts                 |   2 +-
 .../shared-actor-image/actor-avatar.component.scss |  29 +-
 .../shared-actor-image/actor-avatar.component.ts   |  15 +-
 .../channel-miniature-markup.component.html        |   2 +-
 .../channel-miniature-markup.component.scss        |   2 -
 .../select/select-channel.component.ts             |   2 +-
 .../shared/shared-main/account/account.model.ts    |  16 +-
 .../app/shared/shared-main/account/actor.model.ts  |  20 +-
 .../misc/channels-setup-message.component.ts       |   2 +-
 .../shared-main/users/user-notification.model.ts   |   8 +-
 .../video-channel/video-channel.model.ts           |  42 +-
 .../video-channel/video-channel.service.ts         |   2 +-
 .../app/shared/shared-main/video/video.model.ts    |  12 +-
 .../account-blocklist.component.html               |   2 +-
 .../video-miniature.component.html                 |   2 +
 .../assets/images/default-avatar-account-48x48.png | Bin 0 -> 878 bytes
 .../images/default-avatar-video-channel-48x48.png  | Bin 0 -> 728 bytes
 client/src/sass/include/_account-channel-page.scss |   4 -
 client/src/sass/include/_actor.scss                |   4 +-
 client/src/sass/include/_mixins.scss               |   2 +-
 scripts/migrations/peertube-4.2.ts                 | 106 ++++
 server/controllers/activitypub/client.ts           |  15 +-
 server/controllers/api/accounts.ts                 |   2 +-
 server/controllers/api/users/me.ts                 |  19 +-
 server/controllers/api/users/my-notifications.ts   |   2 +-
 server/controllers/api/video-channel.ts            |  20 +-
 server/controllers/client.ts                       |   4 +-
 server/controllers/lazy-static.ts                  |  10 +-
 server/helpers/activitypub.ts                      |   3 +
 server/initializers/constants.ts                   |  30 +-
 .../migrations/0685-multiple-actor-images.ts       |  62 ++
 server/lib/activitypub/actors/image.ts             |  89 +--
 server/lib/activitypub/actors/shared/creator.ts    |  16 +-
 .../actors/shared/object-to-model-attributes.ts    |  56 +-
 server/lib/activitypub/actors/updater.ts           |  12 +-
 server/lib/actor-image.ts                          |  14 +
 server/lib/client-html.ts                          |  10 +-
 server/lib/local-actor.ts                          |  89 +--
 .../lib/notifier/shared/comment/comment-mention.ts |   2 +-
 .../shared/comment/new-comment-for-video-owner.ts  |   2 +-
 server/models/abuse/abuse-message.ts               |  32 +-
 server/models/account/account-blocklist.ts         |  83 ++-
 server/models/account/account-video-rate.ts        |  56 +-
 server/models/account/account.ts                   |  59 +-
 server/models/actor/actor-follow.ts                | 263 ++++----
 server/models/actor/actor-image.ts                 |  67 +-
 server/models/actor/actor.ts                       | 129 ++--
 server/models/server/plugin.ts                     |   9 +-
 server/models/server/server-blocklist.ts           |  13 +-
 server/models/shared/index.ts                      |   1 +
 server/models/shared/model-builder.ts              | 101 +++
 .../sql/user-notitication-list-query-builder.ts    | 269 ++++++++
 server/models/user/user-notification.ts            | 275 ++------
 server/models/user/user.ts                         |  13 +-
 server/models/utils.ts                             |   2 +-
 .../models/video/sql/shared/abstract-run-query.ts  |  26 -
 .../sql/shared/abstract-video-query-builder.ts     | 328 ----------
 .../video/sql/shared/video-file-query-builder.ts   |  69 --
 .../models/video/sql/shared/video-model-builder.ts | 387 ------------
 .../video/sql/shared/video-table-attributes.ts     | 269 --------
 .../video/sql/video-model-get-query-builder.ts     | 178 ------
 server/models/video/sql/video/index.ts             |   3 +
 .../video/sql/video/shared/abstract-run-query.ts   |  26 +
 .../video/shared/abstract-video-query-builder.ts   | 331 ++++++++++
 .../sql/video/shared/video-file-query-builder.ts   |  69 ++
 .../video/sql/video/shared/video-model-builder.ts  | 406 ++++++++++++
 .../sql/video/shared/video-table-attributes.ts     | 269 ++++++++
 .../sql/video/video-model-get-query-builder.ts     | 178 ++++++
 .../sql/video/videos-id-list-query-builder.ts      | 697 +++++++++++++++++++++
 .../sql/video/videos-model-list-query-builder.ts   |  80 +++
 .../video/sql/videos-id-list-query-builder.ts      | 697 ---------------------
 .../video/sql/videos-model-list-query-builder.ts   |  80 ---
 server/models/video/video-channel.ts               | 209 +++---
 server/models/video/video-comment.ts               | 102 +--
 server/models/video/video-import.ts                |  11 +-
 server/models/video/video-playlist-element.ts      |  36 +-
 server/models/video/video-playlist.ts              |  98 ++-
 server/models/video/video-share.ts                 |   5 +-
 server/models/video/video.ts                       |  18 +-
 server/tests/api/check-params/video-channels.ts    |   2 +-
 server/tests/api/moderation/abuses.ts              |   7 +-
 server/tests/api/moderation/blocklist.ts           |   4 +-
 server/tests/api/moderation/video-blacklist.ts     |   2 +
 .../tests/api/notifications/notifications-api.ts   |  10 +
 .../search/search-activitypub-video-channels.ts    |   4 +
 .../search/search-activitypub-video-playlists.ts   |   2 +
 .../tests/api/search/search-activitypub-videos.ts  |   4 +
 server/tests/api/search/search-channels.ts         |   8 +-
 server/tests/api/search/search-index.ts            |  14 +-
 server/tests/api/search/search-playlists.ts        |   6 +-
 server/tests/api/search/search-videos.ts           |   8 +-
 server/tests/api/server/homepage.ts                |   6 +-
 server/tests/api/users/user-subscriptions.ts       |   4 +
 server/tests/api/users/users-multiple-servers.ts   |  18 +-
 server/tests/api/users/users.ts                    |   8 +-
 server/tests/api/videos/multiple-servers.ts        |   7 +-
 server/tests/api/videos/single-server.ts           |  11 +-
 server/tests/api/videos/video-channels.ts          |  32 +-
 server/tests/api/videos/video-comments.ts          |  17 +-
 server/tests/api/videos/video-playlists.ts         |   2 +
 server/tests/api/videos/videos-common-filters.ts   |   4 +-
 server/tests/cli/prune-storage.ts                  |  29 +-
 server/tests/feeds/feeds.ts                        |   4 +-
 server/tests/fixtures/avatar-resized-120x120.gif   | Bin 0 -> 88318 bytes
 server/tests/fixtures/avatar-resized-120x120.png   | Bin 0 -> 1727 bytes
 server/tests/fixtures/avatar-resized-48x48.gif     | Bin 0 -> 20462 bytes
 server/tests/fixtures/avatar-resized-48x48.png     | Bin 0 -> 727 bytes
 server/tests/fixtures/avatar-resized.gif           | Bin 88318 -> 0 bytes
 server/tests/fixtures/avatar-resized.png           | Bin 1727 -> 0 bytes
 server/tests/fixtures/avatar2-resized-120x120.png  | Bin 0 -> 1725 bytes
 server/tests/fixtures/avatar2-resized-48x48.png    | Bin 0 -> 760 bytes
 server/tests/fixtures/avatar2-resized.png          | Bin 1725 -> 0 bytes
 server/tests/shared/notifications.ts               |  11 +-
 server/types/models/actor/actor-image.ts           |   2 +-
 server/types/models/actor/actor.ts                 |  37 +-
 server/types/models/user/user-notification.ts      |   9 +-
 shared/models/activitypub/activitypub-actor.ts     |   7 +-
 shared/models/actors/account.model.ts              |   7 +-
 shared/models/actors/actor-image.model.ts          |   1 +
 shared/models/actors/actor.model.ts                |   6 +-
 shared/models/users/user-notification.model.ts     |  11 +-
 .../models/videos/channel/video-channel.model.ts   |  13 +-
 shared/server-commands/users/accounts.ts           |  15 +
 shared/server-commands/users/index.ts              |   1 +
 shared/server-commands/videos/channels.ts          |  13 +-
 support/doc/api/openapi.yaml                       | 131 ++--
 support/nginx/peertube                             |   2 +-
 161 files changed, 4037 insertions(+), 3286 deletions(-)
 delete mode 100644 client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
 create mode 100644 client/src/assets/images/default-avatar-account-48x48.png
 create mode 100644 client/src/assets/images/default-avatar-video-channel-48x48.png
 create mode 100644 scripts/migrations/peertube-4.2.ts
 create mode 100644 server/initializers/migrations/0685-multiple-actor-images.ts
 create mode 100644 server/lib/actor-image.ts
 create mode 100644 server/models/shared/model-builder.ts
 create mode 100644 server/models/user/sql/user-notitication-list-query-builder.ts
 delete mode 100644 server/models/video/sql/shared/abstract-run-query.ts
 delete mode 100644 server/models/video/sql/shared/abstract-video-query-builder.ts
 delete mode 100644 server/models/video/sql/shared/video-file-query-builder.ts
 delete mode 100644 server/models/video/sql/shared/video-model-builder.ts
 delete mode 100644 server/models/video/sql/shared/video-table-attributes.ts
 delete mode 100644 server/models/video/sql/video-model-get-query-builder.ts
 create mode 100644 server/models/video/sql/video/index.ts
 create mode 100644 server/models/video/sql/video/shared/abstract-run-query.ts
 create mode 100644 server/models/video/sql/video/shared/abstract-video-query-builder.ts
 create mode 100644 server/models/video/sql/video/shared/video-file-query-builder.ts
 create mode 100644 server/models/video/sql/video/shared/video-model-builder.ts
 create mode 100644 server/models/video/sql/video/shared/video-table-attributes.ts
 create mode 100644 server/models/video/sql/video/video-model-get-query-builder.ts
 create mode 100644 server/models/video/sql/video/videos-id-list-query-builder.ts
 create mode 100644 server/models/video/sql/video/videos-model-list-query-builder.ts
 delete mode 100644 server/models/video/sql/videos-id-list-query-builder.ts
 delete mode 100644 server/models/video/sql/videos-model-list-query-builder.ts
 create mode 100644 server/tests/fixtures/avatar-resized-120x120.gif
 create mode 100644 server/tests/fixtures/avatar-resized-120x120.png
 create mode 100644 server/tests/fixtures/avatar-resized-48x48.gif
 create mode 100644 server/tests/fixtures/avatar-resized-48x48.png
 delete mode 100644 server/tests/fixtures/avatar-resized.gif
 delete mode 100644 server/tests/fixtures/avatar-resized.png
 create mode 100644 server/tests/fixtures/avatar2-resized-120x120.png
 create mode 100644 server/tests/fixtures/avatar2-resized-48x48.png
 delete mode 100644 server/tests/fixtures/avatar2-resized.png
 create mode 100644 shared/server-commands/users/accounts.ts

diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
index 105bc12c3..379c0443e 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
@@ -9,8 +9,11 @@
 
       <div class="channel-avatar-row">
         <my-actor-avatar
-          [channel]="videoChannel" [internalHref]="getVideoChannelLink(videoChannel)"
-          i18n-title title="See this video channel"
+          [channel]="videoChannel"
+          [internalHref]="getVideoChannelLink(videoChannel)"
+          i18n-title
+          title="See this video channel"
+          size="75"
         ></my-actor-avatar>
 
         <h2>
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
index be9e94f69..30b8098be 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
@@ -29,7 +29,6 @@
   grid-template-rows: auto 1fr;
 
   my-actor-avatar {
-    @include actor-avatar-size(75px);
     @include margin-right(15px);
 
     grid-column: 1;
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 8362e6b7e..1544ad034 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -2,7 +2,7 @@
   <div class="account-info">
 
     <div class="account-avatar-row">
-      <my-actor-avatar class="main-avatar" [account]="account"></my-actor-avatar>
+      <my-actor-avatar class="main-avatar" [account]="account" size="120"></my-actor-avatar>
 
       <div>
         <div class="section-label" i18n>ACCOUNT</div>
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
deleted file mode 100644
index feade0c26..000000000
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<p-table
-  [value]="blockedAccounts" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
-  [sortField]="sort.field" [sortOrder]="sort.order"
-  [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false"
-  [showCurrentPageReport]="true" i18n-currentPageReportTemplate
-  currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} muted accounts"
->
-  <ng-template pTemplate="caption">
-    <div class="caption">
-      <div class="ml-auto">
-        <my-advanced-input-filter (search)="onSearch($event)"></my-advanced-input-filter>
-      </div>
-    </div>
-  </ng-template>
-
-  <ng-template pTemplate="header">
-    <tr>
-      <th style="width: 150px;">Action</th> <!-- column for action buttons -->
-      <th style="width: calc(100% - 300px);" i18n>Account</th>
-      <th style="width: 150px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th>
-    </tr>
-  </ng-template>
-
-  <ng-template pTemplate="body" let-accountBlock>
-    <tr>
-      <td class="action-cell">
-        <button class="unblock-button" (click)="unblockAccount(accountBlock)" i18n>Unmute</button>
-      </td>
-
-      <td>
-        <a [href]="accountBlock.blockedAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer">
-          <div class="chip two-lines">
-            <my-actor-avatar [account]="accountBlock.blockedAccount"></my-actor-avatar>
-            <div>
-              {{ accountBlock.blockedAccount.displayName }}
-              <span class="text-muted">{{ accountBlock.blockedAccount.nameWithHost }}</span>
-            </div>
-          </div>
-        </a>
-      </td>
-
-      <td>{{ accountBlock.createdAt | date: 'short' }}</td>
-    </tr>
-  </ng-template>
-
-  <ng-template pTemplate="emptymessage">
-    <tr>
-      <td colspan="6">
-        <div class="no-results">
-          <ng-container *ngIf="search" i18n>No account found matching current filters.</ng-container>
-          <ng-container *ngIf="!search" i18n>No account found.</ng-container>
-        </div>
-      </td>
-    </tr>
-  </ng-template>
-</p-table>
diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html
index 9bf23c21a..0dbbbe1cc 100644
--- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html
+++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html
@@ -66,7 +66,7 @@
       <td>
         <a [href]="videoComment.account.localUrl" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer">
           <div class="chip two-lines">
-            <my-actor-avatar [account]="videoComment.account"></my-actor-avatar>
+            <my-actor-avatar [account]="videoComment.account" size="32"></my-actor-avatar>
           <div>
               {{ videoComment.account.displayName }}
               <span>{{ videoComment.by }}</span>
diff --git a/client/src/app/+manage/video-channel-edit/video-channel-update.component.ts b/client/src/app/+manage/video-channel-edit/video-channel-update.component.ts
index 21b6167b2..51cd45605 100644
--- a/client/src/app/+manage/video-channel-edit/video-channel-update.component.ts
+++ b/client/src/app/+manage/video-channel-edit/video-channel-update.component.ts
@@ -111,7 +111,7 @@ export class VideoChannelUpdateComponent extends VideoChannelEdit implements OnI
           next: data => {
             this.notifier.success($localize`Avatar changed.`)
 
-            this.videoChannel.updateAvatar(data.avatar)
+            this.videoChannel.updateAvatar(data.avatars)
           },
 
           error: (err: HttpErrorResponse) => genericUploadErrorHandler({
@@ -141,7 +141,7 @@ export class VideoChannelUpdateComponent extends VideoChannelEdit implements OnI
           next: data => {
             this.notifier.success($localize`Banner changed.`)
 
-            this.videoChannel.updateBanner(data.banner)
+            this.videoChannel.updateBanner(data.banners)
           },
 
           error: (err: HttpErrorResponse) => genericUploadErrorHandler({
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
index a5bcb6496..577f4a252 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
@@ -43,7 +43,7 @@ export class MyAccountSettingsComponent implements OnInit, AfterViewChecked {
         next: data => {
           this.notifier.success($localize`Avatar changed.`)
 
-          this.user.updateAccountAvatar(data.avatar)
+          this.user.updateAccountAvatar(data.avatars)
         },
 
         error: (err: HttpErrorResponse) => genericUploadErrorHandler({
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html
index 77947315b..c1ded0f6d 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html
+++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html
@@ -19,7 +19,7 @@
 
 <div class="video-channels">
   <div *ngFor="let videoChannel of videoChannels; let i = index" class="video-channel">
-    <my-actor-avatar [channel]="videoChannel" [internalHref]="[ '/c', videoChannel.nameWithHost ]"></my-actor-avatar>
+    <my-actor-avatar [channel]="videoChannel" [internalHref]="[ '/c', videoChannel.nameWithHost ]" size="80"></my-actor-avatar>
 
     <div class="video-channel-info">
       <a [routerLink]="[ '/c', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Channel page">
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.scss b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.scss
index 998e46cb2..484355967 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.scss
+++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.scss
@@ -24,7 +24,6 @@ my-edit-button {
   padding-bottom: 0;
 
   my-actor-avatar {
-    @include actor-avatar-size(80px);
     @include margin-right(10px);
   }
 }
diff --git a/client/src/app/+my-library/my-follows/my-followers.component.html b/client/src/app/+my-library/my-follows/my-followers.component.html
index eac750c86..4303695a3 100644
--- a/client/src/app/+my-library/my-follows/my-followers.component.html
+++ b/client/src/app/+my-library/my-follows/my-followers.component.html
@@ -14,7 +14,7 @@
 
 <div class="actors" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()">
   <div *ngFor="let follow of follows" class="actor">
-    <my-actor-avatar [account]="follow.follower" [href]="follow.follower.url"></my-actor-avatar>
+    <my-actor-avatar [account]="follow.follower" [href]="follow.follower.url" size="40"></my-actor-avatar>
 
     <div class="actor-info">
       <a [href]="follow.follower.url" class="actor-names" rel="noopener noreferrer" target="_blank" i18n-title title="Follower page">
diff --git a/client/src/app/+my-library/my-follows/my-followers.component.scss b/client/src/app/+my-library/my-follows/my-followers.component.scss
index 15b51c419..fae4cd972 100644
--- a/client/src/app/+my-library/my-follows/my-followers.component.scss
+++ b/client/src/app/+my-library/my-follows/my-followers.component.scss
@@ -12,7 +12,7 @@ input[type=text] {
 }
 
 .actor {
-  @include actor-row($avatar-size: 40px, $min-height: auto, $separator: true);
+  @include actor-row($min-height: auto, $separator: true);
 
   .actor-display-name {
     font-size: 16px;
diff --git a/client/src/app/+my-library/my-follows/my-subscriptions.component.html b/client/src/app/+my-library/my-follows/my-subscriptions.component.html
index 775f0e783..391c4d3be 100644
--- a/client/src/app/+my-library/my-follows/my-subscriptions.component.html
+++ b/client/src/app/+my-library/my-follows/my-subscriptions.component.html
@@ -14,7 +14,7 @@
 
 <div class="actors" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()">
   <div *ngFor="let videoChannel of videoChannels" class="actor">
-    <my-actor-avatar [channel]="videoChannel" [internalHref]="[ '/c', videoChannel.nameWithHost ]"></my-actor-avatar>
+    <my-actor-avatar [channel]="videoChannel" [internalHref]="[ '/c', videoChannel.nameWithHost ]" size="80"></my-actor-avatar>
 
     <div class="actor-info">
       <a [routerLink]="[ '/c', videoChannel.nameWithHost ]" class="actor-names" i18n-title title="Channel page">
diff --git a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
index 764da2369..8ead237c7 100644
--- a/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
+++ b/client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
@@ -1,7 +1,7 @@
 import { SelectChannelItem } from 'src/types/select-options-item.model'
 import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'
 import { AuthService, Notifier } from '@app/core'
-import { listUserChannels } from '@app/helpers'
+import { listUserChannelsForSelect } from '@app/helpers'
 import { OWNERSHIP_CHANGE_CHANNEL_VALIDATOR } from '@app/shared/form-validators/video-ownership-change-validators'
 import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
 import { VideoOwnershipService } from '@app/shared/shared-main'
@@ -36,7 +36,7 @@ export class MyAcceptOwnershipComponent extends FormReactive implements OnInit {
   ngOnInit () {
     this.videoChannels = []
 
-    listUserChannels(this.authService)
+    listUserChannelsForSelect(this.authService)
       .subscribe(channels => this.videoChannels = channels)
 
     this.buildForm({
diff --git a/client/src/app/+my-library/my-ownership/my-ownership.component.html b/client/src/app/+my-library/my-ownership/my-ownership.component.html
index 4c02c78fc..cb032505e 100644
--- a/client/src/app/+my-library/my-ownership/my-ownership.component.html
+++ b/client/src/app/+my-library/my-ownership/my-ownership.component.html
@@ -37,7 +37,7 @@
       <td>
         <a [href]="videoChangeOwnership.initiatorAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer">
           <div class="chip two-lines">
-            <my-actor-avatar [account]="videoChangeOwnership.initiatorAccount"></my-actor-avatar>
+            <my-actor-avatar [account]="videoChangeOwnership.initiatorAccount" size="32"></my-actor-avatar>
             <div>
               {{ videoChangeOwnership.initiatorAccount.displayName }}
               <span class="text-muted">{{ videoChangeOwnership.initiatorAccount.nameWithHost }}</span>
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts
index 8bc78b2db..9eb3e9888 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
 import { AuthService, Notifier, ServerService } from '@app/core'
-import { listUserChannels } from '@app/helpers'
+import { listUserChannelsForSelect } from '@app/helpers'
 import {
   setPlaylistChannelValidator,
   VIDEO_PLAYLIST_CHANNEL_ID_VALIDATOR,
@@ -46,7 +46,7 @@ export class MyVideoPlaylistCreateComponent extends MyVideoPlaylistEdit implemen
       setPlaylistChannelValidator(this.form.get('videoChannelId'), privacy)
     })
 
-    listUserChannels(this.authService)
+    listUserChannelsForSelect(this.authService)
       .subscribe(channels => this.userVideoChannels = channels)
 
     this.serverService.getVideoPlaylistPrivacies()
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts
index 06ac3ad50..ef7ba0018 100644
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts
@@ -3,7 +3,7 @@ import { map, switchMap } from 'rxjs/operators'
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, Notifier, ServerService } from '@app/core'
-import { listUserChannels } from '@app/helpers'
+import { listUserChannelsForSelect } from '@app/helpers'
 import {
   setPlaylistChannelValidator,
   VIDEO_PLAYLIST_CHANNEL_ID_VALIDATOR,
@@ -51,7 +51,7 @@ export class MyVideoPlaylistUpdateComponent extends MyVideoPlaylistEdit implemen
       setPlaylistChannelValidator(this.form.get('videoChannelId'), privacy)
     })
 
-    listUserChannels(this.authService)
+    listUserChannelsForSelect(this.authService)
       .subscribe(channels => this.userVideoChannels = channels)
 
     this.paramsSub = this.route.params
diff --git a/client/src/app/+search/search.component.html b/client/src/app/+search/search.component.html
index 412b962d1..2c84dd930 100644
--- a/client/src/app/+search/search.component.html
+++ b/client/src/app/+search/search.component.html
@@ -36,7 +36,7 @@
   <ng-container *ngFor="let result of results">
     <div *ngIf="isVideoChannel(result)" class="entry video-channel">
 
-      <my-actor-avatar [channel]="result" [internalHref]="getInternalChannelUrl(result)" [href]="getExternalChannelUrl(result)"></my-actor-avatar>
+      <my-actor-avatar [channel]="result" [internalHref]="getInternalChannelUrl(result)" [href]="getExternalChannelUrl(result)" size="120"></my-actor-avatar>
 
       <div class="video-channel-info">
         <a *ngIf="!isExternalChannelUrl()" [routerLink]="getInternalChannelUrl(result)" class="video-channel-names">
diff --git a/client/src/app/+search/search.component.scss b/client/src/app/+search/search.component.scss
index b521825e5..cab1d0e88 100644
--- a/client/src/app/+search/search.component.scss
+++ b/client/src/app/+search/search.component.scss
@@ -58,10 +58,6 @@
   max-width: 800px;
 }
 
-.video-channel my-actor-avatar {
-  @include build-channel-img-size($video-thumbnail-width);
-}
-
 .video-channel-info {
   flex-grow: 1;
   margin: 0 10px;
diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html
index 212e2f867..09f81d2ce 100644
--- a/client/src/app/+video-channels/video-channels.component.html
+++ b/client/src/app/+video-channels/video-channels.component.html
@@ -23,7 +23,7 @@
         <div class="section-label" i18n>OWNER ACCOUNT</div>
 
         <div class="avatar-row">
-          <my-actor-avatar class="account-avatar" [account]="ownerAccount" [internalHref]="getAccountUrl()"></my-actor-avatar>
+          <my-actor-avatar class="account-avatar" [account]="ownerAccount" [internalHref]="getAccountUrl()" size="48"></my-actor-avatar>
 
           <div class="actor-info">
             <h4>
@@ -51,7 +51,7 @@
     </ng-template>
 
     <div class="channel-avatar-row">
-      <my-actor-avatar class="main-avatar" [channel]="videoChannel"></my-actor-avatar>
+      <my-actor-avatar class="main-avatar" [channel]="videoChannel" size="120"></my-actor-avatar>
 
       <div>
         <div class="section-label" i18n>VIDEO CHANNEL</div>
diff --git a/client/src/app/+video-channels/video-channels.component.scss b/client/src/app/+video-channels/video-channels.component.scss
index 72ee2d7bb..004ad7998 100644
--- a/client/src/app/+video-channels/video-channels.component.scss
+++ b/client/src/app/+video-channels/video-channels.component.scss
@@ -107,10 +107,6 @@
     display: flex;
     margin-bottom: 15px;
 
-    .account-avatar {
-      @include actor-avatar-size(48px);
-    }
-
     .actor-info {
       @include margin-left(15px);
     }
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-send.ts b/client/src/app/+videos/+video-edit/video-add-components/video-send.ts
index 3d0e1bf2a..9de373cd3 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-send.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-send.ts
@@ -2,7 +2,7 @@ import { catchError, switchMap, tap } from 'rxjs/operators'
 import { SelectChannelItem } from 'src/types/select-options-item.model'
 import { Directive, EventEmitter, OnInit } from '@angular/core'
 import { AuthService, CanComponentDeactivateResult, Notifier, ServerService } from '@app/core'
-import { listUserChannels } from '@app/helpers'
+import { listUserChannelsForSelect } from '@app/helpers'
 import { FormReactive } from '@app/shared/shared-forms'
 import { VideoCaptionEdit, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main'
 import { LoadingBarService } from '@ngx-loading-bar/core'
@@ -38,7 +38,7 @@ export abstract class VideoSend extends FormReactive implements OnInit {
   ngOnInit () {
     this.buildForm({})
 
-    listUserChannels(this.authService)
+    listUserChannelsForSelect(this.authService)
       .subscribe(channels => {
         this.userVideoChannels = channels
         this.firstStepChannelId = this.userVideoChannels[0].id
diff --git a/client/src/app/+videos/+video-edit/video-update.resolver.ts b/client/src/app/+videos/+video-edit/video-update.resolver.ts
index 91e76b7fe..82dae5c1c 100644
--- a/client/src/app/+videos/+video-edit/video-update.resolver.ts
+++ b/client/src/app/+videos/+video-edit/video-update.resolver.ts
@@ -3,7 +3,7 @@ import { map, switchMap } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
 import { AuthService } from '@app/core'
-import { listUserChannels } from '@app/helpers'
+import { listUserChannelsForSelect } from '@app/helpers'
 import { VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main'
 import { LiveVideoService } from '@app/shared/shared-video-live'
 
@@ -33,7 +33,7 @@ export class VideoUpdateResolver implements Resolve<any> {
         .loadCompleteDescription(video.descriptionPath)
         .pipe(map(description => Object.assign(video, { description }))),
 
-      listUserChannels(this.authService),
+      listUserChannelsForSelect(this.authService),
 
       this.videoCaptionService
         .listCaptions(video.id)
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html
index d0e9bcd29..5014b9692 100644
--- a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="isCommentDisplayed()" class="root-comment" [ngClass]="{ 'is-child': isChild() }">
   <div class="left">
-    <my-actor-avatar *ngIf="!comment.isDeleted" [href]="comment.account.url" [account]="comment.account"></my-actor-avatar>
+    <my-actor-avatar *ngIf="!comment.isDeleted" [href]="comment.account.url" [account]="comment.account" [size]="isChild() ? '25' : '36'"></my-actor-avatar>
     <div class="vertical-border"></div>
   </div>
 
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.scss
index 87e313d41..54f828014 100644
--- a/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.scss
@@ -25,10 +25,6 @@
   }
 }
 
-my-actor-avatar {
-  @include actor-avatar-size(36px);
-}
-
 .comment {
   flex-grow: 1;
   // Fix word-wrap with flex
@@ -160,11 +156,6 @@ my-video-comment-add {
 }
 
 .is-child {
-  // Reduce avatars size for replies
-  my-actor-avatar {
-    @include actor-avatar-size(25px);
-  }
-
   .left {
     @include margin-right(6px);
   }
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html
index d433c7aba..a23152b67 100644
--- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html
@@ -2,19 +2,19 @@
   <my-actor-avatar
     *ngIf="showChannel"
     class="channel"
-    [class.main-avatar]="showChannel"
     [channel]="video.channel"
     [internalHref]="[ '/c', video.byVideoChannel ]"
     [title]="channelLinkTitle"
+    size="35"
   ></my-actor-avatar>
 
   <my-actor-avatar
     *ngIf="showAccount"
     class="account"
-    [class.main-avatar]="!showChannel"
     [class.second-avatar]="showChannel"
     [account]="video.account"
     [internalHref]="[ '/a', video.byAccount ]"
-    [title]="accountLinkTitle">
+    [title]="accountLinkTitle"
+    size="35">
   </my-actor-avatar>
 </div>
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss
index 71c5e4b5a..80711ff32 100644
--- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss
@@ -1,9 +1,5 @@
 @use '_mixins' as *;
 
-@mixin main {
-  @include actor-avatar-size(35px);
-}
-
 @mixin secondary {
   height: 60%;
   width: 60%;
@@ -14,16 +10,11 @@
 }
 
 .wrapper {
-  @include actor-avatar-size(35px);
   @include margin-right(5px);
 
   position: relative;
   margin-bottom: 5px;
 
-  .main-avatar {
-    @include main();
-  }
-
   .second-avatar {
     @include secondary();
   }
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts
index 146c440b3..4bfc7bd9d 100644
--- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts
@@ -20,8 +20,4 @@ export class VideoAvatarChannelComponent implements OnInit {
     this.channelLinkTitle = $localize`${this.video.account.name} (channel page)`
     this.accountLinkTitle = $localize`${this.video.byAccount} (account page)`
   }
-
-  isChannelAvatarNull () {
-    return this.video.channel.avatar === null
-  }
 }
diff --git a/client/src/app/+videos/video-list/overview/video-overview.component.html b/client/src/app/+videos/video-list/overview/video-overview.component.html
index 1a715560c..f250c2407 100644
--- a/client/src/app/+videos/video-list/overview/video-overview.component.html
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.html
@@ -33,7 +33,7 @@
       <div class="section channel videos" *ngFor="let object of overview.channels">
         <div class="section-title">
           <a [routerLink]="[ '/c', buildVideoChannelBy(object) ]">
-            <my-actor-avatar [channel]="buildVideoChannel(object)"></my-actor-avatar>
+            <my-actor-avatar [channel]="buildVideoChannel(object)" size="28"></my-actor-avatar>
 
             <h2 class="section-title">{{ object.channel.displayName }}</h2>
           </a>
diff --git a/client/src/app/+videos/video-list/overview/video-overview.component.scss b/client/src/app/+videos/video-list/overview/video-overview.component.scss
index 2239d1913..8b2aa88f2 100644
--- a/client/src/app/+videos/video-list/overview/video-overview.component.scss
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.scss
@@ -52,7 +52,6 @@
         align-items: center;
 
         my-actor-avatar {
-          @include actor-avatar-size(28px);
           @include margin-right(8px);
 
           font-size: initial;
diff --git a/client/src/app/core/users/user.model.ts b/client/src/app/core/users/user.model.ts
index f211051ce..6ba30e4b8 100644
--- a/client/src/app/core/users/user.model.ts
+++ b/client/src/app/core/users/user.model.ts
@@ -132,8 +132,8 @@ export class User implements UserServerModel {
     }
   }
 
-  updateAccountAvatar (newAccountAvatar?: ActorImage) {
-    if (newAccountAvatar) this.account.updateAvatar(newAccountAvatar)
+  updateAccountAvatar (newAccountAvatars?: ActorImage[]) {
+    if (newAccountAvatars) this.account.updateAvatar(newAccountAvatars)
     else this.account.resetAvatar()
   }
 
diff --git a/client/src/app/core/users/user.service.ts b/client/src/app/core/users/user.service.ts
index b14bff193..b4024c02d 100644
--- a/client/src/app/core/users/user.service.ts
+++ b/client/src/app/core/users/user.service.ts
@@ -118,7 +118,7 @@ export class UserService {
   changeAvatar (avatarForm: FormData) {
     const url = UserService.BASE_USERS_URL + 'me/avatar/pick'
 
-    return this.authHttp.post<{ avatar: ActorImage }>(url, avatarForm)
+    return this.authHttp.post<{ avatars: ActorImage[] }>(url, avatarForm)
                .pipe(catchError(err => this.restExtractor.handleError(err)))
   }
 
diff --git a/client/src/app/helpers/utils/channel.ts b/client/src/app/helpers/utils/channel.ts
index 93863a8af..2cd56d6e6 100644
--- a/client/src/app/helpers/utils/channel.ts
+++ b/client/src/app/helpers/utils/channel.ts
@@ -1,8 +1,9 @@
+import { minBy } from 'lodash-es'
 import { first, map } from 'rxjs/operators'
 import { SelectChannelItem } from 'src/types/select-options-item.model'
 import { AuthService } from '../../core/auth'
 
-function listUserChannels (authService: AuthService) {
+function listUserChannelsForSelect (authService: AuthService) {
   return authService.userInformationLoaded
     .pipe(
       first(),
@@ -23,12 +24,12 @@ function listUserChannels (authService: AuthService) {
             id: c.id,
             label: c.displayName,
             support: c.support,
-            avatarPath: c.avatar?.path
+            avatarPath: minBy(c.avatars, 'width')[0]?.path
           }) as SelectChannelItem)
       })
     )
 }
 
 export {
-  listUserChannels
+  listUserChannelsForSelect
 }
diff --git a/client/src/app/modal/account-setup-warning-modal.component.ts b/client/src/app/modal/account-setup-warning-modal.component.ts
index c78de447d..c4cbf92b6 100644
--- a/client/src/app/modal/account-setup-warning-modal.component.ts
+++ b/client/src/app/modal/account-setup-warning-modal.component.ts
@@ -32,7 +32,7 @@ export class AccountSetupWarningModalComponent {
   }
 
   hasAccountAvatar (user: User) {
-    return !!user.account.avatar
+    return user.account.avatars.length !== 0
   }
 
   hasAccountDescription (user: User) {
diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html
index 07cc73461..f0a27c6e2 100644
--- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html
+++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html
@@ -43,7 +43,7 @@
       <td *ngIf="isAdminView()">
         <a *ngIf="abuse.reporterAccount" [href]="abuse.reporterAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer">
           <div class="chip two-lines">
-            <my-actor-avatar [account]="abuse.reporterAccount"></my-actor-avatar>
+            <my-actor-avatar [account]="abuse.reporterAccount" size="32"></my-actor-avatar>
             <div>
               {{ abuse.reporterAccount.displayName }}
               <span>{{ abuse.reporterAccount.nameWithHost }}</span>
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
index 8b7d64ed3..01bb401fb 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.ts
@@ -72,7 +72,7 @@ export class ActorAvatarEditComponent implements OnInit {
   }
 
   hasAvatar () {
-    return !!this.preview || !!this.actor.avatar
+    return !!this.preview || this.actor.avatars.length !== 0
   }
 
   isChannel () {
diff --git a/client/src/app/shared/shared-actor-image/actor-avatar.component.scss b/client/src/app/shared/shared-actor-image/actor-avatar.component.scss
index a2424b593..68bf74553 100644
--- a/client/src/app/shared/shared-actor-image/actor-avatar.component.scss
+++ b/client/src/app/shared/shared-actor-image/actor-avatar.component.scss
@@ -20,38 +20,23 @@
   }
 }
 
-.avatar-18 {
-  --avatarSize: 18px;
-  --initialFontSize: 13px;
-}
+$sizes: '18', '25', '28', '32', '34', '35', '36', '40', '48', '75', '80', '100', '120';
 
-.avatar-25 {
-  --avatarSize: 25px;
+@each $size in $sizes {
+  .avatar-#{$size} {
+    --avatarSize: #{$size}px;
+  }  
 }
 
-.avatar-32 {
-  --avatarSize: 32px;
-}
-
-.avatar-34 {
-  --avatarSize: 34px;
-}
-
-.avatar-36 {
-  --avatarSize: 36px;
-}
-
-.avatar-40 {
-  --avatarSize: 40px;
+.avatar-18 {
+  --initialFontSize: 13px;
 }
 
 .avatar-100 {
-  --avatarSize: 100px;
   --initialFontSize: 40px;
 }
 
 .avatar-120 {
-  --avatarSize: 120px;
   --initialFontSize: 46px;
 }
 
diff --git a/client/src/app/shared/shared-actor-image/actor-avatar.component.ts b/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
index c323dc724..bc7e8a096 100644
--- a/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
+++ b/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
@@ -4,11 +4,11 @@ import { Account } from '../shared-main/account/account.model'
 
 type ActorInput = {
   name: string
-  avatar?: { url?: string, path: string }
+  avatars: { width: number, url?: string, path: string }[]
   url: string
 }
 
-export type ActorAvatarSize = '18' | '25' | '32' | '34' | '36' | '40' | '100' | '120'
+export type ActorAvatarSize = '18' | '25' | '28' | '32' | '34' | '35' | '36' | '40' | '48' | '75' | '80' | '100' | '120'
 
 @Component({
   selector: 'my-actor-avatar',
@@ -23,7 +23,7 @@ export class ActorAvatarComponent {
 
   @Input() previewImage: string
 
-  @Input() size: ActorAvatarSize
+  @Input() size: ActorAvatarSize = '32'
 
   // Use an external link
   @Input() href: string
@@ -50,14 +50,13 @@ export class ActorAvatarComponent {
   }
 
   get defaultAvatarUrl () {
-    if (this.channel) return VideoChannel.GET_DEFAULT_AVATAR_URL()
-
-    return Account.GET_DEFAULT_AVATAR_URL()
+    if (this.account) return Account.GET_DEFAULT_AVATAR_URL(+this.size)
+    if (this.channel) return VideoChannel.GET_DEFAULT_AVATAR_URL(+this.size)
   }
 
   get avatarUrl () {
-    if (this.account) return Account.GET_ACTOR_AVATAR_URL(this.account)
-    if (this.channel) return VideoChannel.GET_ACTOR_AVATAR_URL(this.channel)
+    if (this.account) return Account.GET_ACTOR_AVATAR_URL(this.account, +this.size)
+    if (this.channel) return VideoChannel.GET_ACTOR_AVATAR_URL(this.channel, +this.size)
 
     return ''
   }
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.html b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.html
index de150aac9..52a402329 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.html
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="channel" class="channel">
 
   <div class="channel-avatar-row">
-    <my-actor-avatar [channel]="channel" [internalHref]="getVideoChannelLink()" i18n-title title="See this video channel"></my-actor-avatar>
+    <my-actor-avatar [channel]="channel" [internalHref]="getVideoChannelLink()" i18n-title title="See this video channel" size="75"></my-actor-avatar>
 
     <h6>
       <a [routerLink]="getVideoChannelLink()" i18n-title title="See this video channel">
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss
index 39e8d2091..e8ef478d9 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.scss
@@ -26,8 +26,6 @@
   }
 
   my-actor-avatar {
-    @include actor-avatar-size(75px);
-
     grid-column: 1;
     grid-row: 1 / 4;
   }
diff --git a/client/src/app/shared/shared-forms/select/select-channel.component.ts b/client/src/app/shared/shared-forms/select/select-channel.component.ts
index 40a7c53bb..5fcae0050 100644
--- a/client/src/app/shared/shared-forms/select/select-channel.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-channel.component.ts
@@ -31,7 +31,7 @@ export class SelectChannelComponent implements ControlValueAccessor, OnChanges {
     this.channels = this.items.map(c => {
       const avatarPath = c.avatarPath
         ? c.avatarPath
-        : VideoChannel.GET_DEFAULT_AVATAR_URL()
+        : VideoChannel.GET_DEFAULT_AVATAR_URL(20)
 
       return Object.assign({}, c, { avatarPath })
     })
diff --git a/client/src/app/shared/shared-main/account/account.model.ts b/client/src/app/shared/shared-main/account/account.model.ts
index 8b78d01a6..a26a9c11c 100644
--- a/client/src/app/shared/shared-main/account/account.model.ts
+++ b/client/src/app/shared/shared-main/account/account.model.ts
@@ -17,11 +17,15 @@ export class Account extends Actor implements ServerAccount {
 
   userId?: number
 
-  static GET_ACTOR_AVATAR_URL (actor: { avatar?: { url?: string, path: string } }) {
-    return Actor.GET_ACTOR_AVATAR_URL(actor)
+  static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size: number) {
+    return Actor.GET_ACTOR_AVATAR_URL(actor, size)
   }
 
-  static GET_DEFAULT_AVATAR_URL () {
+  static GET_DEFAULT_AVATAR_URL (size: number) {
+    if (size <= 48) {
+      return `${window.location.origin}/client/assets/images/default-avatar-account-48x48.png`
+    }
+
     return `${window.location.origin}/client/assets/images/default-avatar-account.png`
   }
 
@@ -42,12 +46,12 @@ export class Account extends Actor implements ServerAccount {
     this.mutedServerByInstance = false
   }
 
-  updateAvatar (newAvatar: ActorImage) {
-    this.avatar = newAvatar
+  updateAvatar (newAvatars: ActorImage[]) {
+    this.avatars = newAvatars
   }
 
   resetAvatar () {
-    this.avatar = null
+    this.avatars = []
   }
 
   updateBlockStatus (blockStatus: BlockStatus) {
diff --git a/client/src/app/shared/shared-main/account/actor.model.ts b/client/src/app/shared/shared-main/account/actor.model.ts
index 082f44fb9..a54f51aa4 100644
--- a/client/src/app/shared/shared-main/account/actor.model.ts
+++ b/client/src/app/shared/shared-main/account/actor.model.ts
@@ -13,20 +13,22 @@ export abstract class Actor implements ServerActor {
 
   createdAt: Date | string
 
-  avatar: ActorImage
+  // TODO: remove, deprecated in 4.2
+  avatar: never
+
+  avatars: ActorImage[]
 
   isLocal: boolean
 
-  static GET_ACTOR_AVATAR_URL (actor: { avatar?: { url?: string, path: string } }) {
-    if (actor?.avatar?.url) return actor.avatar.url
+  static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size: number) {
+    const avatar = actor.avatars.sort((a, b) => a.width - b.width).find(a => a.width >= size)
 
-    if (actor?.avatar) {
-      const absoluteAPIUrl = getAbsoluteAPIUrl()
+    if (!avatar) return ''
+    if (avatar.url) return avatar.url
 
-      return absoluteAPIUrl + actor.avatar.path
-    }
+    const absoluteAPIUrl = getAbsoluteAPIUrl()
 
-    return ''
+    return absoluteAPIUrl + avatar.path
   }
 
   static CREATE_BY_STRING (accountName: string, host: string, forceHostname = false) {
@@ -55,7 +57,7 @@ export abstract class Actor implements ServerActor {
 
     if (hash.createdAt) this.createdAt = new Date(hash.createdAt.toString())
 
-    this.avatar = hash.avatar
+    this.avatars = hash.avatars
     this.isLocal = Actor.IS_LOCAL(this.host)
   }
 }
diff --git a/client/src/app/shared/shared-main/misc/channels-setup-message.component.ts b/client/src/app/shared/shared-main/misc/channels-setup-message.component.ts
index 702475029..4f9cbc525 100644
--- a/client/src/app/shared/shared-main/misc/channels-setup-message.component.ts
+++ b/client/src/app/shared/shared-main/misc/channels-setup-message.component.ts
@@ -19,7 +19,7 @@ export class ChannelsSetupMessageComponent implements OnInit {
   hasChannelNotConfigured () {
     if (!this.user.videoChannels) return false
 
-    return this.user.videoChannels.filter((channel: VideoChannel) => (!channel.avatar || !channel.description)).length > 0
+    return this.user.videoChannels.filter((channel: VideoChannel) => (channel.avatars.length === 0 || !channel.description)).length > 0
   }
 
   ngOnInit () {
diff --git a/client/src/app/shared/shared-main/users/user-notification.model.ts b/client/src/app/shared/shared-main/users/user-notification.model.ts
index 439547102..1eb69d5a2 100644
--- a/client/src/app/shared/shared-main/users/user-notification.model.ts
+++ b/client/src/app/shared/shared-main/users/user-notification.model.ts
@@ -254,11 +254,11 @@ export class UserNotification implements UserNotificationServer {
     return [ this.buildVideoUrl(comment.video), { threadId: comment.threadId } ]
   }
 
-  private setAccountAvatarUrl (actor: { avatarUrl?: string, avatar?: { url?: string, path: string } }) {
-    actor.avatarUrl = Account.GET_ACTOR_AVATAR_URL(actor) || Account.GET_DEFAULT_AVATAR_URL()
+  private setAccountAvatarUrl (actor: { avatarUrl?: string, avatars: { width: number, url?: string, path: string }[] }) {
+    actor.avatarUrl = VideoChannel.GET_ACTOR_AVATAR_URL(actor, 48) || Account.GET_DEFAULT_AVATAR_URL(48)
   }
 
-  private setVideoChannelAvatarUrl (actor: { avatarUrl?: string, avatar?: { url?: string, path: string } }) {
-    actor.avatarUrl = VideoChannel.GET_ACTOR_AVATAR_URL(actor) || VideoChannel.GET_DEFAULT_AVATAR_URL()
+  private setVideoChannelAvatarUrl (actor: { avatarUrl?: string, avatars: { width: number, url?: string, path: string }[] }) {
+    actor.avatarUrl = VideoChannel.GET_ACTOR_AVATAR_URL(actor, 48) || VideoChannel.GET_DEFAULT_AVATAR_URL(48)
   }
 }
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
index ac2679b42..e22b0cfd0 100644
--- a/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
+++ b/client/src/app/shared/shared-main/video-channel/video-channel.model.ts
@@ -12,7 +12,11 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
   nameWithHost: string
   nameWithHostForced: string
 
-  banner: ActorImage
+  // TODO: remove, deprecated in 4.2
+  banner: never
+
+  banners: ActorImage[]
+
   bannerUrl: string
 
   updatedAt: Date | string
@@ -24,23 +28,25 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
 
   viewsPerDay?: ViewsPerDate[]
 
-  static GET_ACTOR_AVATAR_URL (actor: { avatar?: { url?: string, path: string } }) {
-    return Actor.GET_ACTOR_AVATAR_URL(actor)
+  static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size: number) {
+    return Actor.GET_ACTOR_AVATAR_URL(actor, size)
   }
 
   static GET_ACTOR_BANNER_URL (channel: ServerVideoChannel) {
-    if (channel?.banner?.url) return channel.banner.url
-
-    if (channel?.banner) {
-      const absoluteAPIUrl = getAbsoluteAPIUrl()
+    if (!channel) return ''
 
-      return absoluteAPIUrl + channel.banner.path
-    }
+    const banner = channel.banners[0]
+    if (!banner) return ''
 
-    return ''
+    if (banner.url) return banner.url
+    return getAbsoluteAPIUrl() + banner.path
   }
 
-  static GET_DEFAULT_AVATAR_URL () {
+  static GET_DEFAULT_AVATAR_URL (size: number) {
+    if (size <= 48) {
+      return `${window.location.origin}/client/assets/images/default-avatar-video-channel-48x48.png`
+    }
+
     return `${window.location.origin}/client/assets/images/default-avatar-video-channel.png`
   }
 
@@ -51,7 +57,7 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
     this.description = hash.description
     this.support = hash.support
 
-    this.banner = hash.banner
+    this.banners = hash.banners
 
     this.isLocal = hash.isLocal
 
@@ -74,24 +80,24 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
     this.updateComputedAttributes()
   }
 
-  updateAvatar (newAvatar: ActorImage) {
-    this.avatar = newAvatar
+  updateAvatar (newAvatars: ActorImage[]) {
+    this.avatars = newAvatars
 
     this.updateComputedAttributes()
   }
 
   resetAvatar () {
-    this.updateAvatar(null)
+    this.updateAvatar([])
   }
 
-  updateBanner (newBanner: ActorImage) {
-    this.banner = newBanner
+  updateBanner (newBanners: ActorImage[]) {
+    this.banners = newBanners
 
     this.updateComputedAttributes()
   }
 
   resetBanner () {
-    this.updateBanner(null)
+    this.updateBanner([])
   }
 
   updateComputedAttributes () {
diff --git a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
index f37f13c51..480d250fb 100644
--- a/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
+++ b/client/src/app/shared/shared-main/video-channel/video-channel.service.ts
@@ -80,7 +80,7 @@ export class VideoChannelService {
   changeVideoChannelImage (videoChannelName: string, avatarForm: FormData, type: 'avatar' | 'banner') {
     const url = VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannelName + '/' + type + '/pick'
 
-    return this.authHttp.post<{ avatar?: ActorImage, banner?: ActorImage }>(url, avatarForm)
+    return this.authHttp.post<{ avatars?: ActorImage[], banners?: ActorImage[] }>(url, avatarForm)
                .pipe(catchError(err => this.restExtractor.handleError(err)))
   }
 
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts
index fe5643688..8e275181c 100644
--- a/client/src/app/shared/shared-main/video/video.model.ts
+++ b/client/src/app/shared/shared-main/video/video.model.ts
@@ -84,7 +84,11 @@ export class Video implements VideoServerModel {
     displayName: string
     url: string
     host: string
-    avatar?: ActorImage
+
+    // TODO: remove, deprecated in 4.2
+    avatar: ActorImage
+
+    avatars: ActorImage[]
   }
 
   channel: {
@@ -93,7 +97,11 @@ export class Video implements VideoServerModel {
     displayName: string
     url: string
     host: string
-    avatar?: ActorImage
+
+    // TODO: remove, deprecated in 4.2
+    avatar: ActorImage
+
+    avatars: ActorImage[]
   }
 
   userHistory?: {
diff --git a/client/src/app/shared/shared-moderation/account-blocklist.component.html b/client/src/app/shared/shared-moderation/account-blocklist.component.html
index 637abcb51..0143194e9 100644
--- a/client/src/app/shared/shared-moderation/account-blocklist.component.html
+++ b/client/src/app/shared/shared-moderation/account-blocklist.component.html
@@ -33,7 +33,7 @@
       <td>
         <a [href]="accountBlock.blockedAccount.url" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer">
           <div class="chip two-lines">
-            <my-actor-avatar [account]="accountBlock.blockedAccount"></my-actor-avatar>
+            <my-actor-avatar [account]="accountBlock.blockedAccount" size="32"></my-actor-avatar>
             <div>
               {{ accountBlock.blockedAccount.displayName }}
               <span class="text-muted">{{ accountBlock.blockedAccount.nameWithHost }}</span>
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
index 30483831a..3cf128de0 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
@@ -13,11 +13,13 @@
         <my-actor-avatar
           *ngIf="displayOptions.avatar && displayOwnerVideoChannel() && !displayAsRow" [title]="channelLinkTitle"
           [channel]="video.channel" [size]="actorImageSize" [internalHref]="[ '/c', video.byVideoChannel ]"
+          size="32"
         ></my-actor-avatar>
 
         <my-actor-avatar
           *ngIf="displayOptions.avatar && displayOwnerAccount() && !displayAsRow" [title]="channelLinkTitle"
           [account]="video.account" [size]="actorImageSize" [internalHref]="[ '/c', video.byVideoChannel ]"
+          size="32"
         ></my-actor-avatar>
 
         <div class="w-100 d-flex flex-column">
diff --git a/client/src/assets/images/default-avatar-account-48x48.png b/client/src/assets/images/default-avatar-account-48x48.png
new file mode 100644
index 000000000..cd09cbe1d
Binary files /dev/null and b/client/src/assets/images/default-avatar-account-48x48.png differ
diff --git a/client/src/assets/images/default-avatar-video-channel-48x48.png b/client/src/assets/images/default-avatar-video-channel-48x48.png
new file mode 100644
index 000000000..d0e7d11c9
Binary files /dev/null and b/client/src/assets/images/default-avatar-video-channel-48x48.png differ
diff --git a/client/src/sass/include/_account-channel-page.scss b/client/src/sass/include/_account-channel-page.scss
index b135bbb6d..06384b98d 100644
--- a/client/src/sass/include/_account-channel-page.scss
+++ b/client/src/sass/include/_account-channel-page.scss
@@ -26,10 +26,6 @@
   grid-column: 1;
   margin-bottom: 30px;
 
-  .main-avatar {
-    @include actor-avatar-size(120px);
-  }
-
   > div {
     @include margin-left($img-margin);
 
diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss
index f9e44b8ad..aa2331efe 100644
--- a/client/src/sass/include/_actor.scss
+++ b/client/src/sass/include/_actor.scss
@@ -1,12 +1,10 @@
 @use '_variables' as *;
 @use '_mixins' as *;
 
-@mixin actor-row ($avatar-size: 80px, $avatar-margin-right: 10px, $min-height: 130px, $separator: true) {
+@mixin actor-row ($avatar-margin-right: 10px, $min-height: 130px, $separator: true) {
   @include row-blocks($min-height: $min-height, $separator: $separator);
 
   > my-actor-avatar {
-    @include actor-avatar-size($avatar-size);
-
     @include margin-right($avatar-margin-right);
   }
 
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index c8ec3b4d1..291bff6db 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -887,7 +887,7 @@
     height: $avatar-height;
 
     my-actor-avatar {
-      @include actor-avatar-size($avatar-height);
+      display: inline-block;
     }
 
     div {
diff --git a/scripts/migrations/peertube-4.2.ts b/scripts/migrations/peertube-4.2.ts
new file mode 100644
index 000000000..045c3e511
--- /dev/null
+++ b/scripts/migrations/peertube-4.2.ts
@@ -0,0 +1,106 @@
+import { minBy } from 'lodash'
+import { join } from 'path'
+import { processImage } from '@server/helpers/image-utils'
+import { CONFIG } from '@server/initializers/config'
+import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
+import { updateActorImages } from '@server/lib/activitypub/actors'
+import { sendUpdateActor } from '@server/lib/activitypub/send'
+import { getBiggestActorImage } from '@server/lib/actor-image'
+import { JobQueue } from '@server/lib/job-queue'
+import { AccountModel } from '@server/models/account/account'
+import { ActorModel } from '@server/models/actor/actor'
+import { VideoChannelModel } from '@server/models/video/video-channel'
+import { MAccountDefault, MActorDefault, MChannelDefault } from '@server/types/models'
+import { getLowercaseExtension } from '@shared/core-utils'
+import { buildUUID } from '@shared/extra-utils'
+import { ActorImageType } from '@shared/models'
+import { initDatabaseModels } from '../../server/initializers/database'
+
+run()
+  .then(() => process.exit(0))
+  .catch(err => {
+    console.error(err)
+    process.exit(-1)
+  })
+
+async function run () {
+  console.log('Generate avatar miniatures from existing avatars.')
+
+  await initDatabaseModels(true)
+  JobQueue.Instance.init(true)
+
+  const accounts: AccountModel[] = await AccountModel.findAll({
+    include: [
+      {
+        model: ActorModel,
+        required: true,
+        where: {
+          serverId: null
+        }
+      },
+      {
+        model: VideoChannelModel,
+        include: [
+          {
+            model: AccountModel
+          }
+        ]
+      }
+    ]
+  })
+
+  for (const account of accounts) {
+    try {
+      await generateSmallerAvatarIfNeeded(account)
+    } catch (err) {
+      console.error(`Cannot process account avatar ${account.name}`, err)
+    }
+
+    for (const videoChannel of account.VideoChannels) {
+      try {
+        await generateSmallerAvatarIfNeeded(videoChannel)
+      } catch (err) {
+        console.error(`Cannot process channel avatar ${videoChannel.name}`, err)
+      }
+    }
+  }
+
+  console.log('Generation finished!')
+}
+
+async function generateSmallerAvatarIfNeeded (accountOrChannel: MAccountDefault | MChannelDefault) {
+  const avatars = accountOrChannel.Actor.Avatars
+  if (avatars.length !== 1) {
+    return
+  }
+
+  console.log(`Processing ${accountOrChannel.name}.`)
+
+  await generateSmallerAvatar(accountOrChannel.Actor)
+  accountOrChannel.Actor = Object.assign(accountOrChannel.Actor, { Server: null })
+
+  return sendUpdateActor(accountOrChannel, undefined)
+}
+
+async function generateSmallerAvatar (actor: MActorDefault) {
+  const bigAvatar = getBiggestActorImage(actor.Avatars)
+
+  const imageSize = minBy(ACTOR_IMAGES_SIZE[ActorImageType.AVATAR], 'width')
+  const sourceFilename = bigAvatar.filename
+
+  const newImageName = buildUUID() + getLowercaseExtension(sourceFilename)
+  const source = join(CONFIG.STORAGE.ACTOR_IMAGES, sourceFilename)
+  const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, newImageName)
+
+  await processImage(source, destination, imageSize, true)
+
+  const actorImageInfo = {
+    name: newImageName,
+    fileUrl: null,
+    height: imageSize.height,
+    width: imageSize.width,
+    onDisk: true
+  }
+
+  await updateActorImages(actor, ActorImageType.AVATAR, [ actorImageInfo ], undefined)
+}
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index 4e6bd5e25..c4d1be121 100644
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -18,10 +18,10 @@ import {
 } from '../../lib/activitypub/url'
 import {
   asyncMiddleware,
+  ensureIsLocalChannel,
   executeIfActivityPub,
   localAccountValidator,
   videoChannelsNameWithHostValidator,
-  ensureIsLocalChannel,
   videosCustomGetValidator,
   videosShareValidator
 } from '../../middlewares'
@@ -265,8 +265,8 @@ async function videoAnnouncesController (req: express.Request, res: express.Resp
   const handler = async (start: number, count: number) => {
     const result = await VideoShareModel.listAndCountByVideoId(video.id, start, count)
     return {
-      total: result.count,
-      data: result.rows.map(r => r.url)
+      total: result.total,
+      data: result.data.map(r => r.url)
     }
   }
   const json = await activityPubCollectionPagination(getLocalVideoSharesActivityPubUrl(video), handler, req.query.page)
@@ -301,9 +301,10 @@ async function videoCommentsController (req: express.Request, res: express.Respo
 
   const handler = async (start: number, count: number) => {
     const result = await VideoCommentModel.listAndCountByVideoForAP(video, start, count)
+
     return {
-      total: result.count,
-      data: result.rows.map(r => r.url)
+      total: result.total,
+      data: result.data.map(r => r.url)
     }
   }
   const json = await activityPubCollectionPagination(getLocalVideoCommentsActivityPubUrl(video), handler, req.query.page)
@@ -425,8 +426,8 @@ function videoRates (req: express.Request, rateType: VideoRateType, video: MVide
   const handler = async (start: number, count: number) => {
     const result = await AccountVideoRateModel.listAndCountAccountUrlsByVideoId(rateType, video.id, start, count)
     return {
-      total: result.count,
-      data: result.rows.map(r => r.url)
+      total: result.total,
+      data: result.data.map(r => r.url)
     }
   }
   return activityPubCollectionPagination(url, handler, req.query.page)
diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts
index 46d89bafa..8d9f92d93 100644
--- a/server/controllers/api/accounts.ts
+++ b/server/controllers/api/accounts.ts
@@ -213,7 +213,7 @@ async function listAccountRatings (req: express.Request, res: express.Response)
     sort: req.query.sort,
     type: req.query.rating
   })
-  return res.json(getFormattedObjects(resultList.rows, resultList.count))
+  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 
 async function listAccountFollowers (req: express.Request, res: express.Response) {
diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts
index c2ad0b710..a1d621152 100644
--- a/server/controllers/api/users/me.ts
+++ b/server/controllers/api/users/me.ts
@@ -1,7 +1,9 @@
 import 'multer'
 import express from 'express'
 import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '@server/helpers/audit-logger'
+import { getBiggestActorImage } from '@server/lib/actor-image'
 import { Hooks } from '@server/lib/plugins/hooks'
+import { pick } from '@shared/core-utils'
 import { ActorImageType, HttpStatusCode, UserUpdateMe, UserVideoQuota, UserVideoRate as FormattedUserVideoRate } from '@shared/models'
 import { AttributesOnly } from '@shared/typescript-utils'
 import { createReqFiles } from '../../../helpers/express-utils'
@@ -10,7 +12,7 @@ import { CONFIG } from '../../../initializers/config'
 import { MIMETYPES } from '../../../initializers/constants'
 import { sequelizeTypescript } from '../../../initializers/database'
 import { sendUpdateActor } from '../../../lib/activitypub/send'
-import { deleteLocalActorImageFile, updateLocalActorImageFile } from '../../../lib/local-actor'
+import { deleteLocalActorImageFile, updateLocalActorImageFiles } from '../../../lib/local-actor'
 import { getOriginalVideoFileTotalDailyFromUser, getOriginalVideoFileTotalFromUser, sendVerifyUserEmail } from '../../../lib/user'
 import {
   asyncMiddleware,
@@ -30,7 +32,6 @@ import { AccountVideoRateModel } from '../../../models/account/account-video-rat
 import { UserModel } from '../../../models/user/user'
 import { VideoModel } from '../../../models/video/video'
 import { VideoImportModel } from '../../../models/video/video-import'
-import { pick } from '@shared/core-utils'
 
 const auditLogger = auditLoggerFactory('users')
 
@@ -253,9 +254,17 @@ async function updateMyAvatar (req: express.Request, res: express.Response) {
 
   const userAccount = await AccountModel.load(user.Account.id)
 
-  const avatar = await updateLocalActorImageFile(userAccount, avatarPhysicalFile, ActorImageType.AVATAR)
+  const avatars = await updateLocalActorImageFiles(
+    userAccount,
+    avatarPhysicalFile,
+    ActorImageType.AVATAR
+  )
 
-  return res.json({ avatar: avatar.toFormattedJSON() })
+  return res.json({
+    // TODO: remove, deprecated in 4.2
+    avatar: getBiggestActorImage(avatars).toFormattedJSON(),
+    avatars: avatars.map(avatar => avatar.toFormattedJSON())
+  })
 }
 
 async function deleteMyAvatar (req: express.Request, res: express.Response) {
@@ -264,5 +273,5 @@ async function deleteMyAvatar (req: express.Request, res: express.Response) {
   const userAccount = await AccountModel.load(user.Account.id)
   await deleteLocalActorImageFile(userAccount, ActorImageType.AVATAR)
 
-  return res.status(HttpStatusCode.NO_CONTENT_204).end()
+  return res.json({ avatars: [] })
 }
diff --git a/server/controllers/api/users/my-notifications.ts b/server/controllers/api/users/my-notifications.ts
index d107a306e..58732158f 100644
--- a/server/controllers/api/users/my-notifications.ts
+++ b/server/controllers/api/users/my-notifications.ts
@@ -3,7 +3,6 @@ import express from 'express'
 import { UserNotificationModel } from '@server/models/user/user-notification'
 import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
 import { UserNotificationSetting } from '../../../../shared/models/users'
-import { getFormattedObjects } from '../../../helpers/utils'
 import {
   asyncMiddleware,
   asyncRetryTransactionMiddleware,
@@ -20,6 +19,7 @@ import {
 } from '../../../middlewares/validators/user-notifications'
 import { UserNotificationSettingModel } from '../../../models/user/user-notification-setting'
 import { meRouter } from './me'
+import { getFormattedObjects } from '@server/helpers/utils'
 
 const myNotificationsRouter = express.Router()
 
diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts
index e65550a22..2f869d9b3 100644
--- a/server/controllers/api/video-channel.ts
+++ b/server/controllers/api/video-channel.ts
@@ -1,5 +1,6 @@
 import express from 'express'
 import { pickCommonVideoQuery } from '@server/helpers/query'
+import { getBiggestActorImage } from '@server/lib/actor-image'
 import { Hooks } from '@server/lib/plugins/hooks'
 import { ActorFollowModel } from '@server/models/actor/actor-follow'
 import { getServerActor } from '@server/models/application/application'
@@ -16,7 +17,7 @@ import { MIMETYPES } from '../../initializers/constants'
 import { sequelizeTypescript } from '../../initializers/database'
 import { sendUpdateActor } from '../../lib/activitypub/send'
 import { JobQueue } from '../../lib/job-queue'
-import { deleteLocalActorImageFile, updateLocalActorImageFile } from '../../lib/local-actor'
+import { deleteLocalActorImageFile, updateLocalActorImageFiles } from '../../lib/local-actor'
 import { createLocalVideoChannel, federateAllVideosOfChannel } from '../../lib/video-channel'
 import {
   asyncMiddleware,
@@ -186,11 +187,15 @@ async function updateVideoChannelBanner (req: express.Request, res: express.Resp
   const videoChannel = res.locals.videoChannel
   const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannel.toFormattedJSON())
 
-  const banner = await updateLocalActorImageFile(videoChannel, bannerPhysicalFile, ActorImageType.BANNER)
+  const banners = await updateLocalActorImageFiles(videoChannel, bannerPhysicalFile, ActorImageType.BANNER)
 
   auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys)
 
-  return res.json({ banner: banner.toFormattedJSON() })
+  return res.json({
+    // TODO: remove, deprecated in 4.2
+    banner: getBiggestActorImage(banners).toFormattedJSON(),
+    banners: banners.map(b => b.toFormattedJSON())
+  })
 }
 
 async function updateVideoChannelAvatar (req: express.Request, res: express.Response) {
@@ -198,11 +203,14 @@ async function updateVideoChannelAvatar (req: express.Request, res: express.Resp
   const videoChannel = res.locals.videoChannel
   const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannel.toFormattedJSON())
 
-  const avatar = await updateLocalActorImageFile(videoChannel, avatarPhysicalFile, ActorImageType.AVATAR)
-
+  const avatars = await updateLocalActorImageFiles(videoChannel, avatarPhysicalFile, ActorImageType.AVATAR)
   auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys)
 
-  return res.json({ avatar: avatar.toFormattedJSON() })
+  return res.json({
+    // TODO: remove, deprecated in 4.2
+    avatar: getBiggestActorImage(avatars).toFormattedJSON(),
+    avatars: avatars.map(a => a.toFormattedJSON())
+  })
 }
 
 async function deleteVideoChannelAvatar (req: express.Request, res: express.Response) {
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 8a56f2f75..f9514d988 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -68,7 +68,9 @@ const staticClientOverrides = [
   'assets/images/icons/icon-512x512.png',
   'assets/images/default-playlist.jpg',
   'assets/images/default-avatar-account.png',
-  'assets/images/default-avatar-video-channel.png'
+  'assets/images/default-avatar-account-48x48.png',
+  'assets/images/default-avatar-video-channel.png',
+  'assets/images/default-avatar-video-channel-48x48.png'
 ]
 
 for (const staticClientOverride of staticClientOverrides) {
diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts
index a4076ee56..55bf02660 100644
--- a/server/controllers/lazy-static.ts
+++ b/server/controllers/lazy-static.ts
@@ -64,7 +64,15 @@ async function getActorImage (req: express.Request, res: express.Response, next:
     logger.info('Lazy serve remote actor image %s.', image.fileUrl)
 
     try {
-      await pushActorImageProcessInQueue({ filename: image.filename, fileUrl: image.fileUrl, type: image.type })
+      await pushActorImageProcessInQueue({
+        filename: image.filename,
+        fileUrl: image.fileUrl,
+        size: {
+          height: image.height,
+          width: image.width
+        },
+        type: image.type
+      })
     } catch (err) {
       logger.warn('Cannot process remote actor image %s.', image.fileUrl, { err })
       return res.status(HttpStatusCode.NOT_FOUND_404).end()
diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts
index fe721cbac..cbba2f51c 100644
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@@ -38,6 +38,9 @@ function getContextData (type: ContextType) {
         sensitive: 'as:sensitive',
         language: 'sc:inLanguage',
 
+        // TODO: remove in a few versions, introduced in 4.2
+        icons: 'as:icon',
+
         isLiveBroadcast: 'sc:isLiveBroadcast',
         liveSaveReplay: {
           '@type': 'sc:Boolean',
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 1c47d43f0..9b972b87e 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -14,7 +14,7 @@ import {
   VideoTranscodingFPS
 } from '../../shared/models'
 import { ActivityPubActorType } from '../../shared/models/activitypub'
-import { FollowState } from '../../shared/models/actors'
+import { ActorImageType, FollowState } from '../../shared/models/actors'
 import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
 import { VideoPlaylistPrivacy } from '../../shared/models/videos/playlist/video-playlist-privacy.model'
 import { VideoPlaylistType } from '../../shared/models/videos/playlist/video-playlist-type.model'
@@ -24,7 +24,7 @@ import { CONFIG, registerConfigChangedHandler } from './config'
 
 // ---------------------------------------------------------------------------
 
-const LAST_MIGRATION_VERSION = 680
+const LAST_MIGRATION_VERSION = 685
 
 // ---------------------------------------------------------------------------
 
@@ -633,15 +633,23 @@ const PREVIEWS_SIZE = {
   height: 480,
   minWidth: 400
 }
-const ACTOR_IMAGES_SIZE = {
-  AVATARS: {
-    width: 120,
-    height: 120
-  },
-  BANNERS: {
-    width: 1920,
-    height: 317 // 6/1 ratio
-  }
+const ACTOR_IMAGES_SIZE: { [key in ActorImageType]: { width: number, height: number }[]} = {
+  [ActorImageType.AVATAR]: [
+    {
+      width: 120,
+      height: 120
+    },
+    {
+      width: 48,
+      height: 48
+    }
+  ],
+  [ActorImageType.BANNER]: [
+    {
+      width: 1920,
+      height: 317 // 6/1 ratio
+    }
+  ]
 }
 
 const EMBED_SIZE = {
diff --git a/server/initializers/migrations/0685-multiple-actor-images.ts b/server/initializers/migrations/0685-multiple-actor-images.ts
new file mode 100644
index 000000000..c656f7e28
--- /dev/null
+++ b/server/initializers/migrations/0685-multiple-actor-images.ts
@@ -0,0 +1,62 @@
+import * as Sequelize from 'sequelize'
+
+async function up (utils: {
+  transaction: Sequelize.Transaction
+  queryInterface: Sequelize.QueryInterface
+  sequelize: Sequelize.Sequelize
+  db: any
+}): Promise<void> {
+  {
+    await utils.queryInterface.addColumn('actorImage', 'actorId', {
+      type: Sequelize.INTEGER,
+      defaultValue: null,
+      allowNull: true,
+      references: {
+        model: 'actor',
+        key: 'id'
+      },
+      onDelete: 'CASCADE'
+    }, { transaction: utils.transaction })
+
+    // Avatars
+    {
+      const query = `UPDATE "actorImage" SET "actorId" = (SELECT "id" FROM "actor" WHERE "actor"."avatarId" = "actorImage"."id") ` +
+                    `WHERE "type" = 1`
+      await utils.sequelize.query(query, { type: Sequelize.QueryTypes.UPDATE, transaction: utils.transaction })
+    }
+
+    // Banners
+    {
+      const query = `UPDATE "actorImage" SET "actorId" = (SELECT "id" FROM "actor" WHERE "actor"."bannerId" = "actorImage"."id") ` +
+                    `WHERE "type" = 2`
+      await utils.sequelize.query(query, { type: Sequelize.QueryTypes.UPDATE, transaction: utils.transaction })
+    }
+
+    // Remove orphans
+    {
+      const query = `DELETE FROM "actorImage" WHERE id NOT IN (` +
+        `SELECT "bannerId" FROM actor WHERE "bannerId" IS NOT NULL ` +
+        `UNION select "avatarId" FROM actor WHERE "avatarId" IS NOT NULL` +
+      `);`
+
+      await utils.sequelize.query(query, { type: Sequelize.QueryTypes.DELETE, transaction: utils.transaction })
+    }
+
+    await utils.queryInterface.changeColumn('actorImage', 'actorId', {
+      type: Sequelize.INTEGER,
+      allowNull: false
+    }, { transaction: utils.transaction })
+
+    await utils.queryInterface.removeColumn('actor', 'avatarId', { transaction: utils.transaction })
+    await utils.queryInterface.removeColumn('actor', 'bannerId', { transaction: utils.transaction })
+  }
+}
+
+function down () {
+  throw new Error('Not implemented.')
+}
+
+export {
+  up,
+  down
+}
diff --git a/server/lib/activitypub/actors/image.ts b/server/lib/activitypub/actors/image.ts
index 443ad0a63..d17c2ef1a 100644
--- a/server/lib/activitypub/actors/image.ts
+++ b/server/lib/activitypub/actors/image.ts
@@ -12,53 +12,52 @@ type ImageInfo = {
   onDisk?: boolean
 }
 
-async function updateActorImageInstance (actor: MActorImages, type: ActorImageType, imageInfo: ImageInfo | null, t: Transaction) {
-  const oldImageModel = type === ActorImageType.AVATAR
-    ? actor.Avatar
-    : actor.Banner
+async function updateActorImages (actor: MActorImages, type: ActorImageType, imagesInfo: ImageInfo[], t: Transaction) {
+  const avatarsOrBanners = type === ActorImageType.AVATAR
+    ? actor.Avatars
+    : actor.Banners
 
-  if (oldImageModel) {
-    // Don't update the avatar if the file URL did not change
-    if (imageInfo?.fileUrl && oldImageModel.fileUrl === imageInfo.fileUrl) return actor
+  if (imagesInfo.length === 0) {
+    await deleteActorImages(actor, type, t)
+  }
+
+  for (const imageInfo of imagesInfo) {
+    const oldImageModel = (avatarsOrBanners || []).find(i => i.width === imageInfo.width)
 
-    try {
-      await oldImageModel.destroy({ transaction: t })
+    if (oldImageModel) {
+      // Don't update the avatar if the file URL did not change
+      if (imageInfo?.fileUrl && oldImageModel.fileUrl === imageInfo.fileUrl) {
+        continue
+      }
 
-      setActorImage(actor, type, null)
-    } catch (err) {
-      logger.error('Cannot remove old actor image of actor %s.', actor.url, { err })
+      await safeDeleteActorImage(actor, oldImageModel, type, t)
     }
-  }
 
-  if (imageInfo) {
     const imageModel = await ActorImageModel.create({
       filename: imageInfo.name,
       onDisk: imageInfo.onDisk ?? false,
       fileUrl: imageInfo.fileUrl,
       height: imageInfo.height,
       width: imageInfo.width,
-      type
+      type,
+      actorId: actor.id
     }, { transaction: t })
 
-    setActorImage(actor, type, imageModel)
+    addActorImage(actor, type, imageModel)
   }
 
   return actor
 }
 
-async function deleteActorImageInstance (actor: MActorImages, type: ActorImageType, t: Transaction) {
+async function deleteActorImages (actor: MActorImages, type: ActorImageType, t: Transaction) {
   try {
-    if (type === ActorImageType.AVATAR) {
-      await actor.Avatar.destroy({ transaction: t })
-
-      actor.avatarId = null
-      actor.Avatar = null
-    } else {
-      await actor.Banner.destroy({ transaction: t })
+    const association = buildAssociationName(type)
 
-      actor.bannerId = null
-      actor.Banner = null
+    for (const image of actor[association]) {
+      await image.destroy({ transaction: t })
     }
+
+    actor[association] = []
   } catch (err) {
     logger.error('Cannot remove old image of actor %s.', actor.url, { err })
   }
@@ -66,29 +65,37 @@ async function deleteActorImageInstance (actor: MActorImages, type: ActorImageTy
   return actor
 }
 
+async function safeDeleteActorImage (actor: MActorImages, toDelete: MActorImage, type: ActorImageType, t: Transaction) {
+  try {
+    await toDelete.destroy({ transaction: t })
+
+    const association = buildAssociationName(type)
+    actor[association] = actor[association].filter(image => image.id !== toDelete.id)
+  } catch (err) {
+    logger.error('Cannot remove old actor image of actor %s.', actor.url, { err })
+  }
+}
+
 // ---------------------------------------------------------------------------
 
 export {
   ImageInfo,
 
-  updateActorImageInstance,
-  deleteActorImageInstance
+  updateActorImages,
+  deleteActorImages
 }
 
 // ---------------------------------------------------------------------------
 
-function setActorImage (actorModel: MActorImages, type: ActorImageType, imageModel: MActorImage) {
-  const id = imageModel
-    ? imageModel.id
-    : null
-
-  if (type === ActorImageType.AVATAR) {
-    actorModel.avatarId = id
-    actorModel.Avatar = imageModel
-  } else {
-    actorModel.bannerId = id
-    actorModel.Banner = imageModel
-  }
+function addActorImage (actor: MActorImages, type: ActorImageType, imageModel: MActorImage) {
+  const association = buildAssociationName(type)
+  if (!actor[association]) actor[association] = []
+
+  actor[association].push(imageModel)
+}
 
-  return actorModel
+function buildAssociationName (type: ActorImageType) {
+  return type === ActorImageType.AVATAR
+    ? 'Avatars'
+    : 'Banners'
 }
diff --git a/server/lib/activitypub/actors/shared/creator.ts b/server/lib/activitypub/actors/shared/creator.ts
index 999aed97d..500bc9912 100644
--- a/server/lib/activitypub/actors/shared/creator.ts
+++ b/server/lib/activitypub/actors/shared/creator.ts
@@ -6,8 +6,8 @@ import { ServerModel } from '@server/models/server/server'
 import { VideoChannelModel } from '@server/models/video/video-channel'
 import { MAccount, MAccountDefault, MActor, MActorFullActor, MActorId, MActorImages, MChannel, MServer } from '@server/types/models'
 import { ActivityPubActor, ActorImageType } from '@shared/models'
-import { updateActorImageInstance } from '../image'
-import { getActorAttributesFromObject, getActorDisplayNameFromObject, getImageInfoFromObject } from './object-to-model-attributes'
+import { updateActorImages } from '../image'
+import { getActorAttributesFromObject, getActorDisplayNameFromObject, getImagesInfoFromObject } from './object-to-model-attributes'
 import { fetchActorFollowsCount } from './url-to-object'
 
 export class APActorCreator {
@@ -27,11 +27,11 @@ export class APActorCreator {
     return sequelizeTypescript.transaction(async t => {
       const server = await this.setServer(actorInstance, t)
 
-      await this.setImageIfNeeded(actorInstance, ActorImageType.AVATAR, t)
-      await this.setImageIfNeeded(actorInstance, ActorImageType.BANNER, t)
-
       const { actorCreated, created } = await this.saveActor(actorInstance, t)
 
+      await this.setImageIfNeeded(actorCreated, ActorImageType.AVATAR, t)
+      await this.setImageIfNeeded(actorCreated, ActorImageType.BANNER, t)
+
       await this.tryToFixActorUrlIfNeeded(actorCreated, actorInstance, created, t)
 
       if (actorCreated.type === 'Person' || actorCreated.type === 'Application') { // Account or PeerTube instance
@@ -71,10 +71,10 @@ export class APActorCreator {
   }
 
   private async setImageIfNeeded (actor: MActor, type: ActorImageType, t: Transaction) {
-    const imageInfo = getImageInfoFromObject(this.actorObject, type)
-    if (!imageInfo) return
+    const imagesInfo = getImagesInfoFromObject(this.actorObject, type)
+    if (imagesInfo.length === 0) return
 
-    return updateActorImageInstance(actor as MActorImages, type, imageInfo, t)
+    return updateActorImages(actor as MActorImages, type, imagesInfo, t)
   }
 
   private async saveActor (actor: MActor, t: Transaction) {
diff --git a/server/lib/activitypub/actors/shared/object-to-model-attributes.ts b/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
index 23bc972e5..f6a78c457 100644
--- a/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
+++ b/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
@@ -4,7 +4,7 @@ import { ActorModel } from '@server/models/actor/actor'
 import { FilteredModelAttributes } from '@server/types'
 import { getLowercaseExtension } from '@shared/core-utils'
 import { buildUUID } from '@shared/extra-utils'
-import { ActivityPubActor, ActorImageType } from '@shared/models'
+import { ActivityIconObject, ActivityPubActor, ActorImageType } from '@shared/models'
 
 function getActorAttributesFromObject (
   actorObject: ActivityPubActor,
@@ -30,33 +30,36 @@ function getActorAttributesFromObject (
   }
 }
 
-function getImageInfoFromObject (actorObject: ActivityPubActor, type: ActorImageType) {
-  const mimetypes = MIMETYPES.IMAGE
-  const icon = type === ActorImageType.AVATAR
-    ? actorObject.icon
+function getImagesInfoFromObject (actorObject: ActivityPubActor, type: ActorImageType) {
+  const iconsOrImages = type === ActorImageType.AVATAR
+    ? actorObject.icons || actorObject.icon
     : actorObject.image
 
-  if (!icon || icon.type !== 'Image' || !isActivityPubUrlValid(icon.url)) return undefined
+  return normalizeIconOrImage(iconsOrImages).map(iconOrImage => {
+    const mimetypes = MIMETYPES.IMAGE
 
-  let extension: string
+    if (iconOrImage.type !== 'Image' || !isActivityPubUrlValid(iconOrImage.url)) return undefined
 
-  if (icon.mediaType) {
-    extension = mimetypes.MIMETYPE_EXT[icon.mediaType]
-  } else {
-    const tmp = getLowercaseExtension(icon.url)
+    let extension: string
 
-    if (mimetypes.EXT_MIMETYPE[tmp] !== undefined) extension = tmp
-  }
+    if (iconOrImage.mediaType) {
+      extension = mimetypes.MIMETYPE_EXT[iconOrImage.mediaType]
+    } else {
+      const tmp = getLowercaseExtension(iconOrImage.url)
 
-  if (!extension) return undefined
+      if (mimetypes.EXT_MIMETYPE[tmp] !== undefined) extension = tmp
+    }
 
-  return {
-    name: buildUUID() + extension,
-    fileUrl: icon.url,
-    height: icon.height,
-    width: icon.width,
-    type
-  }
+    if (!extension) return undefined
+
+    return {
+      name: buildUUID() + extension,
+      fileUrl: iconOrImage.url,
+      height: iconOrImage.height,
+      width: iconOrImage.width,
+      type
+    }
+  })
 }
 
 function getActorDisplayNameFromObject (actorObject: ActivityPubActor) {
@@ -65,6 +68,15 @@ function getActorDisplayNameFromObject (actorObject: ActivityPubActor) {
 
 export {
   getActorAttributesFromObject,
-  getImageInfoFromObject,
+  getImagesInfoFromObject,
   getActorDisplayNameFromObject
 }
+
+// ---------------------------------------------------------------------------
+
+function normalizeIconOrImage (icon: ActivityIconObject | ActivityIconObject[]): ActivityIconObject[] {
+  if (Array.isArray(icon)) return icon
+  if (icon) return [ icon ]
+
+  return []
+}
diff --git a/server/lib/activitypub/actors/updater.ts b/server/lib/activitypub/actors/updater.ts
index 042438d9c..fe94af9f1 100644
--- a/server/lib/activitypub/actors/updater.ts
+++ b/server/lib/activitypub/actors/updater.ts
@@ -5,9 +5,9 @@ import { VideoChannelModel } from '@server/models/video/video-channel'
 import { MAccount, MActor, MActorFull, MChannel } from '@server/types/models'
 import { ActivityPubActor, ActorImageType } from '@shared/models'
 import { getOrCreateAPOwner } from './get'
-import { updateActorImageInstance } from './image'
+import { updateActorImages } from './image'
 import { fetchActorFollowsCount } from './shared'
-import { getImageInfoFromObject } from './shared/object-to-model-attributes'
+import { getImagesInfoFromObject } from './shared/object-to-model-attributes'
 
 export class APActorUpdater {
 
@@ -29,8 +29,8 @@ export class APActorUpdater {
   }
 
   async update () {
-    const avatarInfo = getImageInfoFromObject(this.actorObject, ActorImageType.AVATAR)
-    const bannerInfo = getImageInfoFromObject(this.actorObject, ActorImageType.BANNER)
+    const avatarsInfo = getImagesInfoFromObject(this.actorObject, ActorImageType.AVATAR)
+    const bannersInfo = getImagesInfoFromObject(this.actorObject, ActorImageType.BANNER)
 
     try {
       await this.updateActorInstance(this.actor, this.actorObject)
@@ -47,8 +47,8 @@ export class APActorUpdater {
       }
 
       await runInReadCommittedTransaction(async t => {
-        await updateActorImageInstance(this.actor, ActorImageType.AVATAR, avatarInfo, t)
-        await updateActorImageInstance(this.actor, ActorImageType.BANNER, bannerInfo, t)
+        await updateActorImages(this.actor, ActorImageType.BANNER, bannersInfo, t)
+        await updateActorImages(this.actor, ActorImageType.AVATAR, avatarsInfo, t)
       })
 
       await runInReadCommittedTransaction(async t => {
diff --git a/server/lib/actor-image.ts b/server/lib/actor-image.ts
new file mode 100644
index 000000000..e9bd148f6
--- /dev/null
+++ b/server/lib/actor-image.ts
@@ -0,0 +1,14 @@
+import maxBy from 'lodash/maxBy'
+
+function getBiggestActorImage <T extends { width: number }> (images: T[]) {
+  const image = maxBy(images, 'width')
+
+  // If width is null, maxBy won't return a value
+  if (!image) return images[0]
+
+  return image
+}
+
+export {
+  getBiggestActorImage
+}
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts
index 19354ab70..c010f3c44 100644
--- a/server/lib/client-html.ts
+++ b/server/lib/client-html.ts
@@ -3,6 +3,7 @@ import { readFile } from 'fs-extra'
 import { join } from 'path'
 import validator from 'validator'
 import { toCompleteUUID } from '@server/helpers/custom-validators/misc'
+import { ActorImageModel } from '@server/models/actor/actor-image'
 import { root } from '@shared/core-utils'
 import { escapeHTML } from '@shared/core-utils/renderer'
 import { sha256 } from '@shared/extra-utils'
@@ -16,7 +17,6 @@ import { mdToOneLinePlainText } from '../helpers/markdown'
 import { CONFIG } from '../initializers/config'
 import {
   ACCEPT_HEADERS,
-  ACTOR_IMAGES_SIZE,
   CUSTOM_HTML_TAG_COMMENTS,
   EMBED_SIZE,
   FILES_CONTENT_HASH,
@@ -29,6 +29,7 @@ import { VideoModel } from '../models/video/video'
 import { VideoChannelModel } from '../models/video/video-channel'
 import { VideoPlaylistModel } from '../models/video/video-playlist'
 import { MAccountActor, MChannelActor } from '../types/models'
+import { getBiggestActorImage } from './actor-image'
 import { ServerConfigManager } from './server-config-manager'
 
 type Tags = {
@@ -273,10 +274,11 @@ class ClientHtml {
     const siteName = CONFIG.INSTANCE.NAME
     const title = entity.getDisplayName()
 
+    const avatar = getBiggestActorImage(entity.Actor.Avatars)
     const image = {
-      url: entity.Actor.getAvatarUrl(),
-      width: ACTOR_IMAGES_SIZE.AVATARS.width,
-      height: ACTOR_IMAGES_SIZE.AVATARS.height
+      url: ActorImageModel.getImageUrl(avatar),
+      width: avatar?.width,
+      height: avatar?.height
     }
 
     const ogType = 'website'
diff --git a/server/lib/local-actor.ts b/server/lib/local-actor.ts
index c6826759b..01046d017 100644
--- a/server/lib/local-actor.ts
+++ b/server/lib/local-actor.ts
@@ -1,5 +1,5 @@
-import 'multer'
 import { queue } from 'async'
+import { remove } from 'fs-extra'
 import LRUCache from 'lru-cache'
 import { join } from 'path'
 import { ActorModel } from '@server/models/actor/actor'
@@ -13,7 +13,7 @@ import { CONFIG } from '../initializers/config'
 import { ACTOR_IMAGES_SIZE, LRU_CACHE, QUEUE_CONCURRENCY, WEBSERVER } from '../initializers/constants'
 import { sequelizeTypescript } from '../initializers/database'
 import { MAccountDefault, MActor, MChannelDefault } from '../types/models'
-import { deleteActorImageInstance, updateActorImageInstance } from './activitypub/actors'
+import { deleteActorImages, updateActorImages } from './activitypub/actors'
 import { sendUpdateActor } from './activitypub/send'
 
 function buildActorInstance (type: ActivityPubActorType, url: string, preferredUsername: string) {
@@ -33,64 +33,69 @@ function buildActorInstance (type: ActivityPubActorType, url: string, preferredU
   }) as MActor
 }
 
-async function updateLocalActorImageFile (
+async function updateLocalActorImageFiles (
   accountOrChannel: MAccountDefault | MChannelDefault,
   imagePhysicalFile: Express.Multer.File,
   type: ActorImageType
 ) {
-  const imageSize = type === ActorImageType.AVATAR
-    ? ACTOR_IMAGES_SIZE.AVATARS
-    : ACTOR_IMAGES_SIZE.BANNERS
-
-  const extension = getLowercaseExtension(imagePhysicalFile.filename)
-
-  const imageName = buildUUID() + extension
-  const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, imageName)
-  await processImage(imagePhysicalFile.path, destination, imageSize)
-
-  return retryTransactionWrapper(() => {
-    return sequelizeTypescript.transaction(async t => {
-      const actorImageInfo = {
-        name: imageName,
-        fileUrl: null,
-        height: imageSize.height,
-        width: imageSize.width,
-        onDisk: true
-      }
-
-      const updatedActor = await updateActorImageInstance(accountOrChannel.Actor, type, actorImageInfo, t)
-      await updatedActor.save({ transaction: t })
-
-      await sendUpdateActor(accountOrChannel, t)
-
-      return type === ActorImageType.AVATAR
-        ? updatedActor.Avatar
-        : updatedActor.Banner
-    })
-  })
+  const processImageSize = async (imageSize: { width: number, height: number }) => {
+    const extension = getLowercaseExtension(imagePhysicalFile.filename)
+
+    const imageName = buildUUID() + extension
+    const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, imageName)
+    await processImage(imagePhysicalFile.path, destination, imageSize, true)
+
+    return {
+      imageName,
+      imageSize
+    }
+  }
+
+  const processedImages = await Promise.all(ACTOR_IMAGES_SIZE[type].map(processImageSize))
+  await remove(imagePhysicalFile.path)
+
+  return retryTransactionWrapper(() => sequelizeTypescript.transaction(async t => {
+    const actorImagesInfo = processedImages.map(({ imageName, imageSize }) => ({
+      name: imageName,
+      fileUrl: null,
+      height: imageSize.height,
+      width: imageSize.width,
+      onDisk: true
+    }))
+
+    const updatedActor = await updateActorImages(accountOrChannel.Actor, type, actorImagesInfo, t)
+    await updatedActor.save({ transaction: t })
+
+    await sendUpdateActor(accountOrChannel, t)
+
+    return type === ActorImageType.AVATAR
+      ? updatedActor.Avatars
+      : updatedActor.Banners
+  }))
 }
 
 async function deleteLocalActorImageFile (accountOrChannel: MAccountDefault | MChannelDefault, type: ActorImageType) {
   return retryTransactionWrapper(() => {
     return sequelizeTypescript.transaction(async t => {
-      const updatedActor = await deleteActorImageInstance(accountOrChannel.Actor, type, t)
+      const updatedActor = await deleteActorImages(accountOrChannel.Actor, type, t)
       await updatedActor.save({ transaction: t })
 
       await sendUpdateActor(accountOrChannel, t)
 
-      return updatedActor.Avatar
+      return updatedActor.Avatars
     })
   })
 }
 
-type DownloadImageQueueTask = { fileUrl: string, filename: string, type: ActorImageType }
+type DownloadImageQueueTask = {
+  fileUrl: string
+  filename: string
+  type: ActorImageType
+  size: typeof ACTOR_IMAGES_SIZE[ActorImageType][0]
+}
 
 const downloadImageQueue = queue<DownloadImageQueueTask, Error>((task, cb) => {
-  const size = task.type === ActorImageType.AVATAR
-    ? ACTOR_IMAGES_SIZE.AVATARS
-    : ACTOR_IMAGES_SIZE.BANNERS
-
-  downloadImage(task.fileUrl, CONFIG.STORAGE.ACTOR_IMAGES, task.filename, size)
+  downloadImage(task.fileUrl, CONFIG.STORAGE.ACTOR_IMAGES, task.filename, task.size)
     .then(() => cb())
     .catch(err => cb(err))
 }, QUEUE_CONCURRENCY.ACTOR_PROCESS_IMAGE)
@@ -110,7 +115,7 @@ const actorImagePathUnsafeCache = new LRUCache<string, string>({ max: LRU_CACHE.
 
 export {
   actorImagePathUnsafeCache,
-  updateLocalActorImageFile,
+  updateLocalActorImageFiles,
   deleteLocalActorImageFile,
   pushActorImageProcessInQueue,
   buildActorInstance
diff --git a/server/lib/notifier/shared/comment/comment-mention.ts b/server/lib/notifier/shared/comment/comment-mention.ts
index 765cbaad9..ecd1687b4 100644
--- a/server/lib/notifier/shared/comment/comment-mention.ts
+++ b/server/lib/notifier/shared/comment/comment-mention.ts
@@ -77,7 +77,7 @@ export class CommentMention extends AbstractNotification <MCommentOwnerVideo, MU
       userId: user.id,
       commentId: this.payload.id
     })
-    notification.Comment = this.payload
+    notification.VideoComment = this.payload
 
     return notification
   }
diff --git a/server/lib/notifier/shared/comment/new-comment-for-video-owner.ts b/server/lib/notifier/shared/comment/new-comment-for-video-owner.ts
index b76fc15bf..757502703 100644
--- a/server/lib/notifier/shared/comment/new-comment-for-video-owner.ts
+++ b/server/lib/notifier/shared/comment/new-comment-for-video-owner.ts
@@ -44,7 +44,7 @@ export class NewCommentForVideoOwner extends AbstractNotification <MCommentOwner
       userId: user.id,
       commentId: this.payload.id
     })
-    notification.Comment = this.payload
+    notification.VideoComment = this.payload
 
     return notification
   }
diff --git a/server/models/abuse/abuse-message.ts b/server/models/abuse/abuse-message.ts
index 6a441a210..d9eb25f0f 100644
--- a/server/models/abuse/abuse-message.ts
+++ b/server/models/abuse/abuse-message.ts
@@ -1,11 +1,12 @@
 import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
 import { isAbuseMessageValid } from '@server/helpers/custom-validators/abuses'
 import { MAbuseMessage, MAbuseMessageFormattable } from '@server/types/models'
-import { AttributesOnly } from '@shared/typescript-utils'
 import { AbuseMessage } from '@shared/models'
+import { AttributesOnly } from '@shared/typescript-utils'
 import { AccountModel, ScopeNames as AccountScopeNames } from '../account/account'
 import { getSort, throwIfNotValid } from '../utils'
 import { AbuseModel } from './abuse'
+import { FindOptions } from 'sequelize/dist'
 
 @Table({
   tableName: 'abuseMessage',
@@ -62,21 +63,28 @@ export class AbuseMessageModel extends Model<Partial<AttributesOnly<AbuseMessage
   Abuse: AbuseModel
 
   static listForApi (abuseId: number) {
-    const options = {
-      where: { abuseId },
+    const getQuery = (forCount: boolean) => {
+      const query: FindOptions = {
+        where: { abuseId },
+        order: getSort('createdAt')
+      }
 
-      order: getSort('createdAt'),
+      if (forCount !== true) {
+        query.include = [
+          {
+            model: AccountModel.scope(AccountScopeNames.SUMMARY),
+            required: false
+          }
+        ]
+      }
 
-      include: [
-        {
-          model: AccountModel.scope(AccountScopeNames.SUMMARY),
-          required: false
-        }
-      ]
+      return query
     }
 
-    return AbuseMessageModel.findAndCountAll(options)
-      .then(({ rows, count }) => ({ data: rows, total: count }))
+    return Promise.all([
+      AbuseMessageModel.count(getQuery(true)),
+      AbuseMessageModel.findAll(getQuery(false))
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static loadByIdAndAbuseId (messageId: number, abuseId: number): Promise<MAbuseMessage> {
diff --git a/server/models/account/account-blocklist.ts b/server/models/account/account-blocklist.ts
index 1162962bf..a7b8db076 100644
--- a/server/models/account/account-blocklist.ts
+++ b/server/models/account/account-blocklist.ts
@@ -1,7 +1,7 @@
-import { Op, QueryTypes } from 'sequelize'
-import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+import { FindOptions, Op, QueryTypes } from 'sequelize'
+import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
 import { handlesToNameAndHost } from '@server/helpers/actors'
-import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/types/models'
+import { MAccountBlocklist, MAccountBlocklistFormattable } from '@server/types/models'
 import { AttributesOnly } from '@shared/typescript-utils'
 import { AccountBlock } from '../../../shared/models'
 import { ActorModel } from '../actor/actor'
@@ -9,27 +9,6 @@ import { ServerModel } from '../server/server'
 import { createSafeIn, getSort, searchAttribute } from '../utils'
 import { AccountModel } from './account'
 
-enum ScopeNames {
-  WITH_ACCOUNTS = 'WITH_ACCOUNTS'
-}
-
-@Scopes(() => ({
-  [ScopeNames.WITH_ACCOUNTS]: {
-    include: [
-      {
-        model: AccountModel,
-        required: true,
-        as: 'ByAccount'
-      },
-      {
-        model: AccountModel,
-        required: true,
-        as: 'BlockedAccount'
-      }
-    ]
-  }
-}))
-
 @Table({
   tableName: 'accountBlocklist',
   indexes: [
@@ -123,33 +102,45 @@ export class AccountBlocklistModel extends Model<Partial<AttributesOnly<AccountB
   }) {
     const { start, count, sort, search, accountId } = parameters
 
-    const query = {
-      offset: start,
-      limit: count,
-      order: getSort(sort)
-    }
+    const getQuery = (forCount: boolean) => {
+      const query: FindOptions = {
+        offset: start,
+        limit: count,
+        order: getSort(sort),
+        where: { accountId }
+      }
 
-    const where = {
-      accountId
-    }
+      if (search) {
+        Object.assign(query.where, {
+          [Op.or]: [
+            searchAttribute(search, '$BlockedAccount.name$'),
+            searchAttribute(search, '$BlockedAccount.Actor.url$')
+          ]
+        })
+      }
 
-    if (search) {
-      Object.assign(where, {
-        [Op.or]: [
-          searchAttribute(search, '$BlockedAccount.name$'),
-          searchAttribute(search, '$BlockedAccount.Actor.url$')
+      if (forCount !== true) {
+        query.include = [
+          {
+            model: AccountModel,
+            required: true,
+            as: 'ByAccount'
+          },
+          {
+            model: AccountModel,
+            required: true,
+            as: 'BlockedAccount'
+          }
         ]
-      })
-    }
+      }
 
-    Object.assign(query, { where })
+      return query
+    }
 
-    return AccountBlocklistModel
-      .scope([ ScopeNames.WITH_ACCOUNTS ])
-      .findAndCountAll<MAccountBlocklistAccounts>(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    return Promise.all([
+      AccountBlocklistModel.count(getQuery(true)),
+      AccountBlocklistModel.findAll(getQuery(false))
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listHandlesBlockedBy (accountIds: number[]): Promise<string[]> {
diff --git a/server/models/account/account-video-rate.ts b/server/models/account/account-video-rate.ts
index e89d31adf..7303651eb 100644
--- a/server/models/account/account-video-rate.ts
+++ b/server/models/account/account-video-rate.ts
@@ -121,29 +121,40 @@ export class AccountVideoRateModel extends Model<Partial<AttributesOnly<AccountV
     type?: string
     accountId: number
   }) {
-    const query: FindOptions = {
-      offset: options.start,
-      limit: options.count,
-      order: getSort(options.sort),
-      where: {
-        accountId: options.accountId
-      },
-      include: [
-        {
-          model: VideoModel,
-          required: true,
-          include: [
-            {
-              model: VideoChannelModel.scope({ method: [ VideoChannelScopeNames.SUMMARY, { withAccount: true } as SummaryOptions ] }),
-              required: true
-            }
-          ]
+    const getQuery = (forCount: boolean) => {
+      const query: FindOptions = {
+        offset: options.start,
+        limit: options.count,
+        order: getSort(options.sort),
+        where: {
+          accountId: options.accountId
         }
-      ]
+      }
+
+      if (options.type) query.where['type'] = options.type
+
+      if (forCount !== true) {
+        query.include = [
+          {
+            model: VideoModel,
+            required: true,
+            include: [
+              {
+                model: VideoChannelModel.scope({ method: [ VideoChannelScopeNames.SUMMARY, { withAccount: true } as SummaryOptions ] }),
+                required: true
+              }
+            ]
+          }
+        ]
+      }
+
+      return query
     }
-    if (options.type) query.where['type'] = options.type
 
-    return AccountVideoRateModel.findAndCountAll(query)
+    return Promise.all([
+      AccountVideoRateModel.count(getQuery(true)),
+      AccountVideoRateModel.findAll(getQuery(false))
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listRemoteRateUrlsOfLocalVideos () {
@@ -232,7 +243,10 @@ export class AccountVideoRateModel extends Model<Partial<AttributesOnly<AccountV
       ]
     }
 
-    return AccountVideoRateModel.findAndCountAll<MAccountVideoRateAccountUrl>(query)
+    return Promise.all([
+      AccountVideoRateModel.count(query),
+      AccountVideoRateModel.findAll<MAccountVideoRateAccountUrl>(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static cleanOldRatesOf (videoId: number, type: VideoRateType, beforeUpdatedAt: Date) {
diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index 619a598dd..8a7dfba94 100644
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -54,6 +54,7 @@ export type SummaryOptions = {
   whereActor?: WhereOptions
   whereServer?: WhereOptions
   withAccountBlockerIds?: number[]
+  forCount?: boolean
 }
 
 @DefaultScope(() => ({
@@ -73,22 +74,24 @@ export type SummaryOptions = {
       where: options.whereServer
     }
 
-    const queryInclude: Includeable[] = [
-      {
-        attributes: [ 'id', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
-        model: ActorModel.unscoped(),
-        required: options.actorRequired ?? true,
-        where: options.whereActor,
-        include: [
-          serverInclude,
+    const actorInclude: Includeable = {
+      attributes: [ 'id', 'preferredUsername', 'url', 'serverId' ],
+      model: ActorModel.unscoped(),
+      required: options.actorRequired ?? true,
+      where: options.whereActor,
+      include: [ serverInclude ]
+    }
 
-          {
-            model: ActorImageModel.unscoped(),
-            as: 'Avatar',
-            required: false
-          }
-        ]
-      }
+    if (options.forCount !== true) {
+      actorInclude.include.push({
+        model: ActorImageModel,
+        as: 'Avatars',
+        required: false
+      })
+    }
+
+    const queryInclude: Includeable[] = [
+      actorInclude
     ]
 
     const query: FindOptions = {
@@ -349,13 +352,10 @@ export class AccountModel extends Model<Partial<AttributesOnly<AccountModel>>> {
       order: getSort(sort)
     }
 
-    return AccountModel.findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return {
-          data: rows,
-          total: count
-        }
-      })
+    return Promise.all([
+      AccountModel.count(),
+      AccountModel.findAll(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static loadAccountIdFromVideo (videoId: number): Promise<MAccount> {
@@ -407,16 +407,15 @@ export class AccountModel extends Model<Partial<AttributesOnly<AccountModel>>> {
   }
 
   toFormattedJSON (this: MAccountFormattable): Account {
-    const actor = this.Actor.toFormattedJSON()
-    const account = {
+    return {
+      ...this.Actor.toFormattedJSON(),
+
       id: this.id,
       displayName: this.getDisplayName(),
       description: this.description,
       updatedAt: this.updatedAt,
-      userId: this.userId ? this.userId : undefined
+      userId: this.userId ?? undefined
     }
-
-    return Object.assign(actor, account)
   }
 
   toFormattedSummaryJSON (this: MAccountSummaryFormattable): AccountSummary {
@@ -424,10 +423,14 @@ export class AccountModel extends Model<Partial<AttributesOnly<AccountModel>>> {
 
     return {
       id: this.id,
-      name: actor.name,
       displayName: this.getDisplayName(),
+
+      name: actor.name,
       url: actor.url,
       host: actor.host,
+      avatars: actor.avatars,
+
+      // TODO: remove, deprecated in 4.2
       avatar: actor.avatar
     }
   }
diff --git a/server/models/actor/actor-follow.ts b/server/models/actor/actor-follow.ts
index 006282530..0f4d3c0a6 100644
--- a/server/models/actor/actor-follow.ts
+++ b/server/models/actor/actor-follow.ts
@@ -1,5 +1,5 @@
 import { difference, values } from 'lodash'
-import { IncludeOptions, Op, QueryTypes, Transaction, WhereOptions } from 'sequelize'
+import { Includeable, IncludeOptions, literal, Op, QueryTypes, Transaction, WhereOptions } from 'sequelize'
 import {
   AfterCreate,
   AfterDestroy,
@@ -30,12 +30,12 @@ import {
   MActorFollowFormattable,
   MActorFollowSubscriptions
 } from '@server/types/models'
-import { AttributesOnly } from '@shared/typescript-utils'
 import { ActivityPubActorType } from '@shared/models'
+import { AttributesOnly } from '@shared/typescript-utils'
 import { FollowState } from '../../../shared/models/actors'
 import { ActorFollow } from '../../../shared/models/actors/follow.model'
 import { logger } from '../../helpers/logger'
-import { ACTOR_FOLLOW_SCORE, CONSTRAINTS_FIELDS, FOLLOW_STATES, SERVER_ACTOR_NAME } from '../../initializers/constants'
+import { ACTOR_FOLLOW_SCORE, CONSTRAINTS_FIELDS, FOLLOW_STATES, SERVER_ACTOR_NAME, SORTABLE_COLUMNS } from '../../initializers/constants'
 import { AccountModel } from '../account/account'
 import { ServerModel } from '../server/server'
 import { doesExist } from '../shared/query'
@@ -375,43 +375,46 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo
       Object.assign(followingWhere, { type: actorType })
     }
 
-    const query = {
-      distinct: true,
-      offset: start,
-      limit: count,
-      order: getFollowsSort(sort),
-      where: followWhere,
-      include: [
-        {
-          model: ActorModel,
-          required: true,
-          as: 'ActorFollower',
-          where: {
-            id
-          }
-        },
-        {
-          model: ActorModel,
-          as: 'ActorFollowing',
-          required: true,
-          where: followingWhere,
-          include: [
-            {
-              model: ServerModel,
-              required: true
+    const getQuery = (forCount: boolean) => {
+      const actorModel = forCount
+        ? ActorModel.unscoped()
+        : ActorModel
+
+      return {
+        distinct: true,
+        offset: start,
+        limit: count,
+        order: getFollowsSort(sort),
+        where: followWhere,
+        include: [
+          {
+            model: actorModel,
+            required: true,
+            as: 'ActorFollower',
+            where: {
+              id
             }
-          ]
-        }
-      ]
+          },
+          {
+            model: actorModel,
+            as: 'ActorFollowing',
+            required: true,
+            where: followingWhere,
+            include: [
+              {
+                model: ServerModel,
+                required: true
+              }
+            ]
+          }
+        ]
+      }
     }
 
-    return ActorFollowModel.findAndCountAll<MActorFollowActorsDefault>(query)
-      .then(({ rows, count }) => {
-        return {
-          data: rows,
-          total: count
-        }
-      })
+    return Promise.all([
+      ActorFollowModel.count(getQuery(true)),
+      ActorFollowModel.findAll<MActorFollowActorsDefault>(getQuery(false))
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listFollowersForApi (options: {
@@ -429,11 +432,17 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo
     const followerWhere: WhereOptions = {}
 
     if (search) {
-      Object.assign(followWhere, {
-        [Op.or]: [
-          searchAttribute(search, '$ActorFollower.preferredUsername$'),
-          searchAttribute(search, '$ActorFollower.Server.host$')
-        ]
+      const escapedSearch = ActorFollowModel.sequelize.escape('%' + search + '%')
+
+      Object.assign(followerWhere, {
+        id: {
+          [Op.in]: literal(
+            `(` +
+              `SELECT "actor".id FROM actor LEFT JOIN server on server.id = actor."serverId" ` +
+              `WHERE "preferredUsername" ILIKE ${escapedSearch} OR "host" ILIKE ${escapedSearch}` +
+            `)`
+          )
+        }
       })
     }
 
@@ -441,39 +450,43 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo
       Object.assign(followerWhere, { type: actorType })
     }
 
-    const query = {
-      distinct: true,
-      offset: start,
-      limit: count,
-      order: getFollowsSort(sort),
-      where: followWhere,
-      include: [
-        {
-          model: ActorModel,
-          required: true,
-          as: 'ActorFollower',
-          where: followerWhere
-        },
-        {
-          model: ActorModel,
-          as: 'ActorFollowing',
-          required: true,
-          where: {
-            id: {
-              [Op.in]: actorIds
+    const getQuery = (forCount: boolean) => {
+      const actorModel = forCount
+        ? ActorModel.unscoped()
+        : ActorModel
+
+      return {
+        distinct: true,
+
+        offset: start,
+        limit: count,
+        order: getFollowsSort(sort),
+        where: followWhere,
+        include: [
+          {
+            model: actorModel,
+            required: true,
+            as: 'ActorFollower',
+            where: followerWhere
+          },
+          {
+            model: actorModel,
+            as: 'ActorFollowing',
+            required: true,
+            where: {
+              id: {
+                [Op.in]: actorIds
+              }
             }
           }
-        }
-      ]
+        ]
+      }
     }
 
-    return ActorFollowModel.findAndCountAll<MActorFollowActorsDefault>(query)
-                           .then(({ rows, count }) => {
-                             return {
-                               data: rows,
-                               total: count
-                             }
-                           })
+    return Promise.all([
+      ActorFollowModel.count(getQuery(true)),
+      ActorFollowModel.findAll<MActorFollowActorsDefault>(getQuery(false))
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listSubscriptionsForApi (options: {
@@ -497,58 +510,68 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo
       })
     }
 
-    const query = {
-      attributes: [],
-      distinct: true,
-      offset: start,
-      limit: count,
-      order: getSort(sort),
-      where,
-      include: [
-        {
-          attributes: [ 'id' ],
-          model: ActorModel.unscoped(),
-          as: 'ActorFollowing',
-          required: true,
-          include: [
-            {
-              model: VideoChannelModel.unscoped(),
-              required: true,
-              include: [
-                {
-                  attributes: {
-                    exclude: unusedActorAttributesForAPI
-                  },
-                  model: ActorModel,
-                  required: true
+    const getQuery = (forCount: boolean) => {
+      let channelInclude: Includeable[] = []
+
+      if (forCount !== true) {
+        channelInclude = [
+          {
+            attributes: {
+              exclude: unusedActorAttributesForAPI
+            },
+            model: ActorModel,
+            required: true
+          },
+          {
+            model: AccountModel.unscoped(),
+            required: true,
+            include: [
+              {
+                attributes: {
+                  exclude: unusedActorAttributesForAPI
                 },
-                {
-                  model: AccountModel.unscoped(),
-                  required: true,
-                  include: [
-                    {
-                      attributes: {
-                        exclude: unusedActorAttributesForAPI
-                      },
-                      model: ActorModel,
-                      required: true
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      ]
+                model: ActorModel,
+                required: true
+              }
+            ]
+          }
+        ]
+      }
+
+      return {
+        attributes: forCount === true
+          ? []
+          : SORTABLE_COLUMNS.USER_SUBSCRIPTIONS,
+        distinct: true,
+        offset: start,
+        limit: count,
+        order: getSort(sort),
+        where,
+        include: [
+          {
+            attributes: [ 'id' ],
+            model: ActorModel.unscoped(),
+            as: 'ActorFollowing',
+            required: true,
+            include: [
+              {
+                model: VideoChannelModel.unscoped(),
+                required: true,
+                include: channelInclude
+              }
+            ]
+          }
+        ]
+      }
     }
 
-    return ActorFollowModel.findAndCountAll<MActorFollowSubscriptions>(query)
-                           .then(({ rows, count }) => {
-                             return {
-                               data: rows.map(r => r.ActorFollowing.VideoChannel),
-                               total: count
-                             }
-                           })
+    return Promise.all([
+      ActorFollowModel.count(getQuery(true)),
+      ActorFollowModel.findAll<MActorFollowSubscriptions>(getQuery(false))
+    ]).then(([ total, rows ]) => ({
+      total,
+      data: rows.map(r => r.ActorFollowing.VideoChannel)
+    }))
   }
 
   static async keepUnfollowedInstance (hosts: string[]) {
diff --git a/server/models/actor/actor-image.ts b/server/models/actor/actor-image.ts
index 8edff5ab4..f74ab735e 100644
--- a/server/models/actor/actor-image.ts
+++ b/server/models/actor/actor-image.ts
@@ -1,15 +1,29 @@
 import { remove } from 'fs-extra'
 import { join } from 'path'
-import { AfterDestroy, AllowNull, Column, CreatedAt, Default, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
-import { MActorImageFormattable } from '@server/types/models'
+import {
+  AfterDestroy,
+  AllowNull,
+  BelongsTo,
+  Column,
+  CreatedAt,
+  Default,
+  ForeignKey,
+  Is,
+  Model,
+  Table,
+  UpdatedAt
+} from 'sequelize-typescript'
+import { MActorImage, MActorImageFormattable } from '@server/types/models'
+import { getLowercaseExtension } from '@shared/core-utils'
+import { ActivityIconObject, ActorImageType } from '@shared/models'
 import { AttributesOnly } from '@shared/typescript-utils'
-import { ActorImageType } from '@shared/models'
 import { ActorImage } from '../../../shared/models/actors/actor-image.model'
 import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
 import { logger } from '../../helpers/logger'
 import { CONFIG } from '../../initializers/config'
-import { LAZY_STATIC_PATHS } from '../../initializers/constants'
+import { LAZY_STATIC_PATHS, MIMETYPES, WEBSERVER } from '../../initializers/constants'
 import { throwIfNotValid } from '../utils'
+import { ActorModel } from './actor'
 
 @Table({
   tableName: 'actorImage',
@@ -17,6 +31,10 @@ import { throwIfNotValid } from '../utils'
     {
       fields: [ 'filename' ],
       unique: true
+    },
+    {
+      fields: [ 'actorId', 'type', 'width' ],
+      unique: true
     }
   ]
 })
@@ -55,6 +73,18 @@ export class ActorImageModel extends Model<Partial<AttributesOnly<ActorImageMode
   @UpdatedAt
   updatedAt: Date
 
+  @ForeignKey(() => ActorModel)
+  @Column
+  actorId: number
+
+  @BelongsTo(() => ActorModel, {
+    foreignKey: {
+      allowNull: false
+    },
+    onDelete: 'CASCADE'
+  })
+  Actor: ActorModel
+
   @AfterDestroy
   static removeFilesAndSendDelete (instance: ActorImageModel) {
     logger.info('Removing actor image file %s.', instance.filename)
@@ -74,20 +104,41 @@ export class ActorImageModel extends Model<Partial<AttributesOnly<ActorImageMode
     return ActorImageModel.findOne(query)
   }
 
+  static getImageUrl (image: MActorImage) {
+    if (!image) return undefined
+
+    return WEBSERVER.URL + image.getStaticPath()
+  }
+
   toFormattedJSON (this: MActorImageFormattable): ActorImage {
     return {
+      width: this.width,
       path: this.getStaticPath(),
       createdAt: this.createdAt,
       updatedAt: this.updatedAt
     }
   }
 
-  getStaticPath () {
-    if (this.type === ActorImageType.AVATAR) {
-      return join(LAZY_STATIC_PATHS.AVATARS, this.filename)
+  toActivityPubObject (): ActivityIconObject {
+    const extension = getLowercaseExtension(this.filename)
+
+    return {
+      type: 'Image',
+      mediaType: MIMETYPES.IMAGE.EXT_MIMETYPE[extension],
+      height: this.height,
+      width: this.width,
+      url: ActorImageModel.getImageUrl(this)
     }
+  }
 
-    return join(LAZY_STATIC_PATHS.BANNERS, this.filename)
+  getStaticPath () {
+    switch (this.type) {
+      case ActorImageType.AVATAR:
+        return join(LAZY_STATIC_PATHS.AVATARS, this.filename)
+
+      case ActorImageType.BANNER:
+        return join(LAZY_STATIC_PATHS.BANNERS, this.filename)
+    }
   }
 
   getPath () {
diff --git a/server/models/actor/actor.ts b/server/models/actor/actor.ts
index c12dcf634..08cb2fd24 100644
--- a/server/models/actor/actor.ts
+++ b/server/models/actor/actor.ts
@@ -16,11 +16,11 @@ import {
   Table,
   UpdatedAt
 } from 'sequelize-typescript'
+import { getBiggestActorImage } from '@server/lib/actor-image'
 import { ModelCache } from '@server/models/model-cache'
 import { getLowercaseExtension } from '@shared/core-utils'
+import { ActivityIconObject, ActivityPubActorType, ActorImageType } from '@shared/models'
 import { AttributesOnly } from '@shared/typescript-utils'
-import { ActivityIconObject, ActivityPubActorType } from '../../../shared/models/activitypub'
-import { ActorImage } from '../../../shared/models/actors/actor-image.model'
 import { activityPubContextify } from '../../helpers/activitypub'
 import {
   isActorFollowersCountValid,
@@ -81,7 +81,7 @@ export const unusedActorAttributesForAPI = [
     },
     {
       model: ActorImageModel,
-      as: 'Avatar',
+      as: 'Avatars',
       required: false
     }
   ]
@@ -109,12 +109,12 @@ export const unusedActorAttributesForAPI = [
       },
       {
         model: ActorImageModel,
-        as: 'Avatar',
+        as: 'Avatars',
         required: false
       },
       {
         model: ActorImageModel,
-        as: 'Banner',
+        as: 'Banners',
         required: false
       }
     ]
@@ -152,9 +152,6 @@ export const unusedActorAttributesForAPI = [
     {
       fields: [ 'serverId' ]
     },
-    {
-      fields: [ 'avatarId' ]
-    },
     {
       fields: [ 'followersUrl' ]
     }
@@ -231,35 +228,31 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
   @UpdatedAt
   updatedAt: Date
 
-  @ForeignKey(() => ActorImageModel)
-  @Column
-  avatarId: number
-
-  @ForeignKey(() => ActorImageModel)
-  @Column
-  bannerId: number
-
-  @BelongsTo(() => ActorImageModel, {
+  @HasMany(() => ActorImageModel, {
+    as: 'Avatars',
+    onDelete: 'cascade',
+    hooks: true,
     foreignKey: {
-      name: 'avatarId',
-      allowNull: true
+      allowNull: false
     },
-    as: 'Avatar',
-    onDelete: 'set null',
-    hooks: true
+    scope: {
+      type: ActorImageType.AVATAR
+    }
   })
-  Avatar: ActorImageModel
+  Avatars: ActorImageModel[]
 
-  @BelongsTo(() => ActorImageModel, {
+  @HasMany(() => ActorImageModel, {
+    as: 'Banners',
+    onDelete: 'cascade',
+    hooks: true,
     foreignKey: {
-      name: 'bannerId',
-      allowNull: true
+      allowNull: false
     },
-    as: 'Banner',
-    onDelete: 'set null',
-    hooks: true
+    scope: {
+      type: ActorImageType.BANNER
+    }
   })
-  Banner: ActorImageModel
+  Banners: ActorImageModel[]
 
   @HasMany(() => ActorFollowModel, {
     foreignKey: {
@@ -386,8 +379,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
         transaction
       }
 
-      return ActorModel.scope(ScopeNames.FULL)
-                       .findOne(query)
+      return ActorModel.scope(ScopeNames.FULL).findOne(query)
     }
 
     return ModelCache.Instance.doCache({
@@ -410,8 +402,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
         transaction
       }
 
-      return ActorModel.unscoped()
-                       .findOne(query)
+      return ActorModel.unscoped().findOne(query)
     }
 
     return ModelCache.Instance.doCache({
@@ -532,55 +523,50 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
   }
 
   toFormattedSummaryJSON (this: MActorSummaryFormattable) {
-    let avatar: ActorImage = null
-    if (this.Avatar) {
-      avatar = this.Avatar.toFormattedJSON()
-    }
-
     return {
       url: this.url,
       name: this.preferredUsername,
       host: this.getHost(),
-      avatar
+      avatars: (this.Avatars || []).map(a => a.toFormattedJSON()),
+
+      // TODO: remove, deprecated in 4.2
+      avatar: this.hasImage(ActorImageType.AVATAR)
+        ? this.Avatars[0].toFormattedJSON()
+        : undefined
     }
   }
 
   toFormattedJSON (this: MActorFormattable) {
-    const base = this.toFormattedSummaryJSON()
-
-    let banner: ActorImage = null
-    if (this.Banner) {
-      banner = this.Banner.toFormattedJSON()
-    }
+    return {
+      ...this.toFormattedSummaryJSON(),
 
-    return Object.assign(base, {
       id: this.id,
       hostRedundancyAllowed: this.getRedundancyAllowed(),
       followingCount: this.followingCount,
       followersCount: this.followersCount,
-      banner,
-      createdAt: this.getCreatedAt()
-    })
+      createdAt: this.getCreatedAt(),
+
+      banners: (this.Banners || []).map(b => b.toFormattedJSON()),
+
+      // TODO: remove, deprecated in 4.2
+      banner: this.hasImage(ActorImageType.BANNER)
+        ? this.Banners[0].toFormattedJSON()
+        : undefined
+    }
   }
 
   toActivityPubObject (this: MActorAPChannel | MActorAPAccount, name: string) {
     let icon: ActivityIconObject
+    let icons: ActivityIconObject[]
     let image: ActivityIconObject
 
-    if (this.avatarId) {
-      const extension = getLowercaseExtension(this.Avatar.filename)
-
-      icon = {
-        type: 'Image',
-        mediaType: MIMETYPES.IMAGE.EXT_MIMETYPE[extension],
-        height: this.Avatar.height,
-        width: this.Avatar.width,
-        url: this.getAvatarUrl()
-      }
+    if (this.hasImage(ActorImageType.AVATAR)) {
+      icon = getBiggestActorImage(this.Avatars).toActivityPubObject()
+      icons = this.Avatars.map(a => a.toActivityPubObject())
     }
 
-    if (this.bannerId) {
-      const banner = (this as MActorAPChannel).Banner
+    if (this.hasImage(ActorImageType.BANNER)) {
+      const banner = getBiggestActorImage((this as MActorAPChannel).Banners)
       const extension = getLowercaseExtension(banner.filename)
 
       image = {
@@ -588,7 +574,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
         mediaType: MIMETYPES.IMAGE.EXT_MIMETYPE[extension],
         height: banner.height,
         width: banner.width,
-        url: this.getBannerUrl()
+        url: ActorImageModel.getImageUrl(banner)
       }
     }
 
@@ -612,7 +598,10 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
         publicKeyPem: this.publicKey
       },
       published: this.getCreatedAt().toISOString(),
+
       icon,
+      icons,
+
       image
     }
 
@@ -677,16 +666,12 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
     return this.Server ? this.Server.redundancyAllowed : false
   }
 
-  getAvatarUrl () {
-    if (!this.avatarId) return undefined
-
-    return WEBSERVER.URL + this.Avatar.getStaticPath()
-  }
-
-  getBannerUrl () {
-    if (!this.bannerId) return undefined
+  hasImage (type: ActorImageType) {
+    const images = type === ActorImageType.AVATAR
+      ? this.Avatars
+      : this.Banners
 
-    return WEBSERVER.URL + this.Banner.getStaticPath()
+    return Array.isArray(images) && images.length !== 0
   }
 
   isOutdated () {
diff --git a/server/models/server/plugin.ts b/server/models/server/plugin.ts
index 05083e3f7..fa5b4cc4b 100644
--- a/server/models/server/plugin.ts
+++ b/server/models/server/plugin.ts
@@ -239,11 +239,10 @@ export class PluginModel extends Model<Partial<AttributesOnly<PluginModel>>> {
 
     if (options.pluginType) query.where['type'] = options.pluginType
 
-    return PluginModel
-      .findAndCountAll<MPlugin>(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    return Promise.all([
+      PluginModel.count(query),
+      PluginModel.findAll<MPlugin>(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listInstalled (): Promise<MPlugin[]> {
diff --git a/server/models/server/server-blocklist.ts b/server/models/server/server-blocklist.ts
index 9f64eeb7f..9752dfbc3 100644
--- a/server/models/server/server-blocklist.ts
+++ b/server/models/server/server-blocklist.ts
@@ -1,8 +1,8 @@
 import { Op, QueryTypes } from 'sequelize'
 import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
 import { MServerBlocklist, MServerBlocklistAccountServer, MServerBlocklistFormattable } from '@server/types/models'
-import { AttributesOnly } from '@shared/typescript-utils'
 import { ServerBlock } from '@shared/models'
+import { AttributesOnly } from '@shared/typescript-utils'
 import { AccountModel } from '../account/account'
 import { createSafeIn, getSort, searchAttribute } from '../utils'
 import { ServerModel } from './server'
@@ -169,16 +169,15 @@ export class ServerBlocklistModel extends Model<Partial<AttributesOnly<ServerBlo
       order: getSort(sort),
       where: {
         accountId,
+
         ...searchAttribute(search, '$BlockedServer.host$')
       }
     }
 
-    return ServerBlocklistModel
-      .scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_SERVER ])
-      .findAndCountAll<MServerBlocklistAccountServer>(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    return Promise.all([
+      ServerBlocklistModel.scope(ScopeNames.WITH_SERVER).count(query),
+      ServerBlocklistModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_SERVER ]).findAll<MServerBlocklistAccountServer>(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   toFormattedJSON (this: MServerBlocklistFormattable): ServerBlock {
diff --git a/server/models/shared/index.ts b/server/models/shared/index.ts
index 5b97510e0..802404555 100644
--- a/server/models/shared/index.ts
+++ b/server/models/shared/index.ts
@@ -1,2 +1,3 @@
+export * from './model-builder'
 export * from './query'
 export * from './update'
diff --git a/server/models/shared/model-builder.ts b/server/models/shared/model-builder.ts
new file mode 100644
index 000000000..c015ca4f5
--- /dev/null
+++ b/server/models/shared/model-builder.ts
@@ -0,0 +1,101 @@
+import { isPlainObject } from 'lodash'
+import { Model as SequelizeModel, Sequelize } from 'sequelize'
+import { logger } from '@server/helpers/logger'
+
+export class ModelBuilder <T extends SequelizeModel> {
+  private readonly modelRegistry = new Map<string, T>()
+
+  constructor (private readonly sequelize: Sequelize) {
+
+  }
+
+  createModels (jsonArray: any[], baseModelName: string): T[] {
+    const result: T[] = []
+
+    for (const json of jsonArray) {
+      const { created, model } = this.createModel(json, baseModelName, json.id + '.' + baseModelName)
+
+      if (created) result.push(model)
+    }
+
+    return result
+  }
+
+  private createModel (json: any, modelName: string, keyPath: string) {
+    if (!json.id) return { created: false, model: null }
+
+    const { created, model } = this.createOrFindModel(json, modelName, keyPath)
+
+    for (const key of Object.keys(json)) {
+      const value = json[key]
+      if (!value) continue
+
+      // Child model
+      if (isPlainObject(value)) {
+        const { created, model: subModel } = this.createModel(value, key, keyPath + '.' + json.id + '.' + key)
+        if (!created || !subModel) continue
+
+        const Model = this.findModelBuilder(modelName)
+        const association = Model.associations[key]
+
+        if (!association) {
+          logger.error('Cannot find association %s of model %s', key, modelName, { associations: Object.keys(Model.associations) })
+          continue
+        }
+
+        if (association.isMultiAssociation) {
+          if (!Array.isArray(model[key])) model[key] = []
+
+          model[key].push(subModel)
+        } else {
+          model[key] = subModel
+        }
+      }
+    }
+
+    return { created, model }
+  }
+
+  private createOrFindModel (json: any, modelName: string, keyPath: string) {
+    const registryKey = this.getModelRegistryKey(json, keyPath)
+    if (this.modelRegistry.has(registryKey)) {
+      return {
+        created: false,
+        model: this.modelRegistry.get(registryKey)
+      }
+    }
+
+    const Model = this.findModelBuilder(modelName)
+
+    if (!Model) {
+      logger.error(
+        'Cannot build model %s that does not exist', this.buildSequelizeModelName(modelName),
+        { existing: this.sequelize.modelManager.all.map(m => m.name) }
+      )
+      return undefined
+    }
+
+    // FIXME: typings
+    const model = new (Model as any)(json)
+    this.modelRegistry.set(registryKey, model)
+
+    return { created: true, model }
+  }
+
+  private findModelBuilder (modelName: string) {
+    return this.sequelize.modelManager.getModel(this.buildSequelizeModelName(modelName))
+  }
+
+  private buildSequelizeModelName (modelName: string) {
+    if (modelName === 'Avatars') return 'ActorImageModel'
+    if (modelName === 'ActorFollowing') return 'ActorModel'
+    if (modelName === 'ActorFollower') return 'ActorModel'
+    if (modelName === 'FlaggedAccount') return 'AccountModel'
+
+    return modelName + 'Model'
+  }
+
+  private getModelRegistryKey (json: any, keyPath: string) {
+    return keyPath + json.id
+  }
+}
diff --git a/server/models/user/sql/user-notitication-list-query-builder.ts b/server/models/user/sql/user-notitication-list-query-builder.ts
new file mode 100644
index 000000000..9eae4fc22
--- /dev/null
+++ b/server/models/user/sql/user-notitication-list-query-builder.ts
@@ -0,0 +1,269 @@
+import { QueryTypes, Sequelize } from 'sequelize'
+import { ModelBuilder } from '@server/models/shared'
+import { getSort } from '@server/models/utils'
+import { UserNotificationModelForApi } from '@server/types/models'
+import { ActorImageType } from '@shared/models'
+
+export interface ListNotificationsOptions {
+  userId: number
+  unread?: boolean
+  sort: string
+  offset: number
+  limit: number
+  sequelize: Sequelize
+}
+
+export class UserNotificationListQueryBuilder {
+  private innerQuery: string
+  private replacements: any = {}
+  private query: string
+
+  constructor (private readonly options: ListNotificationsOptions) {
+
+  }
+
+  async listNotifications () {
+    this.buildQuery()
+
+    const results = await this.options.sequelize.query(this.query, {
+      replacements: this.replacements,
+      type: QueryTypes.SELECT,
+      nest: true
+    })
+
+    const modelBuilder = new ModelBuilder<UserNotificationModelForApi>(this.options.sequelize)
+
+    return modelBuilder.createModels(results, 'UserNotification')
+  }
+
+  private buildInnerQuery () {
+    this.innerQuery = `SELECT * FROM "userNotification" AS "UserNotificationModel" ` +
+      `${this.getWhere()} ` +
+      `${this.getOrder()} ` +
+      `LIMIT :limit OFFSET :offset `
+
+    this.replacements.limit = this.options.limit
+    this.replacements.offset = this.options.offset
+  }
+
+  private buildQuery () {
+    this.buildInnerQuery()
+
+    this.query = `
+      ${this.getSelect()}
+      FROM (${this.innerQuery}) "UserNotificationModel"
+      ${this.getJoins()}
+      ${this.getOrder()}`
+  }
+
+  private getWhere () {
+    let base = '"UserNotificationModel"."userId" = :userId '
+    this.replacements.userId = this.options.userId
+
+    if (this.options.unread === true) {
+      base += 'AND "UserNotificationModel"."read" IS FALSE '
+    } else if (this.options.unread === false) {
+      base += 'AND "UserNotificationModel"."read" IS TRUE '
+    }
+
+    return `WHERE ${base}`
+  }
+
+  private getOrder () {
+    const orders = getSort(this.options.sort)
+
+    return 'ORDER BY ' + orders.map(o => `"UserNotificationModel"."${o[0]}" ${o[1]}`).join(', ')
+  }
+
+  private getSelect () {
+    return `SELECT
+      "UserNotificationModel"."id",
+      "UserNotificationModel"."type",
+      "UserNotificationModel"."read",
+      "UserNotificationModel"."createdAt",
+      "UserNotificationModel"."updatedAt",
+      "Video"."id" AS "Video.id",
+      "Video"."uuid" AS "Video.uuid",
+      "Video"."name" AS "Video.name",
+      "Video->VideoChannel"."id" AS "Video.VideoChannel.id",
+      "Video->VideoChannel"."name" AS "Video.VideoChannel.name",
+      "Video->VideoChannel->Actor"."id" AS "Video.VideoChannel.Actor.id",
+      "Video->VideoChannel->Actor"."preferredUsername" AS "Video.VideoChannel.Actor.preferredUsername",
+      "Video->VideoChannel->Actor->Avatars"."id" AS "Video.VideoChannel.Actor.Avatars.id",
+      "Video->VideoChannel->Actor->Avatars"."width" AS "Video.VideoChannel.Actor.Avatars.width",
+      "Video->VideoChannel->Actor->Avatars"."filename" AS "Video.VideoChannel.Actor.Avatars.filename",
+      "Video->VideoChannel->Actor->Server"."id" AS "Video.VideoChannel.Actor.Server.id",
+      "Video->VideoChannel->Actor->Server"."host" AS "Video.VideoChannel.Actor.Server.host",
+      "VideoComment"."id" AS "VideoComment.id",
+      "VideoComment"."originCommentId" AS "VideoComment.originCommentId",
+      "VideoComment->Account"."id" AS "VideoComment.Account.id",
+      "VideoComment->Account"."name" AS "VideoComment.Account.name",
+      "VideoComment->Account->Actor"."id" AS "VideoComment.Account.Actor.id",
+      "VideoComment->Account->Actor"."preferredUsername" AS "VideoComment.Account.Actor.preferredUsername",
+      "VideoComment->Account->Actor->Avatars"."id" AS "VideoComment.Account.Actor.Avatars.id",
+      "VideoComment->Account->Actor->Avatars"."width" AS "VideoComment.Account.Actor.Avatars.width",
+      "VideoComment->Account->Actor->Avatars"."filename" AS "VideoComment.Account.Actor.Avatars.filename",
+      "VideoComment->Account->Actor->Server"."id" AS "VideoComment.Account.Actor.Server.id",
+      "VideoComment->Account->Actor->Server"."host" AS "VideoComment.Account.Actor.Server.host",
+      "VideoComment->Video"."id" AS "VideoComment.Video.id",
+      "VideoComment->Video"."uuid" AS "VideoComment.Video.uuid",
+      "VideoComment->Video"."name" AS "VideoComment.Video.name",
+      "Abuse"."id" AS "Abuse.id",
+      "Abuse"."state" AS "Abuse.state",
+      "Abuse->VideoAbuse"."id" AS "Abuse.VideoAbuse.id",
+      "Abuse->VideoAbuse->Video"."id" AS "Abuse.VideoAbuse.Video.id",
+      "Abuse->VideoAbuse->Video"."uuid" AS "Abuse.VideoAbuse.Video.uuid",
+      "Abuse->VideoAbuse->Video"."name" AS "Abuse.VideoAbuse.Video.name",
+      "Abuse->VideoCommentAbuse"."id" AS "Abuse.VideoCommentAbuse.id",
+      "Abuse->VideoCommentAbuse->VideoComment"."id" AS "Abuse.VideoCommentAbuse.VideoComment.id",
+      "Abuse->VideoCommentAbuse->VideoComment"."originCommentId" AS "Abuse.VideoCommentAbuse.VideoComment.originCommentId",
+      "Abuse->VideoCommentAbuse->VideoComment->Video"."id" AS "Abuse.VideoCommentAbuse.VideoComment.Video.id",
+      "Abuse->VideoCommentAbuse->VideoComment->Video"."name" AS "Abuse.VideoCommentAbuse.VideoComment.Video.name",
+      "Abuse->VideoCommentAbuse->VideoComment->Video"."uuid" AS "Abuse.VideoCommentAbuse.VideoComment.Video.uuid",
+      "Abuse->FlaggedAccount"."id" AS "Abuse.FlaggedAccount.id",
+      "Abuse->FlaggedAccount"."name" AS "Abuse.FlaggedAccount.name",
+      "Abuse->FlaggedAccount"."description" AS "Abuse.FlaggedAccount.description",
+      "Abuse->FlaggedAccount"."actorId" AS "Abuse.FlaggedAccount.actorId",
+      "Abuse->FlaggedAccount"."userId" AS "Abuse.FlaggedAccount.userId",
+      "Abuse->FlaggedAccount"."applicationId" AS "Abuse.FlaggedAccount.applicationId",
+      "Abuse->FlaggedAccount"."createdAt" AS "Abuse.FlaggedAccount.createdAt",
+      "Abuse->FlaggedAccount"."updatedAt" AS "Abuse.FlaggedAccount.updatedAt",
+      "Abuse->FlaggedAccount->Actor"."id" AS "Abuse.FlaggedAccount.Actor.id",
+      "Abuse->FlaggedAccount->Actor"."preferredUsername" AS "Abuse.FlaggedAccount.Actor.preferredUsername",
+      "Abuse->FlaggedAccount->Actor->Avatars"."id" AS "Abuse.FlaggedAccount.Actor.Avatars.id",
+      "Abuse->FlaggedAccount->Actor->Avatars"."width" AS "Abuse.FlaggedAccount.Actor.Avatars.width",
+      "Abuse->FlaggedAccount->Actor->Avatars"."filename" AS "Abuse.FlaggedAccount.Actor.Avatars.filename",
+      "Abuse->FlaggedAccount->Actor->Server"."id" AS "Abuse.FlaggedAccount.Actor.Server.id",
+      "Abuse->FlaggedAccount->Actor->Server"."host" AS "Abuse.FlaggedAccount.Actor.Server.host",
+      "VideoBlacklist"."id" AS "VideoBlacklist.id",
+      "VideoBlacklist->Video"."id" AS "VideoBlacklist.Video.id",
+      "VideoBlacklist->Video"."uuid" AS "VideoBlacklist.Video.uuid",
+      "VideoBlacklist->Video"."name" AS "VideoBlacklist.Video.name",
+      "VideoImport"."id" AS "VideoImport.id",
+      "VideoImport"."magnetUri" AS "VideoImport.magnetUri",
+      "VideoImport"."targetUrl" AS "VideoImport.targetUrl",
+      "VideoImport"."torrentName" AS "VideoImport.torrentName",
+      "VideoImport->Video"."id" AS "VideoImport.Video.id",
+      "VideoImport->Video"."uuid" AS "VideoImport.Video.uuid",
+      "VideoImport->Video"."name" AS "VideoImport.Video.name",
+      "Plugin"."id" AS "Plugin.id",
+      "Plugin"."name" AS "Plugin.name",
+      "Plugin"."type" AS "Plugin.type",
+      "Plugin"."latestVersion" AS "Plugin.latestVersion",
+      "Application"."id" AS "Application.id",
+      "Application"."latestPeerTubeVersion" AS "Application.latestPeerTubeVersion",
+      "ActorFollow"."id" AS "ActorFollow.id",
+      "ActorFollow"."state" AS "ActorFollow.state",
+      "ActorFollow->ActorFollower"."id" AS "ActorFollow.ActorFollower.id",
+      "ActorFollow->ActorFollower"."preferredUsername" AS "ActorFollow.ActorFollower.preferredUsername",
+      "ActorFollow->ActorFollower->Account"."id" AS "ActorFollow.ActorFollower.Account.id",
+      "ActorFollow->ActorFollower->Account"."name" AS "ActorFollow.ActorFollower.Account.name",
+      "ActorFollow->ActorFollower->Avatars"."id" AS "ActorFollow.ActorFollower.Avatars.id",
+      "ActorFollow->ActorFollower->Avatars"."width" AS "ActorFollow.ActorFollower.Avatars.width",
+      "ActorFollow->ActorFollower->Avatars"."filename" AS "ActorFollow.ActorFollower.Avatars.filename",
+      "ActorFollow->ActorFollower->Server"."id" AS "ActorFollow.ActorFollower.Server.id",
+      "ActorFollow->ActorFollower->Server"."host" AS "ActorFollow.ActorFollower.Server.host",
+      "ActorFollow->ActorFollowing"."id" AS "ActorFollow.ActorFollowing.id",
+      "ActorFollow->ActorFollowing"."preferredUsername" AS "ActorFollow.ActorFollowing.preferredUsername",
+      "ActorFollow->ActorFollowing"."type" AS "ActorFollow.ActorFollowing.type",
+      "ActorFollow->ActorFollowing->VideoChannel"."id" AS "ActorFollow.ActorFollowing.VideoChannel.id",
+      "ActorFollow->ActorFollowing->VideoChannel"."name" AS "ActorFollow.ActorFollowing.VideoChannel.name",
+      "ActorFollow->ActorFollowing->Account"."id" AS "ActorFollow.ActorFollowing.Account.id",
+      "ActorFollow->ActorFollowing->Account"."name" AS "ActorFollow.ActorFollowing.Account.name",
+      "ActorFollow->ActorFollowing->Server"."id" AS "ActorFollow.ActorFollowing.Server.id",
+      "ActorFollow->ActorFollowing->Server"."host" AS "ActorFollow.ActorFollowing.Server.host",
+      "Account"."id" AS "Account.id",
+      "Account"."name" AS "Account.name",
+      "Account->Actor"."id" AS "Account.Actor.id",
+      "Account->Actor"."preferredUsername" AS "Account.Actor.preferredUsername",
+      "Account->Actor->Avatars"."id" AS "Account.Actor.Avatars.id",
+      "Account->Actor->Avatars"."width" AS "Account.Actor.Avatars.width",
+      "Account->Actor->Avatars"."filename" AS "Account.Actor.Avatars.filename",
+      "Account->Actor->Server"."id" AS "Account.Actor.Server.id",
+      "Account->Actor->Server"."host" AS "Account.Actor.Server.host"`
+  }
+
+  private getJoins () {
+    return `
+    LEFT JOIN (
+      "video" AS "Video"
+      INNER JOIN "videoChannel" AS "Video->VideoChannel" ON "Video"."channelId" = "Video->VideoChannel"."id"
+      INNER JOIN "actor" AS "Video->VideoChannel->Actor" ON "Video->VideoChannel"."actorId" = "Video->VideoChannel->Actor"."id"
+      LEFT JOIN "actorImage" AS "Video->VideoChannel->Actor->Avatars"
+        ON "Video->VideoChannel->Actor"."id" = "Video->VideoChannel->Actor->Avatars"."actorId"
+        AND "Video->VideoChannel->Actor->Avatars"."type" = ${ActorImageType.AVATAR}
+      LEFT JOIN "server" AS "Video->VideoChannel->Actor->Server"
+        ON "Video->VideoChannel->Actor"."serverId" = "Video->VideoChannel->Actor->Server"."id"
+    ) ON "UserNotificationModel"."videoId" = "Video"."id"
+
+  LEFT JOIN (
+    "videoComment" AS "VideoComment"
+    INNER JOIN "account" AS "VideoComment->Account" ON "VideoComment"."accountId" = "VideoComment->Account"."id"
+    INNER JOIN "actor" AS "VideoComment->Account->Actor" ON "VideoComment->Account"."actorId" = "VideoComment->Account->Actor"."id"
+    LEFT JOIN "actorImage" AS "VideoComment->Account->Actor->Avatars"
+      ON "VideoComment->Account->Actor"."id" = "VideoComment->Account->Actor->Avatars"."actorId"
+      AND "VideoComment->Account->Actor->Avatars"."type" = ${ActorImageType.AVATAR}
+    LEFT JOIN "server" AS "VideoComment->Account->Actor->Server"
+      ON "VideoComment->Account->Actor"."serverId" = "VideoComment->Account->Actor->Server"."id"
+    INNER JOIN "video" AS "VideoComment->Video" ON "VideoComment"."videoId" = "VideoComment->Video"."id"
+  ) ON "UserNotificationModel"."commentId" = "VideoComment"."id"
+
+  LEFT JOIN "abuse" AS "Abuse" ON "UserNotificationModel"."abuseId" = "Abuse"."id"
+  LEFT JOIN "videoAbuse" AS "Abuse->VideoAbuse" ON "Abuse"."id" = "Abuse->VideoAbuse"."abuseId"
+  LEFT JOIN "video" AS "Abuse->VideoAbuse->Video" ON "Abuse->VideoAbuse"."videoId" = "Abuse->VideoAbuse->Video"."id"
+  LEFT JOIN "commentAbuse" AS "Abuse->VideoCommentAbuse" ON "Abuse"."id" = "Abuse->VideoCommentAbuse"."abuseId"
+  LEFT JOIN "videoComment" AS "Abuse->VideoCommentAbuse->VideoComment"
+    ON "Abuse->VideoCommentAbuse"."videoCommentId" = "Abuse->VideoCommentAbuse->VideoComment"."id"
+  LEFT JOIN "video" AS "Abuse->VideoCommentAbuse->VideoComment->Video"
+    ON "Abuse->VideoCommentAbuse->VideoComment"."videoId" = "Abuse->VideoCommentAbuse->VideoComment->Video"."id"
+  LEFT JOIN (
+    "account" AS "Abuse->FlaggedAccount"
+    INNER JOIN "actor" AS "Abuse->FlaggedAccount->Actor" ON "Abuse->FlaggedAccount"."actorId" = "Abuse->FlaggedAccount->Actor"."id"
+    LEFT JOIN "actorImage" AS "Abuse->FlaggedAccount->Actor->Avatars"
+      ON "Abuse->FlaggedAccount->Actor"."id" = "Abuse->FlaggedAccount->Actor->Avatars"."actorId"
+      AND "Abuse->FlaggedAccount->Actor->Avatars"."type" = ${ActorImageType.AVATAR}
+    LEFT JOIN "server" AS "Abuse->FlaggedAccount->Actor->Server"
+      ON "Abuse->FlaggedAccount->Actor"."serverId" = "Abuse->FlaggedAccount->Actor->Server"."id"
+  ) ON "Abuse"."flaggedAccountId" = "Abuse->FlaggedAccount"."id"
+
+  LEFT JOIN (
+    "videoBlacklist" AS "VideoBlacklist"
+    INNER JOIN "video" AS "VideoBlacklist->Video" ON "VideoBlacklist"."videoId" = "VideoBlacklist->Video"."id"
+  ) ON "UserNotificationModel"."videoBlacklistId" = "VideoBlacklist"."id"
+
+  LEFT JOIN "videoImport" AS "VideoImport" ON "UserNotificationModel"."videoImportId" = "VideoImport"."id"
+  LEFT JOIN "video" AS "VideoImport->Video" ON "VideoImport"."videoId" = "VideoImport->Video"."id"
+
+  LEFT JOIN "plugin" AS "Plugin" ON "UserNotificationModel"."pluginId" = "Plugin"."id"
+
+  LEFT JOIN "application" AS "Application" ON "UserNotificationModel"."applicationId" = "Application"."id"
+
+  LEFT JOIN (
+    "actorFollow" AS "ActorFollow"
+    INNER JOIN "actor" AS "ActorFollow->ActorFollower" ON "ActorFollow"."actorId" = "ActorFollow->ActorFollower"."id"
+    INNER JOIN "account" AS "ActorFollow->ActorFollower->Account"
+      ON "ActorFollow->ActorFollower"."id" = "ActorFollow->ActorFollower->Account"."actorId"
+    LEFT JOIN "actorImage" AS "ActorFollow->ActorFollower->Avatars"
+      ON "ActorFollow->ActorFollower"."id" = "ActorFollow->ActorFollower->Avatars"."actorId"
+      AND "ActorFollow->ActorFollower->Avatars"."type" = ${ActorImageType.AVATAR}
+    LEFT JOIN "server" AS "ActorFollow->ActorFollower->Server"
+      ON "ActorFollow->ActorFollower"."serverId" = "ActorFollow->ActorFollower->Server"."id"
+    INNER JOIN "actor" AS "ActorFollow->ActorFollowing" ON "ActorFollow"."targetActorId" = "ActorFollow->ActorFollowing"."id"
+    LEFT JOIN "videoChannel" AS "ActorFollow->ActorFollowing->VideoChannel"
+      ON "ActorFollow->ActorFollowing"."id" = "ActorFollow->ActorFollowing->VideoChannel"."actorId"
+    LEFT JOIN "account" AS "ActorFollow->ActorFollowing->Account"
+      ON "ActorFollow->ActorFollowing"."id" = "ActorFollow->ActorFollowing->Account"."actorId"
+    LEFT JOIN "server" AS "ActorFollow->ActorFollowing->Server"
+      ON "ActorFollow->ActorFollowing"."serverId" = "ActorFollow->ActorFollowing->Server"."id"
+  ) ON "UserNotificationModel"."actorFollowId" = "ActorFollow"."id"
+
+  LEFT JOIN (
+    "account" AS "Account"
+    INNER JOIN "actor" AS "Account->Actor" ON "Account"."actorId" = "Account->Actor"."id"
+    LEFT JOIN "actorImage" AS "Account->Actor->Avatars"
+      ON "Account->Actor"."id" = "Account->Actor->Avatars"."actorId"
+      AND "Account->Actor->Avatars"."type" = ${ActorImageType.AVATAR}
+    LEFT JOIN "server" AS "Account->Actor->Server" ON "Account->Actor"."serverId" = "Account->Actor->Server"."id"
+  ) ON "UserNotificationModel"."accountId" = "Account"."id"`
+  }
+}
diff --git a/server/models/user/user-notification.ts b/server/models/user/user-notification.ts
index edad10a55..eca127e7e 100644
--- a/server/models/user/user-notification.ts
+++ b/server/models/user/user-notification.ts
@@ -1,5 +1,6 @@
-import { FindOptions, ModelIndexesOptions, Op, WhereOptions } from 'sequelize'
-import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Is, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+import { ModelIndexesOptions, Op, WhereOptions } from 'sequelize'
+import { AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { getBiggestActorImage } from '@server/lib/actor-image'
 import { UserNotificationIncludes, UserNotificationModelForApi } from '@server/types/models/user'
 import { uuidToShort } from '@shared/extra-utils'
 import { UserNotification, UserNotificationType } from '@shared/models'
@@ -7,207 +8,18 @@ import { AttributesOnly } from '@shared/typescript-utils'
 import { isBooleanValid } from '../../helpers/custom-validators/misc'
 import { isUserNotificationTypeValid } from '../../helpers/custom-validators/user-notifications'
 import { AbuseModel } from '../abuse/abuse'
-import { VideoAbuseModel } from '../abuse/video-abuse'
-import { VideoCommentAbuseModel } from '../abuse/video-comment-abuse'
 import { AccountModel } from '../account/account'
-import { ActorModel } from '../actor/actor'
 import { ActorFollowModel } from '../actor/actor-follow'
-import { ActorImageModel } from '../actor/actor-image'
 import { ApplicationModel } from '../application/application'
 import { PluginModel } from '../server/plugin'
-import { ServerModel } from '../server/server'
-import { getSort, throwIfNotValid } from '../utils'
+import { throwIfNotValid } from '../utils'
 import { VideoModel } from '../video/video'
 import { VideoBlacklistModel } from '../video/video-blacklist'
-import { VideoChannelModel } from '../video/video-channel'
 import { VideoCommentModel } from '../video/video-comment'
 import { VideoImportModel } from '../video/video-import'
+import { UserNotificationListQueryBuilder } from './sql/user-notitication-list-query-builder'
 import { UserModel } from './user'
 
-enum ScopeNames {
-  WITH_ALL = 'WITH_ALL'
-}
-
-function buildActorWithAvatarInclude () {
-  return {
-    attributes: [ 'preferredUsername' ],
-    model: ActorModel.unscoped(),
-    required: true,
-    include: [
-      {
-        attributes: [ 'filename' ],
-        as: 'Avatar',
-        model: ActorImageModel.unscoped(),
-        required: false
-      },
-      {
-        attributes: [ 'host' ],
-        model: ServerModel.unscoped(),
-        required: false
-      }
-    ]
-  }
-}
-
-function buildVideoInclude (required: boolean) {
-  return {
-    attributes: [ 'id', 'uuid', 'name' ],
-    model: VideoModel.unscoped(),
-    required
-  }
-}
-
-function buildChannelInclude (required: boolean, withActor = false) {
-  return {
-    required,
-    attributes: [ 'id', 'name' ],
-    model: VideoChannelModel.unscoped(),
-    include: withActor === true ? [ buildActorWithAvatarInclude() ] : []
-  }
-}
-
-function buildAccountInclude (required: boolean, withActor = false) {
-  return {
-    required,
-    attributes: [ 'id', 'name' ],
-    model: AccountModel.unscoped(),
-    include: withActor === true ? [ buildActorWithAvatarInclude() ] : []
-  }
-}
-
-@Scopes(() => ({
-  [ScopeNames.WITH_ALL]: {
-    include: [
-      Object.assign(buildVideoInclude(false), {
-        include: [ buildChannelInclude(true, true) ]
-      }),
-
-      {
-        attributes: [ 'id', 'originCommentId' ],
-        model: VideoCommentModel.unscoped(),
-        required: false,
-        include: [
-          buildAccountInclude(true, true),
-          buildVideoInclude(true)
-        ]
-      },
-
-      {
-        attributes: [ 'id', 'state' ],
-        model: AbuseModel.unscoped(),
-        required: false,
-        include: [
-          {
-            attributes: [ 'id' ],
-            model: VideoAbuseModel.unscoped(),
-            required: false,
-            include: [ buildVideoInclude(false) ]
-          },
-          {
-            attributes: [ 'id' ],
-            model: VideoCommentAbuseModel.unscoped(),
-            required: false,
-            include: [
-              {
-                attributes: [ 'id', 'originCommentId' ],
-                model: VideoCommentModel.unscoped(),
-                required: false,
-                include: [
-                  {
-                    attributes: [ 'id', 'name', 'uuid' ],
-                    model: VideoModel.unscoped(),
-                    required: false
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            model: AccountModel,
-            as: 'FlaggedAccount',
-            required: false,
-            include: [ buildActorWithAvatarInclude() ]
-          }
-        ]
-      },
-
-      {
-        attributes: [ 'id' ],
-        model: VideoBlacklistModel.unscoped(),
-        required: false,
-        include: [ buildVideoInclude(true) ]
-      },
-
-      {
-        attributes: [ 'id', 'magnetUri', 'targetUrl', 'torrentName' ],
-        model: VideoImportModel.unscoped(),
-        required: false,
-        include: [ buildVideoInclude(false) ]
-      },
-
-      {
-        attributes: [ 'id', 'name', 'type', 'latestVersion' ],
-        model: PluginModel.unscoped(),
-        required: false
-      },
-
-      {
-        attributes: [ 'id', 'latestPeerTubeVersion' ],
-        model: ApplicationModel.unscoped(),
-        required: false
-      },
-
-      {
-        attributes: [ 'id', 'state' ],
-        model: ActorFollowModel.unscoped(),
-        required: false,
-        include: [
-          {
-            attributes: [ 'preferredUsername' ],
-            model: ActorModel.unscoped(),
-            required: true,
-            as: 'ActorFollower',
-            include: [
-              {
-                attributes: [ 'id', 'name' ],
-                model: AccountModel.unscoped(),
-                required: true
-              },
-              {
-                attributes: [ 'filename' ],
-                as: 'Avatar',
-                model: ActorImageModel.unscoped(),
-                required: false
-              },
-              {
-                attributes: [ 'host' ],
-                model: ServerModel.unscoped(),
-                required: false
-              }
-            ]
-          },
-          {
-            attributes: [ 'preferredUsername', 'type' ],
-            model: ActorModel.unscoped(),
-            required: true,
-            as: 'ActorFollowing',
-            include: [
-              buildChannelInclude(false),
-              buildAccountInclude(false),
-              {
-                attributes: [ 'host' ],
-                model: ServerModel.unscoped(),
-                required: false
-              }
-            ]
-          }
-        ]
-      },
-
-      buildAccountInclude(false, true)
-    ]
-  }
-}))
 @Table({
   tableName: 'userNotification',
   indexes: [
@@ -342,7 +154,7 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
     },
     onDelete: 'cascade'
   })
-  Comment: VideoCommentModel
+  VideoComment: VideoCommentModel
 
   @ForeignKey(() => AbuseModel)
   @Column
@@ -431,11 +243,14 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
   static listForApi (userId: number, start: number, count: number, sort: string, unread?: boolean) {
     const where = { userId }
 
-    const query: FindOptions = {
+    const query = {
+      userId,
+      unread,
       offset: start,
       limit: count,
-      order: getSort(sort),
-      where
+      sort,
+      where,
+      sequelize: this.sequelize
     }
 
     if (unread !== undefined) query.where['read'] = !unread
@@ -445,8 +260,8 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
         .then(count => count || 0),
 
       count === 0
-        ? []
-        : UserNotificationModel.scope(ScopeNames.WITH_ALL).findAll(query)
+        ? [] as UserNotificationModelForApi[]
+        : new UserNotificationListQueryBuilder(query).listNotifications()
     ]).then(([ total, data ]) => ({ total, data }))
   }
 
@@ -524,25 +339,31 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
 
   toFormattedJSON (this: UserNotificationModelForApi): UserNotification {
     const video = this.Video
-      ? Object.assign(this.formatVideo(this.Video), { channel: this.formatActor(this.Video.VideoChannel) })
+      ? {
+        ...this.formatVideo(this.Video),
+
+        channel: this.formatActor(this.Video.VideoChannel)
+      }
       : undefined
 
     const videoImport = this.VideoImport
       ? {
         id: this.VideoImport.id,
-        video: this.VideoImport.Video ? this.formatVideo(this.VideoImport.Video) : undefined,
+        video: this.VideoImport.Video
+          ? this.formatVideo(this.VideoImport.Video)
+          : undefined,
         torrentName: this.VideoImport.torrentName,
         magnetUri: this.VideoImport.magnetUri,
         targetUrl: this.VideoImport.targetUrl
       }
       : undefined
 
-    const comment = this.Comment
+    const comment = this.VideoComment
       ? {
-        id: this.Comment.id,
-        threadId: this.Comment.getThreadId(),
-        account: this.formatActor(this.Comment.Account),
-        video: this.formatVideo(this.Comment.Video)
+        id: this.VideoComment.id,
+        threadId: this.VideoComment.getThreadId(),
+        account: this.formatActor(this.VideoComment.Account),
+        video: this.formatVideo(this.VideoComment.Video)
       }
       : undefined
 
@@ -570,8 +391,9 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
           id: this.ActorFollow.ActorFollower.Account.id,
           displayName: this.ActorFollow.ActorFollower.Account.getDisplayName(),
           name: this.ActorFollow.ActorFollower.preferredUsername,
-          avatar: this.ActorFollow.ActorFollower.Avatar ? { path: this.ActorFollow.ActorFollower.Avatar.getStaticPath() } : undefined,
-          host: this.ActorFollow.ActorFollower.getHost()
+          host: this.ActorFollow.ActorFollower.getHost(),
+
+          ...this.formatAvatars(this.ActorFollow.ActorFollower.Avatars)
         },
         following: {
           type: actorFollowingType[this.ActorFollow.ActorFollowing.type],
@@ -612,7 +434,7 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
     }
   }
 
-  formatVideo (this: UserNotificationModelForApi, video: UserNotificationIncludes.VideoInclude) {
+  formatVideo (video: UserNotificationIncludes.VideoInclude) {
     return {
       id: video.id,
       uuid: video.uuid,
@@ -621,7 +443,7 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
     }
   }
 
-  formatAbuse (this: UserNotificationModelForApi, abuse: UserNotificationIncludes.AbuseInclude) {
+  formatAbuse (abuse: UserNotificationIncludes.AbuseInclude) {
     const commentAbuse = abuse.VideoCommentAbuse?.VideoComment
       ? {
         threadId: abuse.VideoCommentAbuse.VideoComment.getThreadId(),
@@ -637,9 +459,13 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
       }
       : undefined
 
-    const videoAbuse = abuse.VideoAbuse?.Video ? this.formatVideo(abuse.VideoAbuse.Video) : undefined
+    const videoAbuse = abuse.VideoAbuse?.Video
+      ? this.formatVideo(abuse.VideoAbuse.Video)
+      : undefined
 
-    const accountAbuse = (!commentAbuse && !videoAbuse && abuse.FlaggedAccount) ? this.formatActor(abuse.FlaggedAccount) : undefined
+    const accountAbuse = (!commentAbuse && !videoAbuse && abuse.FlaggedAccount)
+      ? this.formatActor(abuse.FlaggedAccount)
+      : undefined
 
     return {
       id: abuse.id,
@@ -651,19 +477,32 @@ export class UserNotificationModel extends Model<Partial<AttributesOnly<UserNoti
   }
 
   formatActor (
-    this: UserNotificationModelForApi,
     accountOrChannel: UserNotificationIncludes.AccountIncludeActor | UserNotificationIncludes.VideoChannelIncludeActor
   ) {
-    const avatar = accountOrChannel.Actor.Avatar
-      ? { path: accountOrChannel.Actor.Avatar.getStaticPath() }
-      : undefined
-
     return {
       id: accountOrChannel.id,
       displayName: accountOrChannel.getDisplayName(),
       name: accountOrChannel.Actor.preferredUsername,
       host: accountOrChannel.Actor.getHost(),
-      avatar
+
+      ...this.formatAvatars(accountOrChannel.Actor.Avatars)
+    }
+  }
+
+  formatAvatars (avatars: UserNotificationIncludes.ActorImageInclude[]) {
+    if (!avatars || avatars.length === 0) return { avatar: undefined, avatars: [] }
+
+    return {
+      avatar: this.formatAvatar(getBiggestActorImage(avatars)),
+
+      avatars: avatars.map(a => this.formatAvatar(a))
+    }
+  }
+
+  formatAvatar (a: UserNotificationIncludes.ActorImageInclude) {
+    return {
+      path: a.getStaticPath(),
+      width: a.width
     }
   }
 }
diff --git a/server/models/user/user.ts b/server/models/user/user.ts
index ad8ce08cb..bcf56dfa1 100644
--- a/server/models/user/user.ts
+++ b/server/models/user/user.ts
@@ -106,7 +106,7 @@ enum ScopeNames {
                 include: [
                   {
                     model: ActorImageModel,
-                    as: 'Banner',
+                    as: 'Banners',
                     required: false
                   }
                 ]
@@ -495,13 +495,10 @@ export class UserModel extends Model<Partial<AttributesOnly<UserModel>>> {
       where
     }
 
-    return UserModel.findAndCountAll(query)
-                    .then(({ rows, count }) => {
-                      return {
-                        data: rows,
-                        total: count
-                      }
-                    })
+    return Promise.all([
+      UserModel.unscoped().count(query),
+      UserModel.findAll(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listWithRight (right: UserRight): Promise<MUserDefault[]> {
diff --git a/server/models/utils.ts b/server/models/utils.ts
index 66b653e3d..70bfbdb8b 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -181,7 +181,7 @@ function buildServerIdsFollowedBy (actorId: any) {
     'SELECT "actor"."serverId" FROM "actorFollow" ' +
     'INNER JOIN "actor" ON actor.id = "actorFollow"."targetActorId" ' +
     'WHERE "actorFollow"."actorId" = ' + actorIdNumber +
-    ')'
+  ')'
 }
 
 function buildWhereIdOrUUID (id: number | string) {
diff --git a/server/models/video/sql/shared/abstract-run-query.ts b/server/models/video/sql/shared/abstract-run-query.ts
deleted file mode 100644
index 8e7a7642d..000000000
--- a/server/models/video/sql/shared/abstract-run-query.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { QueryTypes, Sequelize, Transaction } from 'sequelize'
-
-/**
- *
- * Abstact builder to run video SQL queries
- *
- */
-
-export class AbstractRunQuery {
-  protected sequelize: Sequelize
-
-  protected query: string
-  protected replacements: any = {}
-
-  protected runQuery (options: { transaction?: Transaction, logging?: boolean } = {}) {
-    const queryOptions = {
-      transaction: options.transaction,
-      logging: options.logging,
-      replacements: this.replacements,
-      type: QueryTypes.SELECT as QueryTypes.SELECT,
-      nest: false
-    }
-
-    return this.sequelize.query<any>(this.query, queryOptions)
-  }
-}
diff --git a/server/models/video/sql/shared/abstract-video-query-builder.ts b/server/models/video/sql/shared/abstract-video-query-builder.ts
deleted file mode 100644
index a6afb04e4..000000000
--- a/server/models/video/sql/shared/abstract-video-query-builder.ts
+++ /dev/null
@@ -1,328 +0,0 @@
-import { createSafeIn } from '@server/models/utils'
-import { MUserAccountId } from '@server/types/models'
-import validator from 'validator'
-import { AbstractRunQuery } from './abstract-run-query'
-import { VideoTableAttributes } from './video-table-attributes'
-
-/**
- *
- * Abstract builder to create SQL query and fetch video models
- *
- */
-
-export class AbstractVideoQueryBuilder extends AbstractRunQuery {
-  protected attributes: { [key: string]: string } = {}
-
-  protected joins = ''
-  protected where: string
-
-  protected tables: VideoTableAttributes
-
-  constructor (protected readonly mode: 'list' | 'get') {
-    super()
-
-    this.tables = new VideoTableAttributes(this.mode)
-  }
-
-  protected buildSelect () {
-    return 'SELECT ' + Object.keys(this.attributes).map(key => {
-      const value = this.attributes[key]
-      if (value) return `${key} AS ${value}`
-
-      return key
-    }).join(', ')
-  }
-
-  protected includeChannels () {
-    this.addJoin('INNER JOIN "videoChannel" AS "VideoChannel" ON "video"."channelId" = "VideoChannel"."id"')
-    this.addJoin('INNER JOIN "actor" AS "VideoChannel->Actor" ON "VideoChannel"."actorId" = "VideoChannel->Actor"."id"')
-
-    this.addJoin(
-      'LEFT OUTER JOIN "server" AS "VideoChannel->Actor->Server" ON "VideoChannel->Actor"."serverId" = "VideoChannel->Actor->Server"."id"'
-    )
-
-    this.addJoin(
-      'LEFT OUTER JOIN "actorImage" AS "VideoChannel->Actor->Avatar" ' +
-        'ON "VideoChannel->Actor"."avatarId" = "VideoChannel->Actor->Avatar"."id"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoChannel', this.tables.getChannelAttributes()),
-      ...this.buildActorInclude('VideoChannel->Actor'),
-      ...this.buildAvatarInclude('VideoChannel->Actor->Avatar'),
-      ...this.buildServerInclude('VideoChannel->Actor->Server')
-    }
-  }
-
-  protected includeAccounts () {
-    this.addJoin('INNER JOIN "account" AS "VideoChannel->Account" ON "VideoChannel"."accountId" = "VideoChannel->Account"."id"')
-    this.addJoin(
-      'INNER JOIN "actor" AS "VideoChannel->Account->Actor" ON "VideoChannel->Account"."actorId" = "VideoChannel->Account->Actor"."id"'
-    )
-
-    this.addJoin(
-      'LEFT OUTER JOIN "server" AS "VideoChannel->Account->Actor->Server" ' +
-        'ON "VideoChannel->Account->Actor"."serverId" = "VideoChannel->Account->Actor->Server"."id"'
-    )
-
-    this.addJoin(
-      'LEFT OUTER JOIN "actorImage" AS "VideoChannel->Account->Actor->Avatar" ' +
-        'ON "VideoChannel->Account->Actor"."avatarId" = "VideoChannel->Account->Actor->Avatar"."id"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoChannel->Account', this.tables.getAccountAttributes()),
-      ...this.buildActorInclude('VideoChannel->Account->Actor'),
-      ...this.buildAvatarInclude('VideoChannel->Account->Actor->Avatar'),
-      ...this.buildServerInclude('VideoChannel->Account->Actor->Server')
-    }
-  }
-
-  protected includeOwnerUser () {
-    this.addJoin('INNER JOIN "videoChannel" AS "VideoChannel" ON "video"."channelId" = "VideoChannel"."id"')
-    this.addJoin('INNER JOIN "account" AS "VideoChannel->Account" ON "VideoChannel"."accountId" = "VideoChannel->Account"."id"')
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoChannel', this.tables.getChannelAttributes()),
-      ...this.buildAttributesObject('VideoChannel->Account', this.tables.getUserAccountAttributes())
-    }
-  }
-
-  protected includeThumbnails () {
-    this.addJoin('LEFT OUTER JOIN "thumbnail" AS "Thumbnails" ON "video"."id" = "Thumbnails"."videoId"')
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('Thumbnails', this.tables.getThumbnailAttributes())
-    }
-  }
-
-  protected includeWebtorrentFiles () {
-    this.addJoin('LEFT JOIN "videoFile" AS "VideoFiles" ON "VideoFiles"."videoId" = "video"."id"')
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoFiles', this.tables.getFileAttributes())
-    }
-  }
-
-  protected includeStreamingPlaylistFiles () {
-    this.addJoin(
-      'LEFT JOIN "videoStreamingPlaylist" AS "VideoStreamingPlaylists" ON "VideoStreamingPlaylists"."videoId" = "video"."id"'
-    )
-
-    this.addJoin(
-      'LEFT JOIN "videoFile" AS "VideoStreamingPlaylists->VideoFiles" ' +
-        'ON "VideoStreamingPlaylists->VideoFiles"."videoStreamingPlaylistId" = "VideoStreamingPlaylists"."id"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoStreamingPlaylists', this.tables.getStreamingPlaylistAttributes()),
-      ...this.buildAttributesObject('VideoStreamingPlaylists->VideoFiles', this.tables.getFileAttributes())
-    }
-  }
-
-  protected includeUserHistory (userId: number) {
-    this.addJoin(
-      'LEFT OUTER JOIN "userVideoHistory" ' +
-        'ON "video"."id" = "userVideoHistory"."videoId" AND "userVideoHistory"."userId" = :userVideoHistoryId'
-    )
-
-    this.replacements.userVideoHistoryId = userId
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('userVideoHistory', this.tables.getUserHistoryAttributes())
-    }
-  }
-
-  protected includePlaylist (playlistId: number) {
-    this.addJoin(
-      'INNER JOIN "videoPlaylistElement" as "VideoPlaylistElement" ON "videoPlaylistElement"."videoId" = "video"."id" ' +
-        'AND "VideoPlaylistElement"."videoPlaylistId" = :videoPlaylistId'
-    )
-
-    this.replacements.videoPlaylistId = playlistId
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoPlaylistElement', this.tables.getPlaylistAttributes())
-    }
-  }
-
-  protected includeTags () {
-    this.addJoin(
-      'LEFT OUTER JOIN (' +
-        '"videoTag" AS "Tags->VideoTagModel" INNER JOIN "tag" AS "Tags" ON "Tags"."id" = "Tags->VideoTagModel"."tagId"' +
-      ') ' +
-      'ON "video"."id" = "Tags->VideoTagModel"."videoId"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('Tags', this.tables.getTagAttributes()),
-      ...this.buildAttributesObject('Tags->VideoTagModel', this.tables.getVideoTagAttributes())
-    }
-  }
-
-  protected includeBlacklisted () {
-    this.addJoin(
-      'LEFT OUTER JOIN "videoBlacklist" AS "VideoBlacklist" ON "video"."id" = "VideoBlacklist"."videoId"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoBlacklist', this.tables.getBlacklistedAttributes())
-    }
-  }
-
-  protected includeBlockedOwnerAndServer (serverAccountId: number, user?: MUserAccountId) {
-    const blockerIds = [ serverAccountId ]
-    if (user) blockerIds.push(user.Account.id)
-
-    const inClause = createSafeIn(this.sequelize, blockerIds)
-
-    this.addJoin(
-      'LEFT JOIN "accountBlocklist" AS "VideoChannel->Account->AccountBlocklist" ' +
-        'ON "VideoChannel->Account"."id" = "VideoChannel->Account->AccountBlocklist"."targetAccountId" ' +
-        'AND "VideoChannel->Account->AccountBlocklist"."accountId" IN (' + inClause + ')'
-    )
-
-    this.addJoin(
-      'LEFT JOIN "serverBlocklist" AS "VideoChannel->Account->Actor->Server->ServerBlocklist" ' +
-        'ON "VideoChannel->Account->Actor->Server->ServerBlocklist"."targetServerId" = "VideoChannel->Account->Actor"."serverId" ' +
-        'AND "VideoChannel->Account->Actor->Server->ServerBlocklist"."accountId" IN (' + inClause + ') '
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoChannel->Account->AccountBlocklist', this.tables.getBlocklistAttributes()),
-      ...this.buildAttributesObject('VideoChannel->Account->Actor->Server->ServerBlocklist', this.tables.getBlocklistAttributes())
-    }
-  }
-
-  protected includeScheduleUpdate () {
-    this.addJoin(
-      'LEFT OUTER JOIN "scheduleVideoUpdate" AS "ScheduleVideoUpdate" ON "video"."id" = "ScheduleVideoUpdate"."videoId"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('ScheduleVideoUpdate', this.tables.getScheduleUpdateAttributes())
-    }
-  }
-
-  protected includeLive () {
-    this.addJoin(
-      'LEFT OUTER JOIN "videoLive" AS "VideoLive" ON "video"."id" = "VideoLive"."videoId"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoLive', this.tables.getLiveAttributes())
-    }
-  }
-
-  protected includeTrackers () {
-    this.addJoin(
-      'LEFT OUTER JOIN (' +
-        '"videoTracker" AS "Trackers->VideoTrackerModel" ' +
-          'INNER JOIN "tracker" AS "Trackers" ON "Trackers"."id" = "Trackers->VideoTrackerModel"."trackerId"' +
-      ') ON "video"."id" = "Trackers->VideoTrackerModel"."videoId"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('Trackers', this.tables.getTrackerAttributes()),
-      ...this.buildAttributesObject('Trackers->VideoTrackerModel', this.tables.getVideoTrackerAttributes())
-    }
-  }
-
-  protected includeWebTorrentRedundancies () {
-    this.addJoin(
-      'LEFT OUTER JOIN "videoRedundancy" AS "VideoFiles->RedundancyVideos" ON ' +
-        '"VideoFiles"."id" = "VideoFiles->RedundancyVideos"."videoFileId"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoFiles->RedundancyVideos', this.tables.getRedundancyAttributes())
-    }
-  }
-
-  protected includeStreamingPlaylistRedundancies () {
-    this.addJoin(
-      'LEFT OUTER JOIN "videoRedundancy" AS "VideoStreamingPlaylists->RedundancyVideos" ' +
-        'ON "VideoStreamingPlaylists"."id" = "VideoStreamingPlaylists->RedundancyVideos"."videoStreamingPlaylistId"'
-    )
-
-    this.attributes = {
-      ...this.attributes,
-
-      ...this.buildAttributesObject('VideoStreamingPlaylists->RedundancyVideos', this.tables.getRedundancyAttributes())
-    }
-  }
-
-  protected buildActorInclude (prefixKey: string) {
-    return this.buildAttributesObject(prefixKey, this.tables.getActorAttributes())
-  }
-
-  protected buildAvatarInclude (prefixKey: string) {
-    return this.buildAttributesObject(prefixKey, this.tables.getAvatarAttributes())
-  }
-
-  protected buildServerInclude (prefixKey: string) {
-    return this.buildAttributesObject(prefixKey, this.tables.getServerAttributes())
-  }
-
-  protected buildAttributesObject (prefixKey: string, attributeKeys: string[]) {
-    const result: { [id: string]: string} = {}
-
-    const prefixValue = prefixKey.replace(/->/g, '.')
-
-    for (const attribute of attributeKeys) {
-      result[`"${prefixKey}"."${attribute}"`] = `"${prefixValue}.${attribute}"`
-    }
-
-    return result
-  }
-
-  protected whereId (options: { id?: string | number, url?: string }) {
-    if (options.url) {
-      this.where = 'WHERE "video"."url" = :videoUrl'
-      this.replacements.videoUrl = options.url
-      return
-    }
-
-    if (validator.isInt('' + options.id)) {
-      this.where = 'WHERE "video".id = :videoId'
-    } else {
-      this.where = 'WHERE uuid = :videoId'
-    }
-
-    this.replacements.videoId = options.id
-  }
-
-  protected addJoin (join: string) {
-    this.joins += join + ' '
-  }
-}
diff --git a/server/models/video/sql/shared/video-file-query-builder.ts b/server/models/video/sql/shared/video-file-query-builder.ts
deleted file mode 100644
index 3eb3dc07d..000000000
--- a/server/models/video/sql/shared/video-file-query-builder.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Sequelize } from 'sequelize'
-import { BuildVideoGetQueryOptions } from '../video-model-get-query-builder'
-import { AbstractVideoQueryBuilder } from './abstract-video-query-builder'
-
-/**
- *
- * Fetch files (webtorrent and streaming playlist) according to a video
- *
- */
-
-export class VideoFileQueryBuilder extends AbstractVideoQueryBuilder {
-  protected attributes: { [key: string]: string }
-
-  constructor (protected readonly sequelize: Sequelize) {
-    super('get')
-  }
-
-  queryWebTorrentVideos (options: BuildVideoGetQueryOptions) {
-    this.buildWebtorrentFilesQuery(options)
-
-    return this.runQuery(options)
-  }
-
-  queryStreamingPlaylistVideos (options: BuildVideoGetQueryOptions) {
-    this.buildVideoStreamingPlaylistFilesQuery(options)
-
-    return this.runQuery(options)
-  }
-
-  private buildWebtorrentFilesQuery (options: BuildVideoGetQueryOptions) {
-    this.attributes = {
-      '"video"."id"': ''
-    }
-
-    this.includeWebtorrentFiles()
-
-    if (this.shouldIncludeRedundancies(options)) {
-      this.includeWebTorrentRedundancies()
-    }
-
-    this.whereId(options)
-
-    this.query = this.buildQuery()
-  }
-
-  private buildVideoStreamingPlaylistFilesQuery (options: BuildVideoGetQueryOptions) {
-    this.attributes = {
-      '"video"."id"': ''
-    }
-
-    this.includeStreamingPlaylistFiles()
-
-    if (this.shouldIncludeRedundancies(options)) {
-      this.includeStreamingPlaylistRedundancies()
-    }
-
-    this.whereId(options)
-
-    this.query = this.buildQuery()
-  }
-
-  private buildQuery () {
-    return `${this.buildSelect()} FROM "video" ${this.joins} ${this.where}`
-  }
-
-  private shouldIncludeRedundancies (options: BuildVideoGetQueryOptions) {
-    return options.type === 'api'
-  }
-}
diff --git a/server/models/video/sql/shared/video-model-builder.ts b/server/models/video/sql/shared/video-model-builder.ts
deleted file mode 100644
index 7751d8e68..000000000
--- a/server/models/video/sql/shared/video-model-builder.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-
-import { AccountModel } from '@server/models/account/account'
-import { AccountBlocklistModel } from '@server/models/account/account-blocklist'
-import { ActorModel } from '@server/models/actor/actor'
-import { ActorImageModel } from '@server/models/actor/actor-image'
-import { VideoRedundancyModel } from '@server/models/redundancy/video-redundancy'
-import { ServerModel } from '@server/models/server/server'
-import { ServerBlocklistModel } from '@server/models/server/server-blocklist'
-import { TrackerModel } from '@server/models/server/tracker'
-import { UserVideoHistoryModel } from '@server/models/user/user-video-history'
-import { VideoInclude } from '@shared/models'
-import { ScheduleVideoUpdateModel } from '../../schedule-video-update'
-import { TagModel } from '../../tag'
-import { ThumbnailModel } from '../../thumbnail'
-import { VideoModel } from '../../video'
-import { VideoBlacklistModel } from '../../video-blacklist'
-import { VideoChannelModel } from '../../video-channel'
-import { VideoFileModel } from '../../video-file'
-import { VideoLiveModel } from '../../video-live'
-import { VideoStreamingPlaylistModel } from '../../video-streaming-playlist'
-import { VideoTableAttributes } from './video-table-attributes'
-
-type SQLRow = { [id: string]: string | number }
-
-/**
- *
- * Build video models from SQL rows
- *
- */
-
-export class VideoModelBuilder {
-  private videosMemo: { [ id: number ]: VideoModel }
-  private videoStreamingPlaylistMemo: { [ id: number ]: VideoStreamingPlaylistModel }
-  private videoFileMemo: { [ id: number ]: VideoFileModel }
-
-  private thumbnailsDone: Set<any>
-  private historyDone: Set<any>
-  private blacklistDone: Set<any>
-  private accountBlocklistDone: Set<any>
-  private serverBlocklistDone: Set<any>
-  private liveDone: Set<any>
-  private redundancyDone: Set<any>
-  private scheduleVideoUpdateDone: Set<any>
-
-  private trackersDone: Set<string>
-  private tagsDone: Set<string>
-
-  private videos: VideoModel[]
-
-  private readonly buildOpts = { raw: true, isNewRecord: false }
-
-  constructor (
-    readonly mode: 'get' | 'list',
-    readonly tables: VideoTableAttributes
-  ) {
-
-  }
-
-  buildVideosFromRows (options: {
-    rows: SQLRow[]
-    include?: VideoInclude
-    rowsWebTorrentFiles?: SQLRow[]
-    rowsStreamingPlaylist?: SQLRow[]
-  }) {
-    const { rows, rowsWebTorrentFiles, rowsStreamingPlaylist, include } = options
-
-    this.reinit()
-
-    for (const row of rows) {
-      this.buildVideoAndAccount(row)
-
-      const videoModel = this.videosMemo[row.id]
-
-      this.setUserHistory(row, videoModel)
-      this.addThumbnail(row, videoModel)
-
-      if (!rowsWebTorrentFiles) {
-        this.addWebTorrentFile(row, videoModel)
-      }
-
-      if (!rowsStreamingPlaylist) {
-        this.addStreamingPlaylist(row, videoModel)
-        this.addStreamingPlaylistFile(row)
-      }
-
-      if (this.mode === 'get') {
-        this.addTag(row, videoModel)
-        this.addTracker(row, videoModel)
-        this.setBlacklisted(row, videoModel)
-        this.setScheduleVideoUpdate(row, videoModel)
-        this.setLive(row, videoModel)
-      } else {
-        if (include & VideoInclude.BLACKLISTED) {
-          this.setBlacklisted(row, videoModel)
-        }
-
-        if (include & VideoInclude.BLOCKED_OWNER) {
-          this.setBlockedOwner(row, videoModel)
-          this.setBlockedServer(row, videoModel)
-        }
-      }
-    }
-
-    this.grabSeparateWebTorrentFiles(rowsWebTorrentFiles)
-    this.grabSeparateStreamingPlaylistFiles(rowsStreamingPlaylist)
-
-    return this.videos
-  }
-
-  private reinit () {
-    this.videosMemo = {}
-    this.videoStreamingPlaylistMemo = {}
-    this.videoFileMemo = {}
-
-    this.thumbnailsDone = new Set()
-    this.historyDone = new Set()
-    this.blacklistDone = new Set()
-    this.liveDone = new Set()
-    this.redundancyDone = new Set()
-    this.scheduleVideoUpdateDone = new Set()
-
-    this.accountBlocklistDone = new Set()
-    this.serverBlocklistDone = new Set()
-
-    this.trackersDone = new Set()
-    this.tagsDone = new Set()
-
-    this.videos = []
-  }
-
-  private grabSeparateWebTorrentFiles (rowsWebTorrentFiles?: SQLRow[]) {
-    if (!rowsWebTorrentFiles) return
-
-    for (const row of rowsWebTorrentFiles) {
-      const id = row['VideoFiles.id']
-      if (!id) continue
-
-      const videoModel = this.videosMemo[row.id]
-      this.addWebTorrentFile(row, videoModel)
-      this.addRedundancy(row, 'VideoFiles', this.videoFileMemo[id])
-    }
-  }
-
-  private grabSeparateStreamingPlaylistFiles (rowsStreamingPlaylist?: SQLRow[]) {
-    if (!rowsStreamingPlaylist) return
-
-    for (const row of rowsStreamingPlaylist) {
-      const id = row['VideoStreamingPlaylists.id']
-      if (!id) continue
-
-      const videoModel = this.videosMemo[row.id]
-
-      this.addStreamingPlaylist(row, videoModel)
-      this.addStreamingPlaylistFile(row)
-      this.addRedundancy(row, 'VideoStreamingPlaylists', this.videoStreamingPlaylistMemo[id])
-    }
-  }
-
-  private buildVideoAndAccount (row: SQLRow) {
-    if (this.videosMemo[row.id]) return
-
-    const videoModel = new VideoModel(this.grab(row, this.tables.getVideoAttributes(), ''), this.buildOpts)
-
-    videoModel.UserVideoHistories = []
-    videoModel.Thumbnails = []
-    videoModel.VideoFiles = []
-    videoModel.VideoStreamingPlaylists = []
-    videoModel.Tags = []
-    videoModel.Trackers = []
-
-    this.buildAccount(row, videoModel)
-
-    this.videosMemo[row.id] = videoModel
-
-    // Keep rows order
-    this.videos.push(videoModel)
-  }
-
-  private buildAccount (row: SQLRow, videoModel: VideoModel) {
-    const id = row['VideoChannel.Account.id']
-    if (!id) return
-
-    const channelModel = new VideoChannelModel(this.grab(row, this.tables.getChannelAttributes(), 'VideoChannel'), this.buildOpts)
-    channelModel.Actor = this.buildActor(row, 'VideoChannel')
-
-    const accountModel = new AccountModel(this.grab(row, this.tables.getAccountAttributes(), 'VideoChannel.Account'), this.buildOpts)
-    accountModel.Actor = this.buildActor(row, 'VideoChannel.Account')
-
-    accountModel.BlockedBy = []
-
-    channelModel.Account = accountModel
-
-    videoModel.VideoChannel = channelModel
-  }
-
-  private buildActor (row: SQLRow, prefix: string) {
-    const actorPrefix = `${prefix}.Actor`
-    const avatarPrefix = `${actorPrefix}.Avatar`
-    const serverPrefix = `${actorPrefix}.Server`
-
-    const avatarModel = row[`${avatarPrefix}.id`] !== null
-      ? new ActorImageModel(this.grab(row, this.tables.getAvatarAttributes(), avatarPrefix), this.buildOpts)
-      : null
-
-    const serverModel = row[`${serverPrefix}.id`] !== null
-      ? new ServerModel(this.grab(row, this.tables.getServerAttributes(), serverPrefix), this.buildOpts)
-      : null
-
-    if (serverModel) serverModel.BlockedBy = []
-
-    const actorModel = new ActorModel(this.grab(row, this.tables.getActorAttributes(), actorPrefix), this.buildOpts)
-    actorModel.Avatar = avatarModel
-    actorModel.Server = serverModel
-
-    return actorModel
-  }
-
-  private setUserHistory (row: SQLRow, videoModel: VideoModel) {
-    const id = row['userVideoHistory.id']
-    if (!id || this.historyDone.has(id)) return
-
-    const attributes = this.grab(row, this.tables.getUserHistoryAttributes(), 'userVideoHistory')
-    const historyModel = new UserVideoHistoryModel(attributes, this.buildOpts)
-    videoModel.UserVideoHistories.push(historyModel)
-
-    this.historyDone.add(id)
-  }
-
-  private addThumbnail (row: SQLRow, videoModel: VideoModel) {
-    const id = row['Thumbnails.id']
-    if (!id || this.thumbnailsDone.has(id)) return
-
-    const attributes = this.grab(row, this.tables.getThumbnailAttributes(), 'Thumbnails')
-    const thumbnailModel = new ThumbnailModel(attributes, this.buildOpts)
-    videoModel.Thumbnails.push(thumbnailModel)
-
-    this.thumbnailsDone.add(id)
-  }
-
-  private addWebTorrentFile (row: SQLRow, videoModel: VideoModel) {
-    const id = row['VideoFiles.id']
-    if (!id || this.videoFileMemo[id]) return
-
-    const attributes = this.grab(row, this.tables.getFileAttributes(), 'VideoFiles')
-    const videoFileModel = new VideoFileModel(attributes, this.buildOpts)
-    videoModel.VideoFiles.push(videoFileModel)
-
-    this.videoFileMemo[id] = videoFileModel
-  }
-
-  private addStreamingPlaylist (row: SQLRow, videoModel: VideoModel) {
-    const id = row['VideoStreamingPlaylists.id']
-    if (!id || this.videoStreamingPlaylistMemo[id]) return
-
-    const attributes = this.grab(row, this.tables.getStreamingPlaylistAttributes(), 'VideoStreamingPlaylists')
-    const streamingPlaylist = new VideoStreamingPlaylistModel(attributes, this.buildOpts)
-    streamingPlaylist.VideoFiles = []
-
-    videoModel.VideoStreamingPlaylists.push(streamingPlaylist)
-
-    this.videoStreamingPlaylistMemo[id] = streamingPlaylist
-  }
-
-  private addStreamingPlaylistFile (row: SQLRow) {
-    const id = row['VideoStreamingPlaylists.VideoFiles.id']
-    if (!id || this.videoFileMemo[id]) return
-
-    const streamingPlaylist = this.videoStreamingPlaylistMemo[row['VideoStreamingPlaylists.id']]
-
-    const attributes = this.grab(row, this.tables.getFileAttributes(), 'VideoStreamingPlaylists.VideoFiles')
-    const videoFileModel = new VideoFileModel(attributes, this.buildOpts)
-    streamingPlaylist.VideoFiles.push(videoFileModel)
-
-    this.videoFileMemo[id] = videoFileModel
-  }
-
-  private addRedundancy (row: SQLRow, prefix: string, to: VideoFileModel | VideoStreamingPlaylistModel) {
-    if (!to.RedundancyVideos) to.RedundancyVideos = []
-
-    const redundancyPrefix = `${prefix}.RedundancyVideos`
-    const id = row[`${redundancyPrefix}.id`]
-
-    if (!id || this.redundancyDone.has(id)) return
-
-    const attributes = this.grab(row, this.tables.getRedundancyAttributes(), redundancyPrefix)
-    const redundancyModel = new VideoRedundancyModel(attributes, this.buildOpts)
-    to.RedundancyVideos.push(redundancyModel)
-
-    this.redundancyDone.add(id)
-  }
-
-  private addTag (row: SQLRow, videoModel: VideoModel) {
-    if (!row['Tags.name']) return
-
-    const key = `${row['Tags.VideoTagModel.videoId']}-${row['Tags.VideoTagModel.tagId']}`
-    if (this.tagsDone.has(key)) return
-
-    const attributes = this.grab(row, this.tables.getTagAttributes(), 'Tags')
-    const tagModel = new TagModel(attributes, this.buildOpts)
-    videoModel.Tags.push(tagModel)
-
-    this.tagsDone.add(key)
-  }
-
-  private addTracker (row: SQLRow, videoModel: VideoModel) {
-    if (!row['Trackers.id']) return
-
-    const key = `${row['Trackers.VideoTrackerModel.videoId']}-${row['Trackers.VideoTrackerModel.trackerId']}`
-    if (this.trackersDone.has(key)) return
-
-    const attributes = this.grab(row, this.tables.getTrackerAttributes(), 'Trackers')
-    const trackerModel = new TrackerModel(attributes, this.buildOpts)
-    videoModel.Trackers.push(trackerModel)
-
-    this.trackersDone.add(key)
-  }
-
-  private setBlacklisted (row: SQLRow, videoModel: VideoModel) {
-    const id = row['VideoBlacklist.id']
-    if (!id || this.blacklistDone.has(id)) return
-
-    const attributes = this.grab(row, this.tables.getBlacklistedAttributes(), 'VideoBlacklist')
-    videoModel.VideoBlacklist = new VideoBlacklistModel(attributes, this.buildOpts)
-
-    this.blacklistDone.add(id)
-  }
-
-  private setBlockedOwner (row: SQLRow, videoModel: VideoModel) {
-    const id = row['VideoChannel.Account.AccountBlocklist.id']
-    if (!id) return
-
-    const key = `${videoModel.id}-${id}`
-    if (this.accountBlocklistDone.has(key)) return
-
-    const attributes = this.grab(row, this.tables.getBlocklistAttributes(), 'VideoChannel.Account.AccountBlocklist')
-    videoModel.VideoChannel.Account.BlockedBy.push(new AccountBlocklistModel(attributes, this.buildOpts))
-
-    this.accountBlocklistDone.add(key)
-  }
-
-  private setBlockedServer (row: SQLRow, videoModel: VideoModel) {
-    const id = row['VideoChannel.Account.Actor.Server.ServerBlocklist.id']
-    if (!id || this.serverBlocklistDone.has(id)) return
-
-    const key = `${videoModel.id}-${id}`
-    if (this.serverBlocklistDone.has(key)) return
-
-    const attributes = this.grab(row, this.tables.getBlocklistAttributes(), 'VideoChannel.Account.Actor.Server.ServerBlocklist')
-    videoModel.VideoChannel.Account.Actor.Server.BlockedBy.push(new ServerBlocklistModel(attributes, this.buildOpts))
-
-    this.serverBlocklistDone.add(key)
-  }
-
-  private setScheduleVideoUpdate (row: SQLRow, videoModel: VideoModel) {
-    const id = row['ScheduleVideoUpdate.id']
-    if (!id || this.scheduleVideoUpdateDone.has(id)) return
-
-    const attributes = this.grab(row, this.tables.getScheduleUpdateAttributes(), 'ScheduleVideoUpdate')
-    videoModel.ScheduleVideoUpdate = new ScheduleVideoUpdateModel(attributes, this.buildOpts)
-
-    this.scheduleVideoUpdateDone.add(id)
-  }
-
-  private setLive (row: SQLRow, videoModel: VideoModel) {
-    const id = row['VideoLive.id']
-    if (!id || this.liveDone.has(id)) return
-
-    const attributes = this.grab(row, this.tables.getLiveAttributes(), 'VideoLive')
-    videoModel.VideoLive = new VideoLiveModel(attributes, this.buildOpts)
-
-    this.liveDone.add(id)
-  }
-
-  private grab (row: SQLRow, attributes: string[], prefix: string) {
-    const result: { [ id: string ]: string | number } = {}
-
-    for (const a of attributes) {
-      const key = prefix
-        ? prefix + '.' + a
-        : a
-
-      result[a] = row[key]
-    }
-
-    return result
-  }
-}
diff --git a/server/models/video/sql/shared/video-table-attributes.ts b/server/models/video/sql/shared/video-table-attributes.ts
deleted file mode 100644
index 8a8d2073a..000000000
--- a/server/models/video/sql/shared/video-table-attributes.ts
+++ /dev/null
@@ -1,269 +0,0 @@
-
-/**
- *
- * Class to build video attributes/join names we want to fetch from the database
- *
- */
-export class VideoTableAttributes {
-
-  constructor (readonly mode: 'get' | 'list') {
-
-  }
-
-  getChannelAttributesForUser () {
-    return [ 'id', 'accountId' ]
-  }
-
-  getChannelAttributes () {
-    let attributeKeys = [
-      'id',
-      'name',
-      'description',
-      'actorId'
-    ]
-
-    if (this.mode === 'get') {
-      attributeKeys = attributeKeys.concat([
-        'support',
-        'createdAt',
-        'updatedAt'
-      ])
-    }
-
-    return attributeKeys
-  }
-
-  getUserAccountAttributes () {
-    return [ 'id', 'userId' ]
-  }
-
-  getAccountAttributes () {
-    let attributeKeys = [ 'id', 'name', 'actorId' ]
-
-    if (this.mode === 'get') {
-      attributeKeys = attributeKeys.concat([
-        'description',
-        'userId',
-        'createdAt',
-        'updatedAt'
-      ])
-    }
-
-    return attributeKeys
-  }
-
-  getThumbnailAttributes () {
-    let attributeKeys = [ 'id', 'type', 'filename' ]
-
-    if (this.mode === 'get') {
-      attributeKeys = attributeKeys.concat([
-        'height',
-        'width',
-        'fileUrl',
-        'automaticallyGenerated',
-        'videoId',
-        'videoPlaylistId',
-        'createdAt',
-        'updatedAt'
-      ])
-    }
-
-    return attributeKeys
-  }
-
-  getFileAttributes () {
-    return [
-      'id',
-      'createdAt',
-      'updatedAt',
-      'resolution',
-      'size',
-      'extname',
-      'filename',
-      'fileUrl',
-      'torrentFilename',
-      'torrentUrl',
-      'infoHash',
-      'fps',
-      'metadataUrl',
-      'videoStreamingPlaylistId',
-      'videoId',
-      'storage'
-    ]
-  }
-
-  getStreamingPlaylistAttributes () {
-    return [
-      'id',
-      'playlistUrl',
-      'playlistFilename',
-      'type',
-      'p2pMediaLoaderInfohashes',
-      'p2pMediaLoaderPeerVersion',
-      'segmentsSha256Filename',
-      'segmentsSha256Url',
-      'videoId',
-      'createdAt',
-      'updatedAt',
-      'storage'
-    ]
-  }
-
-  getUserHistoryAttributes () {
-    return [ 'id', 'currentTime' ]
-  }
-
-  getPlaylistAttributes () {
-    return [
-      'createdAt',
-      'updatedAt',
-      'url',
-      'position',
-      'startTimestamp',
-      'stopTimestamp',
-      'videoPlaylistId'
-    ]
-  }
-
-  getTagAttributes () {
-    return [ 'id', 'name' ]
-  }
-
-  getVideoTagAttributes () {
-    return [ 'videoId', 'tagId', 'createdAt', 'updatedAt' ]
-  }
-
-  getBlacklistedAttributes () {
-    return [ 'id', 'reason', 'unfederated' ]
-  }
-
-  getBlocklistAttributes () {
-    return [ 'id' ]
-  }
-
-  getScheduleUpdateAttributes () {
-    return [
-      'id',
-      'updateAt',
-      'privacy',
-      'videoId',
-      'createdAt',
-      'updatedAt'
-    ]
-  }
-
-  getLiveAttributes () {
-    return [
-      'id',
-      'streamKey',
-      'saveReplay',
-      'permanentLive',
-      'videoId',
-      'createdAt',
-      'updatedAt'
-    ]
-  }
-
-  getTrackerAttributes () {
-    return [ 'id', 'url' ]
-  }
-
-  getVideoTrackerAttributes () {
-    return [
-      'videoId',
-      'trackerId',
-      'createdAt',
-      'updatedAt'
-    ]
-  }
-
-  getRedundancyAttributes () {
-    return [ 'id', 'fileUrl' ]
-  }
-
-  getActorAttributes () {
-    let attributeKeys = [
-      'id',
-      'preferredUsername',
-      'url',
-      'serverId',
-      'avatarId'
-    ]
-
-    if (this.mode === 'get') {
-      attributeKeys = attributeKeys.concat([
-        'type',
-        'followersCount',
-        'followingCount',
-        'inboxUrl',
-        'outboxUrl',
-        'sharedInboxUrl',
-        'followersUrl',
-        'followingUrl',
-        'remoteCreatedAt',
-        'createdAt',
-        'updatedAt'
-      ])
-    }
-
-    return attributeKeys
-  }
-
-  getAvatarAttributes () {
-    let attributeKeys = [
-      'id',
-      'filename',
-      'type',
-      'fileUrl',
-      'onDisk',
-      'createdAt',
-      'updatedAt'
-    ]
-
-    if (this.mode === 'get') {
-      attributeKeys = attributeKeys.concat([
-        'height',
-        'width',
-        'type'
-      ])
-    }
-
-    return attributeKeys
-  }
-
-  getServerAttributes () {
-    return [ 'id', 'host' ]
-  }
-
-  getVideoAttributes () {
-    return [
-      'id',
-      'uuid',
-      'name',
-      'category',
-      'licence',
-      'language',
-      'privacy',
-      'nsfw',
-      'description',
-      'support',
-      'duration',
-      'views',
-      'likes',
-      'dislikes',
-      'remote',
-      'isLive',
-      'url',
-      'commentsEnabled',
-      'downloadEnabled',
-      'waitTranscoding',
-      'state',
-      'publishedAt',
-      'originallyPublishedAt',
-      'channelId',
-      'createdAt',
-      'updatedAt',
-      'moveJobsRunning'
-    ]
-  }
-}
diff --git a/server/models/video/sql/video-model-get-query-builder.ts b/server/models/video/sql/video-model-get-query-builder.ts
deleted file mode 100644
index a65c96097..000000000
--- a/server/models/video/sql/video-model-get-query-builder.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { Sequelize, Transaction } from 'sequelize'
-import { AbstractVideoQueryBuilder } from './shared/abstract-video-query-builder'
-import { VideoFileQueryBuilder } from './shared/video-file-query-builder'
-import { VideoModelBuilder } from './shared/video-model-builder'
-import { VideoTableAttributes } from './shared/video-table-attributes'
-
-/**
- *
- * Build a GET SQL query, fetch rows and create the video model
- *
- */
-
-export type GetType =
-  'api' |
-  'full-light' |
-  'account-blacklist-files' |
-  'all-files' |
-  'thumbnails' |
-  'thumbnails-blacklist' |
-  'id' |
-  'blacklist-rights'
-
-export type BuildVideoGetQueryOptions = {
-  id?: number | string
-  url?: string
-
-  type: GetType
-
-  userId?: number
-  transaction?: Transaction
-
-  logging?: boolean
-}
-
-export class VideoModelGetQueryBuilder {
-  videoQueryBuilder: VideosModelGetQuerySubBuilder
-  webtorrentFilesQueryBuilder: VideoFileQueryBuilder
-  streamingPlaylistFilesQueryBuilder: VideoFileQueryBuilder
-
-  private readonly videoModelBuilder: VideoModelBuilder
-
-  private static readonly videoFilesInclude = new Set<GetType>([ 'api', 'full-light', 'account-blacklist-files', 'all-files' ])
-
-  constructor (protected readonly sequelize: Sequelize) {
-    this.videoQueryBuilder = new VideosModelGetQuerySubBuilder(sequelize)
-    this.webtorrentFilesQueryBuilder = new VideoFileQueryBuilder(sequelize)
-    this.streamingPlaylistFilesQueryBuilder = new VideoFileQueryBuilder(sequelize)
-
-    this.videoModelBuilder = new VideoModelBuilder('get', new VideoTableAttributes('get'))
-  }
-
-  async queryVideo (options: BuildVideoGetQueryOptions) {
-    const [ videoRows, webtorrentFilesRows, streamingPlaylistFilesRows ] = await Promise.all([
-      this.videoQueryBuilder.queryVideos(options),
-
-      VideoModelGetQueryBuilder.videoFilesInclude.has(options.type)
-        ? this.webtorrentFilesQueryBuilder.queryWebTorrentVideos(options)
-        : Promise.resolve(undefined),
-
-      VideoModelGetQueryBuilder.videoFilesInclude.has(options.type)
-        ? this.streamingPlaylistFilesQueryBuilder.queryStreamingPlaylistVideos(options)
-        : Promise.resolve(undefined)
-    ])
-
-    const videos = this.videoModelBuilder.buildVideosFromRows({
-      rows: videoRows,
-      rowsWebTorrentFiles: webtorrentFilesRows,
-      rowsStreamingPlaylist: streamingPlaylistFilesRows
-    })
-
-    if (videos.length > 1) {
-      throw new Error('Video results is more than 1')
-    }
-
-    if (videos.length === 0) return null
-
-    return videos[0]
-  }
-}
-
-export class VideosModelGetQuerySubBuilder extends AbstractVideoQueryBuilder {
-  protected attributes: { [key: string]: string }
-
-  protected webtorrentFilesQuery: string
-  protected streamingPlaylistFilesQuery: string
-
-  private static readonly trackersInclude = new Set<GetType>([ 'api' ])
-  private static readonly liveInclude = new Set<GetType>([ 'api', 'full-light' ])
-  private static readonly scheduleUpdateInclude = new Set<GetType>([ 'api', 'full-light' ])
-  private static readonly tagsInclude = new Set<GetType>([ 'api', 'full-light' ])
-  private static readonly userHistoryInclude = new Set<GetType>([ 'api', 'full-light' ])
-  private static readonly accountInclude = new Set<GetType>([ 'api', 'full-light', 'account-blacklist-files' ])
-  private static readonly ownerUserInclude = new Set<GetType>([ 'blacklist-rights' ])
-
-  private static readonly blacklistedInclude = new Set<GetType>([
-    'api',
-    'full-light',
-    'account-blacklist-files',
-    'thumbnails-blacklist',
-    'blacklist-rights'
-  ])
-
-  private static readonly thumbnailsInclude = new Set<GetType>([
-    'api',
-    'full-light',
-    'account-blacklist-files',
-    'all-files',
-    'thumbnails',
-    'thumbnails-blacklist'
-  ])
-
-  constructor (protected readonly sequelize: Sequelize) {
-    super('get')
-  }
-
-  queryVideos (options: BuildVideoGetQueryOptions) {
-    this.buildMainGetQuery(options)
-
-    return this.runQuery(options)
-  }
-
-  private buildMainGetQuery (options: BuildVideoGetQueryOptions) {
-    this.attributes = {
-      '"video".*': ''
-    }
-
-    if (VideosModelGetQuerySubBuilder.thumbnailsInclude.has(options.type)) {
-      this.includeThumbnails()
-    }
-
-    if (VideosModelGetQuerySubBuilder.blacklistedInclude.has(options.type)) {
-      this.includeBlacklisted()
-    }
-
-    if (VideosModelGetQuerySubBuilder.accountInclude.has(options.type)) {
-      this.includeChannels()
-      this.includeAccounts()
-    }
-
-    if (VideosModelGetQuerySubBuilder.tagsInclude.has(options.type)) {
-      this.includeTags()
-    }
-
-    if (VideosModelGetQuerySubBuilder.scheduleUpdateInclude.has(options.type)) {
-      this.includeScheduleUpdate()
-    }
-
-    if (VideosModelGetQuerySubBuilder.liveInclude.has(options.type)) {
-      this.includeLive()
-    }
-
-    if (options.userId && VideosModelGetQuerySubBuilder.userHistoryInclude.has(options.type)) {
-      this.includeUserHistory(options.userId)
-    }
-
-    if (VideosModelGetQuerySubBuilder.ownerUserInclude.has(options.type)) {
-      this.includeOwnerUser()
-    }
-
-    if (VideosModelGetQuerySubBuilder.trackersInclude.has(options.type)) {
-      this.includeTrackers()
-    }
-
-    this.whereId(options)
-
-    this.query = this.buildQuery(options)
-  }
-
-  private buildQuery (options: BuildVideoGetQueryOptions) {
-    const order = VideosModelGetQuerySubBuilder.tagsInclude.has(options.type)
-      ? 'ORDER BY "Tags"."name" ASC'
-      : ''
-
-    const from = `SELECT * FROM "video" ${this.where} LIMIT 1`
-
-    return `${this.buildSelect()} FROM (${from}) AS "video" ${this.joins} ${order}`
-  }
-}
diff --git a/server/models/video/sql/video/index.ts b/server/models/video/sql/video/index.ts
new file mode 100644
index 000000000..e9132d5e1
--- /dev/null
+++ b/server/models/video/sql/video/index.ts
@@ -0,0 +1,3 @@
+export * from './video-model-get-query-builder'
+export * from './videos-id-list-query-builder'
+export * from './videos-model-list-query-builder'
diff --git a/server/models/video/sql/video/shared/abstract-run-query.ts b/server/models/video/sql/video/shared/abstract-run-query.ts
new file mode 100644
index 000000000..8e7a7642d
--- /dev/null
+++ b/server/models/video/sql/video/shared/abstract-run-query.ts
@@ -0,0 +1,26 @@
+import { QueryTypes, Sequelize, Transaction } from 'sequelize'
+
+/**
+ *
+ * Abstact builder to run video SQL queries
+ *
+ */
+
+export class AbstractRunQuery {
+  protected sequelize: Sequelize
+
+  protected query: string
+  protected replacements: any = {}
+
+  protected runQuery (options: { transaction?: Transaction, logging?: boolean } = {}) {
+    const queryOptions = {
+      transaction: options.transaction,
+      logging: options.logging,
+      replacements: this.replacements,
+      type: QueryTypes.SELECT as QueryTypes.SELECT,
+      nest: false
+    }
+
+    return this.sequelize.query<any>(this.query, queryOptions)
+  }
+}
diff --git a/server/models/video/sql/video/shared/abstract-video-query-builder.ts b/server/models/video/sql/video/shared/abstract-video-query-builder.ts
new file mode 100644
index 000000000..490e5e6e0
--- /dev/null
+++ b/server/models/video/sql/video/shared/abstract-video-query-builder.ts
@@ -0,0 +1,331 @@
+import { createSafeIn } from '@server/models/utils'
+import { MUserAccountId } from '@server/types/models'
+import { ActorImageType } from '@shared/models'
+import validator from 'validator'
+import { AbstractRunQuery } from './abstract-run-query'
+import { VideoTableAttributes } from './video-table-attributes'
+
+/**
+ *
+ * Abstract builder to create SQL query and fetch video models
+ *
+ */
+
+export class AbstractVideoQueryBuilder extends AbstractRunQuery {
+  protected attributes: { [key: string]: string } = {}
+
+  protected joins = ''
+  protected where: string
+
+  protected tables: VideoTableAttributes
+
+  constructor (protected readonly mode: 'list' | 'get') {
+    super()
+
+    this.tables = new VideoTableAttributes(this.mode)
+  }
+
+  protected buildSelect () {
+    return 'SELECT ' + Object.keys(this.attributes).map(key => {
+      const value = this.attributes[key]
+      if (value) return `${key} AS ${value}`
+
+      return key
+    }).join(', ')
+  }
+
+  protected includeChannels () {
+    this.addJoin('INNER JOIN "videoChannel" AS "VideoChannel" ON "video"."channelId" = "VideoChannel"."id"')
+    this.addJoin('INNER JOIN "actor" AS "VideoChannel->Actor" ON "VideoChannel"."actorId" = "VideoChannel->Actor"."id"')
+
+    this.addJoin(
+      'LEFT OUTER JOIN "server" AS "VideoChannel->Actor->Server" ON "VideoChannel->Actor"."serverId" = "VideoChannel->Actor->Server"."id"'
+    )
+
+    this.addJoin(
+      'LEFT OUTER JOIN "actorImage" AS "VideoChannel->Actor->Avatars" ' +
+        'ON "VideoChannel->Actor"."id" = "VideoChannel->Actor->Avatars"."actorId" ' +
+        `AND "VideoChannel->Actor->Avatars"."type" = ${ActorImageType.AVATAR}`
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoChannel', this.tables.getChannelAttributes()),
+      ...this.buildActorInclude('VideoChannel->Actor'),
+      ...this.buildAvatarInclude('VideoChannel->Actor->Avatars'),
+      ...this.buildServerInclude('VideoChannel->Actor->Server')
+    }
+  }
+
+  protected includeAccounts () {
+    this.addJoin('INNER JOIN "account" AS "VideoChannel->Account" ON "VideoChannel"."accountId" = "VideoChannel->Account"."id"')
+    this.addJoin(
+      'INNER JOIN "actor" AS "VideoChannel->Account->Actor" ON "VideoChannel->Account"."actorId" = "VideoChannel->Account->Actor"."id"'
+    )
+
+    this.addJoin(
+      'LEFT OUTER JOIN "server" AS "VideoChannel->Account->Actor->Server" ' +
+        'ON "VideoChannel->Account->Actor"."serverId" = "VideoChannel->Account->Actor->Server"."id"'
+    )
+
+    this.addJoin(
+      'LEFT OUTER JOIN "actorImage" AS "VideoChannel->Account->Actor->Avatars" ' +
+        'ON "VideoChannel->Account"."actorId"= "VideoChannel->Account->Actor->Avatars"."actorId" ' +
+        `AND "VideoChannel->Account->Actor->Avatars"."type" = ${ActorImageType.AVATAR}`
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoChannel->Account', this.tables.getAccountAttributes()),
+      ...this.buildActorInclude('VideoChannel->Account->Actor'),
+      ...this.buildAvatarInclude('VideoChannel->Account->Actor->Avatars'),
+      ...this.buildServerInclude('VideoChannel->Account->Actor->Server')
+    }
+  }
+
+  protected includeOwnerUser () {
+    this.addJoin('INNER JOIN "videoChannel" AS "VideoChannel" ON "video"."channelId" = "VideoChannel"."id"')
+    this.addJoin('INNER JOIN "account" AS "VideoChannel->Account" ON "VideoChannel"."accountId" = "VideoChannel->Account"."id"')
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoChannel', this.tables.getChannelAttributes()),
+      ...this.buildAttributesObject('VideoChannel->Account', this.tables.getUserAccountAttributes())
+    }
+  }
+
+  protected includeThumbnails () {
+    this.addJoin('LEFT OUTER JOIN "thumbnail" AS "Thumbnails" ON "video"."id" = "Thumbnails"."videoId"')
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('Thumbnails', this.tables.getThumbnailAttributes())
+    }
+  }
+
+  protected includeWebtorrentFiles () {
+    this.addJoin('LEFT JOIN "videoFile" AS "VideoFiles" ON "VideoFiles"."videoId" = "video"."id"')
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoFiles', this.tables.getFileAttributes())
+    }
+  }
+
+  protected includeStreamingPlaylistFiles () {
+    this.addJoin(
+      'LEFT JOIN "videoStreamingPlaylist" AS "VideoStreamingPlaylists" ON "VideoStreamingPlaylists"."videoId" = "video"."id"'
+    )
+
+    this.addJoin(
+      'LEFT JOIN "videoFile" AS "VideoStreamingPlaylists->VideoFiles" ' +
+        'ON "VideoStreamingPlaylists->VideoFiles"."videoStreamingPlaylistId" = "VideoStreamingPlaylists"."id"'
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoStreamingPlaylists', this.tables.getStreamingPlaylistAttributes()),
+      ...this.buildAttributesObject('VideoStreamingPlaylists->VideoFiles', this.tables.getFileAttributes())
+    }
+  }
+
+  protected includeUserHistory (userId: number) {
+    this.addJoin(
+      'LEFT OUTER JOIN "userVideoHistory" ' +
+        'ON "video"."id" = "userVideoHistory"."videoId" AND "userVideoHistory"."userId" = :userVideoHistoryId'
+    )
+
+    this.replacements.userVideoHistoryId = userId
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('userVideoHistory', this.tables.getUserHistoryAttributes())
+    }
+  }
+
+  protected includePlaylist (playlistId: number) {
+    this.addJoin(
+      'INNER JOIN "videoPlaylistElement" as "VideoPlaylistElement" ON "videoPlaylistElement"."videoId" = "video"."id" ' +
+        'AND "VideoPlaylistElement"."videoPlaylistId" = :videoPlaylistId'
+    )
+
+    this.replacements.videoPlaylistId = playlistId
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoPlaylistElement', this.tables.getPlaylistAttributes())
+    }
+  }
+
+  protected includeTags () {
+    this.addJoin(
+      'LEFT OUTER JOIN (' +
+        '"videoTag" AS "Tags->VideoTagModel" INNER JOIN "tag" AS "Tags" ON "Tags"."id" = "Tags->VideoTagModel"."tagId"' +
+      ') ' +
+      'ON "video"."id" = "Tags->VideoTagModel"."videoId"'
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('Tags', this.tables.getTagAttributes()),
+      ...this.buildAttributesObject('Tags->VideoTagModel', this.tables.getVideoTagAttributes())
+    }
+  }
+
+  protected includeBlacklisted () {
+    this.addJoin(
+      'LEFT OUTER JOIN "videoBlacklist" AS "VideoBlacklist" ON "video"."id" = "VideoBlacklist"."videoId"'
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoBlacklist', this.tables.getBlacklistedAttributes())
+    }
+  }
+
+  protected includeBlockedOwnerAndServer (serverAccountId: number, user?: MUserAccountId) {
+    const blockerIds = [ serverAccountId ]
+    if (user) blockerIds.push(user.Account.id)
+
+    const inClause = createSafeIn(this.sequelize, blockerIds)
+
+    this.addJoin(
+      'LEFT JOIN "accountBlocklist" AS "VideoChannel->Account->AccountBlocklist" ' +
+        'ON "VideoChannel->Account"."id" = "VideoChannel->Account->AccountBlocklist"."targetAccountId" ' +
+        'AND "VideoChannel->Account->AccountBlocklist"."accountId" IN (' + inClause + ')'
+    )
+
+    this.addJoin(
+      'LEFT JOIN "serverBlocklist" AS "VideoChannel->Account->Actor->Server->ServerBlocklist" ' +
+        'ON "VideoChannel->Account->Actor->Server->ServerBlocklist"."targetServerId" = "VideoChannel->Account->Actor"."serverId" ' +
+        'AND "VideoChannel->Account->Actor->Server->ServerBlocklist"."accountId" IN (' + inClause + ') '
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoChannel->Account->AccountBlocklist', this.tables.getBlocklistAttributes()),
+      ...this.buildAttributesObject('VideoChannel->Account->Actor->Server->ServerBlocklist', this.tables.getBlocklistAttributes())
+    }
+  }
+
+  protected includeScheduleUpdate () {
+    this.addJoin(
+      'LEFT OUTER JOIN "scheduleVideoUpdate" AS "ScheduleVideoUpdate" ON "video"."id" = "ScheduleVideoUpdate"."videoId"'
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('ScheduleVideoUpdate', this.tables.getScheduleUpdateAttributes())
+    }
+  }
+
+  protected includeLive () {
+    this.addJoin(
+      'LEFT OUTER JOIN "videoLive" AS "VideoLive" ON "video"."id" = "VideoLive"."videoId"'
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoLive', this.tables.getLiveAttributes())
+    }
+  }
+
+  protected includeTrackers () {
+    this.addJoin(
+      'LEFT OUTER JOIN (' +
+        '"videoTracker" AS "Trackers->VideoTrackerModel" ' +
+          'INNER JOIN "tracker" AS "Trackers" ON "Trackers"."id" = "Trackers->VideoTrackerModel"."trackerId"' +
+      ') ON "video"."id" = "Trackers->VideoTrackerModel"."videoId"'
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('Trackers', this.tables.getTrackerAttributes()),
+      ...this.buildAttributesObject('Trackers->VideoTrackerModel', this.tables.getVideoTrackerAttributes())
+    }
+  }
+
+  protected includeWebTorrentRedundancies () {
+    this.addJoin(
+      'LEFT OUTER JOIN "videoRedundancy" AS "VideoFiles->RedundancyVideos" ON ' +
+        '"VideoFiles"."id" = "VideoFiles->RedundancyVideos"."videoFileId"'
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoFiles->RedundancyVideos', this.tables.getRedundancyAttributes())
+    }
+  }
+
+  protected includeStreamingPlaylistRedundancies () {
+    this.addJoin(
+      'LEFT OUTER JOIN "videoRedundancy" AS "VideoStreamingPlaylists->RedundancyVideos" ' +
+        'ON "VideoStreamingPlaylists"."id" = "VideoStreamingPlaylists->RedundancyVideos"."videoStreamingPlaylistId"'
+    )
+
+    this.attributes = {
+      ...this.attributes,
+
+      ...this.buildAttributesObject('VideoStreamingPlaylists->RedundancyVideos', this.tables.getRedundancyAttributes())
+    }
+  }
+
+  protected buildActorInclude (prefixKey: string) {
+    return this.buildAttributesObject(prefixKey, this.tables.getActorAttributes())
+  }
+
+  protected buildAvatarInclude (prefixKey: string) {
+    return this.buildAttributesObject(prefixKey, this.tables.getAvatarAttributes())
+  }
+
+  protected buildServerInclude (prefixKey: string) {
+    return this.buildAttributesObject(prefixKey, this.tables.getServerAttributes())
+  }
+
+  protected buildAttributesObject (prefixKey: string, attributeKeys: string[]) {
+    const result: { [id: string]: string} = {}
+
+    const prefixValue = prefixKey.replace(/->/g, '.')
+
+    for (const attribute of attributeKeys) {
+      result[`"${prefixKey}"."${attribute}"`] = `"${prefixValue}.${attribute}"`
+    }
+
+    return result
+  }
+
+  protected whereId (options: { id?: string | number, url?: string }) {
+    if (options.url) {
+      this.where = 'WHERE "video"."url" = :videoUrl'
+      this.replacements.videoUrl = options.url
+      return
+    }
+
+    if (validator.isInt('' + options.id)) {
+      this.where = 'WHERE "video".id = :videoId'
+    } else {
+      this.where = 'WHERE uuid = :videoId'
+    }
+
+    this.replacements.videoId = options.id
+  }
+
+  protected addJoin (join: string) {
+    this.joins += join + ' '
+  }
+}
diff --git a/server/models/video/sql/video/shared/video-file-query-builder.ts b/server/models/video/sql/video/shared/video-file-query-builder.ts
new file mode 100644
index 000000000..3eb3dc07d
--- /dev/null
+++ b/server/models/video/sql/video/shared/video-file-query-builder.ts
@@ -0,0 +1,69 @@
+import { Sequelize } from 'sequelize'
+import { BuildVideoGetQueryOptions } from '../video-model-get-query-builder'
+import { AbstractVideoQueryBuilder } from './abstract-video-query-builder'
+
+/**
+ *
+ * Fetch files (webtorrent and streaming playlist) according to a video
+ *
+ */
+
+export class VideoFileQueryBuilder extends AbstractVideoQueryBuilder {
+  protected attributes: { [key: string]: string }
+
+  constructor (protected readonly sequelize: Sequelize) {
+    super('get')
+  }
+
+  queryWebTorrentVideos (options: BuildVideoGetQueryOptions) {
+    this.buildWebtorrentFilesQuery(options)
+
+    return this.runQuery(options)
+  }
+
+  queryStreamingPlaylistVideos (options: BuildVideoGetQueryOptions) {
+    this.buildVideoStreamingPlaylistFilesQuery(options)
+
+    return this.runQuery(options)
+  }
+
+  private buildWebtorrentFilesQuery (options: BuildVideoGetQueryOptions) {
+    this.attributes = {
+      '"video"."id"': ''
+    }
+
+    this.includeWebtorrentFiles()
+
+    if (this.shouldIncludeRedundancies(options)) {
+      this.includeWebTorrentRedundancies()
+    }
+
+    this.whereId(options)
+
+    this.query = this.buildQuery()
+  }
+
+  private buildVideoStreamingPlaylistFilesQuery (options: BuildVideoGetQueryOptions) {
+    this.attributes = {
+      '"video"."id"': ''
+    }
+
+    this.includeStreamingPlaylistFiles()
+
+    if (this.shouldIncludeRedundancies(options)) {
+      this.includeStreamingPlaylistRedundancies()
+    }
+
+    this.whereId(options)
+
+    this.query = this.buildQuery()
+  }
+
+  private buildQuery () {
+    return `${this.buildSelect()} FROM "video" ${this.joins} ${this.where}`
+  }
+
+  private shouldIncludeRedundancies (options: BuildVideoGetQueryOptions) {
+    return options.type === 'api'
+  }
+}
diff --git a/server/models/video/sql/video/shared/video-model-builder.ts b/server/models/video/sql/video/shared/video-model-builder.ts
new file mode 100644
index 000000000..b1b47b721
--- /dev/null
+++ b/server/models/video/sql/video/shared/video-model-builder.ts
@@ -0,0 +1,406 @@
+
+import { AccountModel } from '@server/models/account/account'
+import { AccountBlocklistModel } from '@server/models/account/account-blocklist'
+import { ActorModel } from '@server/models/actor/actor'
+import { ActorImageModel } from '@server/models/actor/actor-image'
+import { VideoRedundancyModel } from '@server/models/redundancy/video-redundancy'
+import { ServerModel } from '@server/models/server/server'
+import { ServerBlocklistModel } from '@server/models/server/server-blocklist'
+import { TrackerModel } from '@server/models/server/tracker'
+import { UserVideoHistoryModel } from '@server/models/user/user-video-history'
+import { VideoInclude } from '@shared/models'
+import { ScheduleVideoUpdateModel } from '../../../schedule-video-update'
+import { TagModel } from '../../../tag'
+import { ThumbnailModel } from '../../../thumbnail'
+import { VideoModel } from '../../../video'
+import { VideoBlacklistModel } from '../../../video-blacklist'
+import { VideoChannelModel } from '../../../video-channel'
+import { VideoFileModel } from '../../../video-file'
+import { VideoLiveModel } from '../../../video-live'
+import { VideoStreamingPlaylistModel } from '../../../video-streaming-playlist'
+import { VideoTableAttributes } from './video-table-attributes'
+
+type SQLRow = { [id: string]: string | number }
+
+/**
+ *
+ * Build video models from SQL rows
+ *
+ */
+
+export class VideoModelBuilder {
+  private videosMemo: { [ id: number ]: VideoModel }
+  private videoStreamingPlaylistMemo: { [ id: number ]: VideoStreamingPlaylistModel }
+  private videoFileMemo: { [ id: number ]: VideoFileModel }
+
+  private thumbnailsDone: Set<any>
+  private actorImagesDone: Set<any>
+  private historyDone: Set<any>
+  private blacklistDone: Set<any>
+  private accountBlocklistDone: Set<any>
+  private serverBlocklistDone: Set<any>
+  private liveDone: Set<any>
+  private redundancyDone: Set<any>
+  private scheduleVideoUpdateDone: Set<any>
+
+  private trackersDone: Set<string>
+  private tagsDone: Set<string>
+
+  private videos: VideoModel[]
+
+  private readonly buildOpts = { raw: true, isNewRecord: false }
+
+  constructor (
+    readonly mode: 'get' | 'list',
+    readonly tables: VideoTableAttributes
+  ) {
+
+  }
+
+  buildVideosFromRows (options: {
+    rows: SQLRow[]
+    include?: VideoInclude
+    rowsWebTorrentFiles?: SQLRow[]
+    rowsStreamingPlaylist?: SQLRow[]
+  }) {
+    const { rows, rowsWebTorrentFiles, rowsStreamingPlaylist, include } = options
+
+    this.reinit()
+
+    for (const row of rows) {
+      this.buildVideoAndAccount(row)
+
+      const videoModel = this.videosMemo[row.id as number]
+
+      this.setUserHistory(row, videoModel)
+      this.addThumbnail(row, videoModel)
+
+      const channelActor = videoModel.VideoChannel?.Actor
+      if (channelActor) {
+        this.addActorAvatar(row, 'VideoChannel.Actor', channelActor)
+      }
+
+      const accountActor = videoModel.VideoChannel?.Account?.Actor
+      if (accountActor) {
+        this.addActorAvatar(row, 'VideoChannel.Account.Actor', accountActor)
+      }
+
+      if (!rowsWebTorrentFiles) {
+        this.addWebTorrentFile(row, videoModel)
+      }
+
+      if (!rowsStreamingPlaylist) {
+        this.addStreamingPlaylist(row, videoModel)
+        this.addStreamingPlaylistFile(row)
+      }
+
+      if (this.mode === 'get') {
+        this.addTag(row, videoModel)
+        this.addTracker(row, videoModel)
+        this.setBlacklisted(row, videoModel)
+        this.setScheduleVideoUpdate(row, videoModel)
+        this.setLive(row, videoModel)
+      } else {
+        if (include & VideoInclude.BLACKLISTED) {
+          this.setBlacklisted(row, videoModel)
+        }
+
+        if (include & VideoInclude.BLOCKED_OWNER) {
+          this.setBlockedOwner(row, videoModel)
+          this.setBlockedServer(row, videoModel)
+        }
+      }
+    }
+
+    this.grabSeparateWebTorrentFiles(rowsWebTorrentFiles)
+    this.grabSeparateStreamingPlaylistFiles(rowsStreamingPlaylist)
+
+    return this.videos
+  }
+
+  private reinit () {
+    this.videosMemo = {}
+    this.videoStreamingPlaylistMemo = {}
+    this.videoFileMemo = {}
+
+    this.thumbnailsDone = new Set()
+    this.actorImagesDone = new Set()
+    this.historyDone = new Set()
+    this.blacklistDone = new Set()
+    this.liveDone = new Set()
+    this.redundancyDone = new Set()
+    this.scheduleVideoUpdateDone = new Set()
+
+    this.accountBlocklistDone = new Set()
+    this.serverBlocklistDone = new Set()
+
+    this.trackersDone = new Set()
+    this.tagsDone = new Set()
+
+    this.videos = []
+  }
+
+  private grabSeparateWebTorrentFiles (rowsWebTorrentFiles?: SQLRow[]) {
+    if (!rowsWebTorrentFiles) return
+
+    for (const row of rowsWebTorrentFiles) {
+      const id = row['VideoFiles.id']
+      if (!id) continue
+
+      const videoModel = this.videosMemo[row.id]
+      this.addWebTorrentFile(row, videoModel)
+      this.addRedundancy(row, 'VideoFiles', this.videoFileMemo[id])
+    }
+  }
+
+  private grabSeparateStreamingPlaylistFiles (rowsStreamingPlaylist?: SQLRow[]) {
+    if (!rowsStreamingPlaylist) return
+
+    for (const row of rowsStreamingPlaylist) {
+      const id = row['VideoStreamingPlaylists.id']
+      if (!id) continue
+
+      const videoModel = this.videosMemo[row.id]
+
+      this.addStreamingPlaylist(row, videoModel)
+      this.addStreamingPlaylistFile(row)
+      this.addRedundancy(row, 'VideoStreamingPlaylists', this.videoStreamingPlaylistMemo[id])
+    }
+  }
+
+  private buildVideoAndAccount (row: SQLRow) {
+    if (this.videosMemo[row.id]) return
+
+    const videoModel = new VideoModel(this.grab(row, this.tables.getVideoAttributes(), ''), this.buildOpts)
+
+    videoModel.UserVideoHistories = []
+    videoModel.Thumbnails = []
+    videoModel.VideoFiles = []
+    videoModel.VideoStreamingPlaylists = []
+    videoModel.Tags = []
+    videoModel.Trackers = []
+
+    this.buildAccount(row, videoModel)
+
+    this.videosMemo[row.id] = videoModel
+
+    // Keep rows order
+    this.videos.push(videoModel)
+  }
+
+  private buildAccount (row: SQLRow, videoModel: VideoModel) {
+    const id = row['VideoChannel.Account.id']
+    if (!id) return
+
+    const channelModel = new VideoChannelModel(this.grab(row, this.tables.getChannelAttributes(), 'VideoChannel'), this.buildOpts)
+    channelModel.Actor = this.buildActor(row, 'VideoChannel')
+
+    const accountModel = new AccountModel(this.grab(row, this.tables.getAccountAttributes(), 'VideoChannel.Account'), this.buildOpts)
+    accountModel.Actor = this.buildActor(row, 'VideoChannel.Account')
+
+    accountModel.BlockedBy = []
+
+    channelModel.Account = accountModel
+
+    videoModel.VideoChannel = channelModel
+  }
+
+  private buildActor (row: SQLRow, prefix: string) {
+    const actorPrefix = `${prefix}.Actor`
+    const serverPrefix = `${actorPrefix}.Server`
+
+    const serverModel = row[`${serverPrefix}.id`] !== null
+      ? new ServerModel(this.grab(row, this.tables.getServerAttributes(), serverPrefix), this.buildOpts)
+      : null
+
+    if (serverModel) serverModel.BlockedBy = []
+
+    const actorModel = new ActorModel(this.grab(row, this.tables.getActorAttributes(), actorPrefix), this.buildOpts)
+    actorModel.Server = serverModel
+    actorModel.Avatars = []
+
+    return actorModel
+  }
+
+  private setUserHistory (row: SQLRow, videoModel: VideoModel) {
+    const id = row['userVideoHistory.id']
+    if (!id || this.historyDone.has(id)) return
+
+    const attributes = this.grab(row, this.tables.getUserHistoryAttributes(), 'userVideoHistory')
+    const historyModel = new UserVideoHistoryModel(attributes, this.buildOpts)
+    videoModel.UserVideoHistories.push(historyModel)
+
+    this.historyDone.add(id)
+  }
+
+  private addActorAvatar (row: SQLRow, actorPrefix: string, actor: ActorModel) {
+    const avatarPrefix = `${actorPrefix}.Avatar`
+    const id = row[`${avatarPrefix}.id`]
+    if (!id || this.actorImagesDone.has(id)) return
+
+    const attributes = this.grab(row, this.tables.getAvatarAttributes(), avatarPrefix)
+    const avatarModel = new ActorImageModel(attributes, this.buildOpts)
+    actor.Avatars.push(avatarModel)
+
+    this.actorImagesDone.add(id)
+  }
+
+  private addThumbnail (row: SQLRow, videoModel: VideoModel) {
+    const id = row['Thumbnails.id']
+    if (!id || this.thumbnailsDone.has(id)) return
+
+    const attributes = this.grab(row, this.tables.getThumbnailAttributes(), 'Thumbnails')
+    const thumbnailModel = new ThumbnailModel(attributes, this.buildOpts)
+    videoModel.Thumbnails.push(thumbnailModel)
+
+    this.thumbnailsDone.add(id)
+  }
+
+  private addWebTorrentFile (row: SQLRow, videoModel: VideoModel) {
+    const id = row['VideoFiles.id']
+    if (!id || this.videoFileMemo[id]) return
+
+    const attributes = this.grab(row, this.tables.getFileAttributes(), 'VideoFiles')
+    const videoFileModel = new VideoFileModel(attributes, this.buildOpts)
+    videoModel.VideoFiles.push(videoFileModel)
+
+    this.videoFileMemo[id] = videoFileModel
+  }
+
+  private addStreamingPlaylist (row: SQLRow, videoModel: VideoModel) {
+    const id = row['VideoStreamingPlaylists.id']
+    if (!id || this.videoStreamingPlaylistMemo[id]) return
+
+    const attributes = this.grab(row, this.tables.getStreamingPlaylistAttributes(), 'VideoStreamingPlaylists')
+    const streamingPlaylist = new VideoStreamingPlaylistModel(attributes, this.buildOpts)
+    streamingPlaylist.VideoFiles = []
+
+    videoModel.VideoStreamingPlaylists.push(streamingPlaylist)
+
+    this.videoStreamingPlaylistMemo[id] = streamingPlaylist
+  }
+
+  private addStreamingPlaylistFile (row: SQLRow) {
+    const id = row['VideoStreamingPlaylists.VideoFiles.id']
+    if (!id || this.videoFileMemo[id]) return
+
+    const streamingPlaylist = this.videoStreamingPlaylistMemo[row['VideoStreamingPlaylists.id']]
+
+    const attributes = this.grab(row, this.tables.getFileAttributes(), 'VideoStreamingPlaylists.VideoFiles')
+    const videoFileModel = new VideoFileModel(attributes, this.buildOpts)
+    streamingPlaylist.VideoFiles.push(videoFileModel)
+
+    this.videoFileMemo[id] = videoFileModel
+  }
+
+  private addRedundancy (row: SQLRow, prefix: string, to: VideoFileModel | VideoStreamingPlaylistModel) {
+    if (!to.RedundancyVideos) to.RedundancyVideos = []
+
+    const redundancyPrefix = `${prefix}.RedundancyVideos`
+    const id = row[`${redundancyPrefix}.id`]
+
+    if (!id || this.redundancyDone.has(id)) return
+
+    const attributes = this.grab(row, this.tables.getRedundancyAttributes(), redundancyPrefix)
+    const redundancyModel = new VideoRedundancyModel(attributes, this.buildOpts)
+    to.RedundancyVideos.push(redundancyModel)
+
+    this.redundancyDone.add(id)
+  }
+
+  private addTag (row: SQLRow, videoModel: VideoModel) {
+    if (!row['Tags.name']) return
+
+    const key = `${row['Tags.VideoTagModel.videoId']}-${row['Tags.VideoTagModel.tagId']}`
+    if (this.tagsDone.has(key)) return
+
+    const attributes = this.grab(row, this.tables.getTagAttributes(), 'Tags')
+    const tagModel = new TagModel(attributes, this.buildOpts)
+    videoModel.Tags.push(tagModel)
+
+    this.tagsDone.add(key)
+  }
+
+  private addTracker (row: SQLRow, videoModel: VideoModel) {
+    if (!row['Trackers.id']) return
+
+    const key = `${row['Trackers.VideoTrackerModel.videoId']}-${row['Trackers.VideoTrackerModel.trackerId']}`
+    if (this.trackersDone.has(key)) return
+
+    const attributes = this.grab(row, this.tables.getTrackerAttributes(), 'Trackers')
+    const trackerModel = new TrackerModel(attributes, this.buildOpts)
+    videoModel.Trackers.push(trackerModel)
+
+    this.trackersDone.add(key)
+  }
+
+  private setBlacklisted (row: SQLRow, videoModel: VideoModel) {
+    const id = row['VideoBlacklist.id']
+    if (!id || this.blacklistDone.has(id)) return
+
+    const attributes = this.grab(row, this.tables.getBlacklistedAttributes(), 'VideoBlacklist')
+    videoModel.VideoBlacklist = new VideoBlacklistModel(attributes, this.buildOpts)
+
+    this.blacklistDone.add(id)
+  }
+
+  private setBlockedOwner (row: SQLRow, videoModel: VideoModel) {
+    const id = row['VideoChannel.Account.AccountBlocklist.id']
+    if (!id) return
+
+    const key = `${videoModel.id}-${id}`
+    if (this.accountBlocklistDone.has(key)) return
+
+    const attributes = this.grab(row, this.tables.getBlocklistAttributes(), 'VideoChannel.Account.AccountBlocklist')
+    videoModel.VideoChannel.Account.BlockedBy.push(new AccountBlocklistModel(attributes, this.buildOpts))
+
+    this.accountBlocklistDone.add(key)
+  }
+
+  private setBlockedServer (row: SQLRow, videoModel: VideoModel) {
+    const id = row['VideoChannel.Account.Actor.Server.ServerBlocklist.id']
+    if (!id || this.serverBlocklistDone.has(id)) return
+
+    const key = `${videoModel.id}-${id}`
+    if (this.serverBlocklistDone.has(key)) return
+
+    const attributes = this.grab(row, this.tables.getBlocklistAttributes(), 'VideoChannel.Account.Actor.Server.ServerBlocklist')
+    videoModel.VideoChannel.Account.Actor.Server.BlockedBy.push(new ServerBlocklistModel(attributes, this.buildOpts))
+
+    this.serverBlocklistDone.add(key)
+  }
+
+  private setScheduleVideoUpdate (row: SQLRow, videoModel: VideoModel) {
+    const id = row['ScheduleVideoUpdate.id']
+    if (!id || this.scheduleVideoUpdateDone.has(id)) return
+
+    const attributes = this.grab(row, this.tables.getScheduleUpdateAttributes(), 'ScheduleVideoUpdate')
+    videoModel.ScheduleVideoUpdate = new ScheduleVideoUpdateModel(attributes, this.buildOpts)
+
+    this.scheduleVideoUpdateDone.add(id)
+  }
+
+  private setLive (row: SQLRow, videoModel: VideoModel) {
+    const id = row['VideoLive.id']
+    if (!id || this.liveDone.has(id)) return
+
+    const attributes = this.grab(row, this.tables.getLiveAttributes(), 'VideoLive')
+    videoModel.VideoLive = new VideoLiveModel(attributes, this.buildOpts)
+
+    this.liveDone.add(id)
+  }
+
+  private grab (row: SQLRow, attributes: string[], prefix: string) {
+    const result: { [ id: string ]: string | number } = {}
+
+    for (const a of attributes) {
+      const key = prefix
+        ? prefix + '.' + a
+        : a
+
+      result[a] = row[key]
+    }
+
+    return result
+  }
+}
diff --git a/server/models/video/sql/video/shared/video-table-attributes.ts b/server/models/video/sql/video/shared/video-table-attributes.ts
new file mode 100644
index 000000000..df2ed3fb0
--- /dev/null
+++ b/server/models/video/sql/video/shared/video-table-attributes.ts
@@ -0,0 +1,269 @@
+
+/**
+ *
+ * Class to build video attributes/join names we want to fetch from the database
+ *
+ */
+export class VideoTableAttributes {
+
+  constructor (readonly mode: 'get' | 'list') {
+
+  }
+
+  getChannelAttributesForUser () {
+    return [ 'id', 'accountId' ]
+  }
+
+  getChannelAttributes () {
+    let attributeKeys = [
+      'id',
+      'name',
+      'description',
+      'actorId'
+    ]
+
+    if (this.mode === 'get') {
+      attributeKeys = attributeKeys.concat([
+        'support',
+        'createdAt',
+        'updatedAt'
+      ])
+    }
+
+    return attributeKeys
+  }
+
+  getUserAccountAttributes () {
+    return [ 'id', 'userId' ]
+  }
+
+  getAccountAttributes () {
+    let attributeKeys = [ 'id', 'name', 'actorId' ]
+
+    if (this.mode === 'get') {
+      attributeKeys = attributeKeys.concat([
+        'description',
+        'userId',
+        'createdAt',
+        'updatedAt'
+      ])
+    }
+
+    return attributeKeys
+  }
+
+  getThumbnailAttributes () {
+    let attributeKeys = [ 'id', 'type', 'filename' ]
+
+    if (this.mode === 'get') {
+      attributeKeys = attributeKeys.concat([
+        'height',
+        'width',
+        'fileUrl',
+        'automaticallyGenerated',
+        'videoId',
+        'videoPlaylistId',
+        'createdAt',
+        'updatedAt'
+      ])
+    }
+
+    return attributeKeys
+  }
+
+  getFileAttributes () {
+    return [
+      'id',
+      'createdAt',
+      'updatedAt',
+      'resolution',
+      'size',
+      'extname',
+      'filename',
+      'fileUrl',
+      'torrentFilename',
+      'torrentUrl',
+      'infoHash',
+      'fps',
+      'metadataUrl',
+      'videoStreamingPlaylistId',
+      'videoId',
+      'storage'
+    ]
+  }
+
+  getStreamingPlaylistAttributes () {
+    return [
+      'id',
+      'playlistUrl',
+      'playlistFilename',
+      'type',
+      'p2pMediaLoaderInfohashes',
+      'p2pMediaLoaderPeerVersion',
+      'segmentsSha256Filename',
+      'segmentsSha256Url',
+      'videoId',
+      'createdAt',
+      'updatedAt',
+      'storage'
+    ]
+  }
+
+  getUserHistoryAttributes () {
+    return [ 'id', 'currentTime' ]
+  }
+
+  getPlaylistAttributes () {
+    return [
+      'createdAt',
+      'updatedAt',
+      'url',
+      'position',
+      'startTimestamp',
+      'stopTimestamp',
+      'videoPlaylistId'
+    ]
+  }
+
+  getTagAttributes () {
+    return [ 'id', 'name' ]
+  }
+
+  getVideoTagAttributes () {
+    return [ 'videoId', 'tagId', 'createdAt', 'updatedAt' ]
+  }
+
+  getBlacklistedAttributes () {
+    return [ 'id', 'reason', 'unfederated' ]
+  }
+
+  getBlocklistAttributes () {
+    return [ 'id' ]
+  }
+
+  getScheduleUpdateAttributes () {
+    return [
+      'id',
+      'updateAt',
+      'privacy',
+      'videoId',
+      'createdAt',
+      'updatedAt'
+    ]
+  }
+
+  getLiveAttributes () {
+    return [
+      'id',
+      'streamKey',
+      'saveReplay',
+      'permanentLive',
+      'videoId',
+      'createdAt',
+      'updatedAt'
+    ]
+  }
+
+  getTrackerAttributes () {
+    return [ 'id', 'url' ]
+  }
+
+  getVideoTrackerAttributes () {
+    return [
+      'videoId',
+      'trackerId',
+      'createdAt',
+      'updatedAt'
+    ]
+  }
+
+  getRedundancyAttributes () {
+    return [ 'id', 'fileUrl' ]
+  }
+
+  getActorAttributes () {
+    let attributeKeys = [
+      'id',
+      'preferredUsername',
+      'url',
+      'serverId'
+    ]
+
+    if (this.mode === 'get') {
+      attributeKeys = attributeKeys.concat([
+        'type',
+        'followersCount',
+        'followingCount',
+        'inboxUrl',
+        'outboxUrl',
+        'sharedInboxUrl',
+        'followersUrl',
+        'followingUrl',
+        'remoteCreatedAt',
+        'createdAt',
+        'updatedAt'
+      ])
+    }
+
+    return attributeKeys
+  }
+
+  getAvatarAttributes () {
+    let attributeKeys = [
+      'id',
+      'width',
+      'filename',
+      'type',
+      'fileUrl',
+      'onDisk',
+      'createdAt',
+      'updatedAt'
+    ]
+
+    if (this.mode === 'get') {
+      attributeKeys = attributeKeys.concat([
+        'height',
+        'width',
+        'type'
+      ])
+    }
+
+    return attributeKeys
+  }
+
+  getServerAttributes () {
+    return [ 'id', 'host' ]
+  }
+
+  getVideoAttributes () {
+    return [
+      'id',
+      'uuid',
+      'name',
+      'category',
+      'licence',
+      'language',
+      'privacy',
+      'nsfw',
+      'description',
+      'support',
+      'duration',
+      'views',
+      'likes',
+      'dislikes',
+      'remote',
+      'isLive',
+      'url',
+      'commentsEnabled',
+      'downloadEnabled',
+      'waitTranscoding',
+      'state',
+      'publishedAt',
+      'originallyPublishedAt',
+      'channelId',
+      'createdAt',
+      'updatedAt',
+      'moveJobsRunning'
+    ]
+  }
+}
diff --git a/server/models/video/sql/video/video-model-get-query-builder.ts b/server/models/video/sql/video/video-model-get-query-builder.ts
new file mode 100644
index 000000000..a65c96097
--- /dev/null
+++ b/server/models/video/sql/video/video-model-get-query-builder.ts
@@ -0,0 +1,178 @@
+import { Sequelize, Transaction } from 'sequelize'
+import { AbstractVideoQueryBuilder } from './shared/abstract-video-query-builder'
+import { VideoFileQueryBuilder } from './shared/video-file-query-builder'
+import { VideoModelBuilder } from './shared/video-model-builder'
+import { VideoTableAttributes } from './shared/video-table-attributes'
+
+/**
+ *
+ * Build a GET SQL query, fetch rows and create the video model
+ *
+ */
+
+export type GetType =
+  'api' |
+  'full-light' |
+  'account-blacklist-files' |
+  'all-files' |
+  'thumbnails' |
+  'thumbnails-blacklist' |
+  'id' |
+  'blacklist-rights'
+
+export type BuildVideoGetQueryOptions = {
+  id?: number | string
+  url?: string
+
+  type: GetType
+
+  userId?: number
+  transaction?: Transaction
+
+  logging?: boolean
+}
+
+export class VideoModelGetQueryBuilder {
+  videoQueryBuilder: VideosModelGetQuerySubBuilder
+  webtorrentFilesQueryBuilder: VideoFileQueryBuilder
+  streamingPlaylistFilesQueryBuilder: VideoFileQueryBuilder
+
+  private readonly videoModelBuilder: VideoModelBuilder
+
+  private static readonly videoFilesInclude = new Set<GetType>([ 'api', 'full-light', 'account-blacklist-files', 'all-files' ])
+
+  constructor (protected readonly sequelize: Sequelize) {
+    this.videoQueryBuilder = new VideosModelGetQuerySubBuilder(sequelize)
+    this.webtorrentFilesQueryBuilder = new VideoFileQueryBuilder(sequelize)
+    this.streamingPlaylistFilesQueryBuilder = new VideoFileQueryBuilder(sequelize)
+
+    this.videoModelBuilder = new VideoModelBuilder('get', new VideoTableAttributes('get'))
+  }
+
+  async queryVideo (options: BuildVideoGetQueryOptions) {
+    const [ videoRows, webtorrentFilesRows, streamingPlaylistFilesRows ] = await Promise.all([
+      this.videoQueryBuilder.queryVideos(options),
+
+      VideoModelGetQueryBuilder.videoFilesInclude.has(options.type)
+        ? this.webtorrentFilesQueryBuilder.queryWebTorrentVideos(options)
+        : Promise.resolve(undefined),
+
+      VideoModelGetQueryBuilder.videoFilesInclude.has(options.type)
+        ? this.streamingPlaylistFilesQueryBuilder.queryStreamingPlaylistVideos(options)
+        : Promise.resolve(undefined)
+    ])
+
+    const videos = this.videoModelBuilder.buildVideosFromRows({
+      rows: videoRows,
+      rowsWebTorrentFiles: webtorrentFilesRows,
+      rowsStreamingPlaylist: streamingPlaylistFilesRows
+    })
+
+    if (videos.length > 1) {
+      throw new Error('Video results is more than 1')
+    }
+
+    if (videos.length === 0) return null
+
+    return videos[0]
+  }
+}
+
+export class VideosModelGetQuerySubBuilder extends AbstractVideoQueryBuilder {
+  protected attributes: { [key: string]: string }
+
+  protected webtorrentFilesQuery: string
+  protected streamingPlaylistFilesQuery: string
+
+  private static readonly trackersInclude = new Set<GetType>([ 'api' ])
+  private static readonly liveInclude = new Set<GetType>([ 'api', 'full-light' ])
+  private static readonly scheduleUpdateInclude = new Set<GetType>([ 'api', 'full-light' ])
+  private static readonly tagsInclude = new Set<GetType>([ 'api', 'full-light' ])
+  private static readonly userHistoryInclude = new Set<GetType>([ 'api', 'full-light' ])
+  private static readonly accountInclude = new Set<GetType>([ 'api', 'full-light', 'account-blacklist-files' ])
+  private static readonly ownerUserInclude = new Set<GetType>([ 'blacklist-rights' ])
+
+  private static readonly blacklistedInclude = new Set<GetType>([
+    'api',
+    'full-light',
+    'account-blacklist-files',
+    'thumbnails-blacklist',
+    'blacklist-rights'
+  ])
+
+  private static readonly thumbnailsInclude = new Set<GetType>([
+    'api',
+    'full-light',
+    'account-blacklist-files',
+    'all-files',
+    'thumbnails',
+    'thumbnails-blacklist'
+  ])
+
+  constructor (protected readonly sequelize: Sequelize) {
+    super('get')
+  }
+
+  queryVideos (options: BuildVideoGetQueryOptions) {
+    this.buildMainGetQuery(options)
+
+    return this.runQuery(options)
+  }
+
+  private buildMainGetQuery (options: BuildVideoGetQueryOptions) {
+    this.attributes = {
+      '"video".*': ''
+    }
+
+    if (VideosModelGetQuerySubBuilder.thumbnailsInclude.has(options.type)) {
+      this.includeThumbnails()
+    }
+
+    if (VideosModelGetQuerySubBuilder.blacklistedInclude.has(options.type)) {
+      this.includeBlacklisted()
+    }
+
+    if (VideosModelGetQuerySubBuilder.accountInclude.has(options.type)) {
+      this.includeChannels()
+      this.includeAccounts()
+    }
+
+    if (VideosModelGetQuerySubBuilder.tagsInclude.has(options.type)) {
+      this.includeTags()
+    }
+
+    if (VideosModelGetQuerySubBuilder.scheduleUpdateInclude.has(options.type)) {
+      this.includeScheduleUpdate()
+    }
+
+    if (VideosModelGetQuerySubBuilder.liveInclude.has(options.type)) {
+      this.includeLive()
+    }
+
+    if (options.userId && VideosModelGetQuerySubBuilder.userHistoryInclude.has(options.type)) {
+      this.includeUserHistory(options.userId)
+    }
+
+    if (VideosModelGetQuerySubBuilder.ownerUserInclude.has(options.type)) {
+      this.includeOwnerUser()
+    }
+
+    if (VideosModelGetQuerySubBuilder.trackersInclude.has(options.type)) {
+      this.includeTrackers()
+    }
+
+    this.whereId(options)
+
+    this.query = this.buildQuery(options)
+  }
+
+  private buildQuery (options: BuildVideoGetQueryOptions) {
+    const order = VideosModelGetQuerySubBuilder.tagsInclude.has(options.type)
+      ? 'ORDER BY "Tags"."name" ASC'
+      : ''
+
+    const from = `SELECT * FROM "video" ${this.where} LIMIT 1`
+
+    return `${this.buildSelect()} FROM (${from}) AS "video" ${this.joins} ${order}`
+  }
+}
diff --git a/server/models/video/sql/video/videos-id-list-query-builder.ts b/server/models/video/sql/video/videos-id-list-query-builder.ts
new file mode 100644
index 000000000..098e15359
--- /dev/null
+++ b/server/models/video/sql/video/videos-id-list-query-builder.ts
@@ -0,0 +1,697 @@
+import { Sequelize } from 'sequelize'
+import validator from 'validator'
+import { exists } from '@server/helpers/custom-validators/misc'
+import { WEBSERVER } from '@server/initializers/constants'
+import { buildDirectionAndField, createSafeIn } from '@server/models/utils'
+import { MUserAccountId, MUserId } from '@server/types/models'
+import { VideoInclude, VideoPrivacy, VideoState } from '@shared/models'
+import { AbstractRunQuery } from './shared/abstract-run-query'
+
+/**
+ *
+ * Build videos list SQL query to fetch rows
+ *
+ */
+
+export type DisplayOnlyForFollowerOptions = {
+  actorId: number
+  orLocalVideos: boolean
+}
+
+export type BuildVideosListQueryOptions = {
+  attributes?: string[]
+
+  serverAccountIdForBlock: number
+
+  displayOnlyForFollower: DisplayOnlyForFollowerOptions
+
+  count: number
+  start: number
+  sort: string
+
+  nsfw?: boolean
+  host?: string
+  isLive?: boolean
+  isLocal?: boolean
+  include?: VideoInclude
+
+  categoryOneOf?: number[]
+  licenceOneOf?: number[]
+  languageOneOf?: string[]
+  tagsOneOf?: string[]
+  tagsAllOf?: string[]
+  privacyOneOf?: VideoPrivacy[]
+
+  uuids?: string[]
+
+  hasFiles?: boolean
+  hasHLSFiles?: boolean
+  hasWebtorrentFiles?: boolean
+
+  accountId?: number
+  videoChannelId?: number
+
+  videoPlaylistId?: number
+
+  trendingAlgorithm?: string // best, hot, or any other algorithm implemented
+  trendingDays?: number
+
+  user?: MUserAccountId
+  historyOfUser?: MUserId
+
+  startDate?: string // ISO 8601
+  endDate?: string // ISO 8601
+  originallyPublishedStartDate?: string
+  originallyPublishedEndDate?: string
+
+  durationMin?: number // seconds
+  durationMax?: number // seconds
+
+  search?: string
+
+  isCount?: boolean
+
+  group?: string
+  having?: string
+}
+
+export class VideosIdListQueryBuilder extends AbstractRunQuery {
+  protected replacements: any = {}
+
+  private attributes: string[]
+  private joins: string[] = []
+
+  private readonly and: string[] = []
+
+  private readonly cte: string[] = []
+
+  private group = ''
+  private having = ''
+
+  private sort = ''
+  private limit = ''
+  private offset = ''
+
+  constructor (protected readonly sequelize: Sequelize) {
+    super()
+  }
+
+  queryVideoIds (options: BuildVideosListQueryOptions) {
+    this.buildIdsListQuery(options)
+
+    return this.runQuery()
+  }
+
+  countVideoIds (countOptions: BuildVideosListQueryOptions): Promise<number> {
+    this.buildIdsListQuery(countOptions)
+
+    return this.runQuery().then(rows => rows.length !== 0 ? rows[0].total : 0)
+  }
+
+  getQuery (options: BuildVideosListQueryOptions) {
+    this.buildIdsListQuery(options)
+
+    return { query: this.query, sort: this.sort, replacements: this.replacements }
+  }
+
+  private buildIdsListQuery (options: BuildVideosListQueryOptions) {
+    this.attributes = options.attributes || [ '"video"."id"' ]
+
+    if (options.group) this.group = options.group
+    if (options.having) this.having = options.having
+
+    this.joins = this.joins.concat([
+      'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId"',
+      'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId"',
+      'INNER JOIN "actor" "accountActor" ON "account"."actorId" = "accountActor"."id"'
+    ])
+
+    if (!(options.include & VideoInclude.BLACKLISTED)) {
+      this.whereNotBlacklisted()
+    }
+
+    if (options.serverAccountIdForBlock && !(options.include & VideoInclude.BLOCKED_OWNER)) {
+      this.whereNotBlocked(options.serverAccountIdForBlock, options.user)
+    }
+
+    // Only list published videos
+    if (!(options.include & VideoInclude.NOT_PUBLISHED_STATE)) {
+      this.whereStateAvailable()
+    }
+
+    if (options.videoPlaylistId) {
+      this.joinPlaylist(options.videoPlaylistId)
+    }
+
+    if (exists(options.isLocal)) {
+      this.whereLocal(options.isLocal)
+    }
+
+    if (options.host) {
+      this.whereHost(options.host)
+    }
+
+    if (options.accountId) {
+      this.whereAccountId(options.accountId)
+    }
+
+    if (options.videoChannelId) {
+      this.whereChannelId(options.videoChannelId)
+    }
+
+    if (options.displayOnlyForFollower) {
+      this.whereFollowerActorId(options.displayOnlyForFollower)
+    }
+
+    if (options.hasFiles === true) {
+      this.whereFileExists()
+    }
+
+    if (exists(options.hasWebtorrentFiles)) {
+      this.whereWebTorrentFileExists(options.hasWebtorrentFiles)
+    }
+
+    if (exists(options.hasHLSFiles)) {
+      this.whereHLSFileExists(options.hasHLSFiles)
+    }
+
+    if (options.tagsOneOf) {
+      this.whereTagsOneOf(options.tagsOneOf)
+    }
+
+    if (options.tagsAllOf) {
+      this.whereTagsAllOf(options.tagsAllOf)
+    }
+
+    if (options.privacyOneOf) {
+      this.wherePrivacyOneOf(options.privacyOneOf)
+    } else {
+      // Only list videos with the appropriate priavcy
+      this.wherePrivacyAvailable(options.user)
+    }
+
+    if (options.uuids) {
+      this.whereUUIDs(options.uuids)
+    }
+
+    if (options.nsfw === true) {
+      this.whereNSFW()
+    } else if (options.nsfw === false) {
+      this.whereSFW()
+    }
+
+    if (options.isLive === true) {
+      this.whereLive()
+    } else if (options.isLive === false) {
+      this.whereVOD()
+    }
+
+    if (options.categoryOneOf) {
+      this.whereCategoryOneOf(options.categoryOneOf)
+    }
+
+    if (options.licenceOneOf) {
+      this.whereLicenceOneOf(options.licenceOneOf)
+    }
+
+    if (options.languageOneOf) {
+      this.whereLanguageOneOf(options.languageOneOf)
+    }
+
+    // We don't exclude results in this so if we do a count we don't need to add this complex clause
+    if (options.isCount !== true) {
+      if (options.trendingDays) {
+        this.groupForTrending(options.trendingDays)
+      } else if ([ 'best', 'hot' ].includes(options.trendingAlgorithm)) {
+        this.groupForHotOrBest(options.trendingAlgorithm, options.user)
+      }
+    }
+
+    if (options.historyOfUser) {
+      this.joinHistory(options.historyOfUser.id)
+    }
+
+    if (options.startDate) {
+      this.whereStartDate(options.startDate)
+    }
+
+    if (options.endDate) {
+      this.whereEndDate(options.endDate)
+    }
+
+    if (options.originallyPublishedStartDate) {
+      this.whereOriginallyPublishedStartDate(options.originallyPublishedStartDate)
+    }
+
+    if (options.originallyPublishedEndDate) {
+      this.whereOriginallyPublishedEndDate(options.originallyPublishedEndDate)
+    }
+
+    if (options.durationMin) {
+      this.whereDurationMin(options.durationMin)
+    }
+
+    if (options.durationMax) {
+      this.whereDurationMax(options.durationMax)
+    }
+
+    this.whereSearch(options.search)
+
+    if (options.isCount === true) {
+      this.setCountAttribute()
+    } else {
+      if (exists(options.sort)) {
+        this.setSort(options.sort)
+      }
+
+      if (exists(options.count)) {
+        this.setLimit(options.count)
+      }
+
+      if (exists(options.start)) {
+        this.setOffset(options.start)
+      }
+    }
+
+    const cteString = this.cte.length !== 0
+      ? `WITH ${this.cte.join(', ')} `
+      : ''
+
+    this.query = cteString +
+      'SELECT ' + this.attributes.join(', ') + ' ' +
+      'FROM "video" ' + this.joins.join(' ') + ' ' +
+      'WHERE ' + this.and.join(' AND ') + ' ' +
+      this.group + ' ' +
+      this.having + ' ' +
+      this.sort + ' ' +
+      this.limit + ' ' +
+      this.offset
+  }
+
+  private setCountAttribute () {
+    this.attributes = [ 'COUNT(*) as "total"' ]
+  }
+
+  private joinHistory (userId: number) {
+    this.joins.push('INNER JOIN "userVideoHistory" ON "video"."id" = "userVideoHistory"."videoId"')
+
+    this.and.push('"userVideoHistory"."userId" = :historyOfUser')
+
+    this.replacements.historyOfUser = userId
+  }
+
+  private joinPlaylist (playlistId: number) {
+    this.joins.push(
+      'INNER JOIN "videoPlaylistElement" "video"."id" = "videoPlaylistElement"."videoId" ' +
+      'AND "videoPlaylistElement"."videoPlaylistId" = :videoPlaylistId'
+    )
+
+    this.replacements.videoPlaylistId = playlistId
+  }
+
+  private whereStateAvailable () {
+    this.and.push(
+      `("video"."state" = ${VideoState.PUBLISHED} OR ` +
+      `("video"."state" = ${VideoState.TO_TRANSCODE} AND "video"."waitTranscoding" IS false))`
+    )
+  }
+
+  private wherePrivacyAvailable (user?: MUserAccountId) {
+    if (user) {
+      this.and.push(
+        `("video"."privacy" = ${VideoPrivacy.PUBLIC} OR "video"."privacy" = ${VideoPrivacy.INTERNAL})`
+      )
+    } else { // Or only public videos
+      this.and.push(
+        `"video"."privacy" = ${VideoPrivacy.PUBLIC}`
+      )
+    }
+  }
+
+  private whereLocal (isLocal: boolean) {
+    const isRemote = isLocal ? 'FALSE' : 'TRUE'
+
+    this.and.push('"video"."remote" IS ' + isRemote)
+  }
+
+  private whereHost (host: string) {
+    // Local instance
+    if (host === WEBSERVER.HOST) {
+      this.and.push('"accountActor"."serverId" IS NULL')
+      return
+    }
+
+    this.joins.push('INNER JOIN "server" ON "server"."id" = "accountActor"."serverId"')
+
+    this.and.push('"server"."host" = :host')
+    this.replacements.host = host
+  }
+
+  private whereAccountId (accountId: number) {
+    this.and.push('"account"."id" = :accountId')
+    this.replacements.accountId = accountId
+  }
+
+  private whereChannelId (channelId: number) {
+    this.and.push('"videoChannel"."id" = :videoChannelId')
+    this.replacements.videoChannelId = channelId
+  }
+
+  private whereFollowerActorId (options: { actorId: number, orLocalVideos: boolean }) {
+    let query =
+    '(' +
+    '  EXISTS (' + // Videos shared by actors we follow
+    '    SELECT 1 FROM "videoShare" ' +
+    '    INNER JOIN "actorFollow" "actorFollowShare" ON "actorFollowShare"."targetActorId" = "videoShare"."actorId" ' +
+    '    AND "actorFollowShare"."actorId" = :followerActorId AND "actorFollowShare"."state" = \'accepted\' ' +
+    '    WHERE "videoShare"."videoId" = "video"."id"' +
+    '  )' +
+    '  OR' +
+    '  EXISTS (' + // Videos published by channels or accounts we follow
+    '    SELECT 1 from "actorFollow" ' +
+    '    WHERE ("actorFollow"."targetActorId" = "account"."actorId" OR "actorFollow"."targetActorId" = "videoChannel"."actorId") ' +
+    '    AND "actorFollow"."actorId" = :followerActorId ' +
+    '    AND "actorFollow"."state" = \'accepted\'' +
+    '  )'
+
+    if (options.orLocalVideos) {
+      query += '  OR "video"."remote" IS FALSE'
+    }
+
+    query += ')'
+
+    this.and.push(query)
+    this.replacements.followerActorId = options.actorId
+  }
+
+  private whereFileExists () {
+    this.and.push(`(${this.buildWebTorrentFileExistsQuery(true)} OR ${this.buildHLSFileExistsQuery(true)})`)
+  }
+
+  private whereWebTorrentFileExists (exists: boolean) {
+    this.and.push(this.buildWebTorrentFileExistsQuery(exists))
+  }
+
+  private whereHLSFileExists (exists: boolean) {
+    this.and.push(this.buildHLSFileExistsQuery(exists))
+  }
+
+  private buildWebTorrentFileExistsQuery (exists: boolean) {
+    const prefix = exists ? '' : 'NOT '
+
+    return prefix + 'EXISTS (SELECT 1 FROM "videoFile" WHERE "videoFile"."videoId" = "video"."id")'
+  }
+
+  private buildHLSFileExistsQuery (exists: boolean) {
+    const prefix = exists ? '' : 'NOT '
+
+    return prefix + 'EXISTS (' +
+    '  SELECT 1 FROM "videoStreamingPlaylist" ' +
+    '  INNER JOIN "videoFile" ON "videoFile"."videoStreamingPlaylistId" = "videoStreamingPlaylist"."id" ' +
+    '  WHERE "videoStreamingPlaylist"."videoId" = "video"."id"' +
+    ')'
+  }
+
+  private whereTagsOneOf (tagsOneOf: string[]) {
+    const tagsOneOfLower = tagsOneOf.map(t => t.toLowerCase())
+
+    this.and.push(
+      'EXISTS (' +
+      '  SELECT 1 FROM "videoTag" ' +
+      '  INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
+      '  WHERE lower("tag"."name") IN (' + createSafeIn(this.sequelize, tagsOneOfLower) + ') ' +
+      '  AND "video"."id" = "videoTag"."videoId"' +
+      ')'
+    )
+  }
+
+  private whereTagsAllOf (tagsAllOf: string[]) {
+    const tagsAllOfLower = tagsAllOf.map(t => t.toLowerCase())
+
+    this.and.push(
+      'EXISTS (' +
+      '  SELECT 1 FROM "videoTag" ' +
+      '  INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
+      '  WHERE lower("tag"."name") IN (' + createSafeIn(this.sequelize, tagsAllOfLower) + ') ' +
+      '  AND "video"."id" = "videoTag"."videoId" ' +
+      '  GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + tagsAllOfLower.length +
+      ')'
+    )
+  }
+
+  private wherePrivacyOneOf (privacyOneOf: VideoPrivacy[]) {
+    this.and.push('"video"."privacy" IN (:privacyOneOf)')
+    this.replacements.privacyOneOf = privacyOneOf
+  }
+
+  private whereUUIDs (uuids: string[]) {
+    this.and.push('"video"."uuid" IN (' + createSafeIn(this.sequelize, uuids) + ')')
+  }
+
+  private whereCategoryOneOf (categoryOneOf: number[]) {
+    this.and.push('"video"."category" IN (:categoryOneOf)')
+    this.replacements.categoryOneOf = categoryOneOf
+  }
+
+  private whereLicenceOneOf (licenceOneOf: number[]) {
+    this.and.push('"video"."licence" IN (:licenceOneOf)')
+    this.replacements.licenceOneOf = licenceOneOf
+  }
+
+  private whereLanguageOneOf (languageOneOf: string[]) {
+    const languages = languageOneOf.filter(l => l && l !== '_unknown')
+    const languagesQueryParts: string[] = []
+
+    if (languages.length !== 0) {
+      languagesQueryParts.push('"video"."language" IN (:languageOneOf)')
+      this.replacements.languageOneOf = languages
+
+      languagesQueryParts.push(
+        'EXISTS (' +
+        '  SELECT 1 FROM "videoCaption" WHERE "videoCaption"."language" ' +
+        '  IN (' + createSafeIn(this.sequelize, languages) + ') AND ' +
+        '  "videoCaption"."videoId" = "video"."id"' +
+        ')'
+      )
+    }
+
+    if (languageOneOf.includes('_unknown')) {
+      languagesQueryParts.push('"video"."language" IS NULL')
+    }
+
+    if (languagesQueryParts.length !== 0) {
+      this.and.push('(' + languagesQueryParts.join(' OR ') + ')')
+    }
+  }
+
+  private whereNSFW () {
+    this.and.push('"video"."nsfw" IS TRUE')
+  }
+
+  private whereSFW () {
+    this.and.push('"video"."nsfw" IS FALSE')
+  }
+
+  private whereLive () {
+    this.and.push('"video"."isLive" IS TRUE')
+  }
+
+  private whereVOD () {
+    this.and.push('"video"."isLive" IS FALSE')
+  }
+
+  private whereNotBlocked (serverAccountId: number, user?: MUserAccountId) {
+    const blockerIds = [ serverAccountId ]
+    if (user) blockerIds.push(user.Account.id)
+
+    const inClause = createSafeIn(this.sequelize, blockerIds)
+
+    this.and.push(
+      'NOT EXISTS (' +
+      '  SELECT 1 FROM "accountBlocklist" ' +
+      '  WHERE "accountBlocklist"."accountId" IN (' + inClause + ') ' +
+      '  AND "accountBlocklist"."targetAccountId" = "account"."id" ' +
+      ')' +
+      'AND NOT EXISTS (' +
+      '  SELECT 1 FROM "serverBlocklist" WHERE "serverBlocklist"."accountId" IN (' + inClause + ') ' +
+      '  AND "serverBlocklist"."targetServerId" = "accountActor"."serverId"' +
+      ')'
+    )
+  }
+
+  private whereSearch (search?: string) {
+    if (!search) {
+      this.attributes.push('0 as similarity')
+      return
+    }
+
+    const escapedSearch = this.sequelize.escape(search)
+    const escapedLikeSearch = this.sequelize.escape('%' + search + '%')
+
+    this.cte.push(
+      '"trigramSearch" AS (' +
+      '  SELECT "video"."id", ' +
+      `  similarity(lower(immutable_unaccent("video"."name")), lower(immutable_unaccent(${escapedSearch}))) as similarity ` +
+      '  FROM "video" ' +
+      '  WHERE lower(immutable_unaccent("video"."name")) % lower(immutable_unaccent(' + escapedSearch + ')) OR ' +
+      '        lower(immutable_unaccent("video"."name")) LIKE lower(immutable_unaccent(' + escapedLikeSearch + '))' +
+      ')'
+    )
+
+    this.joins.push('LEFT JOIN "trigramSearch" ON "video"."id" = "trigramSearch"."id"')
+
+    let base = '(' +
+    '  "trigramSearch"."id" IS NOT NULL OR ' +
+    '  EXISTS (' +
+    '    SELECT 1 FROM "videoTag" ' +
+    '    INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
+    `    WHERE lower("tag"."name") = lower(${escapedSearch}) ` +
+    '    AND "video"."id" = "videoTag"."videoId"' +
+    '  )'
+
+    if (validator.isUUID(search)) {
+      base += ` OR "video"."uuid" = ${escapedSearch}`
+    }
+
+    base += ')'
+
+    this.and.push(base)
+    this.attributes.push(`COALESCE("trigramSearch"."similarity", 0) as similarity`)
+  }
+
+  private whereNotBlacklisted () {
+    this.and.push('"video"."id" NOT IN (SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")')
+  }
+
+  private whereStartDate (startDate: string) {
+    this.and.push('"video"."publishedAt" >= :startDate')
+    this.replacements.startDate = startDate
+  }
+
+  private whereEndDate (endDate: string) {
+    this.and.push('"video"."publishedAt" <= :endDate')
+    this.replacements.endDate = endDate
+  }
+
+  private whereOriginallyPublishedStartDate (startDate: string) {
+    this.and.push('"video"."originallyPublishedAt" >= :originallyPublishedStartDate')
+    this.replacements.originallyPublishedStartDate = startDate
+  }
+
+  private whereOriginallyPublishedEndDate (endDate: string) {
+    this.and.push('"video"."originallyPublishedAt" <= :originallyPublishedEndDate')
+    this.replacements.originallyPublishedEndDate = endDate
+  }
+
+  private whereDurationMin (durationMin: number) {
+    this.and.push('"video"."duration" >= :durationMin')
+    this.replacements.durationMin = durationMin
+  }
+
+  private whereDurationMax (durationMax: number) {
+    this.and.push('"video"."duration" <= :durationMax')
+    this.replacements.durationMax = durationMax
+  }
+
+  private groupForTrending (trendingDays: number) {
+    const viewsGteDate = new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays)
+
+    this.joins.push('LEFT JOIN "videoView" ON "video"."id" = "videoView"."videoId" AND "videoView"."startDate" >= :viewsGteDate')
+    this.replacements.viewsGteDate = viewsGteDate
+
+    this.attributes.push('COALESCE(SUM("videoView"."views"), 0) AS "score"')
+
+    this.group = 'GROUP BY "video"."id"'
+  }
+
+  private groupForHotOrBest (trendingAlgorithm: string, user?: MUserAccountId) {
+    /**
+     * "Hotness" is a measure based on absolute view/comment/like/dislike numbers,
+     * with fixed weights only applied to their log values.
+     *
+     * This algorithm gives little chance for an old video to have a good score,
+     * for which recent spikes in interactions could be a sign of "hotness" and
+     * justify a better score. However there are multiple ways to achieve that
+     * goal, which is left for later. Yes, this is a TODO :)
+     *
+     * notes:
+     *  - weights and base score are in number of half-days.
+     *  - all comments are counted, regardless of being written by the video author or not
+     * see https://github.com/reddit-archive/reddit/blob/master/r2/r2/lib/db/_sorts.pyx#L47-L58
+     *  - we have less interactions than on reddit, so multiply weights by an arbitrary factor
+     */
+    const weights = {
+      like: 3 * 50,
+      dislike: -3 * 50,
+      view: Math.floor((1 / 3) * 50),
+      comment: 2 * 50, // a comment takes more time than a like to do, but can be done multiple times
+      history: -2 * 50
+    }
+
+    this.joins.push('LEFT JOIN "videoComment" ON "video"."id" = "videoComment"."videoId"')
+
+    let attribute =
+      `LOG(GREATEST(1, "video"."likes" - 1)) * ${weights.like} ` + // likes (+)
+      `+ LOG(GREATEST(1, "video"."dislikes" - 1)) * ${weights.dislike} ` + // dislikes (-)
+      `+ LOG("video"."views" + 1) * ${weights.view} ` + // views (+)
+      `+ LOG(GREATEST(1, COUNT(DISTINCT "videoComment"."id"))) * ${weights.comment} ` + // comments (+)
+      '+ (SELECT (EXTRACT(epoch FROM "video"."publishedAt") - 1446156582) / 47000) ' // base score (in number of half-days)
+
+    if (trendingAlgorithm === 'best' && user) {
+      this.joins.push(
+        'LEFT JOIN "userVideoHistory" ON "video"."id" = "userVideoHistory"."videoId" AND "userVideoHistory"."userId" = :bestUser'
+      )
+      this.replacements.bestUser = user.id
+
+      attribute += `+ POWER(COUNT(DISTINCT "userVideoHistory"."id"), 2.0) * ${weights.history} `
+    }
+
+    attribute += 'AS "score"'
+    this.attributes.push(attribute)
+
+    this.group = 'GROUP BY "video"."id"'
+  }
+
+  private setSort (sort: string) {
+    if (sort === '-originallyPublishedAt' || sort === 'originallyPublishedAt') {
+      this.attributes.push('COALESCE("video"."originallyPublishedAt", "video"."publishedAt") AS "publishedAtForOrder"')
+    }
+
+    this.sort = this.buildOrder(sort)
+  }
+
+  private buildOrder (value: string) {
+    const { direction, field } = buildDirectionAndField(value)
+    if (field.match(/^[a-zA-Z."]+$/) === null) throw new Error('Invalid sort column ' + field)
+
+    if (field.toLowerCase() === 'random') return 'ORDER BY RANDOM()'
+
+    if ([ 'trending', 'hot', 'best' ].includes(field.toLowerCase())) { // Sort by aggregation
+      return `ORDER BY "score" ${direction}, "video"."views" ${direction}`
+    }
+
+    let firstSort: string
+
+    if (field.toLowerCase() === 'match') { // Search
+      firstSort = '"similarity"'
+    } else if (field === 'originallyPublishedAt') {
+      firstSort = '"publishedAtForOrder"'
+    } else if (field.includes('.')) {
+      firstSort = field
+    } else {
+      firstSort = `"video"."${field}"`
+    }
+
+    return `ORDER BY ${firstSort} ${direction}, "video"."id" ASC`
+  }
+
+  private setLimit (countArg: number) {
+    const count = parseInt(countArg + '', 10)
+    this.limit = `LIMIT ${count}`
+  }
+
+  private setOffset (startArg: number) {
+    const start = parseInt(startArg + '', 10)
+    this.offset = `OFFSET ${start}`
+  }
+}
diff --git a/server/models/video/sql/video/videos-model-list-query-builder.ts b/server/models/video/sql/video/videos-model-list-query-builder.ts
new file mode 100644
index 000000000..b15b29ec3
--- /dev/null
+++ b/server/models/video/sql/video/videos-model-list-query-builder.ts
@@ -0,0 +1,80 @@
+import { VideoInclude } from '@shared/models'
+import { Sequelize } from 'sequelize'
+import { AbstractVideoQueryBuilder } from './shared/abstract-video-query-builder'
+import { VideoModelBuilder } from './shared/video-model-builder'
+import { BuildVideosListQueryOptions, VideosIdListQueryBuilder } from './videos-id-list-query-builder'
+
+/**
+ *
+ * Build videos list SQL query and create video models
+ *
+ */
+
+export class VideosModelListQueryBuilder extends AbstractVideoQueryBuilder {
+  protected attributes: { [key: string]: string }
+
+  private innerQuery: string
+  private innerSort: string
+
+  private readonly videoModelBuilder: VideoModelBuilder
+
+  constructor (protected readonly sequelize: Sequelize) {
+    super('list')
+
+    this.videoModelBuilder = new VideoModelBuilder(this.mode, this.tables)
+  }
+
+  queryVideos (options: BuildVideosListQueryOptions) {
+    this.buildInnerQuery(options)
+    this.buildMainQuery(options)
+
+    return this.runQuery()
+      .then(rows => this.videoModelBuilder.buildVideosFromRows({ rows, include: options.include }))
+  }
+
+  private buildInnerQuery (options: BuildVideosListQueryOptions) {
+    const idsQueryBuilder = new VideosIdListQueryBuilder(this.sequelize)
+    const { query, sort, replacements } = idsQueryBuilder.getQuery(options)
+
+    this.replacements = replacements
+    this.innerQuery = query
+    this.innerSort = sort
+  }
+
+  private buildMainQuery (options: BuildVideosListQueryOptions) {
+    this.attributes = {
+      '"video".*': ''
+    }
+
+    this.addJoin('INNER JOIN "video" ON "tmp"."id" = "video"."id"')
+
+    this.includeChannels()
+    this.includeAccounts()
+    this.includeThumbnails()
+
+    if (options.include & VideoInclude.FILES) {
+      this.includeWebtorrentFiles()
+      this.includeStreamingPlaylistFiles()
+    }
+
+    if (options.user) {
+      this.includeUserHistory(options.user.id)
+    }
+
+    if (options.videoPlaylistId) {
+      this.includePlaylist(options.videoPlaylistId)
+    }
+
+    if (options.include & VideoInclude.BLACKLISTED) {
+      this.includeBlacklisted()
+    }
+
+    if (options.include & VideoInclude.BLOCKED_OWNER) {
+      this.includeBlockedOwnerAndServer(options.serverAccountIdForBlock, options.user)
+    }
+
+    const select = this.buildSelect()
+
+    this.query = `${select} FROM (${this.innerQuery}) AS "tmp" ${this.joins} ${this.innerSort}`
+  }
+}
diff --git a/server/models/video/sql/videos-id-list-query-builder.ts b/server/models/video/sql/videos-id-list-query-builder.ts
deleted file mode 100644
index 098e15359..000000000
--- a/server/models/video/sql/videos-id-list-query-builder.ts
+++ /dev/null
@@ -1,697 +0,0 @@
-import { Sequelize } from 'sequelize'
-import validator from 'validator'
-import { exists } from '@server/helpers/custom-validators/misc'
-import { WEBSERVER } from '@server/initializers/constants'
-import { buildDirectionAndField, createSafeIn } from '@server/models/utils'
-import { MUserAccountId, MUserId } from '@server/types/models'
-import { VideoInclude, VideoPrivacy, VideoState } from '@shared/models'
-import { AbstractRunQuery } from './shared/abstract-run-query'
-
-/**
- *
- * Build videos list SQL query to fetch rows
- *
- */
-
-export type DisplayOnlyForFollowerOptions = {
-  actorId: number
-  orLocalVideos: boolean
-}
-
-export type BuildVideosListQueryOptions = {
-  attributes?: string[]
-
-  serverAccountIdForBlock: number
-
-  displayOnlyForFollower: DisplayOnlyForFollowerOptions
-
-  count: number
-  start: number
-  sort: string
-
-  nsfw?: boolean
-  host?: string
-  isLive?: boolean
-  isLocal?: boolean
-  include?: VideoInclude
-
-  categoryOneOf?: number[]
-  licenceOneOf?: number[]
-  languageOneOf?: string[]
-  tagsOneOf?: string[]
-  tagsAllOf?: string[]
-  privacyOneOf?: VideoPrivacy[]
-
-  uuids?: string[]
-
-  hasFiles?: boolean
-  hasHLSFiles?: boolean
-  hasWebtorrentFiles?: boolean
-
-  accountId?: number
-  videoChannelId?: number
-
-  videoPlaylistId?: number
-
-  trendingAlgorithm?: string // best, hot, or any other algorithm implemented
-  trendingDays?: number
-
-  user?: MUserAccountId
-  historyOfUser?: MUserId
-
-  startDate?: string // ISO 8601
-  endDate?: string // ISO 8601
-  originallyPublishedStartDate?: string
-  originallyPublishedEndDate?: string
-
-  durationMin?: number // seconds
-  durationMax?: number // seconds
-
-  search?: string
-
-  isCount?: boolean
-
-  group?: string
-  having?: string
-}
-
-export class VideosIdListQueryBuilder extends AbstractRunQuery {
-  protected replacements: any = {}
-
-  private attributes: string[]
-  private joins: string[] = []
-
-  private readonly and: string[] = []
-
-  private readonly cte: string[] = []
-
-  private group = ''
-  private having = ''
-
-  private sort = ''
-  private limit = ''
-  private offset = ''
-
-  constructor (protected readonly sequelize: Sequelize) {
-    super()
-  }
-
-  queryVideoIds (options: BuildVideosListQueryOptions) {
-    this.buildIdsListQuery(options)
-
-    return this.runQuery()
-  }
-
-  countVideoIds (countOptions: BuildVideosListQueryOptions): Promise<number> {
-    this.buildIdsListQuery(countOptions)
-
-    return this.runQuery().then(rows => rows.length !== 0 ? rows[0].total : 0)
-  }
-
-  getQuery (options: BuildVideosListQueryOptions) {
-    this.buildIdsListQuery(options)
-
-    return { query: this.query, sort: this.sort, replacements: this.replacements }
-  }
-
-  private buildIdsListQuery (options: BuildVideosListQueryOptions) {
-    this.attributes = options.attributes || [ '"video"."id"' ]
-
-    if (options.group) this.group = options.group
-    if (options.having) this.having = options.having
-
-    this.joins = this.joins.concat([
-      'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId"',
-      'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId"',
-      'INNER JOIN "actor" "accountActor" ON "account"."actorId" = "accountActor"."id"'
-    ])
-
-    if (!(options.include & VideoInclude.BLACKLISTED)) {
-      this.whereNotBlacklisted()
-    }
-
-    if (options.serverAccountIdForBlock && !(options.include & VideoInclude.BLOCKED_OWNER)) {
-      this.whereNotBlocked(options.serverAccountIdForBlock, options.user)
-    }
-
-    // Only list published videos
-    if (!(options.include & VideoInclude.NOT_PUBLISHED_STATE)) {
-      this.whereStateAvailable()
-    }
-
-    if (options.videoPlaylistId) {
-      this.joinPlaylist(options.videoPlaylistId)
-    }
-
-    if (exists(options.isLocal)) {
-      this.whereLocal(options.isLocal)
-    }
-
-    if (options.host) {
-      this.whereHost(options.host)
-    }
-
-    if (options.accountId) {
-      this.whereAccountId(options.accountId)
-    }
-
-    if (options.videoChannelId) {
-      this.whereChannelId(options.videoChannelId)
-    }
-
-    if (options.displayOnlyForFollower) {
-      this.whereFollowerActorId(options.displayOnlyForFollower)
-    }
-
-    if (options.hasFiles === true) {
-      this.whereFileExists()
-    }
-
-    if (exists(options.hasWebtorrentFiles)) {
-      this.whereWebTorrentFileExists(options.hasWebtorrentFiles)
-    }
-
-    if (exists(options.hasHLSFiles)) {
-      this.whereHLSFileExists(options.hasHLSFiles)
-    }
-
-    if (options.tagsOneOf) {
-      this.whereTagsOneOf(options.tagsOneOf)
-    }
-
-    if (options.tagsAllOf) {
-      this.whereTagsAllOf(options.tagsAllOf)
-    }
-
-    if (options.privacyOneOf) {
-      this.wherePrivacyOneOf(options.privacyOneOf)
-    } else {
-      // Only list videos with the appropriate priavcy
-      this.wherePrivacyAvailable(options.user)
-    }
-
-    if (options.uuids) {
-      this.whereUUIDs(options.uuids)
-    }
-
-    if (options.nsfw === true) {
-      this.whereNSFW()
-    } else if (options.nsfw === false) {
-      this.whereSFW()
-    }
-
-    if (options.isLive === true) {
-      this.whereLive()
-    } else if (options.isLive === false) {
-      this.whereVOD()
-    }
-
-    if (options.categoryOneOf) {
-      this.whereCategoryOneOf(options.categoryOneOf)
-    }
-
-    if (options.licenceOneOf) {
-      this.whereLicenceOneOf(options.licenceOneOf)
-    }
-
-    if (options.languageOneOf) {
-      this.whereLanguageOneOf(options.languageOneOf)
-    }
-
-    // We don't exclude results in this so if we do a count we don't need to add this complex clause
-    if (options.isCount !== true) {
-      if (options.trendingDays) {
-        this.groupForTrending(options.trendingDays)
-      } else if ([ 'best', 'hot' ].includes(options.trendingAlgorithm)) {
-        this.groupForHotOrBest(options.trendingAlgorithm, options.user)
-      }
-    }
-
-    if (options.historyOfUser) {
-      this.joinHistory(options.historyOfUser.id)
-    }
-
-    if (options.startDate) {
-      this.whereStartDate(options.startDate)
-    }
-
-    if (options.endDate) {
-      this.whereEndDate(options.endDate)
-    }
-
-    if (options.originallyPublishedStartDate) {
-      this.whereOriginallyPublishedStartDate(options.originallyPublishedStartDate)
-    }
-
-    if (options.originallyPublishedEndDate) {
-      this.whereOriginallyPublishedEndDate(options.originallyPublishedEndDate)
-    }
-
-    if (options.durationMin) {
-      this.whereDurationMin(options.durationMin)
-    }
-
-    if (options.durationMax) {
-      this.whereDurationMax(options.durationMax)
-    }
-
-    this.whereSearch(options.search)
-
-    if (options.isCount === true) {
-      this.setCountAttribute()
-    } else {
-      if (exists(options.sort)) {
-        this.setSort(options.sort)
-      }
-
-      if (exists(options.count)) {
-        this.setLimit(options.count)
-      }
-
-      if (exists(options.start)) {
-        this.setOffset(options.start)
-      }
-    }
-
-    const cteString = this.cte.length !== 0
-      ? `WITH ${this.cte.join(', ')} `
-      : ''
-
-    this.query = cteString +
-      'SELECT ' + this.attributes.join(', ') + ' ' +
-      'FROM "video" ' + this.joins.join(' ') + ' ' +
-      'WHERE ' + this.and.join(' AND ') + ' ' +
-      this.group + ' ' +
-      this.having + ' ' +
-      this.sort + ' ' +
-      this.limit + ' ' +
-      this.offset
-  }
-
-  private setCountAttribute () {
-    this.attributes = [ 'COUNT(*) as "total"' ]
-  }
-
-  private joinHistory (userId: number) {
-    this.joins.push('INNER JOIN "userVideoHistory" ON "video"."id" = "userVideoHistory"."videoId"')
-
-    this.and.push('"userVideoHistory"."userId" = :historyOfUser')
-
-    this.replacements.historyOfUser = userId
-  }
-
-  private joinPlaylist (playlistId: number) {
-    this.joins.push(
-      'INNER JOIN "videoPlaylistElement" "video"."id" = "videoPlaylistElement"."videoId" ' +
-      'AND "videoPlaylistElement"."videoPlaylistId" = :videoPlaylistId'
-    )
-
-    this.replacements.videoPlaylistId = playlistId
-  }
-
-  private whereStateAvailable () {
-    this.and.push(
-      `("video"."state" = ${VideoState.PUBLISHED} OR ` +
-      `("video"."state" = ${VideoState.TO_TRANSCODE} AND "video"."waitTranscoding" IS false))`
-    )
-  }
-
-  private wherePrivacyAvailable (user?: MUserAccountId) {
-    if (user) {
-      this.and.push(
-        `("video"."privacy" = ${VideoPrivacy.PUBLIC} OR "video"."privacy" = ${VideoPrivacy.INTERNAL})`
-      )
-    } else { // Or only public videos
-      this.and.push(
-        `"video"."privacy" = ${VideoPrivacy.PUBLIC}`
-      )
-    }
-  }
-
-  private whereLocal (isLocal: boolean) {
-    const isRemote = isLocal ? 'FALSE' : 'TRUE'
-
-    this.and.push('"video"."remote" IS ' + isRemote)
-  }
-
-  private whereHost (host: string) {
-    // Local instance
-    if (host === WEBSERVER.HOST) {
-      this.and.push('"accountActor"."serverId" IS NULL')
-      return
-    }
-
-    this.joins.push('INNER JOIN "server" ON "server"."id" = "accountActor"."serverId"')
-
-    this.and.push('"server"."host" = :host')
-    this.replacements.host = host
-  }
-
-  private whereAccountId (accountId: number) {
-    this.and.push('"account"."id" = :accountId')
-    this.replacements.accountId = accountId
-  }
-
-  private whereChannelId (channelId: number) {
-    this.and.push('"videoChannel"."id" = :videoChannelId')
-    this.replacements.videoChannelId = channelId
-  }
-
-  private whereFollowerActorId (options: { actorId: number, orLocalVideos: boolean }) {
-    let query =
-    '(' +
-    '  EXISTS (' + // Videos shared by actors we follow
-    '    SELECT 1 FROM "videoShare" ' +
-    '    INNER JOIN "actorFollow" "actorFollowShare" ON "actorFollowShare"."targetActorId" = "videoShare"."actorId" ' +
-    '    AND "actorFollowShare"."actorId" = :followerActorId AND "actorFollowShare"."state" = \'accepted\' ' +
-    '    WHERE "videoShare"."videoId" = "video"."id"' +
-    '  )' +
-    '  OR' +
-    '  EXISTS (' + // Videos published by channels or accounts we follow
-    '    SELECT 1 from "actorFollow" ' +
-    '    WHERE ("actorFollow"."targetActorId" = "account"."actorId" OR "actorFollow"."targetActorId" = "videoChannel"."actorId") ' +
-    '    AND "actorFollow"."actorId" = :followerActorId ' +
-    '    AND "actorFollow"."state" = \'accepted\'' +
-    '  )'
-
-    if (options.orLocalVideos) {
-      query += '  OR "video"."remote" IS FALSE'
-    }
-
-    query += ')'
-
-    this.and.push(query)
-    this.replacements.followerActorId = options.actorId
-  }
-
-  private whereFileExists () {
-    this.and.push(`(${this.buildWebTorrentFileExistsQuery(true)} OR ${this.buildHLSFileExistsQuery(true)})`)
-  }
-
-  private whereWebTorrentFileExists (exists: boolean) {
-    this.and.push(this.buildWebTorrentFileExistsQuery(exists))
-  }
-
-  private whereHLSFileExists (exists: boolean) {
-    this.and.push(this.buildHLSFileExistsQuery(exists))
-  }
-
-  private buildWebTorrentFileExistsQuery (exists: boolean) {
-    const prefix = exists ? '' : 'NOT '
-
-    return prefix + 'EXISTS (SELECT 1 FROM "videoFile" WHERE "videoFile"."videoId" = "video"."id")'
-  }
-
-  private buildHLSFileExistsQuery (exists: boolean) {
-    const prefix = exists ? '' : 'NOT '
-
-    return prefix + 'EXISTS (' +
-    '  SELECT 1 FROM "videoStreamingPlaylist" ' +
-    '  INNER JOIN "videoFile" ON "videoFile"."videoStreamingPlaylistId" = "videoStreamingPlaylist"."id" ' +
-    '  WHERE "videoStreamingPlaylist"."videoId" = "video"."id"' +
-    ')'
-  }
-
-  private whereTagsOneOf (tagsOneOf: string[]) {
-    const tagsOneOfLower = tagsOneOf.map(t => t.toLowerCase())
-
-    this.and.push(
-      'EXISTS (' +
-      '  SELECT 1 FROM "videoTag" ' +
-      '  INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
-      '  WHERE lower("tag"."name") IN (' + createSafeIn(this.sequelize, tagsOneOfLower) + ') ' +
-      '  AND "video"."id" = "videoTag"."videoId"' +
-      ')'
-    )
-  }
-
-  private whereTagsAllOf (tagsAllOf: string[]) {
-    const tagsAllOfLower = tagsAllOf.map(t => t.toLowerCase())
-
-    this.and.push(
-      'EXISTS (' +
-      '  SELECT 1 FROM "videoTag" ' +
-      '  INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
-      '  WHERE lower("tag"."name") IN (' + createSafeIn(this.sequelize, tagsAllOfLower) + ') ' +
-      '  AND "video"."id" = "videoTag"."videoId" ' +
-      '  GROUP BY "videoTag"."videoId" HAVING COUNT(*) = ' + tagsAllOfLower.length +
-      ')'
-    )
-  }
-
-  private wherePrivacyOneOf (privacyOneOf: VideoPrivacy[]) {
-    this.and.push('"video"."privacy" IN (:privacyOneOf)')
-    this.replacements.privacyOneOf = privacyOneOf
-  }
-
-  private whereUUIDs (uuids: string[]) {
-    this.and.push('"video"."uuid" IN (' + createSafeIn(this.sequelize, uuids) + ')')
-  }
-
-  private whereCategoryOneOf (categoryOneOf: number[]) {
-    this.and.push('"video"."category" IN (:categoryOneOf)')
-    this.replacements.categoryOneOf = categoryOneOf
-  }
-
-  private whereLicenceOneOf (licenceOneOf: number[]) {
-    this.and.push('"video"."licence" IN (:licenceOneOf)')
-    this.replacements.licenceOneOf = licenceOneOf
-  }
-
-  private whereLanguageOneOf (languageOneOf: string[]) {
-    const languages = languageOneOf.filter(l => l && l !== '_unknown')
-    const languagesQueryParts: string[] = []
-
-    if (languages.length !== 0) {
-      languagesQueryParts.push('"video"."language" IN (:languageOneOf)')
-      this.replacements.languageOneOf = languages
-
-      languagesQueryParts.push(
-        'EXISTS (' +
-        '  SELECT 1 FROM "videoCaption" WHERE "videoCaption"."language" ' +
-        '  IN (' + createSafeIn(this.sequelize, languages) + ') AND ' +
-        '  "videoCaption"."videoId" = "video"."id"' +
-        ')'
-      )
-    }
-
-    if (languageOneOf.includes('_unknown')) {
-      languagesQueryParts.push('"video"."language" IS NULL')
-    }
-
-    if (languagesQueryParts.length !== 0) {
-      this.and.push('(' + languagesQueryParts.join(' OR ') + ')')
-    }
-  }
-
-  private whereNSFW () {
-    this.and.push('"video"."nsfw" IS TRUE')
-  }
-
-  private whereSFW () {
-    this.and.push('"video"."nsfw" IS FALSE')
-  }
-
-  private whereLive () {
-    this.and.push('"video"."isLive" IS TRUE')
-  }
-
-  private whereVOD () {
-    this.and.push('"video"."isLive" IS FALSE')
-  }
-
-  private whereNotBlocked (serverAccountId: number, user?: MUserAccountId) {
-    const blockerIds = [ serverAccountId ]
-    if (user) blockerIds.push(user.Account.id)
-
-    const inClause = createSafeIn(this.sequelize, blockerIds)
-
-    this.and.push(
-      'NOT EXISTS (' +
-      '  SELECT 1 FROM "accountBlocklist" ' +
-      '  WHERE "accountBlocklist"."accountId" IN (' + inClause + ') ' +
-      '  AND "accountBlocklist"."targetAccountId" = "account"."id" ' +
-      ')' +
-      'AND NOT EXISTS (' +
-      '  SELECT 1 FROM "serverBlocklist" WHERE "serverBlocklist"."accountId" IN (' + inClause + ') ' +
-      '  AND "serverBlocklist"."targetServerId" = "accountActor"."serverId"' +
-      ')'
-    )
-  }
-
-  private whereSearch (search?: string) {
-    if (!search) {
-      this.attributes.push('0 as similarity')
-      return
-    }
-
-    const escapedSearch = this.sequelize.escape(search)
-    const escapedLikeSearch = this.sequelize.escape('%' + search + '%')
-
-    this.cte.push(
-      '"trigramSearch" AS (' +
-      '  SELECT "video"."id", ' +
-      `  similarity(lower(immutable_unaccent("video"."name")), lower(immutable_unaccent(${escapedSearch}))) as similarity ` +
-      '  FROM "video" ' +
-      '  WHERE lower(immutable_unaccent("video"."name")) % lower(immutable_unaccent(' + escapedSearch + ')) OR ' +
-      '        lower(immutable_unaccent("video"."name")) LIKE lower(immutable_unaccent(' + escapedLikeSearch + '))' +
-      ')'
-    )
-
-    this.joins.push('LEFT JOIN "trigramSearch" ON "video"."id" = "trigramSearch"."id"')
-
-    let base = '(' +
-    '  "trigramSearch"."id" IS NOT NULL OR ' +
-    '  EXISTS (' +
-    '    SELECT 1 FROM "videoTag" ' +
-    '    INNER JOIN "tag" ON "tag"."id" = "videoTag"."tagId" ' +
-    `    WHERE lower("tag"."name") = lower(${escapedSearch}) ` +
-    '    AND "video"."id" = "videoTag"."videoId"' +
-    '  )'
-
-    if (validator.isUUID(search)) {
-      base += ` OR "video"."uuid" = ${escapedSearch}`
-    }
-
-    base += ')'
-
-    this.and.push(base)
-    this.attributes.push(`COALESCE("trigramSearch"."similarity", 0) as similarity`)
-  }
-
-  private whereNotBlacklisted () {
-    this.and.push('"video"."id" NOT IN (SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")')
-  }
-
-  private whereStartDate (startDate: string) {
-    this.and.push('"video"."publishedAt" >= :startDate')
-    this.replacements.startDate = startDate
-  }
-
-  private whereEndDate (endDate: string) {
-    this.and.push('"video"."publishedAt" <= :endDate')
-    this.replacements.endDate = endDate
-  }
-
-  private whereOriginallyPublishedStartDate (startDate: string) {
-    this.and.push('"video"."originallyPublishedAt" >= :originallyPublishedStartDate')
-    this.replacements.originallyPublishedStartDate = startDate
-  }
-
-  private whereOriginallyPublishedEndDate (endDate: string) {
-    this.and.push('"video"."originallyPublishedAt" <= :originallyPublishedEndDate')
-    this.replacements.originallyPublishedEndDate = endDate
-  }
-
-  private whereDurationMin (durationMin: number) {
-    this.and.push('"video"."duration" >= :durationMin')
-    this.replacements.durationMin = durationMin
-  }
-
-  private whereDurationMax (durationMax: number) {
-    this.and.push('"video"."duration" <= :durationMax')
-    this.replacements.durationMax = durationMax
-  }
-
-  private groupForTrending (trendingDays: number) {
-    const viewsGteDate = new Date(new Date().getTime() - (24 * 3600 * 1000) * trendingDays)
-
-    this.joins.push('LEFT JOIN "videoView" ON "video"."id" = "videoView"."videoId" AND "videoView"."startDate" >= :viewsGteDate')
-    this.replacements.viewsGteDate = viewsGteDate
-
-    this.attributes.push('COALESCE(SUM("videoView"."views"), 0) AS "score"')
-
-    this.group = 'GROUP BY "video"."id"'
-  }
-
-  private groupForHotOrBest (trendingAlgorithm: string, user?: MUserAccountId) {
-    /**
-     * "Hotness" is a measure based on absolute view/comment/like/dislike numbers,
-     * with fixed weights only applied to their log values.
-     *
-     * This algorithm gives little chance for an old video to have a good score,
-     * for which recent spikes in interactions could be a sign of "hotness" and
-     * justify a better score. However there are multiple ways to achieve that
-     * goal, which is left for later. Yes, this is a TODO :)
-     *
-     * notes:
-     *  - weights and base score are in number of half-days.
-     *  - all comments are counted, regardless of being written by the video author or not
-     * see https://github.com/reddit-archive/reddit/blob/master/r2/r2/lib/db/_sorts.pyx#L47-L58
-     *  - we have less interactions than on reddit, so multiply weights by an arbitrary factor
-     */
-    const weights = {
-      like: 3 * 50,
-      dislike: -3 * 50,
-      view: Math.floor((1 / 3) * 50),
-      comment: 2 * 50, // a comment takes more time than a like to do, but can be done multiple times
-      history: -2 * 50
-    }
-
-    this.joins.push('LEFT JOIN "videoComment" ON "video"."id" = "videoComment"."videoId"')
-
-    let attribute =
-      `LOG(GREATEST(1, "video"."likes" - 1)) * ${weights.like} ` + // likes (+)
-      `+ LOG(GREATEST(1, "video"."dislikes" - 1)) * ${weights.dislike} ` + // dislikes (-)
-      `+ LOG("video"."views" + 1) * ${weights.view} ` + // views (+)
-      `+ LOG(GREATEST(1, COUNT(DISTINCT "videoComment"."id"))) * ${weights.comment} ` + // comments (+)
-      '+ (SELECT (EXTRACT(epoch FROM "video"."publishedAt") - 1446156582) / 47000) ' // base score (in number of half-days)
-
-    if (trendingAlgorithm === 'best' && user) {
-      this.joins.push(
-        'LEFT JOIN "userVideoHistory" ON "video"."id" = "userVideoHistory"."videoId" AND "userVideoHistory"."userId" = :bestUser'
-      )
-      this.replacements.bestUser = user.id
-
-      attribute += `+ POWER(COUNT(DISTINCT "userVideoHistory"."id"), 2.0) * ${weights.history} `
-    }
-
-    attribute += 'AS "score"'
-    this.attributes.push(attribute)
-
-    this.group = 'GROUP BY "video"."id"'
-  }
-
-  private setSort (sort: string) {
-    if (sort === '-originallyPublishedAt' || sort === 'originallyPublishedAt') {
-      this.attributes.push('COALESCE("video"."originallyPublishedAt", "video"."publishedAt") AS "publishedAtForOrder"')
-    }
-
-    this.sort = this.buildOrder(sort)
-  }
-
-  private buildOrder (value: string) {
-    const { direction, field } = buildDirectionAndField(value)
-    if (field.match(/^[a-zA-Z."]+$/) === null) throw new Error('Invalid sort column ' + field)
-
-    if (field.toLowerCase() === 'random') return 'ORDER BY RANDOM()'
-
-    if ([ 'trending', 'hot', 'best' ].includes(field.toLowerCase())) { // Sort by aggregation
-      return `ORDER BY "score" ${direction}, "video"."views" ${direction}`
-    }
-
-    let firstSort: string
-
-    if (field.toLowerCase() === 'match') { // Search
-      firstSort = '"similarity"'
-    } else if (field === 'originallyPublishedAt') {
-      firstSort = '"publishedAtForOrder"'
-    } else if (field.includes('.')) {
-      firstSort = field
-    } else {
-      firstSort = `"video"."${field}"`
-    }
-
-    return `ORDER BY ${firstSort} ${direction}, "video"."id" ASC`
-  }
-
-  private setLimit (countArg: number) {
-    const count = parseInt(countArg + '', 10)
-    this.limit = `LIMIT ${count}`
-  }
-
-  private setOffset (startArg: number) {
-    const start = parseInt(startArg + '', 10)
-    this.offset = `OFFSET ${start}`
-  }
-}
diff --git a/server/models/video/sql/videos-model-list-query-builder.ts b/server/models/video/sql/videos-model-list-query-builder.ts
deleted file mode 100644
index b15b29ec3..000000000
--- a/server/models/video/sql/videos-model-list-query-builder.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { VideoInclude } from '@shared/models'
-import { Sequelize } from 'sequelize'
-import { AbstractVideoQueryBuilder } from './shared/abstract-video-query-builder'
-import { VideoModelBuilder } from './shared/video-model-builder'
-import { BuildVideosListQueryOptions, VideosIdListQueryBuilder } from './videos-id-list-query-builder'
-
-/**
- *
- * Build videos list SQL query and create video models
- *
- */
-
-export class VideosModelListQueryBuilder extends AbstractVideoQueryBuilder {
-  protected attributes: { [key: string]: string }
-
-  private innerQuery: string
-  private innerSort: string
-
-  private readonly videoModelBuilder: VideoModelBuilder
-
-  constructor (protected readonly sequelize: Sequelize) {
-    super('list')
-
-    this.videoModelBuilder = new VideoModelBuilder(this.mode, this.tables)
-  }
-
-  queryVideos (options: BuildVideosListQueryOptions) {
-    this.buildInnerQuery(options)
-    this.buildMainQuery(options)
-
-    return this.runQuery()
-      .then(rows => this.videoModelBuilder.buildVideosFromRows({ rows, include: options.include }))
-  }
-
-  private buildInnerQuery (options: BuildVideosListQueryOptions) {
-    const idsQueryBuilder = new VideosIdListQueryBuilder(this.sequelize)
-    const { query, sort, replacements } = idsQueryBuilder.getQuery(options)
-
-    this.replacements = replacements
-    this.innerQuery = query
-    this.innerSort = sort
-  }
-
-  private buildMainQuery (options: BuildVideosListQueryOptions) {
-    this.attributes = {
-      '"video".*': ''
-    }
-
-    this.addJoin('INNER JOIN "video" ON "tmp"."id" = "video"."id"')
-
-    this.includeChannels()
-    this.includeAccounts()
-    this.includeThumbnails()
-
-    if (options.include & VideoInclude.FILES) {
-      this.includeWebtorrentFiles()
-      this.includeStreamingPlaylistFiles()
-    }
-
-    if (options.user) {
-      this.includeUserHistory(options.user.id)
-    }
-
-    if (options.videoPlaylistId) {
-      this.includePlaylist(options.videoPlaylistId)
-    }
-
-    if (options.include & VideoInclude.BLACKLISTED) {
-      this.includeBlacklisted()
-    }
-
-    if (options.include & VideoInclude.BLOCKED_OWNER) {
-      this.includeBlockedOwnerAndServer(options.serverAccountIdForBlock, options.user)
-    }
-
-    const select = this.buildSelect()
-
-    this.query = `${select} FROM (${this.innerQuery}) AS "tmp" ${this.joins} ${this.innerSort}`
-  }
-}
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts
index 2c6669bcb..410fd6d3f 100644
--- a/server/models/video/video-channel.ts
+++ b/server/models/video/video-channel.ts
@@ -31,6 +31,7 @@ import {
 import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants'
 import { sendDeleteActor } from '../../lib/activitypub/send'
 import {
+  MChannel,
   MChannelActor,
   MChannelAP,
   MChannelBannerAccountDefault,
@@ -62,6 +63,7 @@ type AvailableForListOptions = {
   search?: string
   host?: string
   handles?: string[]
+  forCount?: boolean
 }
 
 type AvailableWithStatsOptions = {
@@ -116,70 +118,91 @@ export type SummaryOptions = {
       })
     }
 
-    let rootWhere: WhereOptions
-    if (options.handles) {
-      const or: WhereOptions[] = []
+    if (Array.isArray(options.handles) && options.handles.length !== 0) {
+      const or: string[] = []
 
       for (const handle of options.handles || []) {
         const [ preferredUsername, host ] = handle.split('@')
 
         if (!host || host === WEBSERVER.HOST) {
-          or.push({
-            '$Actor.preferredUsername$': preferredUsername,
-            '$Actor.serverId$': null
-          })
+          or.push(`("preferredUsername" = ${VideoChannelModel.sequelize.escape(preferredUsername)} AND "serverId" IS NULL)`)
         } else {
-          or.push({
-            '$Actor.preferredUsername$': preferredUsername,
-            '$Actor.Server.host$': host
-          })
+          or.push(
+            `(` +
+              `"preferredUsername" = ${VideoChannelModel.sequelize.escape(preferredUsername)} ` +
+              `AND "host" = ${VideoChannelModel.sequelize.escape(host)}` +
+            `)`
+          )
         }
       }
 
-      rootWhere = {
-        [Op.or]: or
-      }
+      whereActorAnd.push({
+        id: {
+          [Op.in]: literal(`(SELECT "actor".id FROM actor LEFT JOIN server on server.id = actor."serverId" WHERE ${or.join(' OR ')})`)
+        }
+      })
+    }
+
+    const channelInclude: Includeable[] = []
+    const accountInclude: Includeable[] = []
+
+    if (options.forCount !== true) {
+      accountInclude.push({
+        model: ServerModel,
+        required: false
+      })
+
+      accountInclude.push({
+        model: ActorImageModel,
+        as: 'Avatars',
+        required: false
+      })
+
+      channelInclude.push({
+        model: ActorImageModel,
+        as: 'Avatars',
+        required: false
+      })
+
+      channelInclude.push({
+        model: ActorImageModel,
+        as: 'Banners',
+        required: false
+      })
+    }
+
+    if (options.forCount !== true || serverRequired) {
+      channelInclude.push({
+        model: ServerModel,
+        duplicating: false,
+        required: serverRequired,
+        where: whereServer
+      })
     }
 
     return {
-      where: rootWhere,
       include: [
         {
           attributes: {
             exclude: unusedActorAttributesForAPI
           },
-          model: ActorModel,
+          model: ActorModel.unscoped(),
           where: {
             [Op.and]: whereActorAnd
           },
-          include: [
-            {
-              model: ServerModel,
-              required: serverRequired,
-              where: whereServer
-            },
-            {
-              model: ActorImageModel,
-              as: 'Avatar',
-              required: false
-            },
-            {
-              model: ActorImageModel,
-              as: 'Banner',
-              required: false
-            }
-          ]
+          include: channelInclude
         },
         {
-          model: AccountModel,
+          model: AccountModel.unscoped(),
           required: true,
           include: [
             {
               attributes: {
                 exclude: unusedActorAttributesForAPI
               },
-              model: ActorModel, // Default scope includes avatar and server
-              required: true
+              model: ActorModel.unscoped(),
+              required: true,
+              include: accountInclude
             }
           ]
         }
@@ -189,7 +212,7 @@ export type SummaryOptions = {
   [ScopeNames.SUMMARY]: (options: SummaryOptions = {}) => {
     const include: Includeable[] = [
       {
-        attributes: [ 'id', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
+        attributes: [ 'id', 'preferredUsername', 'url', 'serverId' ],
         model: ActorModel.unscoped(),
         required: options.actorRequired ?? true,
         include: [
@@ -199,8 +222,8 @@ export type SummaryOptions = {
             required: false
           },
           {
-            model: ActorImageModel.unscoped(),
-            as: 'Avatar',
+            model: ActorImageModel,
+            as: 'Avatars',
             required: false
           }
         ]
@@ -245,7 +268,7 @@ export type SummaryOptions = {
           {
             model: ActorImageModel,
             required: false,
-            as: 'Banner'
+            as: 'Banners'
           }
         ]
       }
@@ -474,14 +497,14 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
       order: getSort(parameters.sort)
     }
 
-    return VideoChannelModel
-      .scope({
-        method: [ ScopeNames.FOR_API, { actorId } as AvailableForListOptions ]
-      })
-      .findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    const getScope = (forCount: boolean) => {
+      return { method: [ ScopeNames.FOR_API, { actorId, forCount } as AvailableForListOptions ] }
+    }
+
+    return Promise.all([
+      VideoChannelModel.scope(getScope(true)).count(),
+      VideoChannelModel.scope(getScope(false)).findAll(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static searchForApi (options: Pick<AvailableForListOptions, 'actorId' | 'search' | 'host' | 'handles'> & {
@@ -519,14 +542,22 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
       where
     }
 
-    return VideoChannelModel
-      .scope({
-        method: [ ScopeNames.FOR_API, pick(options, [ 'actorId', 'host', 'handles' ]) as AvailableForListOptions ]
-      })
-      .findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    const getScope = (forCount: boolean) => {
+      return {
+        method: [
+          ScopeNames.FOR_API, {
+            ...pick(options, [ 'actorId', 'host', 'handles' ]),
+
+            forCount
+          } as AvailableForListOptions
+        ]
+      }
+    }
+
+    return Promise.all([
+      VideoChannelModel.scope(getScope(true)).count(query),
+      VideoChannelModel.scope(getScope(false)).findAll(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listByAccountForAPI (options: {
@@ -552,20 +583,26 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
       }
       : null
 
-    const query = {
-      offset: options.start,
-      limit: options.count,
-      order: getSort(options.sort),
-      include: [
-        {
-          model: AccountModel,
-          where: {
-            id: options.accountId
-          },
-          required: true
-        }
-      ],
-      where
+    const getQuery = (forCount: boolean) => {
+      const accountModel = forCount
+        ? AccountModel.unscoped()
+        : AccountModel
+
+      return {
+        offset: options.start,
+        limit: options.count,
+        order: getSort(options.sort),
+        include: [
+          {
+            model: accountModel,
+            where: {
+              id: options.accountId
+            },
+            required: true
+          }
+        ],
+        where
+      }
     }
 
     const scopes: string | ScopeOptions | (string | ScopeOptions)[] = [ ScopeNames.WITH_ACTOR_BANNER ]
@@ -576,21 +613,19 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
       })
     }
 
-    return VideoChannelModel
-      .scope(scopes)
-      .findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    return Promise.all([
+      VideoChannelModel.scope(scopes).count(getQuery(true)),
+      VideoChannelModel.scope(scopes).findAll(getQuery(false))
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
-  static listAllByAccount (accountId: number) {
+  static listAllByAccount (accountId: number): Promise<MChannel[]> {
     const query = {
       limit: CONFIG.VIDEO_CHANNELS.MAX_PER_USER,
       include: [
         {
           attributes: [],
-          model: AccountModel,
+          model: AccountModel.unscoped(),
           where: {
             id: accountId
           },
@@ -621,7 +656,7 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
             {
               model: ActorImageModel,
               required: false,
-              as: 'Banner'
+              as: 'Banners'
             }
           ]
         }
@@ -655,7 +690,7 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
             {
               model: ActorImageModel,
               required: false,
-              as: 'Banner'
+              as: 'Banners'
             }
           ]
         }
@@ -685,7 +720,7 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
             {
               model: ActorImageModel,
               required: false,
-              as: 'Banner'
+              as: 'Banners'
             }
           ]
         }
@@ -706,6 +741,9 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
       displayName: this.getDisplayName(),
       url: actor.url,
       host: actor.host,
+      avatars: actor.avatars,
+
+      // TODO: remove, deprecated in 4.2
       avatar: actor.avatar
     }
   }
@@ -736,9 +774,16 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
       support: this.support,
       isLocal: this.Actor.isOwned(),
       updatedAt: this.updatedAt,
+
       ownerAccount: undefined,
+
       videosCount,
-      viewsPerDay
+      viewsPerDay,
+
+      avatars: actor.avatars,
+
+      // TODO: remove, deprecated in 4.2
+      avatar: actor.avatar
     }
 
     if (this.Account) videoChannel.ownerAccount = this.Account.toFormattedJSON()
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index fa77455bc..2d60c6a30 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -1,5 +1,5 @@
 import { uniq } from 'lodash'
-import { FindAndCountOptions, FindOptions, Op, Order, QueryTypes, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize'
+import { FindOptions, Op, Order, QueryTypes, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize'
 import {
   AllowNull,
   BelongsTo,
@@ -16,8 +16,8 @@ import {
 } from 'sequelize-typescript'
 import { getServerActor } from '@server/models/application/application'
 import { MAccount, MAccountId, MUserAccountId } from '@server/types/models'
-import { AttributesOnly } from '@shared/typescript-utils'
 import { VideoPrivacy } from '@shared/models'
+import { AttributesOnly } from '@shared/typescript-utils'
 import { ActivityTagObject, ActivityTombstoneObject } from '../../../shared/models/activitypub/objects/common-objects'
 import { VideoCommentObject } from '../../../shared/models/activitypub/objects/video-comment-object'
 import { VideoComment, VideoCommentAdmin } from '../../../shared/models/videos/comment/video-comment.model'
@@ -363,40 +363,43 @@ export class VideoCommentModel extends Model<Partial<AttributesOnly<VideoComment
       Object.assign(whereVideo, searchAttribute(searchVideo, 'name'))
     }
 
-    const query: FindAndCountOptions = {
-      offset: start,
-      limit: count,
-      order: getCommentSort(sort),
-      where,
-      include: [
-        {
-          model: AccountModel.unscoped(),
-          required: true,
-          where: whereAccount,
-          include: [
-            {
-              attributes: {
-                exclude: unusedActorAttributesForAPI
-              },
-              model: ActorModel, // Default scope includes avatar and server
-              required: true,
-              where: whereActor
-            }
-          ]
-        },
-        {
-          model: VideoModel.unscoped(),
-          required: true,
-          where: whereVideo
-        }
-      ]
+    const getQuery = (forCount: boolean) => {
+      return {
+        offset: start,
+        limit: count,
+        order: getCommentSort(sort),
+        where,
+        include: [
+          {
+            model: AccountModel.unscoped(),
+            required: true,
+            where: whereAccount,
+            include: [
+              {
+                attributes: {
+                  exclude: unusedActorAttributesForAPI
+                },
+                model: forCount === true
+                  ? ActorModel.unscoped() // Default scope includes avatar and server
+                  : ActorModel,
+                required: true,
+                where: whereActor
+              }
+            ]
+          },
+          {
+            model: VideoModel.unscoped(),
+            required: true,
+            where: whereVideo
+          }
+        ]
+      }
     }
 
-    return VideoCommentModel
-      .findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    return Promise.all([
+      VideoCommentModel.count(getQuery(true)),
+      VideoCommentModel.findAll(getQuery(false))
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static async listThreadsForApi (parameters: {
@@ -443,14 +446,20 @@ export class VideoCommentModel extends Model<Partial<AttributesOnly<VideoComment
       }
     }
 
-    const scopesList: (string | ScopeOptions)[] = [
+    const findScopesList: (string | ScopeOptions)[] = [
       ScopeNames.WITH_ACCOUNT_FOR_API,
       {
         method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ]
       }
     ]
 
-    const queryCount = {
+    const countScopesList: ScopeOptions[] = [
+      {
+        method: [ ScopeNames.ATTRIBUTES_FOR_API, blockerAccountIds ]
+      }
+    ]
+
+    const notDeletedQueryCount = {
       where: {
         videoId,
         deletedAt: null,
@@ -459,9 +468,10 @@ export class VideoCommentModel extends Model<Partial<AttributesOnly<VideoComment
     }
 
     return Promise.all([
-      VideoCommentModel.scope(scopesList).findAndCountAll(queryList),
-      VideoCommentModel.count(queryCount)
-    ]).then(([ { rows, count }, totalNotDeletedComments ]) => {
+      VideoCommentModel.scope(findScopesList).findAll(queryList),
+      VideoCommentModel.scope(countScopesList).count(queryList),
+      VideoCommentModel.count(notDeletedQueryCount)
+    ]).then(([ rows, count, totalNotDeletedComments ]) => {
       return { total: count, data: rows, totalNotDeletedComments }
     })
   }
@@ -512,11 +522,10 @@ export class VideoCommentModel extends Model<Partial<AttributesOnly<VideoComment
       }
     ]
 
-    return VideoCommentModel.scope(scopes)
-      .findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    return Promise.all([
+      VideoCommentModel.count(query),
+      VideoCommentModel.scope(scopes).findAll(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listThreadParentComments (comment: MCommentId, t: Transaction, order: 'ASC' | 'DESC' = 'ASC'): Promise<MCommentOwner[]> {
@@ -565,7 +574,10 @@ export class VideoCommentModel extends Model<Partial<AttributesOnly<VideoComment
       transaction: t
     }
 
-    return VideoCommentModel.findAndCountAll<MComment>(query)
+    return Promise.all([
+      VideoCommentModel.count(query),
+      VideoCommentModel.findAll<MComment>(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static async listForFeed (parameters: {
diff --git a/server/models/video/video-import.ts b/server/models/video/video-import.ts
index 5d2b230e8..1d8296060 100644
--- a/server/models/video/video-import.ts
+++ b/server/models/video/video-import.ts
@@ -155,13 +155,10 @@ export class VideoImportModel extends Model<Partial<AttributesOnly<VideoImportMo
       where
     }
 
-    return VideoImportModel.findAndCountAll<MVideoImportDefault>(query)
-                           .then(({ rows, count }) => {
-                             return {
-                               data: rows,
-                               total: count
-                             }
-                           })
+    return Promise.all([
+      VideoImportModel.unscoped().count(query),
+      VideoImportModel.findAll<MVideoImportDefault>(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   getTargetIdentifier () {
diff --git a/server/models/video/video-playlist-element.ts b/server/models/video/video-playlist-element.ts
index e20e32f8b..4e4160818 100644
--- a/server/models/video/video-playlist-element.ts
+++ b/server/models/video/video-playlist-element.ts
@@ -23,6 +23,7 @@ import {
   MVideoPlaylistElementVideoUrlPlaylistPrivacy,
   MVideoPlaylistVideoThumbnail
 } from '@server/types/models/video/video-playlist-element'
+import { AttributesOnly } from '@shared/typescript-utils'
 import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object'
 import { VideoPrivacy } from '../../../shared/models/videos'
 import { VideoPlaylistElement, VideoPlaylistElementType } from '../../../shared/models/videos/playlist/video-playlist-element.model'
@@ -32,7 +33,6 @@ import { AccountModel } from '../account/account'
 import { getSort, throwIfNotValid } from '../utils'
 import { ForAPIOptions, ScopeNames as VideoScopeNames, VideoModel } from './video'
 import { VideoPlaylistModel } from './video-playlist'
-import { AttributesOnly } from '@shared/typescript-utils'
 
 @Table({
   tableName: 'videoPlaylistElement',
@@ -208,22 +208,28 @@ export class VideoPlaylistElementModel extends Model<Partial<AttributesOnly<Vide
   }
 
   static listUrlsOfForAP (videoPlaylistId: number, start: number, count: number, t?: Transaction) {
-    const query = {
-      attributes: [ 'url' ],
-      offset: start,
-      limit: count,
-      order: getSort('position'),
-      where: {
-        videoPlaylistId
-      },
-      transaction: t
+    const getQuery = (forCount: boolean) => {
+      return {
+        attributes: forCount
+          ? []
+          : [ 'url' ],
+        offset: start,
+        limit: count,
+        order: getSort('position'),
+        where: {
+          videoPlaylistId
+        },
+        transaction: t
+      }
     }
 
-    return VideoPlaylistElementModel
-      .findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows.map(e => e.url) }
-      })
+    return Promise.all([
+      VideoPlaylistElementModel.count(getQuery(true)),
+      VideoPlaylistElementModel.findAll(getQuery(false))
+    ]).then(([ total, rows ]) => ({
+      total,
+      data: rows.map(e => e.url)
+    }))
   }
 
   static loadFirstElementWithVideoThumbnail (videoPlaylistId: number): Promise<MVideoPlaylistVideoThumbnail> {
diff --git a/server/models/video/video-playlist.ts b/server/models/video/video-playlist.ts
index c125db3ff..ae5e237ec 100644
--- a/server/models/video/video-playlist.ts
+++ b/server/models/video/video-playlist.ts
@@ -1,5 +1,5 @@
 import { join } from 'path'
-import { FindOptions, literal, Op, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize'
+import { FindOptions, Includeable, literal, Op, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize'
 import {
   AllowNull,
   BelongsTo,
@@ -86,6 +86,7 @@ type AvailableForListOptions = {
   host?: string
   uuids?: string[]
   withVideos?: boolean
+  forCount?: boolean
 }
 
 function getVideoLengthSelect () {
@@ -239,23 +240,28 @@ function getVideoLengthSelect () {
       [Op.and]: whereAnd
     }
 
+    const include: Includeable[] = [
+      {
+        model: AccountModel.scope({
+          method: [ AccountScopeNames.SUMMARY, { whereActor, whereServer, forCount: options.forCount } as SummaryOptions ]
+        }),
+        required: true
+      }
+    ]
+
+    if (options.forCount !== true) {
+      include.push({
+        model: VideoChannelModel.scope(VideoChannelScopeNames.SUMMARY),
+        required: false
+      })
+    }
+
     return {
       attributes: {
         include: attributesInclude
       },
       where,
-      include: [
-        {
-          model: AccountModel.scope({
-            method: [ AccountScopeNames.SUMMARY, { whereActor, whereServer } as SummaryOptions ]
-          }),
-          required: true
-        },
-        {
-          model: VideoChannelModel.scope(VideoChannelScopeNames.SUMMARY),
-          required: false
-        }
-      ]
+      include
     } as FindOptions
   }
 }))
@@ -369,12 +375,23 @@ export class VideoPlaylistModel extends Model<Partial<AttributesOnly<VideoPlayli
       order: getPlaylistSort(options.sort)
     }
 
-    const scopes: (string | ScopeOptions)[] = [
+    const commonAvailableForListOptions = pick(options, [
+      'type',
+      'followerActorId',
+      'accountId',
+      'videoChannelId',
+      'listMyPlaylists',
+      'search',
+      'host',
+      'uuids'
+    ])
+
+    const scopesFind: (string | ScopeOptions)[] = [
       {
         method: [
           ScopeNames.AVAILABLE_FOR_LIST,
           {
-            ...pick(options, [ 'type', 'followerActorId', 'accountId', 'videoChannelId', 'listMyPlaylists', 'search', 'host', 'uuids' ]),
+            ...commonAvailableForListOptions,
 
             withVideos: options.withVideos || false
           } as AvailableForListOptions
@@ -384,12 +401,26 @@ export class VideoPlaylistModel extends Model<Partial<AttributesOnly<VideoPlayli
       ScopeNames.WITH_THUMBNAIL
     ]
 
-    return VideoPlaylistModel
-      .scope(scopes)
-      .findAndCountAll(query)
-      .then(({ rows, count }) => {
-        return { total: count, data: rows }
-      })
+    const scopesCount: (string | ScopeOptions)[] = [
+      {
+        method: [
+          ScopeNames.AVAILABLE_FOR_LIST,
+
+          {
+            ...commonAvailableForListOptions,
+
+            withVideos: options.withVideos || false,
+            forCount: true
+          } as AvailableForListOptions
+        ]
+      },
+      ScopeNames.WITH_VIDEOS_LENGTH
+    ]
+
+    return Promise.all([
+      VideoPlaylistModel.scope(scopesCount).count(),
+      VideoPlaylistModel.scope(scopesFind).findAll(query)
+    ]).then(([ count, rows ]) => ({ total: count, data: rows }))
   }
 
   static searchForApi (options: Pick<AvailableForListOptions, 'followerActorId' | 'search'| 'host'| 'uuids'> & {
@@ -419,17 +450,24 @@ export class VideoPlaylistModel extends Model<Partial<AttributesOnly<VideoPlayli
       Object.assign(where, { videoChannelId: options.channel.id })
     }
 
-    const query = {
-      attributes: [ 'url' ],
-      offset: start,
-      limit: count,
-      where
+    const getQuery = (forCount: boolean) => {
+      return {
+        attributes: forCount === true
+          ? []
+          : [ 'url' ],
+        offset: start,
+        limit: count,
+        where
+      }
     }
 
-    return VideoPlaylistModel.findAndCountAll(query)
-                             .then(({ rows, count }) => {
-                               return { total: count, data: rows.map(p => p.url) }
-                             })
+    return Promise.all([
+      VideoPlaylistModel.count(getQuery(true)),
+      VideoPlaylistModel.findAll(getQuery(false))
+    ]).then(([ total, rows ]) => ({
+      total,
+      data: rows.map(p => p.url)
+    }))
   }
 
   static listPlaylistIdsOf (accountId: number, videoIds: number[]): Promise<MVideoPlaylistIdWithElements[]> {
diff --git a/server/models/video/video-share.ts b/server/models/video/video-share.ts
index f6659b992..ad95dec6e 100644
--- a/server/models/video/video-share.ts
+++ b/server/models/video/video-share.ts
@@ -183,7 +183,10 @@ export class VideoShareModel extends Model<Partial<AttributesOnly<VideoShareMode
       transaction: t
     }
 
-    return VideoShareModel.findAndCountAll(query)
+    return Promise.all([
+      VideoShareModel.count(query),
+      VideoShareModel.findAll(query)
+    ]).then(([ total, data ]) => ({ total, data }))
   }
 
   static listRemoteShareUrlsOfLocalVideos () {
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 9111c71b0..5536334eb 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -114,9 +114,13 @@ import {
   videoModelToFormattedJSON
 } from './formatter/video-format-utils'
 import { ScheduleVideoUpdateModel } from './schedule-video-update'
-import { VideoModelGetQueryBuilder } from './sql/video-model-get-query-builder'
-import { BuildVideosListQueryOptions, DisplayOnlyForFollowerOptions, VideosIdListQueryBuilder } from './sql/videos-id-list-query-builder'
-import { VideosModelListQueryBuilder } from './sql/videos-model-list-query-builder'
+import {
+  BuildVideosListQueryOptions,
+  DisplayOnlyForFollowerOptions,
+  VideoModelGetQueryBuilder,
+  VideosIdListQueryBuilder,
+  VideosModelListQueryBuilder
+} from './sql/video'
 import { TagModel } from './tag'
 import { ThumbnailModel } from './thumbnail'
 import { VideoBlacklistModel } from './video-blacklist'
@@ -229,8 +233,8 @@ export type ForAPIOptions = {
                 required: false
               },
               {
-                model: ActorImageModel.unscoped(),
-                as: 'Avatar',
+                model: ActorImageModel,
+                as: 'Avatars',
                 required: false
               }
             ]
@@ -252,8 +256,8 @@ export type ForAPIOptions = {
                     required: false
                   },
                   {
-                    model: ActorImageModel.unscoped(),
-                    as: 'Avatar',
+                    model: ActorImageModel,
+                    as: 'Avatars',
                     required: false
                   }
                 ]
diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index 1e9732fe9..5c2650fac 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -228,7 +228,7 @@ describe('Test video channels API validator', function () {
     })
   })
 
-  describe('When updating video channel avatar/banner', function () {
+  describe('When updating video channel avatars/banners', function () {
     const types = [ 'avatar', 'banner' ]
     let path: string
 
diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts
index 0c3bed3e7..7bf49c7ec 100644
--- a/server/tests/api/moderation/abuses.ts
+++ b/server/tests/api/moderation/abuses.ts
@@ -2,6 +2,7 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse } from '@shared/models'
 import {
   AbusesCommand,
   cleanupTests,
@@ -9,9 +10,10 @@ import {
   doubleFollow,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar,
   waitJobs
 } from '@shared/server-commands'
-import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse } from '@shared/models'
 
 const expect = chai.expect
 
@@ -27,8 +29,9 @@ describe('Test abuses', function () {
     // Run servers
     servers = await createMultipleServers(2)
 
-    // Get the access tokens
     await setAccessTokensToServers(servers)
+    await setDefaultChannelAvatar(servers)
+    await setDefaultAccountAvatar(servers)
 
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
diff --git a/server/tests/api/moderation/blocklist.ts b/server/tests/api/moderation/blocklist.ts
index b45460bb4..e1344a245 100644
--- a/server/tests/api/moderation/blocklist.ts
+++ b/server/tests/api/moderation/blocklist.ts
@@ -2,6 +2,7 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { UserNotificationType } from '@shared/models'
 import {
   BlocklistCommand,
   cleanupTests,
@@ -10,9 +11,9 @@ import {
   doubleFollow,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
   waitJobs
 } from '@shared/server-commands'
-import { UserNotificationType } from '@shared/models'
 
 const expect = chai.expect
 
@@ -79,6 +80,7 @@ describe('Test blocklist', function () {
 
     servers = await createMultipleServers(3)
     await setAccessTokensToServers(servers)
+    await setDefaultAccountAvatar(servers)
 
     command = servers[0].blocklist
     commentsCommand = servers.map(s => s.comments)
diff --git a/server/tests/api/moderation/video-blacklist.ts b/server/tests/api/moderation/video-blacklist.ts
index 3e7f2ba33..1790210ff 100644
--- a/server/tests/api/moderation/video-blacklist.ts
+++ b/server/tests/api/moderation/video-blacklist.ts
@@ -13,6 +13,7 @@ import {
   killallServers,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultChannelAvatar,
   waitJobs
 } from '@shared/server-commands'
 
@@ -42,6 +43,7 @@ describe('Test video blacklist', function () {
 
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
+    await setDefaultChannelAvatar(servers[0])
 
     // Upload 2 videos on server 2
     await servers[1].videos.upload({ attributes: { name: 'My 1st video', description: 'A video on server 2' } })
diff --git a/server/tests/api/notifications/notifications-api.ts b/server/tests/api/notifications/notifications-api.ts
index ac08449f8..78864c8a0 100644
--- a/server/tests/api/notifications/notifications-api.ts
+++ b/server/tests/api/notifications/notifications-api.ts
@@ -38,6 +38,16 @@ describe('Test notifications API', function () {
     await waitJobs([ server ])
   })
 
+  describe('Notification list & count', function () {
+
+    it('Should correctly list notifications', async function () {
+      const { data, total } = await server.notifications.list({ token: userToken, start: 0, count: 2 })
+
+      expect(data).to.have.lengthOf(2)
+      expect(total).to.equal(10)
+    })
+  })
+
   describe('Mark as read', function () {
 
     it('Should mark as read some notifications', async function () {
diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts
index 2e0abc6ba..5f5322d03 100644
--- a/server/tests/api/search/search-activitypub-video-channels.ts
+++ b/server/tests/api/search/search-activitypub-video-channels.ts
@@ -10,6 +10,8 @@ import {
   PeerTubeServer,
   SearchCommand,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultVideoChannel,
   waitJobs
 } from '@shared/server-commands'
 
@@ -28,6 +30,8 @@ describe('Test ActivityPub video channels search', function () {
     servers = await createMultipleServers(2)
 
     await setAccessTokensToServers(servers)
+    await setDefaultVideoChannel(servers)
+    await setDefaultAccountAvatar(servers)
 
     {
       await servers[0].users.create({ username: 'user1_server1', password: 'password' })
diff --git a/server/tests/api/search/search-activitypub-video-playlists.ts b/server/tests/api/search/search-activitypub-video-playlists.ts
index d9243ac53..b9a424292 100644
--- a/server/tests/api/search/search-activitypub-video-playlists.ts
+++ b/server/tests/api/search/search-activitypub-video-playlists.ts
@@ -10,6 +10,7 @@ import {
   PeerTubeServer,
   SearchCommand,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
   setDefaultVideoChannel,
   waitJobs
 } from '@shared/server-commands'
@@ -31,6 +32,7 @@ describe('Test ActivityPub playlists search', function () {
 
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
+    await setDefaultAccountAvatar(servers)
 
     {
       const video1 = (await servers[0].videos.quickUpload({ name: 'video 1' })).uuid
diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts
index 60b95ae4c..20249b1f1 100644
--- a/server/tests/api/search/search-activitypub-videos.ts
+++ b/server/tests/api/search/search-activitypub-videos.ts
@@ -10,6 +10,8 @@ import {
   PeerTubeServer,
   SearchCommand,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultVideoChannel,
   waitJobs
 } from '@shared/server-commands'
 
@@ -28,6 +30,8 @@ describe('Test ActivityPub videos search', function () {
     servers = await createMultipleServers(2)
 
     await setAccessTokensToServers(servers)
+    await setDefaultVideoChannel(servers)
+    await setDefaultAccountAvatar(servers)
 
     {
       const { uuid } = await servers[0].videos.upload({ attributes: { name: 'video 1 on server 1' } })
diff --git a/server/tests/api/search/search-channels.ts b/server/tests/api/search/search-channels.ts
index 8a92def61..0073c71e1 100644
--- a/server/tests/api/search/search-channels.ts
+++ b/server/tests/api/search/search-channels.ts
@@ -2,15 +2,17 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { VideoChannel } from '@shared/models'
 import {
   cleanupTests,
   createSingleServer,
   doubleFollow,
   PeerTubeServer,
   SearchCommand,
-  setAccessTokensToServers
+  setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar
 } from '@shared/server-commands'
-import { VideoChannel } from '@shared/models'
 
 const expect = chai.expect
 
@@ -30,6 +32,8 @@ describe('Test channels search', function () {
     remoteServer = servers[1]
 
     await setAccessTokensToServers([ server, remoteServer ])
+    await setDefaultChannelAvatar(server)
+    await setDefaultAccountAvatar(server)
 
     {
       await server.users.create({ username: 'user1' })
diff --git a/server/tests/api/search/search-index.ts b/server/tests/api/search/search-index.ts
index f84d03345..ae933449f 100644
--- a/server/tests/api/search/search-index.ts
+++ b/server/tests/api/search/search-index.ts
@@ -14,7 +14,7 @@ import {
 
 const expect = chai.expect
 
-describe('Test videos search', function () {
+describe('Test index search', function () {
   const localVideoName = 'local video' + new Date().toISOString()
 
   let server: PeerTubeServer = null
@@ -134,12 +134,16 @@ describe('Test videos search', function () {
       expect(video.account.host).to.equal('framatube.org')
       expect(video.account.name).to.equal('framasoft')
       expect(video.account.url).to.equal('https://framatube.org/accounts/framasoft')
+      // TODO: remove, deprecated in 4.2
       expect(video.account.avatar).to.exist
+      expect(video.account.avatars.length).to.equal(1, 'Account should have one avatar image')
 
       expect(video.channel.host).to.equal('framatube.org')
       expect(video.channel.name).to.equal('joinpeertube')
       expect(video.channel.url).to.equal('https://framatube.org/video-channels/joinpeertube')
+      // TODO: remove, deprecated in 4.2
       expect(video.channel.avatar).to.exist
+      expect(video.channel.avatars.length).to.equal(1, 'Channel should have one avatar image')
     }
 
     const baseSearch: VideosSearchQuery = {
@@ -316,13 +320,17 @@ describe('Test videos search', function () {
       const videoChannel = body.data[0]
       expect(videoChannel.url).to.equal('https://framatube.org/video-channels/bf54d359-cfad-4935-9d45-9d6be93f63e8')
       expect(videoChannel.host).to.equal('framatube.org')
+      // TODO: remove, deprecated in 4.2
       expect(videoChannel.avatar).to.exist
+      expect(videoChannel.avatars.length).to.equal(1, 'Channel should have two avatar images')
       expect(videoChannel.displayName).to.exist
 
       expect(videoChannel.ownerAccount.url).to.equal('https://framatube.org/accounts/framasoft')
       expect(videoChannel.ownerAccount.name).to.equal('framasoft')
       expect(videoChannel.ownerAccount.host).to.equal('framatube.org')
+      // TODO: remove, deprecated in 4.2
       expect(videoChannel.ownerAccount.avatar).to.exist
+      expect(videoChannel.ownerAccount.avatars.length).to.equal(1, 'Account should have two avatar images')
     }
 
     it('Should make a simple search and not have results', async function () {
@@ -388,12 +396,16 @@ describe('Test videos search', function () {
       expect(videoPlaylist.ownerAccount.url).to.equal('https://peertube2.cpy.re/accounts/chocobozzz')
       expect(videoPlaylist.ownerAccount.name).to.equal('chocobozzz')
       expect(videoPlaylist.ownerAccount.host).to.equal('peertube2.cpy.re')
+      // TODO: remove, deprecated in 4.2
       expect(videoPlaylist.ownerAccount.avatar).to.exist
+      expect(videoPlaylist.ownerAccount.avatars.length).to.equal(1, 'Account should have two avatar images')
 
       expect(videoPlaylist.videoChannel.url).to.equal('https://peertube2.cpy.re/video-channels/chocobozzz_channel')
       expect(videoPlaylist.videoChannel.name).to.equal('chocobozzz_channel')
       expect(videoPlaylist.videoChannel.host).to.equal('peertube2.cpy.re')
+      // TODO: remove, deprecated in 4.2
       expect(videoPlaylist.videoChannel.avatar).to.exist
+      expect(videoPlaylist.videoChannel.avatars.length).to.equal(1, 'Channel should have two avatar images')
     }
 
     it('Should make a simple search and not have results', async function () {
diff --git a/server/tests/api/search/search-playlists.ts b/server/tests/api/search/search-playlists.ts
index 1e9c8d4bb..fcf2f2ee2 100644
--- a/server/tests/api/search/search-playlists.ts
+++ b/server/tests/api/search/search-playlists.ts
@@ -2,6 +2,7 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { VideoPlaylistPrivacy } from '@shared/models'
 import {
   cleanupTests,
   createSingleServer,
@@ -9,9 +10,10 @@ import {
   PeerTubeServer,
   SearchCommand,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar,
   setDefaultVideoChannel
 } from '@shared/server-commands'
-import { VideoPlaylistPrivacy } from '@shared/models'
 
 const expect = chai.expect
 
@@ -34,6 +36,8 @@ describe('Test playlists search', function () {
 
     await setAccessTokensToServers([ remoteServer, server ])
     await setDefaultVideoChannel([ remoteServer, server ])
+    await setDefaultChannelAvatar([ remoteServer, server ])
+    await setDefaultAccountAvatar([ remoteServer, server ])
 
     {
       const videoId = (await server.videos.upload()).uuid
diff --git a/server/tests/api/search/search-videos.ts b/server/tests/api/search/search-videos.ts
index c544705d3..ff4c3c161 100644
--- a/server/tests/api/search/search-videos.ts
+++ b/server/tests/api/search/search-videos.ts
@@ -2,6 +2,8 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { wait } from '@shared/core-utils'
+import { VideoPrivacy } from '@shared/models'
 import {
   cleanupTests,
   createSingleServer,
@@ -9,11 +11,11 @@ import {
   PeerTubeServer,
   SearchCommand,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar,
   setDefaultVideoChannel,
   stopFfmpeg
 } from '@shared/server-commands'
-import { VideoPrivacy } from '@shared/models'
-import { wait } from '@shared/core-utils'
 
 const expect = chai.expect
 
@@ -38,6 +40,8 @@ describe('Test videos search', function () {
 
     await setAccessTokensToServers([ server, remoteServer ])
     await setDefaultVideoChannel([ server, remoteServer ])
+    await setDefaultChannelAvatar(server)
+    await setDefaultAccountAvatar(servers)
 
     {
       const attributes1 = {
diff --git a/server/tests/api/server/homepage.ts b/server/tests/api/server/homepage.ts
index 552ee98cf..e7de6bfee 100644
--- a/server/tests/api/server/homepage.ts
+++ b/server/tests/api/server/homepage.ts
@@ -9,7 +9,9 @@ import {
   CustomPagesCommand,
   killallServers,
   PeerTubeServer,
-  setAccessTokensToServers
+  setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar
 } from '../../../../shared/server-commands/index'
 
 const expect = chai.expect
@@ -29,6 +31,8 @@ describe('Test instance homepage actions', function () {
 
     server = await createSingleServer(1)
     await setAccessTokensToServers([ server ])
+    await setDefaultChannelAvatar(server)
+    await setDefaultAccountAvatar(server)
 
     command = server.customPage
   })
diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts
index 57cca6ad4..9553a69bb 100644
--- a/server/tests/api/users/user-subscriptions.ts
+++ b/server/tests/api/users/user-subscriptions.ts
@@ -9,6 +9,8 @@ import {
   doubleFollow,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar,
   SubscriptionsCommand,
   waitJobs
 } from '@shared/server-commands'
@@ -29,6 +31,8 @@ describe('Test users subscriptions', function () {
 
     // Get the access tokens
     await setAccessTokensToServers(servers)
+    await setDefaultChannelAvatar(servers)
+    await setDefaultAccountAvatar(servers)
 
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index 5b2bbc520..3e8b932c0 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -16,6 +16,7 @@ import {
   doubleFollow,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultChannelAvatar,
   waitJobs
 } from '@shared/server-commands'
 
@@ -29,7 +30,7 @@ describe('Test users with multiple servers', function () {
 
   let videoUUID: string
   let userAccessToken: string
-  let userAvatarFilename: string
+  let userAvatarFilenames: string[]
 
   before(async function () {
     this.timeout(120_000)
@@ -38,6 +39,7 @@ describe('Test users with multiple servers', function () {
 
     // Get the access tokens
     await setAccessTokensToServers(servers)
+    await setDefaultChannelAvatar(servers)
 
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
@@ -97,9 +99,11 @@ describe('Test users with multiple servers', function () {
     await servers[0].users.updateMyAvatar({ fixture })
 
     user = await servers[0].users.getMyInfo()
-    userAvatarFilename = user.account.avatar.path
+    userAvatarFilenames = user.account.avatars.map(({ path }) => path)
 
-    await testImage(servers[0].url, 'avatar2-resized', userAvatarFilename, '.png')
+    for (const avatar of user.account.avatars) {
+      await testImage(servers[0].url, `avatar2-resized-${avatar.width}x${avatar.width}`, avatar.path, '.png')
+    }
 
     await waitJobs(servers)
   })
@@ -129,7 +133,9 @@ describe('Test users with multiple servers', function () {
         expect(account.userId).to.be.undefined
       }
 
-      await testImage(server.url, 'avatar2-resized', account.avatar.path, '.png')
+      for (const avatar of account.avatars) {
+        await testImage(server.url, `avatar2-resized-${avatar.width}x${avatar.width}`, avatar.path, '.png')
+      }
     }
   })
 
@@ -193,7 +199,9 @@ describe('Test users with multiple servers', function () {
 
   it('Should not have actor files', async () => {
     for (const server of servers) {
-      await checkActorFilesWereRemoved(userAvatarFilename, server.internalServerNumber)
+      for (const userAvatarFilename of userAvatarFilenames) {
+        await checkActorFilesWereRemoved(userAvatarFilename, server.internalServerNumber)
+      }
     }
   })
 
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 7023b3f08..a47713bf0 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -604,7 +604,9 @@ describe('Test users', function () {
       await server.users.updateMyAvatar({ token: userToken, fixture })
 
       const user = await server.users.getMyInfo({ token: userToken })
-      await testImage(server.url, 'avatar-resized', user.account.avatar.path, '.gif')
+      for (const avatar of user.account.avatars) {
+        await testImage(server.url, `avatar-resized-${avatar.width}x${avatar.width}`, avatar.path, '.gif')
+      }
     })
 
     it('Should be able to update my avatar with a gif, and then a png', async function () {
@@ -614,7 +616,9 @@ describe('Test users', function () {
         await server.users.updateMyAvatar({ token: userToken, fixture })
 
         const user = await server.users.getMyInfo({ token: userToken })
-        await testImage(server.url, 'avatar-resized', user.account.avatar.path, extension)
+        for (const avatar of user.account.avatars) {
+          await testImage(server.url, `avatar-resized-${avatar.width}x${avatar.width}`, avatar.path, extension)
+        }
       }
     })
 
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index ecdd36613..5bbc60559 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -19,6 +19,8 @@ import {
   doubleFollow,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar,
   waitJobs,
   webtorrentAdd
 } from '@shared/server-commands'
@@ -46,6 +48,9 @@ describe('Test multiple servers', function () {
         description: 'super channel'
       }
       await servers[0].channels.create({ attributes: videoChannel })
+      await setDefaultChannelAvatar(servers[0], videoChannel.name)
+      await setDefaultAccountAvatar(servers)
+
       const { data } = await servers[0].channels.list({ start: 0, count: 1 })
       videoChannelId = data[0].id
     }
@@ -207,7 +212,7 @@ describe('Test multiple servers', function () {
             },
             {
               resolution: 720,
-              size: 788000
+              size: 750000
             }
           ],
           thumbnailfile: 'thumbnail',
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts
index 28bf018c5..d37043aef 100644
--- a/server/tests/api/videos/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -5,7 +5,14 @@ import * as chai from 'chai'
 import { checkVideoFilesWereRemoved, completeVideoCheck, testImage } from '@server/tests/shared'
 import { wait } from '@shared/core-utils'
 import { Video, VideoPrivacy } from '@shared/models'
-import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
+import {
+  cleanupTests,
+  createSingleServer,
+  PeerTubeServer,
+  setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar
+} from '@shared/server-commands'
 
 const expect = chai.expect
 
@@ -90,6 +97,8 @@ describe('Test a single server', function () {
       server = await createSingleServer(1)
 
       await setAccessTokensToServers([ server ])
+      await setDefaultChannelAvatar(server)
+      await setDefaultAccountAvatar(server)
     })
 
     it('Should list video categories', async function () {
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index d435f3682..0f8227fd3 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -6,13 +6,14 @@ import { basename } from 'path'
 import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
 import { testFileExistsOrNot, testImage } from '@server/tests/shared'
 import { wait } from '@shared/core-utils'
-import { User, VideoChannel } from '@shared/models'
+import { ActorImageType, User, VideoChannel } from '@shared/models'
 import {
   cleanupTests,
   createMultipleServers,
   doubleFollow,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
   setDefaultVideoChannel,
   waitJobs
 } from '@shared/server-commands'
@@ -44,6 +45,7 @@ describe('Test video channels', function () {
 
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
+    await setDefaultAccountAvatar(servers)
 
     await doubleFollow(servers[0], servers[1])
   })
@@ -281,14 +283,19 @@ describe('Test video channels', function () {
 
     for (const server of servers) {
       const videoChannel = await findChannel(server, secondVideoChannelId)
+      const expectedSizes = ACTOR_IMAGES_SIZE[ActorImageType.AVATAR]
 
-      avatarPaths[server.port] = videoChannel.avatar.path
-      await testImage(server.url, 'avatar-resized', avatarPaths[server.port], '.png')
-      await testFileExistsOrNot(server, 'avatars', basename(avatarPaths[server.port]), true)
+      expect(videoChannel.avatars.length).to.equal(expectedSizes.length, 'Expected avatars to be generated in all sizes')
 
-      const row = await server.sql.getActorImage(basename(avatarPaths[server.port]))
-      expect(row.height).to.equal(ACTOR_IMAGES_SIZE.AVATARS.height)
-      expect(row.width).to.equal(ACTOR_IMAGES_SIZE.AVATARS.width)
+      for (const avatar of videoChannel.avatars) {
+        avatarPaths[server.port] = avatar.path
+        await testImage(server.url, `avatar-resized-${avatar.width}x${avatar.width}`, avatarPaths[server.port], '.png')
+        await testFileExistsOrNot(server, 'avatars', basename(avatarPaths[server.port]), true)
+
+        const row = await server.sql.getActorImage(basename(avatarPaths[server.port]))
+
+        expect(expectedSizes.some(({ height, width }) => row.height === height && row.width === width)).to.equal(true)
+      }
     }
   })
 
@@ -308,19 +315,18 @@ describe('Test video channels', function () {
     for (const server of servers) {
       const videoChannel = await server.channels.get({ channelName: 'second_video_channel@' + servers[0].host })
 
-      bannerPaths[server.port] = videoChannel.banner.path
+      bannerPaths[server.port] = videoChannel.banners[0].path
       await testImage(server.url, 'banner-resized', bannerPaths[server.port])
       await testFileExistsOrNot(server, 'avatars', basename(bannerPaths[server.port]), true)
 
       const row = await server.sql.getActorImage(basename(bannerPaths[server.port]))
-      expect(row.height).to.equal(ACTOR_IMAGES_SIZE.BANNERS.height)
-      expect(row.width).to.equal(ACTOR_IMAGES_SIZE.BANNERS.width)
+      expect(row.height).to.equal(ACTOR_IMAGES_SIZE[ActorImageType.BANNER][0].height)
+      expect(row.width).to.equal(ACTOR_IMAGES_SIZE[ActorImageType.BANNER][0].width)
     }
   })
 
   it('Should delete the video channel avatar', async function () {
     this.timeout(15000)
-
     await servers[0].channels.deleteImage({ channelName: 'second_video_channel', type: 'avatar' })
 
     await waitJobs(servers)
@@ -329,7 +335,7 @@ describe('Test video channels', function () {
       const videoChannel = await findChannel(server, secondVideoChannelId)
       await testFileExistsOrNot(server, 'avatars', basename(avatarPaths[server.port]), false)
 
-      expect(videoChannel.avatar).to.be.null
+      expect(videoChannel.avatars).to.be.empty
     }
   })
 
@@ -344,7 +350,7 @@ describe('Test video channels', function () {
       const videoChannel = await findChannel(server, secondVideoChannelId)
       await testFileExistsOrNot(server, 'avatars', basename(bannerPaths[server.port]), false)
 
-      expect(videoChannel.banner).to.be.null
+      expect(videoChannel.banners).to.be.empty
     }
   })
 
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index 2ae523970..1488ce2b5 100644
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -3,7 +3,15 @@
 import 'mocha'
 import * as chai from 'chai'
 import { dateIsValid, testImage } from '@server/tests/shared'
-import { cleanupTests, CommentsCommand, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
+import {
+  cleanupTests,
+  CommentsCommand,
+  createSingleServer,
+  PeerTubeServer,
+  setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar
+} from '@shared/server-commands'
 
 const expect = chai.expect
 
@@ -29,7 +37,8 @@ describe('Test video comments', function () {
     videoUUID = uuid
     videoId = id
 
-    await server.users.updateMyAvatar({ fixture: 'avatar.png' })
+    await setDefaultChannelAvatar(server)
+    await setDefaultAccountAvatar(server)
 
     userAccessTokenServer1 = await server.users.generateUserAndToken('user1')
 
@@ -81,7 +90,9 @@ describe('Test video comments', function () {
       expect(comment.account.name).to.equal('root')
       expect(comment.account.host).to.equal('localhost:' + server.port)
 
-      await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png')
+      for (const avatar of comment.account.avatars) {
+        await testImage(server.url, `avatar-resized-${avatar.width}x${avatar.width}`, avatar.path, '.png')
+      }
 
       expect(comment.totalReplies).to.equal(0)
       expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts
index 34327334f..1e8dbef02 100644
--- a/server/tests/api/videos/video-playlists.ts
+++ b/server/tests/api/videos/video-playlists.ts
@@ -20,6 +20,7 @@ import {
   PeerTubeServer,
   PlaylistsCommand,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
   setDefaultVideoChannel,
   waitJobs
 } from '@shared/server-commands'
@@ -79,6 +80,7 @@ describe('Test video playlists', function () {
     // Get the access tokens
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
+    await setDefaultAccountAvatar(servers)
 
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
diff --git a/server/tests/api/videos/videos-common-filters.ts b/server/tests/api/videos/videos-common-filters.ts
index 0254662c5..317de90a9 100644
--- a/server/tests/api/videos/videos-common-filters.ts
+++ b/server/tests/api/videos/videos-common-filters.ts
@@ -3,6 +3,7 @@
 import 'mocha'
 import { expect } from 'chai'
 import { pick } from '@shared/core-utils'
+import { HttpStatusCode, UserRole, Video, VideoDetails, VideoInclude, VideoPrivacy } from '@shared/models'
 import {
   cleanupTests,
   createMultipleServers,
@@ -10,10 +11,10 @@ import {
   makeGetRequest,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
   setDefaultVideoChannel,
   waitJobs
 } from '@shared/server-commands'
-import { HttpStatusCode, UserRole, Video, VideoDetails, VideoInclude, VideoPrivacy } from '@shared/models'
 
 describe('Test videos filter', function () {
   let servers: PeerTubeServer[]
@@ -29,6 +30,7 @@ describe('Test videos filter', function () {
 
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
+    await setDefaultAccountAvatar(servers)
 
     for (const server of servers) {
       const moderator = { username: 'moderator', password: 'my super password' }
diff --git a/server/tests/cli/prune-storage.ts b/server/tests/cli/prune-storage.ts
index a723ed8b4..3ca7c19ea 100644
--- a/server/tests/cli/prune-storage.ts
+++ b/server/tests/cli/prune-storage.ts
@@ -51,7 +51,7 @@ async function assertCountAreOkay (servers: PeerTubeServer[]) {
     expect(thumbnailsCount).to.equal(6)
 
     const avatarsCount = await countFiles(server, 'avatars')
-    expect(avatarsCount).to.equal(2)
+    expect(avatarsCount).to.equal(4)
 
     const hlsRootCount = await countFiles(server, 'streaming-playlists/hls')
     expect(hlsRootCount).to.equal(2)
@@ -87,23 +87,28 @@ describe('Test prune storage scripts', function () {
 
     await doubleFollow(servers[0], servers[1])
 
-    // Lazy load the remote avatar
+    // Lazy load the remote avatars
     {
       const account = await servers[0].accounts.get({ accountName: 'root@localhost:' + servers[1].port })
-      await makeGetRequest({
-        url: servers[0].url,
-        path: account.avatar.path,
-        expectedStatus: HttpStatusCode.OK_200
-      })
+
+      for (const avatar of account.avatars) {
+        await makeGetRequest({
+          url: servers[0].url,
+          path: avatar.path,
+          expectedStatus: HttpStatusCode.OK_200
+        })
+      }
     }
 
     {
       const account = await servers[1].accounts.get({ accountName: 'root@localhost:' + servers[0].port })
-      await makeGetRequest({
-        url: servers[1].url,
-        path: account.avatar.path,
-        expectedStatus: HttpStatusCode.OK_200
-      })
+      for (const avatar of account.avatars) {
+        await makeGetRequest({
+          url: servers[1].url,
+          path: avatar.path,
+          expectedStatus: HttpStatusCode.OK_200
+        })
+      }
     }
 
     await wait(1000)
diff --git a/server/tests/feeds/feeds.ts b/server/tests/feeds/feeds.ts
index 4dcd77cca..320dc3333 100644
--- a/server/tests/feeds/feeds.ts
+++ b/server/tests/feeds/feeds.ts
@@ -3,6 +3,7 @@
 import 'mocha'
 import * as chai from 'chai'
 import { XMLParser, XMLValidator } from 'fast-xml-parser'
+import { HttpStatusCode, VideoPrivacy } from '@shared/models'
 import {
   cleanupTests,
   createMultipleServers,
@@ -11,9 +12,9 @@ import {
   makeGetRequest,
   PeerTubeServer,
   setAccessTokensToServers,
+  setDefaultChannelAvatar,
   waitJobs
 } from '@shared/server-commands'
-import { HttpStatusCode, VideoPrivacy } from '@shared/models'
 
 chai.use(require('chai-xml'))
 chai.use(require('chai-json-schema'))
@@ -44,6 +45,7 @@ describe('Test syndication feeds', () => {
     })
 
     await setAccessTokensToServers([ ...servers, serverHLSOnly ])
+    await setDefaultChannelAvatar(servers[0])
     await doubleFollow(servers[0], servers[1])
 
     {
diff --git a/server/tests/fixtures/avatar-resized-120x120.gif b/server/tests/fixtures/avatar-resized-120x120.gif
new file mode 100644
index 000000000..81a82189e
Binary files /dev/null and b/server/tests/fixtures/avatar-resized-120x120.gif differ
diff --git a/server/tests/fixtures/avatar-resized-120x120.png b/server/tests/fixtures/avatar-resized-120x120.png
new file mode 100644
index 000000000..9d84151f8
Binary files /dev/null and b/server/tests/fixtures/avatar-resized-120x120.png differ
diff --git a/server/tests/fixtures/avatar-resized-48x48.gif b/server/tests/fixtures/avatar-resized-48x48.gif
new file mode 100644
index 000000000..5900ff12e
Binary files /dev/null and b/server/tests/fixtures/avatar-resized-48x48.gif differ
diff --git a/server/tests/fixtures/avatar-resized-48x48.png b/server/tests/fixtures/avatar-resized-48x48.png
new file mode 100644
index 000000000..9e5f3b490
Binary files /dev/null and b/server/tests/fixtures/avatar-resized-48x48.png differ
diff --git a/server/tests/fixtures/avatar-resized.gif b/server/tests/fixtures/avatar-resized.gif
deleted file mode 100644
index 81a82189e..000000000
Binary files a/server/tests/fixtures/avatar-resized.gif and /dev/null differ
diff --git a/server/tests/fixtures/avatar-resized.png b/server/tests/fixtures/avatar-resized.png
deleted file mode 100644
index 9d84151f8..000000000
Binary files a/server/tests/fixtures/avatar-resized.png and /dev/null differ
diff --git a/server/tests/fixtures/avatar2-resized-120x120.png b/server/tests/fixtures/avatar2-resized-120x120.png
new file mode 100644
index 000000000..44149facb
Binary files /dev/null and b/server/tests/fixtures/avatar2-resized-120x120.png differ
diff --git a/server/tests/fixtures/avatar2-resized-48x48.png b/server/tests/fixtures/avatar2-resized-48x48.png
new file mode 100644
index 000000000..bb3939b1a
Binary files /dev/null and b/server/tests/fixtures/avatar2-resized-48x48.png differ
diff --git a/server/tests/fixtures/avatar2-resized.png b/server/tests/fixtures/avatar2-resized.png
deleted file mode 100644
index 44149facb..000000000
Binary files a/server/tests/fixtures/avatar2-resized.png and /dev/null differ
diff --git a/server/tests/shared/notifications.ts b/server/tests/shared/notifications.ts
index cdc21fdc8..78d3787f0 100644
--- a/server/tests/shared/notifications.ts
+++ b/server/tests/shared/notifications.ts
@@ -10,7 +10,14 @@ import {
   UserNotificationSettingValue,
   UserNotificationType
 } from '@shared/models'
-import { createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
+import {
+  createMultipleServers,
+  doubleFollow,
+  PeerTubeServer,
+  setAccessTokensToServers,
+  setDefaultAccountAvatar,
+  setDefaultChannelAvatar
+} from '@shared/server-commands'
 import { MockSmtpServer } from './mock-servers'
 
 type CheckerBaseParams = {
@@ -646,6 +653,8 @@ async function prepareNotificationsTest (serversCount = 3, overrideConfigArg: an
   const servers = await createMultipleServers(serversCount, Object.assign(overrideConfig, overrideConfigArg))
 
   await setAccessTokensToServers(servers)
+  await setDefaultChannelAvatar(servers)
+  await setDefaultAccountAvatar(servers)
 
   if (serversCount > 1) {
     await doubleFollow(servers[0], servers[1])
diff --git a/server/types/models/actor/actor-image.ts b/server/types/models/actor/actor-image.ts
index 521b4cc59..e8f32b71e 100644
--- a/server/types/models/actor/actor-image.ts
+++ b/server/types/models/actor/actor-image.ts
@@ -9,4 +9,4 @@ export type MActorImage = ActorImageModel
 
 export type MActorImageFormattable =
   FunctionProperties<MActorImage> &
-  Pick<MActorImage, 'filename' | 'createdAt' | 'updatedAt'>
+  Pick<MActorImage, 'width' | 'filename' | 'createdAt' | 'updatedAt'>
diff --git a/server/types/models/actor/actor.ts b/server/types/models/actor/actor.ts
index 9ce97094f..280256bab 100644
--- a/server/types/models/actor/actor.ts
+++ b/server/types/models/actor/actor.ts
@@ -10,7 +10,7 @@ type UseOpt<K extends keyof ActorModel, M> = PickWithOpt<ActorModel, K, M>
 
 // ############################################################################
 
-export type MActor = Omit<ActorModel, 'Account' | 'VideoChannel' | 'ActorFollowing' | 'Avatar' | 'ActorFollowers' | 'Server' | 'Banner'>
+export type MActor = Omit<ActorModel, 'Account' | 'VideoChannel' | 'ActorFollowing' | 'ActorFollowers' | 'Server' | 'Banners'>
 
 // ############################################################################
 
@@ -35,7 +35,7 @@ export type MActorRedundancyAllowedOpt = PickWithOpt<ActorModel, 'Server', MServ
 export type MActorDefaultLight =
   MActorLight &
   Use<'Server', MServerHost> &
-  Use<'Avatar', MActorImage>
+  Use<'Avatars', MActorImage[]>
 
 export type MActorAccountId =
   MActor &
@@ -78,13 +78,13 @@ export type MActorServer =
 
 export type MActorImages =
   MActor &
-  Use<'Avatar', MActorImage> &
-  UseOpt<'Banner', MActorImage>
+  Use<'Avatars', MActorImage[]> &
+  UseOpt<'Banners', MActorImage[]>
 
 export type MActorDefault =
   MActor &
   Use<'Server', MServer> &
-  Use<'Avatar', MActorImage>
+  Use<'Avatars', MActorImage[]>
 
 export type MActorDefaultChannelId =
   MActorDefault &
@@ -93,8 +93,8 @@ export type MActorDefaultChannelId =
 export type MActorDefaultBanner =
   MActor &
   Use<'Server', MServer> &
-  Use<'Avatar', MActorImage> &
-  Use<'Banner', MActorImage>
+  Use<'Avatars', MActorImage[]> &
+  Use<'Banners', MActorImage[]>
 
 // Actor with channel that is associated to an account and its actor
 // Actor -> VideoChannel -> Account -> Actor
@@ -105,8 +105,8 @@ export type MActorChannelAccountActor =
 export type MActorFull =
   MActor &
   Use<'Server', MServer> &
-  Use<'Avatar', MActorImage> &
-  Use<'Banner', MActorImage> &
+  Use<'Avatars', MActorImage[]> &
+  Use<'Banners', MActorImage[]> &
   Use<'Account', MAccount> &
   Use<'VideoChannel', MChannelAccountActor>
 
@@ -114,8 +114,8 @@ export type MActorFull =
 export type MActorFullActor =
   MActor &
   Use<'Server', MServer> &
-  Use<'Avatar', MActorImage> &
-  Use<'Banner', MActorImage> &
+  Use<'Avatars', MActorImage[]> &
+  Use<'Banners', MActorImage[]> &
   Use<'Account', MAccountDefault> &
   Use<'VideoChannel', MChannelAccountDefault>
 
@@ -125,9 +125,9 @@ export type MActorFullActor =
 
 export type MActorSummary =
   FunctionProperties<MActor> &
-  Pick<MActor, 'id' | 'preferredUsername' | 'url' | 'serverId' | 'avatarId'> &
+  Pick<MActor, 'id' | 'preferredUsername' | 'url' | 'serverId'> &
   Use<'Server', MServerHost> &
-  Use<'Avatar', MActorImage>
+  Use<'Avatars', MActorImage[]>
 
 export type MActorSummaryBlocks =
   MActorSummary &
@@ -145,21 +145,22 @@ export type MActorSummaryFormattable =
   FunctionProperties<MActor> &
   Pick<MActor, 'url' | 'preferredUsername'> &
   Use<'Server', MServerHost> &
-  Use<'Avatar', MActorImageFormattable>
+  Use<'Avatars', MActorImageFormattable[]>
 
 export type MActorFormattable =
   MActorSummaryFormattable &
-  Pick<MActor, 'id' | 'followingCount' | 'followersCount' | 'createdAt' | 'updatedAt' | 'remoteCreatedAt' | 'bannerId' | 'avatarId'> &
+  Pick<MActor, 'id' | 'followingCount' | 'followersCount' | 'createdAt' | 'updatedAt' | 'remoteCreatedAt'> &
   Use<'Server', MServerHost & Partial<Pick<MServer, 'redundancyAllowed'>>> &
-  UseOpt<'Banner', MActorImageFormattable>
+  UseOpt<'Banners', MActorImageFormattable[]> &
+  UseOpt<'Avatars', MActorImageFormattable[]>
 
 type MActorAPBase =
   MActor &
-  Use<'Avatar', MActorImage>
+  Use<'Avatars', MActorImage[]>
 
 export type MActorAPAccount =
   MActorAPBase
 
 export type MActorAPChannel =
   MActorAPBase &
-  Use<'Banner', MActorImage>
+  Use<'Banners', MActorImage[]>
diff --git a/server/types/models/user/user-notification.ts b/server/types/models/user/user-notification.ts
index db9ec0400..d4715a0b6 100644
--- a/server/types/models/user/user-notification.ts
+++ b/server/types/models/user/user-notification.ts
@@ -21,6 +21,7 @@ type Use<K extends keyof UserNotificationModel, M> = PickWith<UserNotificationMo
 // ############################################################################
 
 export module UserNotificationIncludes {
+  export type ActorImageInclude = Pick<ActorImageModel, 'createdAt' | 'filename' | 'getStaticPath' | 'width' | 'updatedAt'>
 
   export type VideoInclude = Pick<VideoModel, 'id' | 'uuid' | 'name'>
   export type VideoIncludeChannel =
@@ -29,7 +30,7 @@ export module UserNotificationIncludes {
 
   export type ActorInclude =
     Pick<ActorModel, 'preferredUsername' | 'getHost'> &
-    PickWith<ActorModel, 'Avatar', Pick<ActorImageModel, 'filename' | 'getStaticPath'>> &
+    PickWith<ActorModel, 'Avatars', ActorImageInclude[]> &
     PickWith<ActorModel, 'Server', Pick<ServerModel, 'host'>>
 
   export type VideoChannelInclude = Pick<VideoChannelModel, 'id' | 'name' | 'getDisplayName'>
@@ -75,7 +76,7 @@ export module UserNotificationIncludes {
     Pick<ActorModel, 'preferredUsername' | 'getHost'> &
     PickWith<ActorModel, 'Account', AccountInclude> &
     PickWith<ActorModel, 'Server', Pick<ServerModel, 'host'>> &
-    PickWithOpt<ActorModel, 'Avatar', Pick<ActorImageModel, 'filename' | 'getStaticPath'>>
+    PickWithOpt<ActorModel, 'Avatars', ActorImageInclude[]>
 
   export type ActorFollowing =
     Pick<ActorModel, 'preferredUsername' | 'type' | 'getHost'> &
@@ -98,7 +99,7 @@ export module UserNotificationIncludes {
 // ############################################################################
 
 export type MUserNotification =
-  Omit<UserNotificationModel, 'User' | 'Video' | 'Comment' | 'Abuse' | 'VideoBlacklist' |
+  Omit<UserNotificationModel, 'User' | 'Video' | 'VideoComment' | 'Abuse' | 'VideoBlacklist' |
   'VideoImport' | 'Account' | 'ActorFollow' | 'Plugin' | 'Application'>
 
 // ############################################################################
@@ -106,7 +107,7 @@ export type MUserNotification =
 export type UserNotificationModelForApi =
   MUserNotification &
   Use<'Video', UserNotificationIncludes.VideoIncludeChannel> &
-  Use<'Comment', UserNotificationIncludes.VideoCommentInclude> &
+  Use<'VideoComment', UserNotificationIncludes.VideoCommentInclude> &
   Use<'Abuse', UserNotificationIncludes.AbuseInclude> &
   Use<'VideoBlacklist', UserNotificationIncludes.VideoBlacklistInclude> &
   Use<'VideoImport', UserNotificationIncludes.VideoImportInclude> &
diff --git a/shared/models/activitypub/activitypub-actor.ts b/shared/models/activitypub/activitypub-actor.ts
index 09d4f7402..efb6edec4 100644
--- a/shared/models/activitypub/activitypub-actor.ts
+++ b/shared/models/activitypub/activitypub-actor.ts
@@ -27,8 +27,11 @@ export interface ActivityPubActor {
     publicKeyPem: string
   }
 
-  icon?: ActivityIconObject
-  image?: ActivityIconObject
+  image?: ActivityIconObject | ActivityIconObject[]
+
+  icon?: ActivityIconObject | ActivityIconObject[]
+  // TODO: migrate to `icon`, introduced in 4.2
+  icons?: ActivityIconObject[]
 
   published?: string
 }
diff --git a/shared/models/actors/account.model.ts b/shared/models/actors/account.model.ts
index f2138077e..60f4236d5 100644
--- a/shared/models/actors/account.model.ts
+++ b/shared/models/actors/account.model.ts
@@ -4,6 +4,7 @@ import { Actor } from './actor.model'
 export interface Account extends Actor {
   displayName: string
   description: string
+  avatars: ActorImage[]
 
   updatedAt: Date | string
 
@@ -16,5 +17,9 @@ export interface AccountSummary {
   displayName: string
   url: string
   host: string
-  avatar?: ActorImage
+
+  avatars: ActorImage[]
+
+  // TODO: remove, deprecated in 4.2
+  avatar: ActorImage
 }
diff --git a/shared/models/actors/actor-image.model.ts b/shared/models/actors/actor-image.model.ts
index ad5eab627..cfe44ac15 100644
--- a/shared/models/actors/actor-image.model.ts
+++ b/shared/models/actors/actor-image.model.ts
@@ -1,4 +1,5 @@
 export interface ActorImage {
+  width: number
   path: string
 
   url?: string
diff --git a/shared/models/actors/actor.model.ts b/shared/models/actors/actor.model.ts
index fd0662331..bf86a917f 100644
--- a/shared/models/actors/actor.model.ts
+++ b/shared/models/actors/actor.model.ts
@@ -8,5 +8,9 @@ export interface Actor {
   followingCount: number
   followersCount: number
   createdAt: Date | string
-  avatar?: ActorImage
+
+  avatars: ActorImage[]
+
+  // TODO: remove, deprecated in 4.2
+  avatar: ActorImage
 }
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts
index 5820589fe..a2621fb5b 100644
--- a/shared/models/users/user-notification.model.ts
+++ b/shared/models/users/user-notification.model.ts
@@ -40,14 +40,19 @@ export interface VideoInfo {
   name: string
 }
 
+export interface AvatarInfo {
+  width: number
+  path: string
+}
+
 export interface ActorInfo {
   id: number
   displayName: string
   name: string
   host: string
-  avatar?: {
-    path: string
-  }
+
+  avatars: AvatarInfo[]
+  avatar: AvatarInfo
 }
 
 export interface UserNotification {
diff --git a/shared/models/videos/channel/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts
index 5393f924d..58b60c177 100644
--- a/shared/models/videos/channel/video-channel.model.ts
+++ b/shared/models/videos/channel/video-channel.model.ts
@@ -1,5 +1,5 @@
-import { Actor } from '../../actors/actor.model'
 import { Account, ActorImage } from '../../actors'
+import { Actor } from '../../actors/actor.model'
 
 export type ViewsPerDate = {
   date: Date
@@ -19,7 +19,10 @@ export interface VideoChannel extends Actor {
   videosCount?: number
   viewsPerDay?: ViewsPerDate[] // chronologically ordered
 
-  banner?: ActorImage
+  banners: ActorImage[]
+
+  // TODO: remove, deprecated in 4.2
+  banner: ActorImage
 }
 
 export interface VideoChannelSummary {
@@ -28,5 +31,9 @@ export interface VideoChannelSummary {
   displayName: string
   url: string
   host: string
-  avatar?: ActorImage
+
+  avatars: ActorImage[]
+
+  // TODO: remove, deprecated in 4.2
+  avatar: ActorImage
 }
diff --git a/shared/server-commands/users/accounts.ts b/shared/server-commands/users/accounts.ts
new file mode 100644
index 000000000..6387891f4
--- /dev/null
+++ b/shared/server-commands/users/accounts.ts
@@ -0,0 +1,15 @@
+import { PeerTubeServer } from '../server/server'
+
+async function setDefaultAccountAvatar (serversArg: PeerTubeServer | PeerTubeServer[], token?: string) {
+  const servers = Array.isArray(serversArg)
+    ? serversArg
+    : [ serversArg ]
+
+  for (const server of servers) {
+    await server.users.updateMyAvatar({ fixture: 'avatar.png', token })
+  }
+}
+
+export {
+  setDefaultAccountAvatar
+}
diff --git a/shared/server-commands/users/index.ts b/shared/server-commands/users/index.ts
index c2bc5c44f..f6f93b4d2 100644
--- a/shared/server-commands/users/index.ts
+++ b/shared/server-commands/users/index.ts
@@ -1,4 +1,5 @@
 export * from './accounts-command'
+export * from './accounts'
 export * from './blocklist-command'
 export * from './login'
 export * from './login-command'
diff --git a/shared/server-commands/videos/channels.ts b/shared/server-commands/videos/channels.ts
index 756c47453..3c0d4b723 100644
--- a/shared/server-commands/videos/channels.ts
+++ b/shared/server-commands/videos/channels.ts
@@ -13,6 +13,17 @@ function setDefaultVideoChannel (servers: PeerTubeServer[]) {
   return Promise.all(tasks)
 }
 
+async function setDefaultChannelAvatar (serversArg: PeerTubeServer | PeerTubeServer[], channelName: string = 'root_channel') {
+  const servers = Array.isArray(serversArg)
+    ? serversArg
+    : [ serversArg ]
+
+  for (const server of servers) {
+    await server.channels.updateImage({ channelName, fixture: 'avatar.png', type: 'avatar' })
+  }
+}
+
 export {
-  setDefaultVideoChannel
+  setDefaultVideoChannel,
+  setDefaultChannelAvatar
 }
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 396074225..70f2d97f5 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -1556,8 +1556,10 @@ paths:
               schema:
                 type: object
                 properties:
-                  avatar:
-                    $ref: '#/components/schemas/ActorImage'
+                  avatars:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/ActorImage'
         '413':
           description: image file too large
           headers:
@@ -2878,7 +2880,7 @@ paths:
                     type: object
                     properties:
                       id:
-                        $ref: '#/components/schemas/VideoChannel/properties/id'
+                        $ref: '#/components/schemas/id'
       requestBody:
         content:
           application/json:
@@ -3010,8 +3012,10 @@ paths:
               schema:
                 type: object
                 properties:
-                  avatar:
-                    $ref: '#/components/schemas/ActorImage'
+                  avatars:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/ActorImage'
         '413':
           description: image file too large
           headers:
@@ -3064,8 +3068,10 @@ paths:
               schema:
                 type: object
                 properties:
-                  banner:
-                    $ref: '#/components/schemas/ActorImage'
+                  banners:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/ActorImage'
         '413':
           description: image file too large
           headers:
@@ -5364,10 +5370,10 @@ components:
         host:
           type: string
           format: hostname
-        avatar:
-          nullable: true
-          allOf:
-            - $ref: '#/components/schemas/ActorImage'
+        avatars:
+          type: array
+          items:
+            $ref: '#/components/schemas/ActorImage'
     VideoChannelSummary:
       properties:
         id:
@@ -5382,10 +5388,10 @@ components:
         host:
           type: string
           format: hostname
-        avatar:
-          nullable: true
-          allOf:
-            - $ref: '#/components/schemas/ActorImage'
+        avatars:
+          type: array
+          items:
+            $ref: '#/components/schemas/ActorImage'
     PlaylistElement:
       properties:
         position:
@@ -5969,6 +5975,8 @@ components:
       properties:
         path:
           type: string
+        width:
+          type: integer
         createdAt:
           type: string
           format: date-time
@@ -5986,12 +5994,10 @@ components:
         host:
           type: string
           format: hostname
-        avatar:
-          nullable: true
-          type: object
-          properties:
-            path:
-              type: string
+        avatars:
+          type: array
+          items:
+            $ref: '#/components/schemas/ActorImage'
     Actor:
       properties:
         id:
@@ -6024,8 +6030,6 @@ components:
         updatedAt:
           type: string
           format: date-time
-        avatar:
-          $ref: '#/components/schemas/ActorImage'
     Account:
       allOf:
         - $ref: '#/components/schemas/Actor'
@@ -6934,7 +6938,7 @@ components:
             name:
               $ref: '#/components/schemas/usernameChannel'
             displayName:
-              $ref: '#/components/schemas/VideoChannel/properties/displayName'
+              type: string
       required:
         - username
         - password
@@ -6996,46 +7000,47 @@ components:
         - refresh_token
 
     VideoChannel:
-      properties:
-        # GET/POST/PUT properties
-        displayName:
-          type: string
-          description: editable name of the channel, displayed in its representations
-          example: Videos of Framasoft
-          minLength: 1
-          maxLength: 120
-        description:
-          type: string
-          example: Videos made with <3 by Framasoft
-          minLength: 3
-          maxLength: 1000
-        support:
-          type: string
-          description: text shown by default on all videos of this channel, to tell the audience how to support it
-          example: Please support our work on https://soutenir.framasoft.org/en/ <3
-          minLength: 3
-          maxLength: 1000
-        # GET-only properties
-        id:
-          readOnly: true
-          allOf:
-            - $ref: '#/components/schemas/id'
-        isLocal:
-          readOnly: true
-          type: boolean
-        updatedAt:
-          readOnly: true
-          type: string
-          format: date-time
-        ownerAccount:
-          readOnly: true
-          nullable: true
-          type: object
+      allOf:
+        - $ref: '#/components/schemas/Actor'
+        - type: object
           properties:
-            id:
-              type: integer
-            uuid:
-              $ref: '#/components/schemas/UUIDv4'
+            displayName:
+              type: string
+              description: editable name of the channel, displayed in its representations
+              example: Videos of Framasoft
+              minLength: 1
+              maxLength: 120
+            description:
+              type: string
+              example: Videos made with <3 by Framasoft
+              minLength: 3
+              maxLength: 1000
+            support:
+              type: string
+              description: text shown by default on all videos of this channel, to tell the audience how to support it
+              example: Please support our work on https://soutenir.framasoft.org/en/ <3
+              minLength: 3
+              maxLength: 1000
+            isLocal:
+              readOnly: true
+              type: boolean
+            updatedAt:
+              readOnly: true
+              type: string
+              format: date-time
+            banners:
+              type: array
+              items:
+                $ref: '#/components/schemas/ActorImage'
+            ownerAccount:
+              readOnly: true
+              nullable: true
+              type: object
+              properties:
+                id:
+                  type: integer
+                uuid:
+                  $ref: '#/components/schemas/UUIDv4'
     VideoChannelCreate:
       allOf:
         - $ref: '#/components/schemas/VideoChannel'
diff --git a/support/nginx/peertube b/support/nginx/peertube
index 2b1600d97..5d7b4f0f0 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -172,7 +172,7 @@ server {
 
   # Bypass PeerTube for performance reasons. Optional.
   # Should be consistent with client-overrides assets list in /server/controllers/client.ts
-  location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-video-channel\.png))$ {
+  location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-account-48x48\.png|default-avatar-video-channel\.png|default-avatar-video-channel-48x48\.png))$ {
     add_header Cache-Control "public, max-age=31536000, immutable"; # Cache 1 year
 
     root /var/www/peertube;
-- 
cgit v1.2.3