diff --git a/modules/ui/src/app/components/device-item/device-item.component.html b/modules/ui/src/app/components/device-item/device-item.component.html
index 7b728b33c..568e8d4e6 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.html
+++ b/modules/ui/src/app/components/device-item/device-item.component.html
@@ -41,6 +41,7 @@
     [tabIndex]="tabIndex"
     (click)="itemClick()"
     attr.aria-label="Edit device {{ label }}"
+    matTooltip="Edit device"
     class="device-item button-edit"
     type="button">
     <ng-container
diff --git a/modules/ui/src/app/components/list-item/list-item.component.ts b/modules/ui/src/app/components/list-item/list-item.component.ts
index 2728ee503..b9dc12a56 100644
--- a/modules/ui/src/app/components/list-item/list-item.component.ts
+++ b/modules/ui/src/app/components/list-item/list-item.component.ts
@@ -28,7 +28,7 @@ import { MatIconModule } from '@angular/material/icon';
 import { CommonModule } from '@angular/common';
 import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
 import { EntityAction } from '../../model/entity-action';
-import { MatTooltip } from '@angular/material/tooltip';
+import { MatTooltip, MatTooltipModule } from '@angular/material/tooltip';
 
 @Component({
   selector: 'app-list-item',
@@ -39,6 +39,8 @@ import { MatTooltip } from '@angular/material/tooltip';
     MatMenu,
     MatMenuItem,
     CommonModule,
+    MatTooltipModule,
+    MatTooltip,
   ],
   providers: [MatTooltip],
   templateUrl: './list-item.component.html',