diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 5b40aff5..8e1df240 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -278,7 +278,7 @@ function initNavPanel() {
     //Customer / Headoffice Users subitem
     sub.push({
       title: "UserList",
-      icon: "fa-users",
+      icon: "$ayiUsers",
       route: "/cust-users",
       key: key++
     });
@@ -286,7 +286,7 @@ function initNavPanel() {
     // ** CUSTOMER (TOP)
     addNavItem(
       "CustomerList",
-      "fa-address-book",
+      "$ayiAddressBook",
       undefined,
       sub,
       key++,
@@ -322,7 +322,7 @@ function initNavPanel() {
     ) {
       sub.push({
         title: "Schedule",
-        icon: "fa-calendar-alt",
+        icon: "$ayiCalendarAlt",
         route: "/svc-schedule",
         key: key++
       });
@@ -362,7 +362,7 @@ function initNavPanel() {
     //so there is no separate role check here as the service group role check supersedes this
     sub.push({
       title: "QuoteList",
-      icon: "fa-pencil-alt",
+      icon: "$ayiPencilAlt",
       route: "/svc-quotes",
       key: key++
     });
@@ -380,7 +380,7 @@ function initNavPanel() {
     ) {
       sub.push({
         title: "PMList",
-        icon: "fa-business-time",
+        icon: "$ayiBusinessTime",
         route: "/svc-pm-list",
         key: key++
       });
@@ -399,7 +399,7 @@ function initNavPanel() {
     ) {
       sub.push({
         title: "UnitList",
-        icon: "fa-fan",
+        icon: "$ayiFan",
         route: "/svc-units",
         key: key++
       });
@@ -407,7 +407,7 @@ function initNavPanel() {
       //UNIT MODELS subitem
       sub.push({
         title: "UnitModels",
-        icon: "fa-dice-d20",
+        icon: "$ayiDiceD20",
         route: "/svc-unit-models",
         key: key++
       });
@@ -425,7 +425,7 @@ function initNavPanel() {
     ) {
       sub.push({
         title: "LoanUnitList",
-        icon: "fa-plug",
+        icon: "$ayiPlug",
         route: "/svc-loaners",
         key: key++
       });
@@ -444,7 +444,7 @@ function initNavPanel() {
     ) {
       sub.push({
         title: "ContractList",
-        icon: "fa-file-contract",
+        icon: "$ayiFileContract",
         route: "/svc-contracts",
         key: key++
       });
@@ -470,7 +470,7 @@ function initNavPanel() {
     }
 
     //**** Service (TOP GROUP)
-    addNavItem("Service", "fa-toolbox", undefined, sub, key++, "service");
+    addNavItem("Service", "$ayiToolbox", undefined, sub, key++, "service");
   }
 
   //******************  INVENTORY
@@ -611,7 +611,7 @@ function initNavPanel() {
     // USERS
     sub.push({
       title: "UserList",
-      icon: "fa-users",
+      icon: "$ayiUsers",
       route: "/adm-users",
       key: key++
     });
diff --git a/ayanova/src/components/date-non-native-control.vue b/ayanova/src/components/date-non-native-control.vue
index 74ae7fbb..9145996f 100644
--- a/ayanova/src/components/date-non-native-control.vue
+++ b/ayanova/src/components/date-non-native-control.vue
@@ -6,7 +6,7 @@
           <template v-slot:activator="{ on }">
             <v-text-field
               v-on="on"
-              prepend-icon="fa-calendar-alt"
+              prepend-icon="$ayiCalendarAlt"
               @click:prepend="dlgdate = true"
               v-model="formatDate"
               v-bind:label="label"
@@ -28,7 +28,7 @@
       v-if="readonly"
       v-model="formatDateTime"
       v-bind:label="label"
-      prepend-icon="fa-calendar-alt"
+      prepend-icon="$ayiCalendarAlt"
       disabled
     ></v-text-field>
     <p v-show="error" class="form__error v-messages theme--light error--text">
diff --git a/ayanova/src/components/date-time-non-native-control.vue b/ayanova/src/components/date-time-non-native-control.vue
index bd1771e3..b6640ae7 100644
--- a/ayanova/src/components/date-time-non-native-control.vue
+++ b/ayanova/src/components/date-time-non-native-control.vue
@@ -11,7 +11,7 @@
           <template v-slot:activator="{ on }">
             <v-text-field
               v-on="on"
-              prepend-icon="fa-calendar-alt"
+              prepend-icon="$ayiCalendarAlt"
               @click:prepend="dlgdate = true"
               v-model="formatDate"
               v-bind:label="label"
@@ -72,7 +72,7 @@
       v-if="readonly"
       v-model="formatDateTime"
       v-bind:label="label"
-      prepend-icon="fa-calendar-alt"
+      prepend-icon="$ayiCalendarAlt"
       disabled
     ></v-text-field>
     <p v-show="error" class="form__error v-messages theme--light error--text">
diff --git a/ayanova/src/components/time-non-native-control.vue b/ayanova/src/components/time-non-native-control.vue
index 30cfac1b..71be1684 100644
--- a/ayanova/src/components/time-non-native-control.vue
+++ b/ayanova/src/components/time-non-native-control.vue
@@ -32,7 +32,7 @@
       v-if="readonly"
       v-model="formatDateTime"
       v-bind:label="label"
-      prepend-icon="fa-calendar-alt"
+      prepend-icon="$ayiCalendarAlt"
       disabled
     ></v-text-field>
     <p v-show="error" class="form__error v-messages theme--light error--text">
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index 26e82e20..807e5f78 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -12,23 +12,31 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
 Vue.component("font-awesome-icon", FontAwesomeIcon); // Register component globally
 import {
+  faAddressBook,
   faAddressCard,
   faBars,
   faBell,
   faBullhorn,
+  faBusinessTime,
+  faCalendarAlt,
   faCalendarCheck,
   faCalendarDay,
   faCaretDown,
   faChevronDown,
   faChild,
+  faDiceD20,
   faEllipsisV,
   faEye,
   faEyeSlash,
+  faFan,
+  faFileContract,
   faHistory,
   faHome,
   faInbox,
   faInfoCircle,
   faKey,
+  faPencilAlt,
+  faPlug,
   faQuestionCircle,
   faSearch,
   faSignInAlt,
@@ -38,31 +46,41 @@ import {
   faStickyNote,
   faTachometerAlt,
   faTicketAlt,
+  faToolbox,
   faTools,
   faUser,
-  faUserCog
+  faUserCog,
+  faUsers
 } from "@fortawesome/free-solid-svg-icons";
 //import { faUserCircle as farUserCircle } from "@fortawesome/free-regular-svg-icons";
 Vue.component("font-awesome-icon", FontAwesomeIcon);
 
 library.add(
+  faAddressBook,
   faAddressCard,
   faBars,
   faBell,
   faBullhorn,
+  faBusinessTime,
+  faCalendarAlt,
   faCalendarCheck,
   faCalendarDay,
   faCaretDown,
   faChevronDown,
   faChild,
+  faDiceD20,
   faEllipsisV,
   faEye,
   faEyeSlash,
+  faFan,
+  faFileContract,
   faHistory,
   faHome,
   faInbox,
   faInfoCircle,
   faKey,
+  faPencilAlt,
+  faPlug,
   faQuestionCircle,
   faSearch,
   faSignInAlt,
@@ -72,12 +90,20 @@ library.add(
   faStickyNote,
   faTachometerAlt,
   faTicketAlt,
+  faToolbox,
   faTools,
   faUser,
-  faUserCog
+  faUserCog,
+  faUsers
 );
 
 const CUSTOM_ICONS = {
+  ayiAddressBook: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "address-book"]
+    }
+  },
   ayiAddressCard: {
     component: FontAwesomeIcon,
     props: {
@@ -96,6 +122,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "bullhorn"]
     }
   },
+  ayiBusinessTime: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "business-time"]
+    }
+  },
+  ayiCalendarAlt: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "calendar-alt"]
+    }
+  },
   ayiCalendarCheck: {
     component: FontAwesomeIcon,
     props: {
@@ -120,6 +158,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "sliders-h"]
     }
   },
+  ayiDiceD20: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "dice-d20"]
+    }
+  },
   ayiEye: {
     component: FontAwesomeIcon,
     props: {
@@ -138,6 +182,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "ellipsis-v"]
     }
   },
