diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index ea840200..015ecbf9 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -3,8 +3,8 @@
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
 
-todo: chunk-vendors has fa-brands in it which is fucking huge, what else is in there I don't need?
-	eradicate fa-brands!
+todo: chunk-vendors has fa - brands in it which is fucking huge, what else is in there I don't need?
+	eradicate fa - brands!
 	Looks like I'm doing it wrong, I was using a generic NPM module when there is a Vue specific one that also has guidance to limit to just the icons I actually use:
 		https://github.com/FortAwesome/vue-fontawesome
 		This could be a big breaking change so need to do it carefully and all at once as it's own project
diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js
index a1a0a557..6b857f71 100644
--- a/ayanova/src/api/gzmenu.js
+++ b/ayanova/src/api/gzmenu.js
@@ -90,14 +90,14 @@ export default {
     if (isCoreBizObject) {
       // vm.appBar.menuItems.push({
       //   title: "Attachments"),
-      //   icon: "fa-paperclip",
+      //   icon: "fa - paperclip",
       //   key: "app:attachments",
       //   data: { ayaType: formAyaType, recordId: formRecordId }
       // });
 
       // vm.appBar.menuItems.push({
       //   title: "WikiPage"),
-      //   icon: "fa-feather",
+      //   icon: "fa - feather",
       //   key: "app:wiki",
       //   data: { ayaType: formAyaType, recordId: formRecordId }
       // });
diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js
index 6cefaa96..2db6024e 100644
--- a/ayanova/src/api/gzutil.js
+++ b/ayanova/src/api/gzutil.js
@@ -5,15 +5,15 @@
 //
 
 const icons = {
-  image: "fa-file-image",
-  pdf: "fa-file-pdf",
-  word: "fa-file-word",
+  image: "$ayiFileImage",
+  pdf: "$ayiFilePdf",
+  word: "$ayiFileWord",
   powerpoint: "fa-file-powerpoint",
   excel: "fa-file-excel",
   csv: "fa-file-csv",
   audio: "fa-file-audio",
   video: "fa-file-video",
-  archive: "fa-file-archive",
+  archive: "$ayiFileArchive",
   code: "fa-file-code",
   text: "fa-file-alt",
   file: "fa-file"
@@ -304,9 +304,9 @@ export default {
       case window.$gz.type.User:
         return "fa-user";
       case window.$gz.type.Widget:
-        return "fa-vial";
+        return "$ayiVial";
       case window.$gz.type.ServerState:
-        return "fa-door-open";
+        return "$ayiDoorOpen";
       case window.$gz.type.License:
         return "$ayiTicket";
       case window.$gz.type.LogFile:
@@ -314,13 +314,13 @@ export default {
       case window.$gz.type.PickListTemplate:
         return "fa-pencil-ruler";
       case window.$gz.type.ServerJob:
-        return "fa-robot";
+        return "$ayiRobot";
       case window.$gz.type.AyaNova7Import:
         return "fa-file-import";
       case window.$gz.type.TrialSeeder:
         return "fa-seedling";
       case window.$gz.type.Metrics:
-        return "fa-file-medical-alt";
+        return "$ayiFileMedicalAlt";
       case window.$gz.type.Translation:
         return "$ayiLanguage";
       case window.$gz.type.UserOptions:
@@ -375,7 +375,7 @@ export default {
   // attempt to detect image extension name
   //
   isImageAttachment: function(fileName, mimeType) {
-    return this.iconForFile(fileName, mimeType) == "fa-file-image";
+    return this.iconForFile(fileName, mimeType) == "$ayiFileImage";
   },
   ///////////////////////////////////////////////
   // Sleep async
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 84852f98..86c2e3c4 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -352,7 +352,7 @@ function initNavPanel() {
     //there used to be an array for 3rd level shit but that's whack yo! ;)
     // subSub.push({
     //   title: "WorkOrderServiceTemplate",
-    //   icon: "fa-stamp",
+    //   icon: "fa - stamp",
     //   route: "/svc-workorder-templates",
     //   key: key++
     // });
@@ -669,7 +669,7 @@ function initNavPanel() {
     // ARCHIVE
     sub.push({
       title: "Backup",
-      icon: "fa-file-archive",
+      icon: "$ayiFileArchive",
       route: "/ops-backup",
       key: key++
     });
@@ -683,7 +683,7 @@ function initNavPanel() {
     // SERVER STATE
     sub.push({
       title: "ServerState",
-      icon: "fa-door-open",
+      icon: "$ayiDoorOpen",
       route: "/ops-server-state",
       key: key++
     });
@@ -691,7 +691,7 @@ function initNavPanel() {
     // JOBS
     sub.push({
       title: "ServerJobs",
-      icon: "fa-robot",
+      icon: "$ayiRobot",
       route: "/ops-jobs",
       key: key++
     });
@@ -707,7 +707,7 @@ function initNavPanel() {
     //METRICS
     sub.push({
       title: "ServerMetrics",
-      icon: "fa-file-medical-alt",
+      icon: "$ayiFileMedicalAlt",
       route: "/ops-metrics",
       key: key++
     });
@@ -715,7 +715,7 @@ function initNavPanel() {
     //PROFILE
     sub.push({
       title: "ServerProfiler",
-      icon: "fa-binoculars",
+      icon: "$ayiBinoculars",
       route: "/ops-profile",
       key: key++
     });
@@ -737,7 +737,7 @@ function initNavPanel() {
     });
 
     // ** OPERATIONS (TOP)
-    addNavItem("Operations", "fa-server", undefined, sub, key++, "operations");
+    addNavItem("Operations", "$ayiServer", undefined, sub, key++, "operations");
   }
 
   //**** WIDGETS (TOP GROUP)
@@ -749,7 +749,7 @@ function initNavPanel() {
       role.InventoryLimited
     ])
   ) {
-    addNavItem("WidgetList", "fa-vial", "/widgets", [], key++, "widgets");
+    addNavItem("WidgetList", "$ayiVial", "/widgets", [], key++, "widgets");
   }
 
   //*** EVALUATION active trial license should always go to evaluation as home page
@@ -757,7 +757,7 @@ function initNavPanel() {
   if ((licenseState == 1) & !isSubcontractorTypeUser) {
     addNavItem(
       "Evaluate",
-      "fa-rocket",
+      "$ayiRocket",
       "/ay-evaluate",
       [],
       key++,
diff --git a/ayanova/src/components/attachment-control.vue b/ayanova/src/components/attachment-control.vue
index 1549a4b0..1ff3ce60 100644
--- a/ayanova/src/components/attachment-control.vue
+++ b/ayanova/src/components/attachment-control.vue
@@ -3,7 +3,7 @@
     <div>
       <v-btn depressed tile @click="revealedClicked">
         {{ $ay.t("Attachments")
-        }}<v-icon v-text="reveal ? 'fa-eye-slash' : 'fa-eye'" right></v-icon
+        }}<v-icon v-text="reveal ? '$ayiEyeSlash' : '$ayiEye'" right></v-icon
       ></v-btn>
     </div>
 
@@ -95,7 +95,7 @@
                 <v-btn depressed tile @click="revealedClicked" class="mt-8">
                   {{ $ay.t("Attachments")
                   }}<v-icon
-                    v-text="reveal ? 'fa-eye-slash' : 'fa-eye'"
+                    v-text="reveal ? '$ayiEyeSlash' : '$ayiEye'"
                     right
                   ></v-icon
                 ></v-btn>
diff --git a/ayanova/src/components/gzconfirm.vue b/ayanova/src/components/gzconfirm.vue
index 39e750e0..b34100d0 100644
--- a/ayanova/src/components/gzconfirm.vue
+++ b/ayanova/src/components/gzconfirm.vue
@@ -11,7 +11,7 @@
       <v-card elevation="24">
         <v-card-title class="text-h6 text-sm-h5 grey lighten-4">
           <template v-if="options.type == 'success'">
-            <v-icon large color="success">fa-check-circle</v-icon>
+            <v-icon large color="success">$ayiCheckCircle</v-icon>
           </template>
           <template v-if="options.type == 'info'">
             <v-icon large color="info">$ayiInfoCircle</v-icon>
diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
index 03ddce2a..250197be 100644
--- a/ayanova/src/components/wiki-control.vue
+++ b/ayanova/src/components/wiki-control.vue
@@ -2,7 +2,7 @@
   <div class="mt-6">
     <div>
       <v-btn depressed tile @click="toggleReveal">
-        Wiki<v-icon v-text="reveal ? 'fa-eye-slash' : 'fa-eye'" right></v-icon
+        Wiki<v-icon v-text="reveal ? '$ayiEyeSlash' : '$ayiEye'" right></v-icon
       ></v-btn>
     </div>
     <template v-if="reveal">
@@ -13,7 +13,7 @@
             :outlined="currentView == view.WIKI_VIEW"
             @click="currentView = view.WIKI_VIEW"
           >
-            <v-icon>fa-eye</v-icon>
+            <v-icon>$ayiEye</v-icon>
           </v-btn>
           <v-btn
             text
@@ -316,7 +316,7 @@
           </v-col>
         </v-row>
         <v-btn depressed tile @click="toggleReveal">
-          Wiki<v-icon v-text="reveal ? 'fa-eye-slash' : 'fa-eye'" right></v-icon
+          Wiki<v-icon v-text="reveal ? '$ayiEyeSlash' : '$ayiEye'" right></v-icon
         ></v-btn>
       </v-sheet>
     </template>
@@ -551,22 +551,22 @@ export default {
 
       if (this.readonly) {
         if (this.currentView == this.view.HIDDEN_VIEW) {
-          return "fa-eye";
+          return "$ayiEye";
         } else {
-          return "fa-eye-slash";
+          return "$ayiEyeSlash";
         }
         return;
       }
 
       switch (this.currentView) {
         case this.view.HIDDEN_VIEW:
-          return "fa-eye";
+          return "$ayiEye";
         case this.view.WIKI_VIEW:
           return "fa-columns";
         case this.view.SPLIT_VIEW:
           return "fa-feather";
         case this.view.DESIGN_VIEW:
-          return "fa-eye";
+          return "$ayiEye";
       }
     },
     showWiki() {
@@ -610,7 +610,7 @@ export default {
       }
     },
     visibleIcon() {
-      return this.wikiVisible ? "fa-eye-slash" : "fa-eye";
+      return this.wikiVisible ? "$ayiEyeSlash" : "$ayiEye";
     },
     //EDITING
     editClick(editType, ex) {
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index 27f94787..6a14d8c9 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -16,6 +16,7 @@ import {
   faAddressCard,
   faBars,
   faBell,
+  faBinoculars,
   faBox,
   faBoxes,
   faBullhorn,
@@ -25,17 +26,24 @@ import {
   faCalendarCheck,
   faCalendarDay,
   faCaretDown,
+  faCheckCircle,
   faChevronDown,
   faChild,
   faCogs,
   faDiceD20,
   faDolly,
   faDollyFlatbed,
+  faDoorOpen,
   faEllipsisV,
   faEye,
   faEyeSlash,
   faFan,
+  faFileArchive,
   faFileContract,
+  faFileImage,
+  faFileMedicalAlt,
+  faFilePdf,
+  faFileWord,
   faFolder,
   faHistory,
   faHome,
@@ -48,7 +56,10 @@ import {
   faPencilAlt,
   faPlug,
   faQuestionCircle,
+  faRobot,
+  faRocket,
   faSearch,
+  faServer,
   faShippingFast,
   faSignInAlt,
   faSignOutAlt,
@@ -64,7 +75,8 @@ import {
   faUser,
   faUserCog,
   faUsers,
-  faUserTie
+  faUserTie,
+  faVial
 } from "@fortawesome/free-solid-svg-icons";
 //import { faUserCircle as farUserCircle } from "@fortawesome/free-regular-svg-icons";
 Vue.component("font-awesome-icon", FontAwesomeIcon);
@@ -74,6 +86,7 @@ library.add(
   faAddressCard,
   faBars,
   faBell,
+  faBinoculars,
   faBox,
   faBoxes,
   faBullhorn,
@@ -83,17 +96,24 @@ library.add(
   faCalendarCheck,
   faCalendarDay,
   faCaretDown,
+  faCheckCircle,
   faChevronDown,
   faChild,
   faCogs,
   faDiceD20,
   faDolly,
   faDollyFlatbed,
+  faDoorOpen,
   faEllipsisV,
   faEye,
   faEyeSlash,
   faFan,
+  faFileArchive,
   faFileContract,
+  faFileImage,
+  faFileMedicalAlt,
+  faFilePdf,
+  faFileWord,
   faFolder,
   faHistory,
   faHome,
@@ -106,7 +126,10 @@ library.add(
   faPencilAlt,
   faPlug,
   faQuestionCircle,
+  faRobot,
+  faRocket,
   faSearch,
+  faServer,
   faShippingFast,
   faSignInAlt,
   faSignOutAlt,
@@ -122,7 +145,8 @@ library.add(
   faUser,
   faUserCog,
   faUsers,
-  faUserTie
+  faUserTie,
+  faVial
 );
 
 const CUSTOM_ICONS = {
@@ -144,6 +168,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "bell"]
     }
   },
+  ayiBinoculars: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "binoculars"]
+    }
+  },
   ayiBox: {
     component: FontAwesomeIcon,
     props: {
@@ -192,6 +222,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "calendar-day"]
     }
   },
+  ayiCheckCircle: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "check-circle"]
+    }
+  },
   ayiChild: {
     component: FontAwesomeIcon,
     props: {
@@ -228,6 +264,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "dolly-flatbed"]
     }
   },
+  ayiDoorOpen: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "door-open"]
+    }
+  },
   ayiEye: {
     component: FontAwesomeIcon,
     props: {
@@ -252,12 +294,42 @@ const CUSTOM_ICONS = {
       icon: ["fas", "fan"]
     }
   },
+  ayiFileArchive: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-archive"]
+    }
+  },
   ayiFileContract: {
     component: FontAwesomeIcon,
     props: {
       icon: ["fas", "file-contract"]
     }
   },
+  ayiFileImage: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-image"]
+    }
+  },
+  ayiFileMedicalAlt: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-medical-alt"]
+    }
+  },
+  ayiFilePdf: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-pdf"]
+    }
+  },
+  ayiFileWord: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-word"]
+    }
+  },
   ayiFolder: {
     component: FontAwesomeIcon,
     props: {
@@ -330,12 +402,30 @@ const CUSTOM_ICONS = {
       icon: ["fas", "question-circle"]
     }
   },
+  ayiRobot: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "robot"]
+    }
+  },
+  ayiRocket: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "rocket"]
+    }
+  },
   ayiSearch: {
     component: FontAwesomeIcon,
     props: {
       icon: ["fas", "search"]
     }
   },
