diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
index f055f198db405f1393b5cae802a1e4099b922a89..7367b3299a9e1a28ad6d4fa65ffbc8529638eb5a 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
@@ -26,11 +26,9 @@
                 <tr>
                   <th nowrap>
                     Source Set
-                    <mat-icon
-                      class="down-arrow"
-                      aria-label="Down arrow icon"
-                      fontIcon="subdirectory_arrow_right"
-                    />
+                    <mat-icon class="down-arrow" aria-label="Down arrow icon">
+                      subdirectory_arrow_right
+                    </mat-icon>
                     Source
                   </th>
                   <th nowrap>Type</th>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
index e3d7925dde9d8b898b5380ac607eeb5bdf76c0ba..d5e18ca03eaa4cd718f81c7ec8b15ffe97a396e4 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.html
@@ -27,19 +27,15 @@
       <span class="logs-toolbar-item">
         <mat-button-toggle-group>
           <mat-button-toggle matTooltip="Scroll to Top" (click)="scrollTop()">
-            <mat-icon
-              aria-label="Scroll to top"
-              fontIcon="vertical_align_top"
-            />
+            <mat-icon aria-label="Scroll to top"> vertical_align_top </mat-icon>
           </mat-button-toggle>
           <mat-button-toggle
             matTooltip="Scroll to Bottom"
             (click)="scrollBottom()"
           >
-            <mat-icon
-              aria-label="Scroll to bottom"
-              fontIcon="vertical_align_bottom"
-            />
+            <mat-icon aria-label="Scroll to bottom">
+              vertical_align_bottom
+            </mat-icon>
           </mat-button-toggle>
         </mat-button-toggle-group>
       </span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html
index d39af39529127541c76ee835bf0b5e3c90c5ab4c..d5fca73b56ae72a0887b31be8a6c3c58ddb89abb 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.html
@@ -15,7 +15,7 @@
     class="download-button"
     (click)="download()"
   >
-    <mat-icon aria-label="Download from cloud" fontIcon="cloud_download" />
+    <mat-icon aria-label="Download from cloud"> cloud_download </mat-icon>
   </button>
 
   <button
@@ -24,6 +24,6 @@
     matTooltip="Click to dismiss"
     (click)="dismiss()"
   >
-    <mat-icon aria-label="Close" fontIcon="close" />
+    <mat-icon aria-label="Close"> close </mat-icon>
   </button>
 </span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
index a702754e061f06a5d383234f411333007271de71..83b08889787220f98934dd7e4f5c5740f4504391 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
@@ -63,7 +63,7 @@
                   "
                 />
                 <span matPrefix>
-                  <mat-icon aria-label="Memory icon" fontIcon="memory" />
+                  <mat-icon aria-label="Memory icon">memory</mat-icon>
                 </span>
                 <a
                   matSuffix
@@ -73,7 +73,7 @@
                   target="__blank"
                   color="primary"
                 >
-                  <mat-icon aria-label="Info icon" fontIcon="info" />
+                  <mat-icon aria-label="Info icon">info</mat-icon>
                 </a>
                 <mat-hint> The AWS EC2 instance type </mat-hint>
                 <mat-error>Must not contain spaces</mat-error>
@@ -110,7 +110,7 @@
                   [formControl]="form.controls.nshmpConfig.controls.email"
                 />
                 <span matPrefix>
-                  <mat-icon aria-label="Email icon" fontIcon="email" />
+                  <mat-icon aria-label="Email icon">email</mat-icon>
                 </span>
                 <mat-error>Must be a valid USGS email</mat-error>
                 <mat-hint>Email to recieve notifications from AWS</mat-hint>
@@ -138,7 +138,7 @@
                       "
                     />
                     <span matPrefix>
-                      <mat-icon aria-label="Code icon" fontIcon="code" />
+                      <mat-icon aria-label="Code icon">code</mat-icon>
                     </span>
                     <a
                       matSuffix
@@ -148,7 +148,7 @@
                       target="__blank"
                       color="primary"
                     >
-                      <mat-icon aria-label="Info icon" fontIcon="info" />
+                      <mat-icon aria-label="Info icon">info</mat-icon>
                     </a>
                     <mat-error>
                       Must be a valid URL ending in <code>.git</code>
