diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js
index 2e8716b9..26a7f6d4 100644
--- a/ayanova/src/api/gzmenu.js
+++ b/ayanova/src/api/gzmenu.js
@@ -107,7 +107,7 @@ export default {
 
       vm.appBar.menuItems.push({
         title: "Review",
-        icon: "fa-calendar-check",
+        icon: "$ayiCalendarCheck",
         key: "app:review",
         data: { ayaType: formAyaType, recordId: formRecordId }
       });
@@ -116,7 +116,7 @@ export default {
       //anything not would be the exception rather than the rule
       vm.appBar.menuItems.push({
         title: "History",
-        icon: "fa-history",
+        icon: "$ayiHistory",
         key: "app:history",
         data: { ayaType: formAyaType, recordId: formRecordId }
       });
@@ -176,7 +176,7 @@ export default {
       //For all forms but not on the search form itself; if this is necessary for others then make a nosearch or something flag controlled by incoming ctx but if not then this should suffice
       vm.appBar.menuItems.push({
         title: "Search",
-        icon: "fa-search",
+        icon: "$ayiSearch",
         key: "app:search",
         data: formAyaType
       });
@@ -185,7 +185,7 @@ export default {
     //HELP
     vm.appBar.menuItems.push({
       title: "MenuHelp",
-      icon: "fa-question-circle",
+      icon: "$ayiQuestionCircle",
       key: "app:help",
       data: vm.appBar.helpUrl
     });
@@ -194,7 +194,7 @@ export default {
     if (!isCoreBizObject && ctx.helpUrl != "form-ay-about") {
       vm.appBar.menuItems.push({
         title: "HelpAboutAyaNova",
-        icon: "fa-info-circle",
+        icon: "$ayiInfoCircle",
         key: "app:nav:abt",
         data: "ay-about"
       });
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index cc2176b2..30faf1ba 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -168,7 +168,7 @@ function initNavPanel() {
     ) {
       sub.push({
         title: "Search",
-        icon: "fa-search",
+        icon: "$ayiSearch",
         route: "/home-search",
         key: key++
       });
@@ -177,7 +177,7 @@ function initNavPanel() {
     //HISTORY / MRU / ACTIVITY (personal)
     sub.push({
       title: "History",
-      icon: "fa-history",
+      icon: "$ayiHistory",
       route: `/history/3/${window.$gz.store.state.userId}/true`,
       key: key++
     });
@@ -663,7 +663,7 @@ function initNavPanel() {
     //EVENT LOG / HISTORY
     sub.push({
       title: "History",
-      icon: "fa-history",
+      icon: "$ayiHistory",
       route: "/adm-history",
       key: key++
     });
@@ -717,7 +717,7 @@ function initNavPanel() {
     // LOGS
     sub.push({
       title: "ServerLog",
-      icon: "fa-history",
+      icon: "$ayiHistory",
       route: "/ops-log",
       key: key++
     });
@@ -749,7 +749,7 @@ function initNavPanel() {
     // OPS VIEW SERVER CONFIGURATION
     sub.push({
       title: "ViewServerConfiguration",
-      icon: "fa-info-circle",
+      icon: "$ayiInfoCircle",
       route: "/ops-view-configuration",
       key: key++
     });
diff --git a/ayanova/src/components/extension-tags-control.vue b/ayanova/src/components/extension-tags-control.vue
index 24bee854..85488cda 100644
--- a/ayanova/src/components/extension-tags-control.vue
+++ b/ayanova/src/components/extension-tags-control.vue
@@ -28,7 +28,7 @@
           ></v-text-field>
         </v-col>
       </v-row>
-      <v-btn icon @click="goHelp()"><v-icon>fa-question-circle</v-icon></v-btn>
+      <v-btn icon @click="goHelp()"><v-icon>$ayiQuestionCircle</v-icon></v-btn>
       <v-btn
         :disabled="!canDoAction()"
         color="blue darken-1"
diff --git a/ayanova/src/components/gzconfirm.vue b/ayanova/src/components/gzconfirm.vue
index 32a98189..39e750e0 100644
--- a/ayanova/src/components/gzconfirm.vue
+++ b/ayanova/src/components/gzconfirm.vue
@@ -14,7 +14,7 @@
             <v-icon large color="success">fa-check-circle</v-icon>
           </template>
           <template v-if="options.type == 'info'">
-            <v-icon large color="info">fa-info-circle</v-icon>
+            <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>
diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index 085ebac4..f62fbb12 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -118,7 +118,7 @@ export default {
     },
     errors(val) {
       if (this.hasError()) {
-        this.errorIcon = "fa-question-circle";
+        this.errorIcon = "$ayiQuestionCircle";
       } else {
         this.errorIcon = null;
       }
diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
index 3b6b556d..03ddce2a 100644
--- a/ayanova/src/components/wiki-control.vue
+++ b/ayanova/src/components/wiki-control.vue
@@ -278,7 +278,7 @@
 
               <!-- HELP -->
               <v-btn depressed tile class="ml-1" @click="goHelp()">
-                <v-icon>fa-question-circle</v-icon></v-btn
+                <v-icon>$ayiQuestionCircle</v-icon></v-btn
               >
               <!-- END OF BUTTONS -->
             </div>
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index 894a7c27..9ecfa0bf 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -14,15 +14,18 @@ Vue.component("font-awesome-icon", FontAwesomeIcon); // Register component globa
 import {
   faBars,
   faBell,
+  faCalendarCheck,
   faCaretDown,
   faChevronDown,
   faEllipsisV,
   faEye,
   faEyeSlash,
+  faHistory,
   faInfoCircle,
   faUser,
   faKey,
   faQuestionCircle,
+  faSearch,
   faSignInAlt,
   faSignOutAlt
 } from "@fortawesome/free-solid-svg-icons";
@@ -32,14 +35,17 @@ Vue.component("font-awesome-icon", FontAwesomeIcon);
 library.add(
   faBars,
   faBell,
+  faCalendarCheck,
   faCaretDown,
   faChevronDown,
   faEllipsisV,
   faEye,
   faEyeSlash,
+  faHistory,
   faInfoCircle,
   faKey,
   faQuestionCircle,
+  faSearch,
   faSignInAlt,
   faSignOutAlt,
   faUser
@@ -52,6 +58,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "bell"]
     }
   },
+  ayiCalendarCheck: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "calendar-check"]
+    }
+  },
   ayiEye: {
     component: FontAwesomeIcon,
     props: {
@@ -70,6 +82,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "ellipsis-v"]
     }
   },
+  ayiHistory: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "history"]
+    }
+  },
+  ayiInfoCircle: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "info-circle"]
+    }
+  },
   ayiKey: {
     component: FontAwesomeIcon,
     props: {
@@ -82,6 +106,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "question-circle"]
     }
   },
