19 files changed, 85 insertions, 80 deletions

diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
index b6047645d..cb149b607 100644
--- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
+++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html
@@ -31,7 +31,7 @@
 
       <my-button i18n-label label="Change ownership"
                  className="action-button-change-ownership grey-button"
-                 icon="forward"
+                 icon="ownership-change"
                  (click)="changeOwnership($event, video)"
       ></my-button>
     </div>
diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index 4040ab4f8..85b2795c5 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -30,7 +30,7 @@ export class MyAccountComponent implements OnInit {
         {
           label: this.i18n('My channels'),
           routerLink: '/my-account/video-channels',
-          iconName: 'folder'
+          iconName: 'channel'
         },
         {
           label: this.i18n('My videos'),
@@ -45,7 +45,7 @@ export class MyAccountComponent implements OnInit {
         {
           label: this.i18n('My subscriptions'),
           routerLink: '/my-account/subscriptions',
-          iconName: 'subscriptions'
+          iconName: 'inbox-full'
         },
         {
           label: this.i18n('My history'),
@@ -79,7 +79,7 @@ export class MyAccountComponent implements OnInit {
         {
           label: this.i18n('Ownership changes'),
           routerLink: '/my-account/ownership',
-          iconName: 'forward'
+          iconName: 'ownership-change'
         }
       ]
     }
diff --git a/client/src/app/+search/search.component.scss b/client/src/app/+search/search.component.scss
index 6e59adb60..64927fa4b 100644
--- a/client/src/app/+search/search.component.scss
+++ b/client/src/app/+search/search.component.scss
@@ -31,7 +31,7 @@
           position: relative;
           top: -1px;
           margin-right: 5px;
-          background-image: url('../../assets/images/search/filter.svg');
+          background-image: url('../../assets/images/feather/filter.svg');
         }
       }
     }
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
index 7287f799d..5678f548f 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
@@ -69,7 +69,7 @@
        (click)="updateSecondStep()"
        [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }"
     >
-      <my-global-icon iconName="validate" aria-hidden="true"></my-global-icon>
+      <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
       <input type="button" i18n-value value="Update" />
     </div>
   </div>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
index 1910da403..2e434271e 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
@@ -65,7 +65,7 @@
        (click)="updateSecondStep()"
        [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }"
     >
-      <my-global-icon iconName="validate" aria-hidden="true"></my-global-icon>
+      <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
       <input type="button" i18n-value value="Update" />
     </div>
   </div>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
index dad88a661..2c40892ee 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
@@ -83,7 +83,7 @@
        (click)="updateSecondStep()"
        [ngClass]="{ disabled: isPublishingButtonDisabled() }"
     >
-      <my-global-icon iconName="validate" aria-hidden="true"></my-global-icon>
+      <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
       <input [disabled]="isPublishingButtonDisabled()" type="button" i18n-value value="Publish" />
     </div>
   </div>
diff --git a/client/src/app/+videos/+video-edit/video-update.component.html b/client/src/app/+videos/+video-edit/video-update.component.html
index fbc642db9..1517d4991 100644
--- a/client/src/app/+videos/+video-edit/video-update.component.html
+++ b/client/src/app/+videos/+video-edit/video-update.component.html
@@ -14,7 +14,7 @@
 
     <div class="submit-container">
       <div class="submit-button" (click)="update()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }">
-        <my-global-icon iconName="validate" aria-hidden="true"></my-global-icon>
+        <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
         <input type="button" i18n-value value="Update" />
       </div>
     </div>
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss
index 2e083982e..c7f91f4a0 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch.component.scss
@@ -249,7 +249,7 @@ $video-info-margin-left: 44px;
               filter: brightness(120%);
 
               .count {
-                margin-right: 5px;
+                margin: 0 5px;
               }
             }
 
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index a2180e19d..d121ebad2 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -39,7 +39,7 @@
 
       &.icon-menu {
         background-color: pvar(--mainForegroundColor);
-        mask-image: url('../assets/images/header/menu.svg');
+        mask-image: url('../assets/images/misc/menu.svg');
         margin: 0 18px 0 20px;
       }
     }
diff --git a/client/src/app/header/search-typeahead.component.html b/client/src/app/header/search-typeahead.component.html
index 4355b67af..548da59bb 100644
--- a/client/src/app/header/search-typeahead.component.html
+++ b/client/src/app/header/search-typeahead.component.html
@@ -4,7 +4,7 @@
     [(ngModel)]="search" (ngModelChange)="onSearchChange()" (keydown)="handleKey($event)" (keydown.enter)="doSearch()"
     aria-label="Search" autocomplete="off"
   >