@@ -170,7 +170,7 @@
                       "
                     />
                     <span matPrefix>
-                      <mat-icon aria-label="Code icon" fontIcon="code" />
+                      <mat-icon aria-label="Code icon">code</mat-icon>
                     </span>
                     <mat-hint>
                       The branch, tag, or commit of the nshmp-haz repository
@@ -195,7 +195,7 @@
                       }
                     </mat-select>
                     <span matPrefix>
-                      <mat-icon aria-label="Code icon" fontIcon="code" />
+                      <mat-icon aria-label="Code icon">code</mat-icon>
                     </span>
                     <a
                       matSuffix
@@ -205,7 +205,7 @@
                       target="__blank"
                       color="primary"
                     >
-                      <mat-icon aria-label="Info icon" fontIcon="info" />
+                      <mat-icon aria-label="Info icon">info</mat-icon>
                     </a>
                     <mat-hint>Java class name of class to run</mat-hint>
                   </mat-form-field>
@@ -238,7 +238,7 @@
                           "
                         />
                         <span matPrefix>
-                          <mat-icon aria-label="Code icon" fontIcon="code" />
+                          <mat-icon aria-label="Code icon">code</mat-icon>
                         </span>
                         <a
                           matSuffix
@@ -248,7 +248,7 @@
                           target="__blank"
                           color="primary"
                         >
-                          <mat-icon aria-label="Info icon" fontIcon="info" />
+                          <mat-icon aria-label="Info icon">info</mat-icon>
                         </a>
                         <mat-error>
                           Must be a valid URL ending in <code>.git</code>
@@ -276,7 +276,7 @@
                           "
                         />
                         <span matPrefix>
-                          <mat-icon aria-label="Code icon" fontIcon="code" />
+                          <mat-icon aria-label="Code icon">code</mat-icon>
                         </span>
                         <mat-error>
                           Must be a valid URL ending in <code>.git</code>
@@ -311,7 +311,7 @@
                       "
                     />
                     <span matPrefix>
-                      <mat-icon aria-label="Plot icon" fontIcon="show_chart" />
+                      <mat-icon aria-label="Plot icon">show_chart</mat-icon>
                     </span>
                     <a
                       matSuffix
@@ -321,7 +321,7 @@
                       target="__blank"
                       color="primary"
                     >
-                      <mat-icon aria-label="Info icon" fontIcon="info" />
+                      <mat-icon aria-label="Info icon">info</mat-icon>
                     </a>
                     <mat-hint>The Git URL to the NSHM repository</mat-hint>
                     <mat-error>
@@ -343,9 +343,7 @@
                       "
                     />
                     <span matPrefix>
-                      <mat-icon aria-label="Code icon" fontIcon="code"
-                        >code</mat-icon
-                      >
+                      <mat-icon aria-label="Code icon">code</mat-icon>
                     </span>
                     <mat-error>Must not contain spaces</mat-error>
                     <mat-hint>
@@ -366,7 +364,7 @@
                       "
                     />
                     <span matPrefix>
-                      <mat-icon aria-label="Folder icon" fontIcon="folder" />
+                      <mat-icon aria-label="Folder icon">folder</mat-icon>
                     </span>
                     <mat-error>Must not contain spaces</mat-error>
                     <mat-hint>Path inside tarball to model</mat-hint>
@@ -412,7 +410,7 @@
                       "
                     />
                     <span matPrefix>
-                      <mat-icon aria-label="Note icon" fontIcon="note_add" />
+                      <mat-icon aria-label="Note icon">note_add</mat-icon>
                     </span>
                     <a
                       matSuffix
@@ -422,7 +420,7 @@
                       target="__blank"
                       color="primary"
                     >
-                      <mat-icon aria-label="Info icon" fontIcon="info" />
+                      <mat-icon aria-label="Info icon">info</mat-icon>
                     </a>
                     <mat-error> Must be a valid URL </mat-error>
                     <mat-hint
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
index 100d4e3dbd24d262896af3980b10fe667d71856a..c3018fa9ad6098e5f978e2cab24a336db9bf1d5a 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
@@ -70,7 +70,7 @@
                     matTooltip="Download the configuration file"
                     (click)="downloadConfiguration(serviceResponse)"
                   >
