diff --git a/ayanova/src/components/date-time-non-native-control.vue b/ayanova/src/components/date-time-non-native-control.vue
index b6640ae7..faf5294e 100644
--- a/ayanova/src/components/date-time-non-native-control.vue
+++ b/ayanova/src/components/date-time-non-native-control.vue
@@ -46,7 +46,7 @@
               v-on="on"
               v-model="formatTime"
               label
-              prepend-icon="fa-clock"
+              prepend-icon="$ayiClock"
               @click:prepend="dlgtime = true"
               readonly
               :error="!!error"
diff --git a/ayanova/src/components/error-control.vue b/ayanova/src/components/error-control.vue
index 4c2f1d73..e2db5bf5 100644
--- a/ayanova/src/components/error-control.vue
+++ b/ayanova/src/components/error-control.vue
@@ -5,7 +5,7 @@
       :data-cy="!!$ay.dev ? 'errorbox' : false"
       v-show="errorBoxMessage"
       color="error"
-      icon="fa-exclamation-circle "
+      icon="$ayiExclamationCircle"
       transition="scale-transition"
       class="multi-line"
       outlined
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index f02a42dd..24cb05e9 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -112,7 +112,7 @@
                   <template v-else-if="c.t == 6">
                     <!-- BOOL -->
                     <div class="text-center">
-                      <v-icon v-if="c.v === false" small>far fa-square</v-icon>
+                      <v-icon v-if="c.v === false" small>$ayiSquare</v-icon>
                       <v-icon v-else-if="c.v === true" small
                         >far $ayiCheckSquare</v-icon
                       >
@@ -199,7 +199,7 @@
               @click="props.toggleSelectAll(!props.everyItem)"
               class="pl-2 pt-2"
             >
-              <v-icon v-if="!props.someItems" large>far fa-square</v-icon>
+              <v-icon v-if="!props.someItems" large>$ayiSquare</v-icon>
               <v-icon v-if="props.someItems && !props.everyItem" large
                 >far $ayiMinus-square</v-icon
               >
@@ -285,7 +285,7 @@
                             <!-- BOOL -->
                             <div>
                               <v-icon v-if="c.v === false" small
-                                >far fa-square</v-icon
+                                >$ayiSquare</v-icon
                               >
                               <v-icon v-else-if="c.v === true" small
                                 >far $ayiCheckSquare</v-icon
diff --git a/ayanova/src/components/gzconfirm.vue b/ayanova/src/components/gzconfirm.vue
index b34100d0..31284076 100644
--- a/ayanova/src/components/gzconfirm.vue
+++ b/ayanova/src/components/gzconfirm.vue
@@ -17,7 +17,7 @@
             <v-icon large color="info">$ayiInfoCircle</v-icon>
           </template>
           <template v-if="options.type == 'warning'">
-            <v-icon large color="warning">fa-exclamation-circle</v-icon>
+            <v-icon large color="warning">$ayiExclamationCircle</v-icon>
           </template>
           <template v-if="options.type == 'error'">
             <v-icon large color="error">fa-exclamation-triangle</v-icon>
diff --git a/ayanova/src/components/time-non-native-control.vue b/ayanova/src/components/time-non-native-control.vue
index 71be1684..bd7e7218 100644
--- a/ayanova/src/components/time-non-native-control.vue
+++ b/ayanova/src/components/time-non-native-control.vue
@@ -8,7 +8,7 @@
               v-on="on"
               v-model="formatTime"
               v-bind:label="label"
-              prepend-icon="fa-clock"
+              prepend-icon="$ayiClock"
               @click:prepend="dlgtime = true"
               readonly
               :error="!!error"
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index f685ff2a..d04eef5c 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -11,6 +11,7 @@ import { library } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
 Vue.component("font-awesome-icon", FontAwesomeIcon); // Register component globally
+import { faSquare as farSquare } from "@fortawesome/free-regular-svg-icons";
 import {
   faAddressBook,
   faAddressCard,
@@ -33,6 +34,7 @@ import {
   faCheckSquare,
   faChevronDown,
   faChild,
+  faClock,
   faCode,
   faCogs,
   faColumns,
@@ -42,6 +44,7 @@ import {
   faDoorOpen,
   faEdit,
   faEllipsisV,
+  faExclamationCircle,
   faEye,
   faEyeSlash,
   faFan,
@@ -113,7 +116,7 @@ import {
   faUserTie,
   faVial
 } from "@fortawesome/free-solid-svg-icons";
-//import { faUserCircle as farUserCircle } from "@fortawesome/free-regular-svg-icons";
+
 Vue.component("font-awesome-icon", FontAwesomeIcon);
 
 library.add(
@@ -138,6 +141,7 @@ library.add(
   faCheckSquare,
   faChevronDown,
   faChild,
+  faClock,
   faCode,
   faCogs,
   faColumns,
@@ -147,6 +151,7 @@ library.add(
   faDoorOpen,
   faEdit,
   faEllipsisV,
+  faExclamationCircle,
   faEye,
   faEyeSlash,
   faFan,
@@ -202,6 +207,7 @@ library.add(
   faSignOutAlt,
   faSitemap,
   faSlidersH,
+  farSquare,
   faSquareFull,
   faStickyNote,
   faStore,
@@ -328,6 +334,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "child"]
     }
   },
+  ayiClock: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "clock"]
+    }
+  },
   ayiCode: {
     component: FontAwesomeIcon,
     props: {
@@ -382,6 +394,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "edit"]
     }
   },
+  ayiExclamationCircle: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "exclamation-circle"]
+    }
+  },
   ayiEye: {
     component: FontAwesomeIcon,
     props: {
@@ -712,6 +730,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "sitemap"]
     }
   },
+  ayiSquare: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["far", "square"]
+    }
+  },
   ayiSquareFull: {
     component: FontAwesomeIcon,
     props: {