-  <span class="icon icon-search" (click)="doSearch()"></span>
+  <my-global-icon iconName="search" class="icon icon-search" role="button" (click)="doSearch()" (keydown.enter)="doSearch()"></my-global-icon>
 
   <div class="position-absolute jump-to-suggestions">
 
diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss
index 920aa61ae..87e8b8c70 100644
--- a/client/src/app/header/search-typeahead.component.scss
+++ b/client/src/app/header/search-typeahead.component.scss
@@ -16,15 +16,13 @@
 
 .icon.icon-search {
   @include icon(25px);
-  height: 21px;
-
-  background-color: pvar(--mainForegroundColor);
-  mask: url('../../assets/images/header/search.svg') no-repeat 50% 50%;
+  height: 18px;
 
   // yolo
   position: absolute;
   margin-left: -35px;
-  margin-top: 5px;
+  margin-top: 3.5px;
+  right: 10px;
 }
 
 .jump-to-suggestions {
diff --git a/client/src/app/header/suggestion.component.html b/client/src/app/header/suggestion.component.html
index ab4b4b678..4ac9809e1 100644
--- a/client/src/app/header/suggestion.component.html
+++ b/client/src/app/header/suggestion.component.html
@@ -11,7 +11,7 @@
   ></div>
 
   <div class="border rounded flex-shrink-0 px-1 bg-gray text-gray-light ml-1 f6">
-    <span *ngIf="result.type === 'search-instance'" i18n>In this instance</span>
+    <span *ngIf="result.type === 'search-instance'" i18n>In this instance's network</span>
     <span *ngIf="result.type === 'search-index'" i18n>In the vidiverse</span>
   </div>
 </a>
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index a8d34088c..7f3bff170 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -26,7 +26,7 @@
             </a>
 
             <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/video-channels">
-              <my-global-icon iconName="folder" aria-hidden="true"></my-global-icon> <ng-container i18n>Channels settings</ng-container>
+              <my-global-icon iconName="channel" aria-hidden="true"></my-global-icon> <ng-container i18n>Channels settings</ng-container>
             </a>
 
             <div class="dropdown-divider"></div>
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 8f8c31417..407d79725 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -296,7 +296,7 @@ menu {
     top: -1px;
     margin-right: 10px;
 
-    background-image: url('../../assets/images/menu/keyboard.png');
+    background-image: url('../../assets/images/misc/keyboard.png');
   }
 }
 
diff --git a/client/src/app/modal/quick-settings-modal.component.scss b/client/src/app/modal/quick-settings-modal.component.scss
index ef21542f3..afc8460d0 100644
--- a/client/src/app/modal/quick-settings-modal.component.scss
+++ b/client/src/app/modal/quick-settings-modal.component.scss
@@ -30,7 +30,7 @@
     top: -1px;
     margin-right: 4px;
 
