diff --git a/app/src/components/confirmationDialog/ConfirmationDialog.tsx b/app/src/components/confirmationDialog/ConfirmationDialog.tsx
index 1bb0086..90a2628 100644
--- a/app/src/components/confirmationDialog/ConfirmationDialog.tsx
+++ b/app/src/components/confirmationDialog/ConfirmationDialog.tsx
@@ -7,6 +7,7 @@ import {
   DialogContentText,
   DialogTitle,
   Icon,
+  IconName,
   Spinner
 } from '@noahspan/noahspan-components';
 import { IDialogConfirmationProps } from './IConfirmationDialogProps';
@@ -33,13 +34,13 @@ const ConfirmationDialog = ({
         {isLoading && <Spinner />}
       </DialogContent>
       <DialogActions>
-        <Button onClick={onCancel} variant="outlined" startIcon={<Icon iconName='fa-xmark' />}>
+        <Button onClick={onCancel} variant="outlined" startIcon={<Icon iconName={IconName.XMARK} />}>
           No
         </Button>
         <Button
           onClick={onConfirm}
           variant="contained"
-          startIcon={<Icon iconName='fa-circle-check' />}
+          startIcon={<Icon iconName={IconName.CIRCLE_CHECK} />}
         >
           Yes
         </Button>
diff --git a/app/src/components/logForm/LogForm.tsx b/app/src/components/logForm/LogForm.tsx
index 4644495..ed99327 100644
--- a/app/src/components/logForm/LogForm.tsx
+++ b/app/src/components/logForm/LogForm.tsx
@@ -898,7 +898,7 @@ const LogForm: React.FC<ILogFormProps> = ({
                     ? state.isDisabled
                     : false
                 }
-                startIcon={<Icon iconName='fa-xmark' />}
+                startIcon={<Icon iconName={IconName.XMARK} />}
                 variant="outlined"
                 onClick={onCancel}
                 size="small"
@@ -908,7 +908,7 @@ const LogForm: React.FC<ILogFormProps> = ({
               {mode.toString() !== FormMode.VIEW && (
                 <Button
                   disabled={state.isDisabled}
-                  startIcon={<Icon iconName='fa-save' />}
+                  startIcon={<Icon iconName={IconName.SAVE} />}
                   size="small"
                   type="submit"
                   variant="contained"
diff --git a/app/src/components/pilotFormCertificates/PilotFormCertificates.tsx b/app/src/components/pilotFormCertificates/PilotFormCertificates.tsx
index 9b4a1a0..d01e0c5 100644
--- a/app/src/components/pilotFormCertificates/PilotFormCertificates.tsx
+++ b/app/src/components/pilotFormCertificates/PilotFormCertificates.tsx
@@ -129,7 +129,7 @@ const PilotFormCertificates = ({
                       marginTop: '-5px'
                     }}
                   >
-                    <Icon iconName={IconName.TRASH} size='md' />
+                    <Icon iconName={IconName.TRASH} size='sm' />
                   </IconButton>
                 </Grid>
               </>