+  ayiServer: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "server"]
+    }
+  },
   ayiShippingFast: {
     component: FontAwesomeIcon,
     props: {
@@ -426,6 +516,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "user-tie"]
     }
   },
+  ayiVial: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "vial"]
+    }
+  },
   //VUETIFY REQUIRED ONES
   //https://vuetifyjs.com/en/features/icons/#using-custom-icons
   dropdown: {
diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index ad8e1874..b8ffa771 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -312,7 +312,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "StartAttachmentMaintenanceJob",
-      icon: "fa-robot",
+      icon: "$ayiRobot",
       surface: false,
       key: FORM_KEY + ":START_MAINTENANCE_JOB",
       vm: vm
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index ade0c0b5..8ead17f9 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -150,7 +150,7 @@
                 id="password"
                 v-model="password"
                 :readonly="formState.readOnly"
-                :append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
+                :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
                 prepend-icon="fa-key"
                 :label="$ay.t('NewPassword')"
                 :type="reveal ? 'text' : 'password'"
diff --git a/ayanova/src/views/ay-evaluate.vue b/ayanova/src/views/ay-evaluate.vue
index 3b666fb3..17aa8baf 100644
--- a/ayanova/src/views/ay-evaluate.vue
+++ b/ayanova/src/views/ay-evaluate.vue
@@ -310,7 +310,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-rocket",
+    icon: "$ayiRocket",
     title: "Evaluate",
     helpUrl: "ay-evaluate",
     menuItems: []
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 5d607158..a2884eee 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -154,7 +154,7 @@
                 id="password"
                 v-model="password"
                 :readonly="formState.readOnly"
-                :append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
+                :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
                 prepend-icon="fa-key"
                 :label="$ay.t('NewPassword')"
                 :type="reveal ? 'text' : 'password'"
diff --git a/ayanova/src/views/home-password.vue b/ayanova/src/views/home-password.vue
index 42c232dc..f5f1da8e 100644
--- a/ayanova/src/views/home-password.vue
+++ b/ayanova/src/views/home-password.vue
@@ -31,7 +31,7 @@
               id="password"
               v-model="obj.oldPassword"
               :readonly="formState.readOnly"
-              :append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
+              :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
               prepend-icon="fa-key"
               :label="$ay.t('OldPassword')"
               :type="reveal ? 'text' : 'password'"
@@ -47,7 +47,7 @@
             <v-text-field
               v-model="obj.newPassword"
               :readonly="formState.readOnly"
-              :append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
+              :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
               prepend-icon="fa-key"
               :label="$ay.t('NewPassword')"
               :type="reveal ? 'text' : 'password'"
@@ -63,7 +63,7 @@
             <v-text-field
               v-model="obj.confirmPassword"
               :readonly="formState.readOnly"
-              :append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
+              :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
               prepend-icon="fa-key"
               :label="$ay.t('ConfirmPassword')"
               :type="reveal ? 'text' : 'password'"
diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue
index c6febb22..29b06df1 100644
--- a/ayanova/src/views/ops-backup.vue
+++ b/ayanova/src/views/ops-backup.vue
@@ -371,7 +371,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-file-archive",
+    icon: "$ayiFileArchive",
     title: "Backup",
     helpUrl: "form-ops-backup",
     formData: {
@@ -392,7 +392,7 @@ function generateMenu(vm) {
 
     menuOptions.menuItems.push({
       title: "BackupNow",
-      icon: "fa-file-archive",
+      icon: "$ayiFileArchive",
       surface: false,
       key: FORM_KEY + ":backupnow",
       vm: vm
diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue
index ddc44b1d..66d40772 100644
--- a/ayanova/src/views/ops-jobs.vue
+++ b/ayanova/src/views/ops-jobs.vue
@@ -174,7 +174,7 @@ export default {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-robot",
+    icon: "$ayiRobot",
     title: "ServerJobs",
     helpUrl: "form-ops-jobs",
     formData: {
@@ -194,7 +194,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "OpsTestJob",
-      icon: "fa-robot",
+      icon: "$ayiRobot",
       surface: false,
       key: FORM_KEY + ":TEST_JOB",
       vm: vm
diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue
index 845dea2d..09cbd66d 100644
--- a/ayanova/src/views/ops-metrics.vue
+++ b/ayanova/src/views/ops-metrics.vue
@@ -455,7 +455,7 @@ function tabIndexToRoute(tabIndex) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-file-medical-alt",
+    icon: "$ayiFileMedicalAlt",
     title: "ServerMetrics",
     helpUrl: "form-ops-metrics",
     formData: {
diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue
index 635e38f0..bf6b9c69 100644
--- a/ayanova/src/views/ops-notification-settings.vue
+++ b/ayanova/src/views/ops-notification-settings.vue
@@ -423,7 +423,7 @@ function generateMenu(vm) {
 
     menuOptions.menuItems.push({
       title: "TestSMTPSettings",
-      icon: "fa-vial",
+      icon: "$ayiVial",
       surface: false,
       key: FORM_KEY + ":test",
       vm: vm
diff --git a/ayanova/src/views/ops-notify-queue.vue b/ayanova/src/views/ops-notify-queue.vue
index 162600e6..8c7ff5e3 100644
--- a/ayanova/src/views/ops-notify-queue.vue
+++ b/ayanova/src/views/ops-notify-queue.vue
@@ -205,7 +205,7 @@ function generateMenu(vm) {
   //   if (vm.rights.change) {
   //     menuOptions.menuItems.push({
   //       title: "OpsTestJob",
-  //       icon: "fa-robot",
+  //       icon: "$ayiRobot",
   //       surface: false,
   //       key: FORM_KEY + ":TEST_JOB",
   //       vm: vm
diff --git a/ayanova/src/views/ops-profile.vue b/ayanova/src/views/ops-profile.vue
index 6a52200a..e8c2a90f 100644
--- a/ayanova/src/views/ops-profile.vue
+++ b/ayanova/src/views/ops-profile.vue
@@ -85,7 +85,7 @@ export default {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-binoculars",
+    icon: "$ayiBinoculars",
     title: "ServerProfiler",
     helpUrl: "form-ops-profile",
     formData: {
diff --git a/ayanova/src/views/ops-server-state.vue b/ayanova/src/views/ops-server-state.vue
index 2a3f3b42..eb94b818 100644
--- a/ayanova/src/views/ops-server-state.vue
+++ b/ayanova/src/views/ops-server-state.vue
@@ -247,7 +247,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-door-open",
+    icon: "$ayiDoorOpen",
     title: "ServerState",
     helpUrl: "form-ops-server-state",
     formData: {
diff --git a/ayanova/src/views/widgets.vue b/ayanova/src/views/widgets.vue
index bfe7df73..41d7844d 100644
--- a/ayanova/src/views/widgets.vue
+++ b/ayanova/src/views/widgets.vue
@@ -113,7 +113,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-vial",
+    icon: "$ayiVial",
     title: "WidgetList",
     helpUrl: "form-ay-data-list-view",
     menuItems: [],