-    background-image: url('../../assets/images/menu/keyboard.png');
+    background-image: url('../../assets/images/misc/keyboard.png');
   }
 }
 
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index 3de926293..75ab9e8f5 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -2,62 +2,65 @@ import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@
 import { HooksService } from '@app/core/plugins/hooks.service'
 
 const icons = {
-  'add': require('!!raw-loader?!../../../assets/images/global/add.svg').default,
-  'user': require('!!raw-loader?!../../../assets/images/global/user.svg').default,
-  'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg').default,
-  'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg').default,
-  'help': require('!!raw-loader?!../../../assets/images/global/help.svg').default,
-  'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg').default,
-  'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg').default,
-  'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg').default,
-  'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg').default,
-  'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg').default,
-  'no': require('!!raw-loader?!../../../assets/images/global/no.svg').default,
-  'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg').default,
-  'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg').default,
-  'history': require('!!raw-loader?!../../../assets/images/global/history.svg').default,
-  'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg').default,
-  'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg').default,
-  'download': require('!!raw-loader?!../../../assets/images/global/download.svg').default,
-  'go': require('!!raw-loader?!../../../assets/images/menu/go.svg').default,
-  'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg').default,
-  'forward': require('!!raw-loader?!../../../assets/images/global/forward.svg').default,
-  'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg').default,
-  'server': require('!!raw-loader?!../../../assets/images/global/server.svg').default,
-  'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg').default,
-  'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg').default,
-  'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg').default,
-  'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg').default,
-  'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg').default,
-  'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg').default,
-  'support': require('!!raw-loader?!../../../assets/images/video/support.svg').default,
-  'like': require('!!raw-loader?!../../../assets/images/video/like.svg').default,
-  'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg').default,
-  'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg').default,
-  'share': require('!!raw-loader?!../../../assets/images/video/share.svg').default,
-  'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg').default,
-  'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg').default,
-  'play': require('!!raw-loader?!../../../assets/images/global/play.svg').default,
-  'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg').default,
-  'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg').default,
-  'home': require('!!raw-loader?!../../../assets/images/menu/home.svg').default,
-  'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg').default,
-  'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg').default,
-  'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg').default,
-  'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg').default,
-  'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg').default,
-  'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg').default,
-  'language': require('!!raw-loader?!../../../assets/images/menu/language.svg').default,
-  'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg').default,
-  'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg').default,
-  'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg').default,
-  'users': require('!!raw-loader?!../../../assets/images/global/users.svg').default,
-  'search': require('!!raw-loader?!../../../assets/images/global/search.svg').default,
-  'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default,
-  'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default,
-  'fullscreen': require('!!raw-loader?!../../../assets/images/global/fullscreen.svg').default,
-  'exit-fullscreen': require('!!raw-loader?!../../../assets/images/global/exit-fullscreen.svg').default,
-  'robot': require('!!raw-loader?!../../../assets/images/global/robot.svg').default
+  // misc icons
+  'npm': require('!!raw-loader?!../../../assets/images/misc/npm.svg').default,
+  'language': require('!!raw-loader?!../../../assets/images/misc/language.svg').default,
+  'video-lang': require('!!raw-loader?!../../../assets/images/misc/video-lang.svg').default,
+  'support': require('!!raw-loader?!../../../assets/images/misc/support.svg').default,
+  'robot': require('!!raw-loader?!../../../assets/images/misc/miscellaneous_services.svg').default, // material ui
+  'videos': require('!!raw-loader?!../../../assets/images/misc/video_library.svg').default, // material ui
+  'history': require('!!raw-loader?!../../../assets/images/misc/history.svg').default, // material ui
+  'subscriptions': require('!!raw-loader?!../../../assets/images/misc/subscriptions.svg').default, // material ui
+  'playlist-add': require('!!raw-loader?!../../../assets/images/misc/playlist-add.svg').default, // material ui
+
+  // feather icons
+  'flag': require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
+  'playlists': require('!!raw-loader?!../../../assets/images/feather/list.svg').default,
+  'syndication': require('!!raw-loader?!../../../assets/images/feather/syndication.svg').default,
+  'help': require('!!raw-loader?!../../../assets/images/feather/help.svg').default,
+  'alert': require('!!raw-loader?!../../../assets/images/feather/alert.svg').default,
+  'globe': require('!!raw-loader?!../../../assets/images/feather/globe.svg').default,
+  'home': require('!!raw-loader?!../../../assets/images/feather/home.svg').default,
+  'recently-added': require('!!raw-loader?!../../../assets/images/feather/recently-added.svg').default,
+  'trending': require('!!raw-loader?!../../../assets/images/feather/trending.svg').default,
+  'search': require('!!raw-loader?!../../../assets/images/feather/search.svg').default,
+  'upload': require('!!raw-loader?!../../../assets/images/feather/upload.svg').default,
+  'dislike': require('!!raw-loader?!../../../assets/images/feather/dislike.svg').default,
+  'like': require('!!raw-loader?!../../../assets/images/feather/like.svg').default,
+  'no': require('!!raw-loader?!../../../assets/images/feather/no.svg').default,
+  'cloud-download': require('!!raw-loader?!../../../assets/images/feather/cloud-download.svg').default,
+  'clock': require('!!raw-loader?!../../../assets/images/feather/clock.svg').default,
+  'cog': require('!!raw-loader?!../../../assets/images/feather/cog.svg').default,
+  'delete': require('!!raw-loader?!../../../assets/images/feather/delete.svg').default,
+  'inbox-full': require('!!raw-loader?!../../../assets/images/feather/inbox-full.svg').default,
+  'sign-out': require('!!raw-loader?!../../../assets/images/feather/log-out.svg').default,
+  'download': require('!!raw-loader?!../../../assets/images/feather/download.svg').default,
+  'ownership-change': require('!!raw-loader?!../../../assets/images/feather/share.svg').default,
+  'share': require('!!raw-loader?!../../../assets/images/feather/share-2.svg').default,
+  'channel': require('!!raw-loader?!../../../assets/images/feather/tv.svg').default,
+  'user': require('!!raw-loader?!../../../assets/images/feather/user.svg').default,
+  'users': require('!!raw-loader?!../../../assets/images/feather/users.svg').default,
+  'user-add': require('!!raw-loader?!../../../assets/images/feather/user-plus.svg').default,
+  'server': require('!!raw-loader?!../../../assets/images/feather/server.svg').default,
+  'add': require('!!raw-loader?!../../../assets/images/feather/plus-circle.svg').default,
+  'cloud-error': require('!!raw-loader?!../../../assets/images/feather/cloud-off.svg').default,
+  'undo': require('!!raw-loader?!../../../assets/images/feather/corner-up-left.svg').default,
+  'circle-tick': require('!!raw-loader?!../../../assets/images/feather/check-circle.svg').default,
+  'more-horizontal': require('!!raw-loader?!../../../assets/images/feather/more-horizontal.svg').default,
+  'more-vertical': require('!!raw-loader?!../../../assets/images/feather/more-vertical.svg').default,
+  'play': require('!!raw-loader?!../../../assets/images/feather/play.svg').default,
+  'p2p': require('!!raw-loader?!../../../assets/images/feather/airplay.svg').default,
+  'fullscreen': require('!!raw-loader?!../../../assets/images/feather/maximize.svg').default,
+  'exit-fullscreen': require('!!raw-loader?!../../../assets/images/feather/minimize.svg').default,
+  'film': require('!!raw-loader?!../../../assets/images/feather/film.svg').default,
+  'edit': require('!!raw-loader?!../../../assets/images/feather/edit-2.svg').default,
+  'sensitive': require('!!raw-loader?!../../../assets/images/feather/eye.svg').default,
+  'unsensitive': require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default,
+  'refresh': require('!!raw-loader?!../../../assets/images/feather/refresh-cw.svg').default,
+  'go': require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default,
+  'cross': require('!!raw-loader?!../../../assets/images/feather/x.svg').default,
+  'tick': require('!!raw-loader?!../../../assets/images/feather/check.svg').default,
+  'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default
 }
 
 export type GlobalIconName = keyof typeof icons