+  ayiFan: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "fan"]
+    }
+  },
+  ayiFileContract: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "file-contract"]
+    }
+  },
   ayiHistory: {
     component: FontAwesomeIcon,
     props: {
@@ -168,6 +224,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "key"]
     }
   },
+  ayiPencilAlt: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "pencil-alt"]
+    }
+  },
+  ayiPlug: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "plug"]
+    }
+  },
   ayiQuestionCircle: {
     component: FontAwesomeIcon,
     props: {
@@ -216,6 +284,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "ticket-alt"]
     }
   },
+  ayiToolbox: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "toolbox"]
+    }
+  },
   ayiTools: {
     component: FontAwesomeIcon,
     props: {
@@ -234,6 +308,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "user-cog"]
     }
   },
+  ayiUsers: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "users"]
+    }
+  },
   //VUETIFY REQUIRED ONES
   //https://vuetifyjs.com/en/features/icons/#using-custom-icons
   dropdown: {
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index dce38ff4..70d67c66 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -205,7 +205,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-users",
+    icon: "$ayiUsers",
     title: "UserList",
     helpUrl: "form-adm-users",
     menuItems: [],
diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue
index 1bc19e3f..cb34d748 100644
--- a/ayanova/src/views/cust-users.vue
+++ b/ayanova/src/views/cust-users.vue
@@ -197,7 +197,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-users",
+    icon: "$ayiUsers",
     title: "UserList",
     helpUrl: "form-cust-users",
     menuItems: []
diff --git a/ayanova/src/views/svc-contracts.vue b/ayanova/src/views/svc-contracts.vue
index 4b85fcf4..71c2972f 100644
--- a/ayanova/src/views/svc-contracts.vue
+++ b/ayanova/src/views/svc-contracts.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-file-contract",
+      icon: "$ayiFileContract",
       title: "ContractList",
       helpUrl: "form-svc-contracts"
     });
