diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js
index 26a7f6d4..a1a0a557 100644
--- a/ayanova/src/api/gzmenu.js
+++ b/ayanova/src/api/gzmenu.js
@@ -122,17 +122,6 @@ export default {
       });
     }
 
-    // //PLUGINS - for anything with a type but not necessarily an ID
-    // if (!UTILITY_TYPES.includes(formAyaType)) {
-    //   vm.appBar.menuItems.push({
-    //     title: "More",
-    //     icon: "fa-puzzle-piece",
-    //     key: "app:plugin",
-    //     data: formAyaType,
-    //     recordId: formRecordId
-    //   });
-    // }
-
     //CUSTOMIZE
     //set custom fields and link to translation text editor
 
@@ -153,7 +142,7 @@ export default {
       //customize
       vm.appBar.menuItems.push({
         title: "Customize",
-        icon: "fa-sliders-h",
+        icon: "$ayiCustomize",
         data: ctx.formData.formCustomTemplateKey,
         key: "app:customize"
       });
diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js
index c8f05e17..b0cc97fe 100644
--- a/ayanova/src/api/gzutil.js
+++ b/ayanova/src/api/gzutil.js
@@ -324,13 +324,13 @@ export default {
       case window.$gz.type.Translation:
         return "fa-language";
       case window.$gz.type.UserOptions:
-        return "fa-user-cog";
+        return "$ayiUserCog";
       case window.$gz.type.FileAttachment:
         return "fa-paperclip";
       case window.$gz.type.DataListView:
         return "fa-filter";
       case window.$gz.type.FormCustom:
-        return "fa-sliders-h";
+        return "$ayiCustomize";
       default:
         return null;
     }
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 30faf1ba..53d4bb7f 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -49,14 +49,14 @@ function initNavPanel() {
     //USER SETTINGS
     sub.push({
       title: "UserSettings",
-      icon: "fa-user-cog",
+      icon: "$ayiUserCog",
       route: "/home-user-settings",
       key: key++
     });
 
     sub.push({
       title: "NotifySubscriptionList",
-      icon: "fa-bullhorn",
+      icon: "$ayiBullhorn",
       route: "/home-notify-subscriptions",
       key: key++
     });
@@ -64,7 +64,7 @@ function initNavPanel() {
     //CSR LIST subitem
     sub.push({
       title: "CustomerServiceRequestList",
-      icon: "fa-child",
+      icon: "$ayiChild",
       route: "/customer-csr-list",
       key: key++
     });
@@ -79,7 +79,7 @@ function initNavPanel() {
 
     //** CUSTOMER LOGIN HOME (TOP)
 
-    addNavItem("Home", "fa-home", undefined, sub, key++, "homecustomer");
+    addNavItem("Home", "$ayiHome", undefined, sub, key++, "homecustomer");
 
     return;
   }
@@ -209,7 +209,7 @@ function initNavPanel() {
     //USER SETTINGS
     sub.push({
       title: "UserSettings",
-      icon: "fa-user-cog",
+      icon: "$ayiUserCog",
       route: "/home-user-settings",
       key: key++
     });
@@ -250,14 +250,14 @@ function initNavPanel() {
     ) {
       sub.push({
         title: "NotifySubscriptionList",
-        icon: "fa-bullhorn",
+        icon: "$ayiBullhorn",
         route: "/home-notify-subscriptions",
         key: key++
       });
     }
 
     //HOME
-    addNavItem("Home", "fa-home", undefined, sub, key++, "home");
+    addNavItem("Home", "$ayiHome", undefined, sub, key++, "home");
   }
 
   //******************  CUSTOMERS
@@ -481,7 +481,7 @@ function initNavPanel() {
     ) {
       sub.push({
         title: "CustomerServiceRequestList",
-        icon: "fa-child",
+        icon: "$ayiChild",
         route: "/svc-csr-list",
         key: key++
       });
@@ -741,7 +741,7 @@ function initNavPanel() {
     //NOTIFICATION CONFIG AND HISTORY
     sub.push({
       title: "NotificationSettings",
-      icon: "fa-bullhorn",
+      icon: "$ayiBullhorn",
       route: "/ops-notification-settings",
       key: key++
     });
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index 9ecfa0bf..daed69fa 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -14,20 +14,26 @@ Vue.component("font-awesome-icon", FontAwesomeIcon); // Register component globa
 import {
   faBars,
   faBell,
+  faBullhorn,
   faCalendarCheck,
   faCaretDown,
   faChevronDown,
+  faChild,
   faEllipsisV,
   faEye,
   faEyeSlash,
   faHistory,
+  faHome,
   faInfoCircle,
-  faUser,
   faKey,
   faQuestionCircle,
   faSearch,
   faSignInAlt,
-  faSignOutAlt
+  faSignOutAlt,
+  faSlidersH,
+  faTools,
+  faUser,
+  faUserCog
 } from "@fortawesome/free-solid-svg-icons";
 //import { faUserCircle as farUserCircle } from "@fortawesome/free-regular-svg-icons";
 Vue.component("font-awesome-icon", FontAwesomeIcon);
@@ -35,20 +41,26 @@ Vue.component("font-awesome-icon", FontAwesomeIcon);
 library.add(
   faBars,
   faBell,
+  faBullhorn,
   faCalendarCheck,
   faCaretDown,
   faChevronDown,
+  faChild,
   faEllipsisV,
   faEye,
   faEyeSlash,
   faHistory,
+  faHome,
   faInfoCircle,
   faKey,
   faQuestionCircle,
   faSearch,
   faSignInAlt,
   faSignOutAlt,
-  faUser
+  faSlidersH,
+  faTools,
+  faUser,
+  faUserCog
 );
 
 const CUSTOM_ICONS = {
@@ -58,12 +70,30 @@ const CUSTOM_ICONS = {
       icon: ["fas", "bell"]
     }
   },
+  ayiBullhorn: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "bullhorn"]
+    }
+  },
   ayiCalendarCheck: {
     component: FontAwesomeIcon,
     props: {
       icon: ["fas", "calendar-check"]
     }
   },
+  ayiChild: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "child"]
+    }
+  },
+  ayiCustomize: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "sliders-h"]
+    }
+  },
   ayiEye: {
     component: FontAwesomeIcon,
     props: {
@@ -88,6 +118,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "history"]
     }
   },
