diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts
index 4345d1945..319d50cda 100644
--- a/client/src/app/+admin/admin.component.ts
+++ b/client/src/app/+admin/admin.component.ts
@@ -63,14 +63,14 @@ export class AdminComponent implements OnInit {
       moderationItems.children.push({
         label: this.i18n('Muted accounts'),
         routerLink: '/admin/moderation/blocklist/accounts',
-        iconName: 'user'
+        iconName: 'user-x'
       })
     }
     if (this.hasServersBlocklistRight()) {
       moderationItems.children.push({
         label: this.i18n('Muted servers'),
         routerLink: '/admin/moderation/blocklist/servers',
-        iconName: 'server'
+        iconName: 'peertube-x'
       })
     }
 
diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index abc823c62..07cab37fc 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -45,7 +45,7 @@ export class MyAccountComponent implements OnInit {
         {
           label: this.i18n('My subscriptions'),
           routerLink: '/my-account/subscriptions',
-          iconName: 'inbox-full'
+          iconName: 'subscriptions'
         },
         {
           label: this.i18n('My history'),
@@ -69,17 +69,17 @@ export class MyAccountComponent implements OnInit {
         {
           label: this.i18n('Muted accounts'),
           routerLink: '/my-account/blocklist/accounts',
-          iconName: 'user'
+          iconName: 'user-x'
         },
         {
           label: this.i18n('Muted servers'),
           routerLink: '/my-account/blocklist/servers',
-          iconName: 'server'
+          iconName: 'peertube-x'
         },
         {
           label: this.i18n('Ownership changes'),
           routerLink: '/my-account/ownership',
-          iconName: 'ownership-change'
+          iconName: 'download'
         }
       ]
     }
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 6527c27a6..66adb7579 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -7,6 +7,7 @@ const icons = {
   '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,
+  'peertube-x': require('!!raw-loader?!../../../assets/images/misc/peertube-x.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
@@ -42,9 +43,9 @@ const icons = {
   '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,
+  'user-x': require('!!raw-loader?!../../../assets/images/feather/user-x.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,
diff --git a/client/src/assets/images/feather/server.svg b/client/src/assets/images/feather/server.svg
deleted file mode 100644
index 54ce094a5..000000000
--- a/client/src/assets/images/feather/server.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-server"><rect x="2" y="2" width="20" height="8" rx="2" ry="2"></rect><rect x="2" y="14" width="20" height="8" rx="2" ry="2"></rect><line x1="6" y1="6" x2="6.01" y2="6"></line><line x1="6" y1="18" x2="6.01" y2="18"></line></svg>
\ No newline at end of file
diff --git a/client/src/assets/images/feather/user-x.svg b/client/src/assets/images/feather/user-x.svg
new file mode 100644
index 000000000..0c41a4819
--- /dev/null
+++ b/client/src/assets/images/feather/user-x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-user-x"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="8.5" cy="7" r="4"></circle><line x1="18" y1="8" x2="23" y2="13"></line><line x1="23" y1="8" x2="18" y2="13"></line></svg>
\ No newline at end of file
diff --git a/client/src/assets/images/misc/peertube-x.svg b/client/src/assets/images/misc/peertube-x.svg
new file mode 100644
index 000000000..0099e627d
--- /dev/null
+++ b/client/src/assets/images/misc/peertube-x.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;}
+	.st1{fill:#211F20;}
+</style>
+<line class="st0" x1="17.1" y1="9.5" x2="22.1" y2="14.5"/>
+<line class="st0" x1="22.1" y1="9.5" x2="17.1" y2="14.5"/>
+<g>
+	<g>
+		<g>
+			<path class="st1" d="M2,2.6V12l6.9-4.3"/>
+			<path class="st1" d="M2,12v9.4l6.9-5.2"/>
+			<path class="st1" d="M8.9,7.7v8.6l6.9-4.3"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index c68e23bf9..53813e6ab 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -36,6 +36,7 @@ async function run () {
     console.log(' * `support` by Chocobozzz (CC-BY)')
     console.log(' * `language` by Aaron Jin (CC-BY)')
     console.log(' * `video-language` by Rigel Kent (CC-BY)')
+    console.log(' * `peertube-x` by Solen DP (CC-BY)')
   }
 }