diff --git a/src/lib/listing/page-header/page-header.component.html b/src/lib/listing/page-header/page-header.component.html
index 6afdef3..bd9a456 100644
--- a/src/lib/listing/page-header/page-header.component.html
+++ b/src/lib/listing/page-header/page-header.component.html
@@ -63,7 +63,6 @@
                     [icon]="config.icon"
                     [iqserHelpMode]="config.helpModeKey"
                     [overlappingElements]="config.overlappingElements"
-                    [tooltipPosition]="'below'"
                     [tooltip]="config.label"
                 ></iqser-circle-button>
             </ng-container>
@@ -79,7 +78,6 @@
                 [icon]="'iqser:close'"
                 [iqserHelpMode]="'edit_dossier_in_dossier'"
                 [overlappingElements]="['USER_MENU']"
-                [tooltipPosition]="'below'"
                 [tooltip]="'common.close' | translate"
             ></iqser-circle-button>
         </div>
diff --git a/src/lib/users/components/initials-avatar/initials-avatar.component.html b/src/lib/users/components/initials-avatar/initials-avatar.component.html
index 4cc1f24..6112b93 100644
--- a/src/lib/users/components/initials-avatar/initials-avatar.component.html
+++ b/src/lib/users/components/initials-avatar/initials-avatar.component.html
@@ -2,7 +2,7 @@
     <div
         [className]="colorClass + ' oval ' + size + (hasBorder ? ' border' : '')"
         [matTooltipPosition]="tooltipPosition"
-        [matTooltip]="userName"
+        [matTooltip]="showTooltip ? userName : ''"
     >
         {{ _user | name : { showInitials: true } }}
     </div>
diff --git a/src/lib/users/components/initials-avatar/initials-avatar.component.ts b/src/lib/users/components/initials-avatar/initials-avatar.component.ts
index 0b4fbaf..25fd3d0 100644
--- a/src/lib/users/components/initials-avatar/initials-avatar.component.ts
+++ b/src/lib/users/components/initials-avatar/initials-avatar.component.ts
@@ -20,6 +20,7 @@ export class InitialsAvatarComponent<Interface extends IIqserUser = IIqserUser,
     @Input() showYou = false;
     @Input() tooltipPosition: 'below' | 'above' = 'above';
     @Input() defaultValue: string = this._translateService.instant('initials-avatar.unassigned');
+    @Input() showTooltip = true;
     colorClass?: string;
     namePipeOptions?: NamePipeOptions;
 
diff --git a/src/lib/users/components/user-button/user-button.component.html b/src/lib/users/components/user-button/user-button.component.html
index 517a08e..05da46f 100644
--- a/src/lib/users/components/user-button/user-button.component.html
+++ b/src/lib/users/components/user-button/user-button.component.html
@@ -1,4 +1,4 @@
-<button [class.overlay]="showDot" mat-button>
+<button [class.overlay]="showDot" [matTooltipPosition]="'below'" [matTooltip]="'user-menu.button-text' | translate" mat-button>
     <ng-container *ngIf="icon; else initialsAvatar">
         <mat-icon [svgIcon]="icon" class="mr-8"></mat-icon>
         {{ userService.currentUser$ | async | name }}
@@ -10,5 +10,5 @@
 <div *ngIf="showDot" class="dot"></div>
 
 <ng-template #initialsAvatar>
-    <iqser-initials-avatar [user]="userService.currentUser$ | async" [withName]="true"></iqser-initials-avatar>
+    <iqser-initials-avatar [user]="userService.currentUser$ | async" [withName]="true" [showTooltip]="false"></iqser-initials-avatar>
 </ng-template>
diff --git a/src/lib/users/iqser-users.module.ts b/src/lib/users/iqser-users.module.ts
index 4d3ed8c..3bdf686 100644
--- a/src/lib/users/iqser-users.module.ts
+++ b/src/lib/users/iqser-users.module.ts
@@ -17,6 +17,7 @@ import { CommonModule } from '@angular/common';
 import { UserButtonComponent } from './components/user-button/user-button.component';
 import { MatIconModule } from '@angular/material/icon';
 import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { TranslateModule } from '@ngx-translate/core';
 
 function getKeycloakOptions(baseUrl: string, configService: IqserConfigService): KeycloakOptions {
     let url: string = configService.values.OAUTH_URL;
@@ -60,7 +61,7 @@ export function keycloakInitializer(
 const components = [NamePipe, InitialsAvatarComponent, UserButtonComponent];
 
 @NgModule({
-    imports: [KeycloakAngularModule, MatTooltipModule, CommonModule, MatIconModule, MatButtonModule],
+    imports: [KeycloakAngularModule, MatTooltipModule, CommonModule, MatIconModule, MatButtonModule, TranslateModule],
     declarations: [...components],
     exports: [...components],
 })