+  ayiHome: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "home"]
+    }
+  },
   ayiInfoCircle: {
     component: FontAwesomeIcon,
     props: {
@@ -124,12 +160,24 @@ const CUSTOM_ICONS = {
       icon: ["fas", "sign-out-alt"]
     }
   },
+  ayiTools: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "tools"]
+    }
+  },
   ayiUser: {
     component: FontAwesomeIcon,
     props: {
       icon: ["fas", "user"]
     }
   },
+  ayiUserCog: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "user-cog"]
+    }
+  },
   //VUETIFY REQUIRED ONES
   //https://vuetifyjs.com/en/features/icons/#using-custom-icons
   dropdown: {
diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue
index 648935ff..0b1c7305 100644
--- a/ayanova/src/views/ay-customize.vue
+++ b/ayanova/src/views/ay-customize.vue
@@ -276,7 +276,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: false,
-    icon: "fa-sliders-h",
+    icon: "$ayiCustomize",
     title: "Customize",
     helpUrl: "form-ay-customize",
     formData: {
diff --git a/ayanova/src/views/customer-csr-list.vue b/ayanova/src/views/customer-csr-list.vue
index 6a1ae5e6..f3f7231f 100644
--- a/ayanova/src/views/customer-csr-list.vue
+++ b/ayanova/src/views/customer-csr-list.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-child",
+      icon: "$ayiChild",
       title: "CustomerServiceRequestList",
       helpUrl: "form-customer-csr-list"
     });
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index 0b175029..6850251d 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -641,7 +641,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: false,
-    icon: "fa-bullhorn",
+    icon: "$ayiBullhorn",
     title: "NotifySubscription",
     helpUrl: "form-home-notify-subscriptions",
     formData: {
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index 082f35d0..32f33ff1 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -158,7 +158,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-bullhorn",
+    icon: "$ayiBullhorn",
     title: "NotifySubscriptionList",
     helpUrl: "form-home-notify-subscriptions",
     menuItems: [],
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 87156e81..5489e204 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -392,7 +392,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-user-cog",
+    icon: "$ayiUserCog",
     title: "UserSettings",
     helpUrl: "form-home-user-settings",
     formData: {
diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue
index 5ec6d1f8..635e38f0 100644
--- a/ayanova/src/views/ops-notification-settings.vue
+++ b/ayanova/src/views/ops-notification-settings.vue
@@ -402,7 +402,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-bullhorn",
+    icon: "$ayiBullhorn",
     title: "NotificationSettings",
     helpUrl: "form-ops-notification-settings",
     formData: {
diff --git a/ayanova/src/views/ops-notify-queue.vue b/ayanova/src/views/ops-notify-queue.vue
index 059a65c0..162600e6 100644
--- a/ayanova/src/views/ops-notify-queue.vue
+++ b/ayanova/src/views/ops-notify-queue.vue
@@ -185,7 +185,7 @@ export default {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-bullhorn",
+    icon: "$ayiBullhorn",
     title: "NotifyQueue",
     helpUrl: "form-ops-notify-queue",
     formData: {
diff --git a/ayanova/src/views/svc-csr-list.vue b/ayanova/src/views/svc-csr-list.vue
index 9ac853fd..b8e8341c 100644
--- a/ayanova/src/views/svc-csr-list.vue
+++ b/ayanova/src/views/svc-csr-list.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-child",
+      icon: "$ayiChild",
       title: "CustomerServiceRequestList",
       helpUrl: "form-svc-csr-list"
     });