diff --git a/ayanova/src/views/svc-loaners.vue b/ayanova/src/views/svc-loaners.vue
index 06ef32df..0112df2f 100644
--- a/ayanova/src/views/svc-loaners.vue
+++ b/ayanova/src/views/svc-loaners.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-plug",
+      icon: "$ayiPlug",
       title: "LoanUnitList",
       helpUrl: "form-svc-loaners"
     });
diff --git a/ayanova/src/views/svc-pm-list.vue b/ayanova/src/views/svc-pm-list.vue
index 3969dfba..47e986e8 100644
--- a/ayanova/src/views/svc-pm-list.vue
+++ b/ayanova/src/views/svc-pm-list.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-business-time",
+      icon: "$ayiBusinessTime",
       title: "PMList",
       helpUrl: "form-svc-pm-list"
     });
diff --git a/ayanova/src/views/svc-quotes.vue b/ayanova/src/views/svc-quotes.vue
index e2290f99..1d96db9d 100644
--- a/ayanova/src/views/svc-quotes.vue
+++ b/ayanova/src/views/svc-quotes.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-pencil-alt",
+      icon: "$ayiPencilAlt",
       title: "QuoteList",
       helpUrl: "form-svc-quotes"
     });
diff --git a/ayanova/src/views/svc-schedule.vue b/ayanova/src/views/svc-schedule.vue
index 96080f79..cf4c59a9 100644
--- a/ayanova/src/views/svc-schedule.vue
+++ b/ayanova/src/views/svc-schedule.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-calendar-alt",
+      icon: "$ayiCalendarAlt",
       title: "Schedule",
       helpUrl: "form-svc-schedule"
     });
diff --git a/ayanova/src/views/svc-unit-models.vue b/ayanova/src/views/svc-unit-models.vue
index 62963923..6a4bccd6 100644
--- a/ayanova/src/views/svc-unit-models.vue
+++ b/ayanova/src/views/svc-unit-models.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-dice-d20",
+      icon: "$ayiDiceD20",
       title: "UnitModels",
       helpUrl: "form-svc-unit-models"
     });
diff --git a/ayanova/src/views/svc-units.vue b/ayanova/src/views/svc-units.vue
index 81d69c39..1fa3cdd6 100644
--- a/ayanova/src/views/svc-units.vue
+++ b/ayanova/src/views/svc-units.vue
@@ -12,7 +12,7 @@ export default {
   beforeCreate() {
     window.$gz.eventBus.$emit("menu-change", {
       isMain: true,
-      icon: "fa-fan",
+      icon: "$ayiFan",
       title: "UnitList",
       helpUrl: "form-svc-units"
     });