diff --git a/client/src/app/shared/shared-main/buttons/button.component.scss b/client/src/app/shared/shared-main/buttons/button.component.scss
index 3ccfefd7e..5b27af3f4 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.scss
+++ b/client/src/app/shared/shared-main/buttons/button.component.scss
@@ -10,6 +10,10 @@ my-small-loader ::ng-deep .root {
 .action-button {
   @include peertube-button-link;
   @include button-with-icon(21px, 0, -2px);
+
+  > :nth-child(2) {
+    margin-left: 5px;
+  }
 }
 
 .orange-button {
diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html
index 08771110d..d5be1470e 100644
--- a/client/src/app/shared/shared-main/users/user-notifications.component.html
+++ b/client/src/app/shared/shared-main/users/user-notifications.component.html
@@ -43,7 +43,7 @@
       </ng-container>
 
       <ng-container *ngSwitchCase="UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS">
-        <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>
+        <my-global-icon iconName="flag" aria-hidden="true"></my-global-icon>
 
         <div class="message" i18n>
           <a (click)="markAsRead(notification)" [routerLink]="notification.videoAbuseUrl">A new video abuse</a> has been created on video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoAbuse.video.name }}</a>
@@ -81,7 +81,7 @@
       </ng-container>
 
       <ng-container *ngSwitchCase="UserNotificationType.MY_VIDEO_PUBLISHED">
-        <my-global-icon iconName="sparkle" aria-hidden="true"></my-global-icon>
+        <my-global-icon iconName="film" aria-hidden="true"></my-global-icon>
 
         <div class="message" i18n>
           Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been published
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index 9bd0741df..3d1fc8690 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -283,7 +283,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
           label: this.i18n('Report'),
           handler: () => this.showReportModal(),
           isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.report,
-          iconName: 'alert'
+          iconName: 'flag'
         }
       ],
       [ // actions regarding the account/its server