diff --git a/make/DEBIAN/control b/make/DEBIAN/control
index 269e7b93d..b512be623 100644
--- a/make/DEBIAN/control
+++ b/make/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 2.3.1-beta.8
+Version: 2.3.1-beta.9
 Architecture: amd64
 Maintainer: Google <ssm-orcas@google.com>
 Homepage: https://github.com/google/testrun
diff --git a/modules/ui/src/app/components/list-layout/list-layout.component.html b/modules/ui/src/app/components/list-layout/list-layout.component.html
index cbf234637..f8ef856f7 100644
--- a/modules/ui/src/app/components/list-layout/list-layout.component.html
+++ b/modules/ui/src/app/components/list-layout/list-layout.component.html
@@ -47,6 +47,7 @@
                 (click)="clearSearch()"
                 class="clear-search-button"
                 mat-icon-button
+                matTooltip="Clear search"
                 aria-label="Clear search">
                 <mat-icon>close</mat-icon>
               </button>
diff --git a/modules/ui/src/app/components/list-layout/list-layout.component.ts b/modules/ui/src/app/components/list-layout/list-layout.component.ts
index b8647a4f7..304cd3754 100644
--- a/modules/ui/src/app/components/list-layout/list-layout.component.ts
+++ b/modules/ui/src/app/components/list-layout/list-layout.component.ts
@@ -33,6 +33,7 @@ import { EntityAction, EntityActionResult } from '../../model/entity-action';
 import { Device } from '../../model/device';
 import { LayoutType } from '../../model/layout-type';
 import { Profile } from '../../model/profile';
+import { MatTooltipModule } from '@angular/material/tooltip';
 
 @Component({
   selector: 'app-list-layout',
@@ -43,6 +44,7 @@ import { Profile } from '../../model/profile';
     MatToolbarModule,
     MatIconModule,
     ListItemComponent,
+    MatTooltipModule,
   ],
   providers: [DatePipe],
   templateUrl: './list-layout.component.html',