9 files changed, 54 insertions, 54 deletions

diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index 256b7e1f5..9c56b5750 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -25,7 +25,7 @@ import { PluginsComponent } from '@app/+admin/plugins/plugins.component'
 import { PluginListInstalledComponent } from '@app/+admin/plugins/plugin-list-installed/plugin-list-installed.component'
 import { PluginSearchComponent } from '@app/+admin/plugins/plugin-search/plugin-search.component'
 import { PluginShowInstalledComponent } from '@app/+admin/plugins/plugin-show-installed/plugin-show-installed.component'
-import { SelectButtonModule } from 'primeng/primeng'
+import { SelectButtonModule } from 'primeng/selectbutton'
 import { PluginApiService } from '@app/+admin/plugins/shared/plugin-api.service'
 
 @NgModule({
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
index e25d9ab66..eb3137e26 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { ConfirmService, Notifier } from '@app/core'
-import { SortMeta } from 'primeng/primeng'
+import { SortMeta } from 'primeng/api'
 import { ActorFollow } from '../../../../../../shared/models/actors/follow.model'
 import { RestPagination, RestTable } from '../../../shared'
 import { FollowService } from '@app/shared/instance/follow.service'
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts
index ded616624..b97923f04 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.ts
+++ b/client/src/app/+admin/follows/following-list/following-list.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { Notifier } from '@app/core'
-import { SortMeta } from 'primeng/primeng'
+import { SortMeta } from 'primeng/api'
 import { ActorFollow } from '../../../../../../shared/models/actors/follow.model'
 import { ConfirmService } from '../../../core/confirm/confirm.service'
 import { RestPagination, RestTable } from '../../../shared'
diff --git a/client/src/app/+admin/system/jobs/job.service.ts b/client/src/app/+admin/system/jobs/job.service.ts
index b96dc3359..1daae8f03 100644
--- a/client/src/app/+admin/system/jobs/job.service.ts
+++ b/client/src/app/+admin/system/jobs/job.service.ts
@@ -1,7 +1,7 @@
 import { catchError, map } from 'rxjs/operators'
 import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { SortMeta } from 'primeng/primeng'
+import { SortMeta } from 'primeng/api'
 import { Observable } from 'rxjs'
 import { ResultList } from '../../../../../../shared'
 import { JobState } from '../../../../../../shared/models'
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts
index ebfb52779..b24353ca6 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.ts
+++ b/client/src/app/+admin/system/jobs/jobs.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
 import { Notifier } from '@app/core'
-import { SortMeta } from 'primeng/primeng'
+import { SortMeta } from 'primeng/api'
 import { Job } from '../../../../../../shared/index'
 import { JobState } from '../../../../../../shared/models'
 import { RestPagination, RestTable } from '../../../shared'
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts
index 01dde5bb6..571f46de9 100644
--- a/client/src/app/+my-account/my-account.module.ts
+++ b/client/src/app/+my-account/my-account.module.ts
@@ -37,7 +37,7 @@ import {
 } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'
 import { DragDropModule } from '@angular/cdk/drag-drop'
 import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email'
-import { MultiSelectModule } from 'primeng/primeng'
+import { MultiSelectModule } from 'primeng/multiselect'
 import { MyAccountInterfaceSettingsComponent } from '@app/+my-account/my-account-settings/my-account-interface'
 
 @NgModule({
diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts
index 5b525dec1..a56674b58 100644
--- a/client/src/app/shared/images/global-icon.component.ts
+++ b/client/src/app/shared/images/global-icon.component.ts
@@ -1,52 +1,52 @@
 import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@angular/core'
 
 const icons = {
-  'add': require('../../../assets/images/global/add.html'),
-  'user': require('../../../assets/images/global/user.html'),
-  'sign-out': require('../../../assets/images/global/sign-out.html'),
-  'syndication': require('../../../assets/images/global/syndication.html'),
-  'help': require('../../../assets/images/global/help.html'),
-  'sparkle': require('../../../assets/images/global/sparkle.html'),
-  'alert': require('../../../assets/images/global/alert.html'),
-  'cloud-error': require('../../../assets/images/global/cloud-error.html'),
-  'user-add': require('../../../assets/images/global/user-add.html'),
-  'no': require('../../../assets/images/global/no.html'),
-  'cloud-download': require('../../../assets/images/global/cloud-download.html'),
-  'undo': require('../../../assets/images/global/undo.html'),
-  'history': require('../../../assets/images/global/history.html'),
-  'circle-tick': require('../../../assets/images/global/circle-tick.html'),
-  'cog': require('../../../assets/images/global/cog.html'),
-  'download': require('../../../assets/images/global/download.html'),
-  'go': require('../../../assets/images/menu/go.html'),
-  'edit': require('../../../assets/images/global/edit.html'),
-  'im-with-her': require('../../../assets/images/global/im-with-her.html'),
-  'delete': require('../../../assets/images/global/delete.html'),
-  'server': require('../../../assets/images/global/server.html'),
-  'cross': require('../../../assets/images/global/cross.html'),
-  'validate': require('../../../assets/images/global/validate.html'),
-  'tick': require('../../../assets/images/global/tick.html'),
-  'dislike': require('../../../assets/images/video/dislike.html'),
-  'heart': require('../../../assets/images/video/heart.html'),
-  'like': require('../../../assets/images/video/like.html'),
-  'more-horizontal': require('../../../assets/images/global/more-horizontal.html'),
-  'more-vertical': require('../../../assets/images/global/more-vertical.html'),
-  'share': require('../../../assets/images/video/share.html'),
-  'upload': require('../../../assets/images/video/upload.html'),
-  'playlist-add': require('../../../assets/images/video/playlist-add.html'),
-  'play': require('../../../assets/images/global/play.html'),
-  'playlists': require('../../../assets/images/global/playlists.html'),
-  'about': require('../../../assets/images/menu/about.html'),
-  'globe': require('../../../assets/images/menu/globe.html'),
-  'home': require('../../../assets/images/menu/home.html'),
-  'recently-added': require('../../../assets/images/menu/recently-added.html'),
-  'trending': require('../../../assets/images/menu/trending.html'),
-  'videos': require('../../../assets/images/global/videos.html'),
-  'folder': require('../../../assets/images/global/folder.html'),
-  'administration': require('../../../assets/images/menu/administration.html'),
-  'subscriptions': require('../../../assets/images/menu/subscriptions.html'),
-  'users': require('../../../assets/images/global/users.html'),
-  'search': require('../../../assets/images/global/search.html'),
-  'refresh': require('../../../assets/images/global/refresh.html')
+  'add': require('!!raw-loader?!../../../assets/images/global/add.svg'),
+  'user': require('!!raw-loader?!../../../assets/images/global/user.svg'),
+  'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg'),
+  'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg'),
+  'help': require('!!raw-loader?!../../../assets/images/global/help.svg'),
+  'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg'),
+  'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg'),
+  'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg'),
+  'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg'),
+  'no': require('!!raw-loader?!../../../assets/images/global/no.svg'),
+  'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg'),
+  'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg'),
+  'history': require('!!raw-loader?!../../../assets/images/global/history.svg'),
+  'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg'),
+  'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg'),
+  'download': require('!!raw-loader?!../../../assets/images/global/download.svg'),
+  'go': require('!!raw-loader?!../../../assets/images/menu/go.svg'),
+  'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg'),
+  'im-with-her': require('!!raw-loader?!../../../assets/images/global/im-with-her.svg'),
+  'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg'),
+  'server': require('!!raw-loader?!../../../assets/images/global/server.svg'),
+  'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg'),
+  'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg'),
+  'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg'),
+  'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg'),
+  'heart': require('!!raw-loader?!../../../assets/images/video/heart.svg'),
+  'like': require('!!raw-loader?!../../../assets/images/video/like.svg'),
+  'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg'),
+  'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg'),
+  'share': require('!!raw-loader?!../../../assets/images/video/share.svg'),
+  'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg'),
+  'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg'),
+  'play': require('!!raw-loader?!../../../assets/images/global/play.svg'),
+  'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg'),
+  'about': require('!!raw-loader?!../../../assets/images/menu/about.svg'),
+  'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg'),
+  'home': require('!!raw-loader?!../../../assets/images/menu/home.svg'),
+  'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg'),
+  'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg'),
+  'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg'),
+  'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg'),
+  'administration': require('!!raw-loader?!../../../assets/images/menu/administration.svg'),
+  'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg'),
+  'users': require('!!raw-loader?!../../../assets/images/global/users.svg'),
+  'search': require('!!raw-loader?!../../../assets/images/global/search.svg'),
+  'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg')
 }
 
 export type GlobalIconName = keyof typeof icons
