diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html
index b4dae3f95..8126c7246 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.html
@@ -2,32 +2,34 @@
   <div class="position-relative me-3">
     <my-actor-avatar [actor]="actor" [actorType]="actorType" [previewImage]="preview" size="100"></my-actor-avatar>
 
-    <div *ngIf="editable && !hasAvatar()" class="actor-img-edit-button button-focus-within" [ngbTooltip]="avatarFormat" placement="right" container="body">
-      <my-global-icon iconName="upload"></my-global-icon>
-      <label class="visually-hidden" for="avatarfile" i18n>Upload a new avatar</label>
-      <input #avatarfileInput type="file" name="avatarfile" id="avatarfile" [accept]="avatarExtensions" (change)="onAvatarChange(avatarfileInput)"/>
-    </div>
+    @if (editable) {
+      @if (hasAvatar()) {
+        <div ngbDropdown placement="right">
+          <button type="button" class="actor-img-edit-button" i18n-arialLabel aria-label="Change your avatar" ngbDropdownToggle>
+            <my-global-icon iconName="edit"></my-global-icon>
+          </button>
 
-    <div *ngIf="editable && hasAvatar()" ngbDropdown placement="right">
-      <button type="button" class="actor-img-edit-button" ngbDropdownToggle>
-        <my-global-icon iconName="edit"></my-global-icon>
-        <label class="visually-hidden" for="avatarMenu" i18n>Change your avatar</label>
-      </button>
+          <div ngbDropdownMenu>
+            <div class="dropdown-item dropdown-file button-focus-within" [ngbTooltip]="avatarFormat">
+              <my-global-icon iconName="upload"></my-global-icon>
+              <label for="avatarfile" i18n>Upload a new avatar</label>
+              <input #avatarfileInput type="file" name="avatarfile" id="avatarfile" [accept]="avatarExtensions" (change)="onAvatarChange(avatarfileInput)"/>
+            </div>
 
-      <div ngbDropdownMenu>
-        <div class="dropdown-item dropdown-file button-focus-within" [ngbTooltip]="avatarFormat">
+            <button type="button" class="dropdown-item" (click)="deleteAvatar()" (key.enter)="deleteAvatar()">
+              <my-global-icon iconName="delete"></my-global-icon>
+              <span i18n>Remove avatar</span>
+            </button>
+          </div>
+        </div>
+      } @else {
+        <div class="actor-img-edit-button button-focus-within" [ngbTooltip]="avatarFormat" placement="right" container="body">
           <my-global-icon iconName="upload"></my-global-icon>
-          <span for="avatarfile" i18n>Upload a new avatar</span>
+          <label class="visually-hidden" for="avatarfile" i18n>Upload a new avatar</label>
           <input #avatarfileInput type="file" name="avatarfile" id="avatarfile" [accept]="avatarExtensions" (change)="onAvatarChange(avatarfileInput)"/>
         </div>
-
-        <button type="button" class="dropdown-item" (click)="deleteAvatar()" (key.enter)="deleteAvatar()">
-          <my-global-icon iconName="delete"></my-global-icon>
-          <span i18n>Remove avatar</span>
-        </button>
-      </div>
-
-    </div>
+      }
+    }
   </div>
 
   <div class="actor-info">
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
index 56d7376f5..46b30d2c9 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
@@ -45,6 +45,11 @@
 
 .dropdown-item {
   @include dropdown-with-icon-item;
+
+  label {
+    font-weight: normal;
+    margin: 0;
+  }
 }
 
 .dropdown-toggle::after {
diff --git a/client/src/app/shared/shared-custom-markup/custom-markup-help.component.html b/client/src/app/shared/shared-custom-markup/custom-markup-help.component.html
index 73a2b4058..fc649db59 100644
--- a/client/src/app/shared/shared-custom-markup/custom-markup-help.component.html
+++ b/client/src/app/shared/shared-custom-markup/custom-markup-help.component.html
@@ -1,3 +1,3 @@
 <ng-container i18n>
-  <a href="https://en.wikipedia.org/wiki/Markdown#Example" target="_blank" rel="noreferrer noopener">Markdown compatible</a> that also supports <a href="https://docs.joinpeertube.org/api/custom-client-markup" target="_blank" rel="noreferrer noopener">custom PeerTube HTML tags</a>
+  <a class="text-decoration-underline" href="https://en.wikipedia.org/wiki/Markdown#Example" target="_blank" rel="noreferrer noopener">Markdown compatible</a> that also supports <a class="text-decoration-underline" href="https://docs.joinpeertube.org/api/custom-client-markup" target="_blank" rel="noreferrer noopener">custom PeerTube HTML tags</a>
 </ng-container>