diff --git a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html
index ab11674347..a943c8c29e 100644
--- a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html
+++ b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html
@@ -11,13 +11,13 @@
     <span class="sr-only">{{ "loading" | i18n }}</span>
   </div>
   <div class="mt-4" *ngIf="hasLoaded">
-    <bit-callout type="success" title="{{ 'goodNews' | i18n }}" *ngIf="!ciphers.length">
+    <app-callout type="success" title="{{ 'goodNews' | i18n }}" *ngIf="!ciphers.length">
       {{ "noWeakPasswords" | i18n }}
-    </bit-callout>
+    </app-callout>
     <ng-container *ngIf="ciphers.length">
-      <bit-callout type="danger" title="{{ 'weakPasswordsFound' | i18n }}">
+      <app-callout type="danger" title="{{ 'weakPasswordsFound' | i18n }}">
         {{ "weakPasswordsFoundReportDesc" | i18n: (ciphers.length | number) : vaultMsg }}
-      </bit-callout>
+      </app-callout>
       <bit-toggle-group
         *ngIf="showFilterToggle && !isAdminConsoleActive"
         [selected]="filterOrgStatus$ | async"
@@ -31,33 +31,36 @@
           </bit-toggle>
         </ng-container>
       </bit-toggle-group>
-      <bit-table [dataSource]="dataSource">
-        <ng-container header *ngIf="!isAdminConsoleActive">
+      <table class="table table-hover table-list table-ciphers">
+        <thead
+          class="tw-border-0 tw-border-b-2 tw-border-solid tw-border-secondary-300 tw-font-bold tw-text-muted"
+          *ngIf="!isAdminConsoleActive"
+        >
           <tr>
             <th></th>
             <th>{{ "name" | i18n }}</th>
             <th>{{ "owner" | i18n }}</th>
           </tr>
-        </ng-container>
-        <ng-template body let-rows$>
-          <tr bitRow *ngFor="let r of rows$ | async">
-            <td bitCell>
-              <app-vault-icon [cipher]="r"></app-vault-icon>
+        </thead>
+        <tbody>
+          <tr *ngFor="let c of ciphers">
+            <td class="table-list-icon">
+              <app-vault-icon [cipher]="c"></app-vault-icon>
             </td>
             <td class="reduced-lh wrap">
-              <ng-container *ngIf="!organization || canManageCipher(r); else cantManage">
+              <ng-container *ngIf="!organization || canManageCipher(c); else cantManage">
                 <a
                   href="#"
                   appStopClick
-                  (click)="selectCipher(r)"
+                  (click)="selectCipher(c)"
                   title="{{ 'editItem' | i18n }}"
-                  >{{ r.name }}</a
+                  >{{ c.name }}</a
                 >
               </ng-container>
               <ng-template #cantManage>
-                <span>{{ r.name }}</span>
+                <span>{{ c.name }}</span>
               </ng-template>
-              <ng-container *ngIf="!organization && r.organizationId">
+              <ng-container *ngIf="!organization && c.organizationId">
                 <i
                   class="bwi bwi-collection"
                   appStopProp
@@ -66,7 +69,7 @@
                 ></i>
                 <span class="sr-only">{{ "shared" | i18n }}</span>
               </ng-container>
-              <ng-container *ngIf="r.hasAttachments">
+              <ng-container *ngIf="c.hasAttachments">
                 <i
                   class="bwi bwi-paperclip"
                   appStopProp
@@ -76,26 +79,26 @@
                 <span class="sr-only">{{ "attachments" | i18n }}</span>
               </ng-container>
               <br />
-              <small>{{ r.subTitle }}</small>
+              <small>{{ c.subTitle }}</small>
             </td>
             <td>
               <app-org-badge
                 *ngIf="!organization"
                 [disabled]="disabled"
-                [organizationId]="r.organizationId"
-                [organizationName]="r.organizationId | orgNameFromId: (organizations$ | async)"
+                [organizationId]="c.organizationId"
+                [organizationName]="c.organizationId | orgNameFromId: (organizations$ | async)"
                 appStopProp
               >
               </app-org-badge>
             </td>
             <td class="text-right">
-              <span bitBadge [variant]="passwordStrengthMap.get(r.id)[1]">
-                {{ passwordStrengthMap.get(r.id)[0] | i18n }}
+              <span bitBadge [variant]="passwordStrengthMap.get(c.id)[1]">
+                {{ passwordStrengthMap.get(c.id)[0] | i18n }}
               </span>
             </td>
           </tr>
-        </ng-template>
-      </bit-table>
+        </tbody>
+      </table>
     </ng-container>
   </div>
   <ng-template #cipherAddEdit></ng-template>