diff --git a/ui/app/templates/clients/client/index.hbs b/ui/app/templates/clients/client/index.hbs
index 55653286d..c1b327656 100644
--- a/ui/app/templates/clients/client/index.hbs
+++ b/ui/app/templates/clients/client/index.hbs
@@ -155,7 +155,7 @@
       <span class="pair" data-test-driver-health>
         <span class="term">Drivers</span>
         {{#if this.model.unhealthyDrivers.length}}
-          {{x-icon "warning" class="is-text is-warning"}}
+          {{x-icon "alert-triangle" class="is-text is-warning"}}
           {{this.model.unhealthyDrivers.length}} of {{this.model.detectedDrivers.length}} {{pluralize "driver" this.model.detectedDrivers.length}} unhealthy
         {{else}}
           All healthy
@@ -197,7 +197,7 @@
             <span data-test-force-drain-text class="pair">
               <span class="term">Force Drain</span>
               {{#if this.model.drainStrategy.isForced}}
-                {{x-icon "warning" class="is-text is-warning"}} Yes
+                {{x-icon "alert-triangle" class="is-text is-warning"}} Yes
               {{else}}
                 No
               {{/if}}
diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/templates/components/allocation-row.hbs
index df1d784cf..0fdc3174e 100644
--- a/ui/app/templates/components/allocation-row.hbs
+++ b/ui/app/templates/components/allocation-row.hbs
@@ -1,7 +1,7 @@
 <td data-test-indicators class="is-narrow">
   {{#if this.allocation.unhealthyDrivers.length}}
     <span data-test-icon="unhealthy-driver" class="tooltip text-center" role="tooltip" aria-label="Allocation depends on unhealthy drivers">
-      {{x-icon "warning" class="is-warning"}}
+      {{x-icon "alert-triangle" class="is-warning"}}
     </span>
   {{/if}}
   {{#if this.allocation.nextAllocation}}
diff --git a/ui/app/templates/components/allocation-stat.hbs b/ui/app/templates/components/allocation-stat.hbs
index d7e61e3c8..92bef3857 100644
--- a/ui/app/templates/components/allocation-stat.hbs
+++ b/ui/app/templates/components/allocation-stat.hbs
@@ -3,7 +3,7 @@
     &hellip;
   {{else if this.error}}
     <span class="tooltip is-small text-center" role="tooltip" aria-label="Couldn't collect stats">
-      {{x-icon "warning" class="is-warning"}}
+      {{x-icon "alert-triangle" class="is-warning"}}
     </span>
   {{else}}
     <div class="inline-chart tooltip" role="tooltip" aria-label="{{this.formattedStat}} / {{this.formattedReserved}}">
diff --git a/ui/app/templates/components/client-node-row.hbs b/ui/app/templates/components/client-node-row.hbs
index 013b2b4ea..3e6435af3 100644
--- a/ui/app/templates/components/client-node-row.hbs
+++ b/ui/app/templates/components/client-node-row.hbs
@@ -1,7 +1,7 @@
 <td data-test-icon class="is-narrow">
   {{#if this.node.unhealthyDrivers.length}}
     <span class="tooltip text-center" role="tooltip" aria-label="Client has unhealthy drivers">
-      {{x-icon "warning" class="is-warning"}}
+      {{x-icon "alert-triangle" class="is-warning"}}
     </span>
   {{/if}}
 </td>
diff --git a/ui/app/templates/components/plugin-allocation-row.hbs b/ui/app/templates/components/plugin-allocation-row.hbs
index cb8e60b40..b1a10734a 100644
--- a/ui/app/templates/components/plugin-allocation-row.hbs
+++ b/ui/app/templates/components/plugin-allocation-row.hbs
@@ -2,7 +2,7 @@
   <td data-test-indicators class="is-narrow">
     {{#if this.allocation.unhealthyDrivers.length}}
       <span data-test-icon="unhealthy-driver" class="tooltip text-center" role="tooltip" aria-label="Allocation depends on unhealthy drivers">
-        {{x-icon "warning" class="is-warning"}}
+        {{x-icon "alert-triangle" class="is-warning"}}
       </span>
     {{/if}}
     {{#if this.allocation.nextAllocation}}
diff --git a/ui/app/templates/components/reschedule-event-timeline.hbs b/ui/app/templates/components/reschedule-event-timeline.hbs
index 8aa844b55..8b7e70560 100644
--- a/ui/app/templates/components/reschedule-event-timeline.hbs
+++ b/ui/app/templates/components/reschedule-event-timeline.hbs
@@ -7,7 +7,7 @@
   {{/if}}
   {{#if @allocation.hasStoppedRescheduling}}
     <li class="timeline-note" data-test-stop-warning>
-      {{x-icon "warning" class="is-warning is-text"}} Nomad has stopped attempting to reschedule this allocation.
+      {{x-icon "alert-triangle" class="is-warning is-text"}} Nomad has stopped attempting to reschedule this allocation.
     </li>
   {{/if}}
   {{#if (and @allocation.followUpEvaluation.waitUntil (not @allocation.nextAllocation))}}
diff --git a/ui/app/templates/components/task-row.hbs b/ui/app/templates/components/task-row.hbs
index 54fdfdd88..673df07b0 100644
--- a/ui/app/templates/components/task-row.hbs
+++ b/ui/app/templates/components/task-row.hbs
@@ -1,7 +1,7 @@
 <td class="is-narrow">
   {{#unless this.task.driverStatus.healthy}}
     <span data-test-icon="unhealthy-driver" class="tooltip text-center" aria-label="{{this.task.driver}} is unhealthy">
-      {{x-icon "warning" class="is-warning"}}
+      {{x-icon "alert-triangle" class="is-warning"}}
     </span>
   {{/unless}}
 </td>
@@ -44,7 +44,7 @@
       ...
     {{else if this.statsError}}
       <span class="tooltip text-center" role="tooltip" aria-label="Couldn't collect stats">
-        {{x-icon "warning" class="is-warning"}}
+        {{x-icon "alert-triangle" class="is-warning"}}
       </span>
     {{else}}
       <div class="inline-chart is-small tooltip" role="tooltip" aria-label="{{this.cpu.used}} / {{this.taskStats.reservedCPU}} MHz">
@@ -64,7 +64,7 @@
       ...
     {{else if this.statsError}}
       <span class="tooltip is-small text-center" role="tooltip" aria-label="Couldn't collect stats">
-        {{x-icon "warning" class="is-warning"}}
+        {{x-icon "alert-triangle" class="is-warning"}}
       </span>
     {{else}}
       <div class="inline-chart tooltip" role="tooltip" aria-label="{{format-bytes this.memory.used}} / {{this.taskStats.reservedMemory}} MiB">