+  ayiSearch: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "search"]
+    }
+  },
   ayiSignIn: {
     component: FontAwesomeIcon,
     props: {
diff --git a/ayanova/src/views/adm-history.vue b/ayanova/src/views/adm-history.vue
index c81138ac..bfe7f1d9 100644
--- a/ayanova/src/views/adm-history.vue
+++ b/ayanova/src/views/adm-history.vue
@@ -76,7 +76,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-history",
+    icon: "$ayiHistory",
     title: "History",
     helpUrl: "form-adm-history",
     hideSearch: true,
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index deb8a59b..dff75c03 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -93,7 +93,7 @@
                 <v-card-title>
                   <v-text-field
                     v-model="search"
-                    append-icon="fa-search"
+                    append-icon="$ayiSearch"
                     :label="$ay.t('Search')"
                     single-line
                     hide-details
diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index 07d24b72..6ad9694f 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -191,7 +191,7 @@ export default {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: false,
-    icon: "fa-info-circle",
+    icon: "$ayiInfoCircle",
     title: "HelpAboutAyaNova",
     helpUrl: "form-ay-about",
     menuItems: [
diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index a4481c24..add7aa50 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -359,7 +359,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: false,
-    icon: "fa-history",
+    icon: "$ayiHistory",
     title: "History",
     helpUrl: "form-ay-history",
     menuItems: []
diff --git a/ayanova/src/views/ay-log.vue b/ayanova/src/views/ay-log.vue
index 8270e3e2..1d8bc41c 100644
--- a/ayanova/src/views/ay-log.vue
+++ b/ayanova/src/views/ay-log.vue
@@ -14,7 +14,7 @@ export default {
     let vm = this;
     window.$gz.eventBus.$emit("menu-change", {
       isMain: false,
-      icon: "fa-info-circle",
+      icon: "$ayiInfoCircle",
       title: "Log",
       helpUrl: "form-ay-log",
 
diff --git a/ayanova/src/views/ay-review.vue b/ayanova/src/views/ay-review.vue
index 944624f7..195c90c5 100644
--- a/ayanova/src/views/ay-review.vue
+++ b/ayanova/src/views/ay-review.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-calendar-check",
+      icon: "$ayiCalendarCheck",
       title: "Review",
       helpUrl: "form-ay-review"
     });
diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue
index a7e8831d..7297ea47 100644
--- a/ayanova/src/views/home-search.vue
+++ b/ayanova/src/views/home-search.vue
@@ -27,7 +27,7 @@
           <v-col cols="12" sm="4" lg="4" xl="3">
             <v-btn color="primary" v-on:click="getDataFromApi()" value="SEARCH">
               <v-icon :data-cy="!!$ay.dev ? 'btnsearch' : false"
-                >fa-search</v-icon
+                >$ayiSearch</v-icon
               >
             </v-btn>
           </v-col>
@@ -67,7 +67,7 @@
                           :data-cy="
                             !!$ay.dev ? 'btnexcerpt' + item.index : false
                           "
-                          >fa-info-circle</v-icon
+                          >$ayiInfoCircle</v-icon
                         >
                       </v-btn>
                     </v-list-item-action>
@@ -329,7 +329,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-search",
+    icon: "$ayiSearch",
     title: "Search",
     helpUrl: "form-home-search",
     hideSearch: true,
diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue
index b7806d3c..aa1bbd35 100644
--- a/ayanova/src/views/ops-log.vue
+++ b/ayanova/src/views/ops-log.vue
@@ -145,7 +145,7 @@ export default {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-history",
+    icon: "$ayiHistory",
     title: "ServerLog",
     helpUrl: "form-ops-log",
     formData: {
diff --git a/ayanova/src/views/ops-view-configuration.vue b/ayanova/src/views/ops-view-configuration.vue
index 18c2ddf4..5e307ad8 100644
--- a/ayanova/src/views/ops-view-configuration.vue
+++ b/ayanova/src/views/ops-view-configuration.vue
@@ -179,7 +179,7 @@ export default {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-info-circle",
+    icon: "$ayiInfoCircle",
     title: "ViewServerConfiguration",
     helpUrl: "ops-config-environment-variables",
     menuItems: []