diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js
index 9e510211..6cefaa96 100644
--- a/ayanova/src/api/gzutil.js
+++ b/ayanova/src/api/gzutil.js
@@ -322,7 +322,7 @@ export default {
       case window.$gz.type.Metrics:
         return "fa-file-medical-alt";
       case window.$gz.type.Translation:
-        return "fa-language";
+        return "$ayiLanguage";
       case window.$gz.type.UserOptions:
         return "$ayiUserCog";
       case window.$gz.type.FileAttachment:
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 37c06d54..84852f98 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -522,7 +522,7 @@ function initNavPanel() {
     //PURCHASE ORDER RECEIPTS
     sub.push({
       title: "InventoryPurchaseOrderReceipts",
-      icon: "fa-dolly-flatbed",
+      icon: "$ayiDollyFlatbed",
       route: "/inv-purchase-order-receipts",
       key: key++
     });
@@ -534,13 +534,13 @@ function initNavPanel() {
     //ADJUSTMENTS
     sub.push({
       title: "InventoryPartInventoryAdjustments",
-      icon: "fa-dolly",
+      icon: "$ayiDolly",
       route: "/inv-adjustments",
       key: key++
     });
 
     //**** INVENTORY (TOP GROUP)
-    addNavItem("Inventory", "fa-box", undefined, sub, key++, "inventory");
+    addNavItem("Inventory", "$ayiBox", undefined, sub, key++, "inventory");
   }
 
   //**** VENDORS (TOP GROUP)
@@ -555,7 +555,7 @@ function initNavPanel() {
       role.InventoryLimited
     ])
   ) {
-    addNavItem("VendorList", "fa-store", "/vendors", [], key++, "vendor");
+    addNavItem("VendorList", "$ayiStore", "/vendors", [], key++, "vendor");
   }
 
   //******************  ACCOUNTING