-                    <mat-icon fontIcon="download" aria-label="Download icon" />
+                    <mat-icon aria-label="Download icon">download</mat-icon>
                   </button>
 
                   <button
@@ -81,7 +81,7 @@
                       service.clearHistory(serviceResponse.response.jobId)
                     "
                   >
-                    <mat-icon fontIcon="delete" aria-label="Delete icon" />
+                    <mat-icon aria-label="Delete icon">delete</mat-icon>
                   </button>
                 </div>
               </mat-card-actions>
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
index c227eda608e5ae7244be3ed05f16ff6432bdad36..a741a95660f2b880eec84a44d294860d246fca82 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
@@ -11,7 +11,7 @@
         <mat-label>Job ID <span class="form-required">*</span></mat-label>
         <input matInput type="text" [formControl]="form.controls.id" />
         <div matSuffix matTooltip="The id of the running job to terminate">
-          <mat-icon aria-label="Info icon" fontIcon="info" />
+          <mat-icon aria-label="Info icon">info</mat-icon>
         </div>
         <mat-hint>The id of the running job to terminate</mat-hint>
       </mat-form-field>
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
index e095673423654534dd022843ac19e7aacc506b9b..74f774163f4e5d60470d51e8846c331d245fbd72 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
@@ -81,7 +81,7 @@
             class="margin-0 margin-top-neg-105"
             (click)="removeLocation(index)"
           >
-            <mat-icon fontIcon="remove" />
+            <mat-icon>remove</mat-icon>
           </button>
         </span>
       }
@@ -122,7 +122,7 @@
     type="button"
     color="secondary"
   >
-    <mat-icon fontIcon="add" />
+    <mat-icon>add</mat-icon>
     Add additional location
   </button>
 
diff --git a/projects/nshmp-apps/src/app/services/components/content/content.component.html b/projects/nshmp-apps/src/app/services/components/content/content.component.html
index fd7dbe5e0fc7633395097f930af04960f7c4a37e..c381cbe8b972209a9deec6c653963776849794de 100644
--- a/projects/nshmp-apps/src/app/services/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/services/components/content/content.component.html
@@ -30,17 +30,15 @@
         >
           @if (sidenavCollapsed === false) {
             <div class="icon-text">
-              <mat-icon
-                aria-label="Left arrow icon"
-                fontIcon="keyboard_double_arrow_left"
-              />
+              <mat-icon aria-label="Left arrow icon">
+                keyboard_double_arrow_left
+              </mat-icon>
               <span>Collapse sidebar</span>
             </div>
           } @else {
-            <mat-icon
-              aria-label="Right arrow icon"
-              fontIcon="keyboard_double_arrow_right"
-            />
+            <mat-icon aria-label="Right arrow icon">
+              keyboard_double_arrow_right
+            </mat-icon>
           }
         </button>
       </div>
@@ -60,7 +58,7 @@
                     mat-icon-button
                     (click)="onLinkIconClick(serviceGroup.id)"
                   >
-                    <mat-icon aria-label="Link Icon" fontIcon="link" />
+                    <mat-icon aria-label="Link Icon">link</mat-icon>
                   </button>
                   {{ serviceGroup.title }}
                 </div>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
index 67e0d34170ff59f7a32d96b9681823acbadba4f1..47f433ac422dfceb0b0b27914bb734251939733a 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/control-panel/control-panel.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="formGroup" class="height-full overflow-auto">
   <div class="settings-section">
-    <mat-label class="settings-section--label">Model Layers</mat-label>
+    <mat-label class="label">Model Layers</mat-label>
     <div class="settings-subsection padding-top-1">
       <div class="settings-subsection--section">
         <nshmp-lib-ng-hazard-model-form
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html
index a9c8dbb791871c0b9419c6ee03e643f7f0832fc3..9b096a51c76a8d1ad192ea4315183040d066099e 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/plot-settings-panel/plot-settings-panel.component.html
@@ -1,6 +1,6 @@
 <div class="height-full overflow-auto">
   <div class="settings-section">
-    <mat-label class="settings-section--label">Map Settings</mat-label>
+    <mat-label class="label">Map Settings</mat-label>
 
     <div class="padding-x-2">
       <div class="padding-top-2">