diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
index d383d1153c7..79f18803727 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
@@ -26,28 +26,42 @@
 <div class="tw-mt-4 tw-flex tw-flex-col" *ngIf="!(isLoading$ | async) && dataSource.data.length">
   <h2 class="tw-mb-6" bitTypography="h2">{{ "allApplications" | i18n }}</h2>
   <div class="tw-flex tw-gap-6">
-    <dirt-card
-      #allAppsOrgAtRiskMembers
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{ 'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskMembers' }"
-      [title]="'atRiskMembers' | i18n"
-      [value]="applicationSummary.totalAtRiskMemberCount"
-      [maxValue]="applicationSummary.totalMemberCount"
+    <button
+      type="button"
+      class="tw-flex-1"
+      tabindex="0"
       (click)="showOrgAtRiskMembers('allAppsOrgAtRiskMembers')"
     >
-    </dirt-card>
-    <dirt-card
-      #allAppsOrgAtRiskApplications
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskApplications',
-      }"
-      [title]="'atRiskApplications' | i18n"
-      [value]="applicationSummary.totalAtRiskApplicationCount"
-      [maxValue]="applicationSummary.totalApplicationCount"
+      <dirt-card
+        #allAppsOrgAtRiskMembers
+        class="tw-w-full"
+        [ngClass]="{
+          'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskMembers',
+        }"
+        [title]="'atRiskMembers' | i18n"
+        [value]="applicationSummary.totalAtRiskMemberCount"
+        [maxValue]="applicationSummary.totalMemberCount"
+      >
+      </dirt-card>
+    </button>
+    <button
+      type="button"
+      class="tw-flex-1"
+      tabindex="0"
       (click)="showOrgAtRiskApps('allAppsOrgAtRiskApplications')"
     >
-    </dirt-card>
+      <dirt-card
+        #allAppsOrgAtRiskApplications
+        class="tw-w-full"
+        [ngClass]="{
+          'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskApplications',
+        }"
+        [title]="'atRiskApplications' | i18n"
+        [value]="applicationSummary.totalAtRiskApplicationCount"
+        [maxValue]="applicationSummary.totalApplicationCount"
+      >
+      </dirt-card>
+    </button>
   </div>
   <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
     <bit-search
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
index d263e043ddc..720c3ec04d0 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
@@ -48,17 +48,14 @@
         <app-vault-icon *ngIf="row.ciphers.length > 0" [cipher]="row.ciphers[0]"></app-vault-icon>
       </td>
       <td
-        bitCell
         class="tw-cursor-pointer"
-        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
-        (click)="showAppAtRiskMembers(row.applicationName)"
-        (keydown.enter)="showAppAtRiskMembers(row.applicationName)"
-        (keydown.space)="showAppAtRiskMembers(row.applicationName)"
-        role="button"
-        tabindex="0"
         [attr.aria-label]="'viewItem' | i18n"
+        [ngClass]="{ 'tw-bg-primary-100': isDrawerIsOpenForThisRecord(row.applicationName) }"
+        bitCell
       >
-        <span>{{ row.applicationName }}</span>
+        <button type="button" tabindex="0" (click)="showAppAtRiskMembers(row.applicationName)">
+          <span>{{ row.applicationName }}</span>
+        </button>
       </td>
       <td
         bitCell
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
index a3312dfa4cf..f78880b34a0 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
@@ -44,30 +44,42 @@
     </button>
   </div>
   <div class="tw-flex tw-gap-6">
-    <dirt-card
-      #criticalAppsAtRiskMembers
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskMembers',
-      }"
-      [title]="'atRiskMembers' | i18n"
-      [value]="applicationSummary.totalAtRiskMemberCount"
-      [maxValue]="applicationSummary.totalMemberCount"
+    <button
+      type="button"
+      class="tw-flex-1"
+      tabindex="0"
       (click)="showOrgAtRiskMembers('criticalAppsAtRiskMembers')"
     >
-    </dirt-card>
-    <dirt-card
-      #criticalAppsAtRiskApplications
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskApplications',
-      }"
-      [title]="'atRiskApplications' | i18n"
-      [value]="applicationSummary.totalAtRiskApplicationCount"
-      [maxValue]="applicationSummary.totalApplicationCount"
+      <dirt-card
+        #criticalAppsAtRiskMembers
+        class="tw-w-full"
+        [ngClass]="{
+          'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskMembers',
+        }"
+        [title]="'atRiskMembers' | i18n"
+        [value]="applicationSummary.totalAtRiskMemberCount"
+        [maxValue]="applicationSummary.totalMemberCount"
+      >
+      </dirt-card>
+    </button>
+    <button
+      type="button"
+      class="tw-flex-1"
+      tabindex="0"
       (click)="showOrgAtRiskApps('criticalAppsAtRiskApplications')"
     >
-    </dirt-card>
+      <dirt-card
+        #criticalAppsAtRiskApplications
+        class="tw-w-full"
+        [ngClass]="{
+          'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskApplications',
+        }"
+        [title]="'atRiskApplications' | i18n"
+        [value]="applicationSummary.totalAtRiskApplicationCount"
+        [maxValue]="applicationSummary.totalApplicationCount"
+      >
+      </dirt-card>
+    </button>
   </div>
   <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
     <bit-search
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
index ab00d2955a1..3c2d5cd0a15 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html
@@ -15,15 +15,17 @@
       "dataLastUpdated" | i18n: (dataLastUpdated$ | async | date: "MMMM d, y 'at' h:mm a")
     }}</span>
     <span class="tw-flex tw-justify-center tw-w-16">
-      <a
+      <button
         *ngIf="!(isRefreshing$ | async)"
+        type="button"
         bitButton
-        buttonType="unstyled"
+        buttonType="secondary"
         class="tw-border-none !tw-font-normal tw-cursor-pointer !tw-py-0"
+        tabindex="0"
         [bitAction]="refreshData.bind(this)"
       >
         {{ "refresh" | i18n }}
-      </a>
+      </button>
       <span>
         <i
           *ngIf="isRefreshing$ | async"