@@ -571,7 +571,7 @@ function initNavPanel() {
     //FAKE subitem as is still TBD
     sub.push({
       title: "Accounting",
-      icon: "fa-calculator",
+      icon: "$ayiCalculator",
       route: "/acc-accounting",
       key: key++
     });
@@ -579,7 +579,7 @@ function initNavPanel() {
     // ** ACCOUNTING (TOP)
     addNavItem(
       "Accounting",
-      "fa-calculator",
+      "$ayiCalculator",
       undefined,
       sub,
       key++,
@@ -595,7 +595,7 @@ function initNavPanel() {
     // GLOBAL SETTINGS
     sub.push({
       title: "AdministrationGlobalSettings",
-      icon: "fa-cogs",
+      icon: "$ayiCogs",
       route: "/adm-global-settings",
       key: key++
     });
@@ -621,7 +621,7 @@ function initNavPanel() {
     //TRANSLATION
     sub.push({
       title: "TranslationList",
-      icon: "fa-language",
+      icon: "$ayiLanguage",
       route: "/adm-translations",
       key: key++
     });
@@ -629,7 +629,7 @@ function initNavPanel() {
     //REPORT TEMPLATES
     sub.push({
       title: "ReportList",
-      icon: "fa-th-list",
+      icon: "$ayiThList",
       route: "/adm-report-templates",
       key: key++
     });
@@ -637,7 +637,7 @@ function initNavPanel() {
     //FILES IN DATABASE
     sub.push({
       title: "Attachments",
-      icon: "fa-folder",
+      icon: "$ayiFolder",
       route: "/adm-attachments",
       key: key++
     });
@@ -653,7 +653,7 @@ function initNavPanel() {
     // ** ADMINISTRATION (TOP)
     addNavItem(
       "Administration",
-      "fa-user-tie",
+      "$ayiUserTie",
       undefined,
       sub,
       key++,
diff --git a/ayanova/src/components/attachment-control.vue b/ayanova/src/components/attachment-control.vue
index 98e602bc..1549a4b0 100644
--- a/ayanova/src/components/attachment-control.vue
+++ b/ayanova/src/components/attachment-control.vue
@@ -46,7 +46,7 @@
         <template v-else>
           <v-tabs v-model="tab" color="primary">
             <v-tabs-slider></v-tabs-slider>
-            <v-tab key="list"><v-icon>fa-folder</v-icon></v-tab>
+            <v-tab key="list"><v-icon>$ayiFolder</v-icon></v-tab>
             <v-tab key="attach"><v-icon>fa-paperclip</v-icon></v-tab>
             <v-tabs-items v-model="tab">
               <v-tab-item key="list">
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index ba47dace..27f94787 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -16,26 +16,33 @@ import {
   faAddressCard,
   faBars,
   faBell,
+  faBox,
   faBoxes,
   faBullhorn,
   faBusinessTime,
+  faCalculator,
   faCalendarAlt,
   faCalendarCheck,
   faCalendarDay,
   faCaretDown,
   faChevronDown,
   faChild,
+  faCogs,
   faDiceD20,
+  faDolly,
+  faDollyFlatbed,
   faEllipsisV,
   faEye,
   faEyeSlash,
   faFan,
   faFileContract,
+  faFolder,
   faHistory,
   faHome,
   faInbox,
   faInfoCircle,
   faKey,
+  faLanguage,
   faPallet,
   faPaperPlane,
   faPencilAlt,
@@ -48,13 +55,16 @@ import {
   faSitemap,
   faSlidersH,
   faStickyNote,
+  faStore,
   faTachometerAlt,
+  faThList,
   faTicketAlt,
   faToolbox,
   faTools,
   faUser,
   faUserCog,
-  faUsers
+  faUsers,
+  faUserTie
 } from "@fortawesome/free-solid-svg-icons";
 //import { faUserCircle as farUserCircle } from "@fortawesome/free-regular-svg-icons";
 Vue.component("font-awesome-icon", FontAwesomeIcon);
@@ -64,26 +74,33 @@ library.add(
   faAddressCard,
   faBars,
   faBell,
+  faBox,
   faBoxes,
   faBullhorn,
   faBusinessTime,
+  faCalculator,
   faCalendarAlt,
   faCalendarCheck,
   faCalendarDay,
   faCaretDown,
   faChevronDown,
   faChild,
+  faCogs,
   faDiceD20,
+  faDolly,
+  faDollyFlatbed,
   faEllipsisV,
   faEye,
   faEyeSlash,
   faFan,
   faFileContract,
+  faFolder,
   faHistory,
   faHome,
   faInbox,
   faInfoCircle,
   faKey,
+  faLanguage,
   faPallet,
   faPaperPlane,
   faPencilAlt,
@@ -96,13 +113,16 @@ library.add(
   faSitemap,
   faSlidersH,
   faStickyNote,
+  faStore,
   faTachometerAlt,
+  faThList,
   faTicketAlt,
   faToolbox,
   faTools,
   faUser,
   faUserCog,
-  faUsers
+  faUsers,
+  faUserTie
 );
 
 const CUSTOM_ICONS = {
@@ -124,6 +144,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "bell"]
     }
   },
+  ayiBox: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "box"]
+    }
+  },
   ayiBoxes: {
     component: FontAwesomeIcon,
     props: {
@@ -142,6 +168,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "business-time"]
     }
   },
+  ayiCalculator: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "calculator"]
+    }
+  },
   ayiCalendarAlt: {
     component: FontAwesomeIcon,
     props: {
@@ -166,6 +198,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "child"]
     }
   },
+  ayiCogs: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "cogs"]
+    }
+  },
   ayiCustomize: {
     component: FontAwesomeIcon,
     props: {
@@ -178,6 +216,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "dice-d20"]
     }
   },
+  ayiDolly: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "dolly"]
+    }
+  },
+  ayiDollyFlatbed: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "dolly-flatbed"]
+    }
+  },
   ayiEye: {
     component: FontAwesomeIcon,
     props: {
@@ -208,6 +258,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "file-contract"]
     }
   },
+  ayiFolder: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "folder"]
+    }
+  },
   ayiHistory: {
     component: FontAwesomeIcon,
     props: {
@@ -238,6 +294,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "key"]
     }
   },
+  ayiLanguage: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "language"]
+    }
+  },
   ayiPallet: {
     component: FontAwesomeIcon,
     props: {
@@ -304,12 +366,24 @@ const CUSTOM_ICONS = {
       icon: ["fas", "sticky-note"]
     }
   },
+  ayiStore: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "store"]
+    }
+  },
   ayiTachometer: {
     component: FontAwesomeIcon,
     props: {
       icon: ["fas", "tachometer-alt"]
     }
   },