diff --git a/client/src/app/shared/instance/follow.service.ts b/client/src/app/shared/instance/follow.service.ts
index 978d60f6b..63f9e2687 100644
--- a/client/src/app/shared/instance/follow.service.ts
+++ b/client/src/app/shared/instance/follow.service.ts
@@ -1,11 +1,11 @@
 import { catchError, map } from 'rxjs/operators'
 import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { SortMeta } from 'primeng/primeng'
 import { Observable } from 'rxjs'
 import { ActorFollow, ResultList } from '@shared/index'
 import { environment } from '../../../environments/environment'
 import { RestExtractor, RestPagination, RestService } from '../rest'
+import { SortMeta } from 'primeng/api'
 
 @Injectable()
 export class FollowService {
diff --git a/client/src/app/videos/+video-edit/video-add.module.ts b/client/src/app/videos/+video-edit/video-add.module.ts
index 3ecf96459..870f7cb97 100644
--- a/client/src/app/videos/+video-edit/video-add.module.ts
+++ b/client/src/app/videos/+video-edit/video-add.module.ts
@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core'
-import { ProgressBarModule } from 'primeng/primeng'
 import { SharedModule } from '../../shared'
 import { VideoEditModule } from './shared/video-edit.module'
 import { VideoAddRoutingModule } from './video-add-routing.module'
@@ -8,6 +7,7 @@ import { CanDeactivateGuard } from '../../shared/guards/can-deactivate-guard.ser
 import { VideoUploadComponent } from '@app/videos/+video-edit/video-add-components/video-upload.component'
 import { VideoImportUrlComponent } from '@app/videos/+video-edit/video-add-components/video-import-url.component'
 import { VideoImportTorrentComponent } from '@app/videos/+video-edit/video-add-components/video-import-torrent.component'
+import { ProgressBarModule } from 'primeng/progressbar'
 
 @NgModule({
   imports: [