diff --git a/libs/components/src/navigation/nav-logo.component.ts b/libs/components/src/navigation/nav-logo.component.ts
index fec50ee8902..370fb96e06f 100644
--- a/libs/components/src/navigation/nav-logo.component.ts
+++ b/libs/components/src/navigation/nav-logo.component.ts
@@ -3,14 +3,14 @@ import { RouterLinkActive, RouterLink } from "@angular/router";
 
 import { BitwardenShield, Icon } from "@bitwarden/assets/svg";
 
-import { BitIconComponent } from "../icon/icon.component";
+import { SvgComponent } from "../svg/svg.component";
 
 import { SideNavService } from "./side-nav.service";
 
 @Component({
   selector: "bit-nav-logo",
   templateUrl: "./nav-logo.component.html",
-  imports: [RouterLinkActive, RouterLink, BitIconComponent],
+  imports: [RouterLinkActive, RouterLink, SvgComponent],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class NavLogoComponent {
diff --git a/libs/components/src/no-items/no-items.component.ts b/libs/components/src/no-items/no-items.component.ts
index c6e52a1f83d..d2cacfd2251 100644
--- a/libs/components/src/no-items/no-items.component.ts
+++ b/libs/components/src/no-items/no-items.component.ts
@@ -1,18 +1,17 @@
-import { Component, input } from "@angular/core";
+import { ChangeDetectionStrategy, Component, input } from "@angular/core";
 
 import { NoResults } from "@bitwarden/assets/svg";
 
-import { BitIconComponent } from "../icon/icon.component";
+import { SvgComponent } from "../svg/svg.component";
 
 /**
  * Component for displaying a message when there are no items to display. Expects title, description and button slots.
  */
-// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
-// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
 @Component({
   selector: "bit-no-items",
   templateUrl: "./no-items.component.html",
-  imports: [BitIconComponent],
+  imports: [SvgComponent],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class NoItemsComponent {
   readonly icon = input(NoResults);