+  ayiThList: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "th-list"]
+    }
+  },
   ayiTicket: {
     component: FontAwesomeIcon,
     props: {
@@ -346,6 +420,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "users"]
     }
   },
+  ayiUserTie: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "user-tie"]
+    }
+  },
   //VUETIFY REQUIRED ONES
   //https://vuetifyjs.com/en/features/icons/#using-custom-icons
   dropdown: {
diff --git a/ayanova/src/views/acc-accounting.vue b/ayanova/src/views/acc-accounting.vue
index 6d17f1bc..6afeaf5a 100644
--- a/ayanova/src/views/acc-accounting.vue
+++ b/ayanova/src/views/acc-accounting.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-calculator",
+      icon: "$ayiCalculator",
       title: "Accounting",
       helpUrl: "form-acc-accounting"
     });
diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index 194adf52..ad8e1874 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -287,7 +287,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-folder",
+    icon: "$ayiFolder",
     title: "Attachments",
     helpUrl: "form-adm-attachments",
     menuItems: []
diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 9089917d..4d1c69f4 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -35,7 +35,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-cogs",
+      icon: "$ayiCogs",
       title: "AdministrationGlobalSettings",
       helpUrl: "form-adm-global-settings",
       formData: {
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index dff75c03..739423d2 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -583,7 +583,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: false,
-    icon: "fa-language",
+    icon: "$ayiLanguage",
     title: "Translation",
     helpUrl: "form-adm-translation",
     formData: {
diff --git a/ayanova/src/views/adm-translations.vue b/ayanova/src/views/adm-translations.vue
index b2aaaf70..cb228679 100644
--- a/ayanova/src/views/adm-translations.vue
+++ b/ayanova/src/views/adm-translations.vue
@@ -122,7 +122,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-language",
+    icon: "$ayiLanguage",
     title: "TranslationList",
     helpUrl: "form-adm-translations",
     menuItems: [],
diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue
index 0b1c7305..726522f2 100644
--- a/ayanova/src/views/ay-customize.vue
+++ b/ayanova/src/views/ay-customize.vue
@@ -300,7 +300,7 @@ function generateMenu(vm) {
   //plus it's related to this form and people think Customize for the whole shebang
   menuOptions.menuItems.push({
     title: "Translation",
-    icon: "fa-language",
+    icon: "$ayiLanguage",
     data: "adm-translations",
     key: "app:nav"
   });
diff --git a/ayanova/src/views/home-translation.vue b/ayanova/src/views/home-translation.vue
index e29ff460..4e0fd1c9 100644
--- a/ayanova/src/views/home-translation.vue
+++ b/ayanova/src/views/home-translation.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-language",
+      icon: "$ayiLanguage",
       title: "Translation",
       helpUrl: "form-home-translation"
     });
diff --git a/ayanova/src/views/inv-adjustments.vue b/ayanova/src/views/inv-adjustments.vue
index a1231efa..df30bd75 100644
--- a/ayanova/src/views/inv-adjustments.vue
+++ b/ayanova/src/views/inv-adjustments.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-dolly",
+      icon: "$ayiDolly",
       title: "InventoryPartInventoryAdjustments",
       helpUrl: "form-inv-adjustments"
     });
diff --git a/ayanova/src/views/inv-purchase-order-receipts.vue b/ayanova/src/views/inv-purchase-order-receipts.vue
index 5106b7dc..1918624c 100644
--- a/ayanova/src/views/inv-purchase-order-receipts.vue
+++ b/ayanova/src/views/inv-purchase-order-receipts.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-dolly-flatbed",
+      icon: "$ayiDollyFlatbed",
       title: "InventoryPurchaseOrderReceipts",
       helpUrl: "form-inv-purchase-order-receipts"
     });
diff --git a/ayanova/src/views/vendors.vue b/ayanova/src/views/vendors.vue
index 270ca64b..9c36a65f 100644
--- a/ayanova/src/views/vendors.vue
+++ b/ayanova/src/views/vendors.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-store",
+      icon: "$ayiStore",
       title: "VendorList",
       helpUrl: "form-vendors"
     });