diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html
index 6dae99227..94421498c 100644
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@@ -124,15 +124,15 @@
         >
       </li>
       @if (hasPermissionToAccessAssistant) {
-        <li class="list-inline-item">
+        <li class="d-inline-flex list-inline-item">
           <button
             #assistantTrigger="matMenuTrigger"
             class="h-100 no-min-width px-2"
-            mat-button
-            matBadge="✓"
+            matBadge="&NoBreak;"
             matBadgeSize="small"
-            [mat-menu-trigger-for]="assistantMenu"
+            matButton
             [matBadgeHidden]="!hasFilters || !hasPermissionToChangeFilters"
+            [matMenuTriggerFor]="assistantMenu"
             [matMenuTriggerRestoreFocus]="false"
             (menuOpened)="onOpenAssistant()"
           >
diff --git a/apps/client/src/app/components/header/header.component.scss b/apps/client/src/app/components/header/header.component.scss
index 28927abec..1fb88757d 100644
--- a/apps/client/src/app/components/header/header.component.scss
+++ b/apps/client/src/app/components/header/header.component.scss
@@ -32,17 +32,6 @@
         text-underline-offset: 0.25rem;
       }
 
-      &.mat-badge {
-        ::ng-deep {
-          .mat-badge-content {
-            --mat-badge-small-size-container-overlap-offset: -0.9rem;
-            --mat-badge-small-size-text-size: 0;
-
-            transform: scale(0.45);
-          }
-        }
-      }
-
       ion-icon {
         font-size: 1.5rem;
 
diff --git a/apps/client/src/styles/theme.scss b/apps/client/src/styles/theme.scss
index a4310f05b..887459cc1 100644
--- a/apps/client/src/styles/theme.scss
+++ b/apps/client/src/styles/theme.scss
@@ -305,6 +305,12 @@ $_tertiary: map.merge(map.get($_palettes, tertiary), $_rest);
     }
   }
 
+  @include mat.badge-overrides(
+    (
+      background-color: var(--gf-theme-primary-500)
+    )
+  );
+
   @include mat.button-overrides(
     (
       filled-container-color: var(--gf-theme-primary-500)