From 800a27b70a3161b50ec3dc970eb2eafcaa3fffe2 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 6 Oct 2020 14:58:03 +0000
Subject: [PATCH]

---
 .../src/components/extension-tags-control.vue |  2 +-
 ayanova/src/components/gz-data-table.vue      |  2 +-
 ayanova/src/components/gzconfirm.vue          |  2 +-
 ayanova/src/components/pick-list.vue          |  2 +-
 ayanova/src/components/tag-picker.vue         |  2 +-
 ayanova/src/plugins/vuetify.js                | 80 +++++++++++++++++++
 ayanova/src/views/adm-attachments.vue         |  2 +-
 ayanova/src/views/adm-global-logo.vue         |  2 +-
 .../src/views/adm-global-select-templates.vue |  2 +-
 ayanova/src/views/adm-license.vue             |  2 +-
 ayanova/src/views/adm-translation.vue         |  8 +-
 ayanova/src/views/adm-user.vue                | 14 ++--
 ayanova/src/views/adm-users.vue               |  4 +-
 ayanova/src/views/ay-about.vue                |  2 +-
 ayanova/src/views/ay-customize.vue            |  2 +-
 ayanova/src/views/ay-data-list-view.vue       | 24 +++---
 ayanova/src/views/ay-history.vue              | 16 ++--
 ayanova/src/views/ay-report-edit.vue          |  8 +-
 ayanova/src/views/cust-user.vue               | 14 ++--
 ayanova/src/views/cust-users.vue              |  4 +-
 ayanova/src/views/home-notifications.vue      |  4 +-
 ayanova/src/views/home-notify-direct.vue      |  6 +-
 .../src/views/home-notify-subscription.vue    |  8 +-
 .../src/views/home-notify-subscriptions.vue   |  2 +-
 ayanova/src/views/home-password.vue           | 10 +--
 ayanova/src/views/home-user-settings.vue      |  4 +-
 ayanova/src/views/ops-backup.vue              |  4 +-
 ayanova/src/views/ops-jobs.vue                |  4 +-
 ayanova/src/views/ops-log.vue                 |  4 +-
 ayanova/src/views/ops-metrics.vue             |  2 +-
 .../src/views/ops-notification-settings.vue   |  2 +-
 ayanova/src/views/ops-notify-queue.vue        |  6 +-
 ayanova/src/views/ops-profile.vue             |  4 +-
 ayanova/src/views/ops-server-state.vue        |  2 +-
 ayanova/src/views/widget.vue                  |  8 +-
 ayanova/src/views/widgets.vue                 |  2 +-
 36 files changed, 173 insertions(+), 93 deletions(-)

diff --git a/ayanova/src/components/extension-tags-control.vue b/ayanova/src/components/extension-tags-control.vue
index 85488cda..ff34421e 100644
--- a/ayanova/src/components/extension-tags-control.vue
+++ b/ayanova/src/components/extension-tags-control.vue
@@ -1,6 +1,6 @@
 <template>
   <v-expansion-panel v-if="available()">
-    <v-expansion-panel-header disable-icon-rotate expand-icon="fa-tags">{{
+    <v-expansion-panel-header disable-icon-rotate expand-icon="$ayiTags">{{
       $ay.t("Tags")
     }}</v-expansion-panel-header>
     <v-expansion-panel-content>
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 24cb05e9..fd5d176d 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -16,7 +16,7 @@
         <v-spacer></v-spacer>
         <div>
           <v-btn @click="refresh">
-            <v-icon :data-cy="!!$ay.dev ? 'refresh' : false">fa-sync</v-icon>
+            <v-icon :data-cy="!!$ay.dev ? 'refresh' : false">$ayiSync</v-icon>
           </v-btn>
 
           <v-btn class="ml-12" @click="editListView">
diff --git a/ayanova/src/components/gzconfirm.vue b/ayanova/src/components/gzconfirm.vue
index 31284076..cfdffa83 100644
--- a/ayanova/src/components/gzconfirm.vue
+++ b/ayanova/src/components/gzconfirm.vue
@@ -20,7 +20,7 @@
             <v-icon large color="warning">$ayiExclamationCircle</v-icon>
           </template>
           <template v-if="options.type == 'error'">
-            <v-icon large color="error">fa-exclamation-triangle</v-icon>
+            <v-icon large color="error">$ayiExclamationTriangle</v-icon>
           </template>
           <span v-if="options.title" class="ml-5"> {{ options.title }} </span>
         </v-card-title>
diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index 9ff68d07..37b3b4bb 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -148,7 +148,7 @@ export default {
       if (this.value != 0) {
         return "$ayiEdit";
       }
-      return "fa-plus";
+      return "$ayiPlus";
     },
     handleEditClick: function() {
       let idToOpen = 0;
diff --git a/ayanova/src/components/tag-picker.vue b/ayanova/src/components/tag-picker.vue
index abf0bcbd..33379487 100644
--- a/ayanova/src/components/tag-picker.vue
+++ b/ayanova/src/components/tag-picker.vue
@@ -34,7 +34,7 @@
                 {{ this.normalizeTag(tagSearchEntry) }}</v-chip
               >
               <v-btn large icon @click="addTag()">
-                <v-icon large color="success">fa-plus-circle</v-icon>
+                <v-icon large color="success">$ayiPlusCircle</v-icon>
               </v-btn>
             </v-row>
           </v-row>
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index d04eef5c..d150b4a4 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -35,9 +35,12 @@ import {
   faChevronDown,
   faChild,
   faClock,
+  faClone,
   faCode,
   faCogs,
   faColumns,
+  faCommentAlt,
+  faCopy,
   faDiceD20,
   faDolly,
   faDollyFlatbed,
@@ -45,6 +48,7 @@ import {
   faEdit,
   faEllipsisV,
   faExclamationCircle,
+  faExclamationTriangle,
   faEye,
   faEyeSlash,
   faFan,
@@ -88,10 +92,13 @@ import {
   faPencilAlt,
   faPencilRuler,
   faPlug,
+  faPlus,
+  faPlusCircle,
   faQuestionCircle,
   faQuoteLeft,
   faRobot,
   faRocket,
+  faSave,
   faSearch,
   faSeedling,
   faServer,
@@ -104,12 +111,15 @@ import {
   faStickyNote,
   faStore,
   faStrikethrough,
+  faSync,
   faTable,
   faTachometerAlt,
+  faTags,
   faThList,
   faTicketAlt,
   faToolbox,
   faTools,
+  faTrashAlt,
   faUser,
   faUserCog,
   faUsers,
@@ -142,9 +152,12 @@ library.add(
   faChevronDown,
   faChild,
   faClock,
+  faClone,
   faCode,
   faCogs,
   faColumns,
+  faCommentAlt,
+  faCopy,
   faDiceD20,
   faDolly,
   faDollyFlatbed,
@@ -152,6 +165,7 @@ library.add(
   faEdit,
   faEllipsisV,
   faExclamationCircle,
+  faExclamationTriangle,
   faEye,
   faEyeSlash,
   faFan,
@@ -195,10 +209,13 @@ library.add(
   faPencilAlt,
   faPencilRuler,
   faPlug,
+  faPlus,
+  faPlusCircle,
   faQuestionCircle,
   faQuoteLeft,
   faRobot,
   faRocket,
+  faSave,
   faSearch,
   faSeedling,
   faServer,
@@ -212,12 +229,15 @@ library.add(
   faStickyNote,
   faStore,
   faStrikethrough,
+  faSync,
   faTable,
   faTachometerAlt,
+  faTags,
   faThList,
   faTicketAlt,
   faToolbox,
   faTools,
+  faTrashAlt,
   faUser,
   faUserCog,
   faUsers,
@@ -340,6 +360,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "clock"]
     }
   },
+  ayiClone: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "clone"]
+    }
+  },
   ayiCode: {
     component: FontAwesomeIcon,
     props: {
@@ -358,6 +384,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "columns"]
     }
   },
+  ayiCommentAlt: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "comment-alt"]
+    }
+  },
+  ayiCopy: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "copy"]
+    }
+  },
   ayiCustomize: {
     component: FontAwesomeIcon,
     props: {
@@ -400,6 +438,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "exclamation-circle"]
     }
   },
+  ayiExclamationTriangle: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "exclamation-triangle"]
+    }
+  },
   ayiEye: {
     component: FontAwesomeIcon,
     props: {
@@ -664,6 +708,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "plug"]
     }
   },
+  ayiPlus: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "plus"]
+    }
+  },
+  ayiPlusCircle: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "plus-circle"]
+    }
+  },
   ayiQuestionCircle: {
     component: FontAwesomeIcon,
     props: {
@@ -688,6 +744,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "rocket"]
     }
   },
+  ayiSave: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "save"]
+    }
+  },
   ayiSearch: {
     component: FontAwesomeIcon,
     props: {
@@ -760,6 +822,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "strikethrough"]
     }
   },
+  ayiSync: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "sync"]
+    }
+  },
   ayiTable: {
     component: FontAwesomeIcon,
     props: {
@@ -772,6 +840,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "tachometer-alt"]
     }
   },
+  ayiTags: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "tags"]
+    }
+  },
   ayiThList: {
     component: FontAwesomeIcon,
     props: {
@@ -796,6 +870,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "tools"]
     }
   },
+  ayiTrashAlt: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "trash-alt"]
+    }
+  },
   ayiUser: {
     component: FontAwesomeIcon,
     props: {
diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index 83d18149..21fefd9e 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -328,7 +328,7 @@ function generateMenu(vm) {
 
     menuOptions.menuItems.push({
       title: "DeleteSelected",
-      icon: "fa-trash-alt",
+      icon: "$ayiTrashAlt",
       surface: false,
       key: FORM_KEY + ":DELETE_SELECTED",
       vm: vm
diff --git a/ayanova/src/views/adm-global-logo.vue b/ayanova/src/views/adm-global-logo.vue
index e6ac9148..91b2c980 100644
--- a/ayanova/src/views/adm-global-logo.vue
+++ b/ayanova/src/views/adm-global-logo.vue
@@ -262,7 +262,7 @@ function generateMenu(vm) {
   //   if (vm.rights.change) {
   //     menuOptions.menuItems.push({
   //       title: "Save",
-  //       icon: "fa-save",
+  //       icon: "$ayiSave",
   //       surface: true,
   //       key: FORM_KEY + ":save",
   //       vm: vm
diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue
index 50327b47..2eb8d3c9 100644
--- a/ayanova/src/views/adm-global-select-templates.vue
+++ b/ayanova/src/views/adm-global-select-templates.vue
@@ -412,7 +412,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue
index ecf9a7d0..fee2fa57 100644
--- a/ayanova/src/views/adm-license.vue
+++ b/ayanova/src/views/adm-license.vue
@@ -555,7 +555,7 @@ function generateMenu(vm) {
   //copy dbid
   menuOptions.menuItems.push({
     title: "CopyDbId",
-    icon: "fa-copy",
+    icon: "$ayiCopy",
     key: FORM_KEY + ":copydbid",
     vm: vm
   });
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index b7804261..e6d9ff4a 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -52,7 +52,7 @@
                 $ay.t("ReadOnly")
               }}</span>
               <v-btn @click="duplicate()" :loading="duplicating">
-                <v-icon left>fa-clone</v-icon> {{ $ay.t("Duplicate") }}
+                <v-icon left>$ayiClone</v-icon> {{ $ay.t("Duplicate") }}
               </v-btn>
             </v-col>
             <v-col cols="12" sm="6" lg="4" xl="3">
@@ -597,7 +597,7 @@ function generateMenu(vm) {
   if (vm.rights.change && vm.obj.stock != true) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
@@ -611,7 +611,7 @@ function generateMenu(vm) {
   ) {
     menuOptions.menuItems.push({
       title: "Delete",
-      icon: "fa-trash-alt",
+      icon: "$ayiTrashAlt",
       surface: false,
       key: FORM_KEY + ":delete",
       vm: vm
@@ -641,7 +641,7 @@ function generateMenu(vm) {
   if (vm.rights.change && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Duplicate",
-      icon: "fa-clone",
+      icon: "$ayiClone",
       key: FORM_KEY + ":duplicate",
       vm: vm
     });
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index ffd7b4f2..9cb0fa0f 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -151,7 +151,7 @@
                 v-model="password"
                 :readonly="formState.readOnly"
                 :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
-                prepend-icon="fa-key"
+                prepend-icon="$ayiKey"
                 :label="$ay.t('NewPassword')"
                 :type="reveal ? 'text' : 'password'"
                 :error-messages="form().serverErrors(this, 'password')"
@@ -660,7 +660,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: false,
-    icon: "fa-splotch",
+    icon: "$ayiUser",
     title: "User",
     helpUrl: "form-adm-user",
     formData: {
@@ -674,7 +674,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
@@ -684,7 +684,7 @@ function generateMenu(vm) {
   if (vm.rights.delete && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Delete",
-      icon: "fa-trash-alt",
+      icon: "$ayiTrashAlt",
       surface: false,
       key: FORM_KEY + ":delete",
       vm: vm
@@ -714,7 +714,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       key: FORM_KEY + ":new",
       vm: vm
     });
@@ -723,7 +723,7 @@ function generateMenu(vm) {
   if (vm.rights.change && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Duplicate",
-      icon: "fa-clone",
+      icon: "$ayiClone",
       key: FORM_KEY + ":duplicate",
       vm: vm
     });
@@ -731,7 +731,7 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({
     title: "DirectNotification",
-    icon: "fa-comment-alt",
+    icon: "$ayiCommentAlt",
     key: FORM_KEY + ":directnotify",
     vm: vm
   });
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index a874a0a8..5cbf5241 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -217,7 +217,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       surface: true,
       key: FORM_KEY + ":new",
       vm: vm
@@ -249,7 +249,7 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({
     title: "DirectNotification",
-    icon: "fa-comment-alt",
+    icon: "$ayiCommentAlt",
     key: FORM_KEY + ":directnotify",
     vm: vm
   });
diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index f36b8617..2c6643fd 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -197,7 +197,7 @@ function generateMenu(vm) {
     menuItems: [
       {
         title: "CopySupportInfo",
-        icon: "fa-copy",
+        icon: "$ayiCopy",
         key: "about:copysupportinfo",
         vm: vm
       },
diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue
index 726522f2..60a2f886 100644
--- a/ayanova/src/views/ay-customize.vue
+++ b/ayanova/src/views/ay-customize.vue
@@ -289,7 +289,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index b2960976..0994d692 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -136,7 +136,7 @@
                           block
                           v-if="item.tempFilterToken != null"
                           @click="addFilterCondition(item)"
-                          ><v-icon large>fa-plus</v-icon></v-btn
+                          ><v-icon large>$ayiPlus</v-icon></v-btn
                         >
                       </div>
 
@@ -170,7 +170,7 @@
                           block
                           v-if="item.tempFilterOperator != null"
                           @click="addFilterCondition(item)"
-                          ><v-icon large>fa-plus</v-icon></v-btn
+                          ><v-icon large>$ayiPlus</v-icon></v-btn
                         >
                       </div>
 
@@ -205,7 +205,7 @@
                           block
                           v-if="item.tempFilterOperator != null"
                           @click="addFilterCondition(item)"
-                          ><v-icon large>fa-plus</v-icon></v-btn
+                          ><v-icon large>$ayiPlus</v-icon></v-btn
                         >
                       </div>
                       <!-- BOOL BUILDER  -->
@@ -242,7 +242,7 @@
                           block
                           v-if="item.tempFilterOperator != null"
                           @click="addFilterCondition(item)"
-                          ><v-icon large>fa-plus</v-icon></v-btn
+                          ><v-icon large>$ayiPlus</v-icon></v-btn
                         >
                       </div>
 
@@ -270,7 +270,7 @@
                           block
                           v-if="item.tempFilterOperator != null"
                           @click="addFilterCondition(item)"
-                          ><v-icon large>fa-plus</v-icon></v-btn
+                          ><v-icon large>$ayiPlus</v-icon></v-btn
                         >
                       </div>
                       <!-- CURRENCY BUILDER  -->
@@ -297,7 +297,7 @@
                           block
                           v-if="item.tempFilterOperator != null"
                           @click="addFilterCondition(item)"
-                          ><v-icon large>fa-plus</v-icon></v-btn
+                          ><v-icon large>$ayiPlus</v-icon></v-btn
                         >
                       </div>
                       <!-- TAG BUILDER  -->
@@ -321,7 +321,7 @@
                           block
                           v-if="item.tempFilterOperator != null"
                           @click="addFilterCondition(item)"
-                          ><v-icon large>fa-plus</v-icon></v-btn
+                          ><v-icon large>$ayiPlus</v-icon></v-btn
                         >
                       </div>
                       <!-- ENUM BUILDER  -->
@@ -352,7 +352,7 @@
                           block
                           v-if="item.tempFilterOperator != null"
                           @click="addFilterCondition(item)"
-                          ><v-icon large>fa-plus</v-icon></v-btn
+                          ><v-icon large>$ayiPlus</v-icon></v-btn
                         >
                       </div>
                     </div>
@@ -386,7 +386,7 @@
                                 icon
                                 @click="removeFilterCondition(item, index)"
                               >
-                                <v-icon>fa-trash-alt</v-icon>
+                                <v-icon>$ayiTrashAlt</v-icon>
                               </v-btn>
                             </v-list-item-action>
                           </v-list-item>
@@ -905,7 +905,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
@@ -914,7 +914,7 @@ function generateMenu(vm) {
   if (vm.rights.delete) {
     menuOptions.menuItems.push({
       title: "Delete",
-      icon: "fa-trash-alt",
+      icon: "$ayiTrashAlt",
       surface: false,
       key: FORM_KEY + ":delete",
       vm: vm
@@ -923,7 +923,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Duplicate",
-      icon: "fa-clone",
+      icon: "$ayiClone",
       key: FORM_KEY + ":duplicate",
       vm: vm
     });
diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index f0e1f80c..50036f08 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -408,20 +408,20 @@ async function populateAyaTypeList(vm) {
 //
 function populateEventTypeList(vm) {
   vm.eventTypes = {
-    0: { name: vm.$ay.t("EventDeleted"), icon: "fa-trash-alt" },
-    1: { name: vm.$ay.t("EventCreated"), icon: "fa-plus" },
+    0: { name: vm.$ay.t("EventDeleted"), icon: "$ayiTrashAlt" },
+    1: { name: vm.$ay.t("EventCreated"), icon: "$ayiPlus" },
     2: {
       name: vm.$ay.t("EventRetrieved"),
       icon: "fa-envelope-open-text"
     },
-    3: { name: vm.$ay.t("EventModified"), icon: "fa-save" },
+    3: { name: vm.$ay.t("EventModified"), icon: "$ayiSave" },
     4: {
       name: vm.$ay.t("EventAttachmentCreate"),
-      icon: "fa-plus"
+      icon: "$ayiPlus"
     },
     5: {
       name: vm.$ay.t("EventAttachmentDelete"),
-      icon: "fa-trash-alt"
+      icon: "$ayiTrashAlt"
     },
     6: {
       name: vm.$ay.t("EventAttachmentDownload"),
@@ -437,10 +437,10 @@ function populateEventTypeList(vm) {
     },
     9: {
       name: vm.$ay.t("EventServerStateChange"),
-      icon: "fa-plus"
+      icon: "$ayiPlus"
     },
-    10: { name: vm.$ay.t("EventSeedDatabase"), icon: "fa-plus" },
-    11: { name: vm.$ay.t("EventAttachmentModified"), icon: "fa-save" },
+    10: { name: vm.$ay.t("EventSeedDatabase"), icon: "$ayiPlus" },
+    11: { name: vm.$ay.t("EventAttachmentModified"), icon: "$ayiSave" },
     12: { name: "ERASE ALL DATA", icon: "$ayiSeedling" },
     13: { name: vm.$ay.t("EventResetSerial"), icon: "fa-egg" },
     13: {
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 74b2ced4..c9e7b9e3 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -1062,7 +1062,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
@@ -1081,7 +1081,7 @@ function generateMenu(vm) {
   if (vm.rights.delete && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Delete",
-      icon: "fa-trash-alt",
+      icon: "$ayiTrashAlt",
       surface: false,
       key: FORM_KEY + ":delete",
       vm: vm
@@ -1111,7 +1111,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       key: FORM_KEY + ":new",
       vm: vm
     });
@@ -1120,7 +1120,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Duplicate",
-      icon: "fa-clone",
+      icon: "$ayiClone",
       key: FORM_KEY + ":duplicate",
       vm: vm
     });
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index f09aebe3..d1008199 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -155,7 +155,7 @@
                 v-model="password"
                 :readonly="formState.readOnly"
                 :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
-                prepend-icon="fa-key"
+                prepend-icon="$ayiKey"
                 :label="$ay.t('NewPassword')"
                 :type="reveal ? 'text' : 'password'"
                 :error-messages="form().serverErrors(this, 'password')"
@@ -664,7 +664,7 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: false,
-    icon: "fa-splotch",
+    icon: "$ayiUser",
     title: "User",
     helpUrl: "form-adm-user",
     formData: {
@@ -678,7 +678,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
@@ -688,7 +688,7 @@ function generateMenu(vm) {
   if (vm.rights.delete && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Delete",
-      icon: "fa-trash-alt",
+      icon: "$ayiTrashAlt",
       surface: false,
       key: FORM_KEY + ":delete",
       vm: vm
@@ -718,7 +718,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       key: FORM_KEY + ":new",
       vm: vm
     });
@@ -727,7 +727,7 @@ function generateMenu(vm) {
   if (vm.rights.change && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Duplicate",
-      icon: "fa-clone",
+      icon: "$ayiClone",
       key: FORM_KEY + ":duplicate",
       vm: vm
     });
@@ -735,7 +735,7 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({
     title: "DirectNotification",
-    icon: "fa-comment-alt",
+    icon: "$ayiCommentAlt",
     key: FORM_KEY + ":directnotify",
     vm: vm
   });
diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue
index 9f1b91ea..6d9980cc 100644
--- a/ayanova/src/views/cust-users.vue
+++ b/ayanova/src/views/cust-users.vue
@@ -206,7 +206,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       surface: true,
       key: FORM_KEY + ":new",
       vm: vm
@@ -238,7 +238,7 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({
     title: "DirectNotification",
-    icon: "fa-comment-alt",
+    icon: "$ayiCommentAlt",
     key: FORM_KEY + ":directnotify",
     vm: vm
   });
diff --git a/ayanova/src/views/home-notifications.vue b/ayanova/src/views/home-notifications.vue
index b4d2b8ea..4925ddc9 100644
--- a/ayanova/src/views/home-notifications.vue
+++ b/ayanova/src/views/home-notifications.vue
@@ -268,7 +268,7 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({
     title: "Refresh",
-    icon: "fa-sync",
+    icon: "$ayiSync",
     surface: true,
     key: FORM_KEY + ":refresh",
     vm: vm
@@ -292,7 +292,7 @@ function generateMenu(vm) {
 
   menuOptions.menuItems.push({
     title: "DirectNotification",
-    icon: "fa-comment-alt",
+    icon: "$ayiCommentAlt",
     data: "home-notify-direct",
     key: "app:nav"
   });
diff --git a/ayanova/src/views/home-notify-direct.vue b/ayanova/src/views/home-notify-direct.vue
index 84755852..2cdb6b85 100644
--- a/ayanova/src/views/home-notify-direct.vue
+++ b/ayanova/src/views/home-notify-direct.vue
@@ -17,7 +17,7 @@
               ></gz-pick-list> </v-col
             ><v-col cols="1">
               <v-btn @click="addSelected()">
-                <v-icon>fa-plus</v-icon>
+                <v-icon>$ayiPlus</v-icon>
               </v-btn>
             </v-col>
           </v-row>
@@ -268,7 +268,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-comment-alt",
+    icon: "$ayiCommentAlt",
     title: "DirectNotification",
     helpUrl: "form-home-notify-direct",
 
@@ -278,7 +278,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index a7615ede..3f5292fd 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -654,7 +654,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
@@ -664,7 +664,7 @@ function generateMenu(vm) {
   if (vm.rights.delete && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Delete",
-      icon: "fa-trash-alt",
+      icon: "$ayiTrashAlt",
       surface: false,
       key: FORM_KEY + ":delete",
       vm: vm
@@ -694,7 +694,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       key: FORM_KEY + ":new",
       vm: vm
     });
@@ -703,7 +703,7 @@ function generateMenu(vm) {
   if (vm.rights.change && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Duplicate",
-      icon: "fa-clone",
+      icon: "$ayiClone",
       key: FORM_KEY + ":duplicate",
       vm: vm
     });
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index 33fed5f4..de2278aa 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -170,7 +170,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       surface: true,
       key: FORM_KEY + ":new",
       vm: vm
diff --git a/ayanova/src/views/home-password.vue b/ayanova/src/views/home-password.vue
index 65a95445..fc276665 100644
--- a/ayanova/src/views/home-password.vue
+++ b/ayanova/src/views/home-password.vue
@@ -32,7 +32,7 @@
               v-model="obj.oldPassword"
               :readonly="formState.readOnly"
               :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
-              prepend-icon="fa-key"
+              prepend-icon="$ayiKey"
               :label="$ay.t('OldPassword')"
               :type="reveal ? 'text' : 'password'"
               :rules="[form().required(this, 'oldPassword')]"
@@ -48,7 +48,7 @@
               v-model="obj.newPassword"
               :readonly="formState.readOnly"
               :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
-              prepend-icon="fa-key"
+              prepend-icon="$ayiKey"
               :label="$ay.t('NewPassword')"
               :type="reveal ? 'text' : 'password'"
               :rules="[form().required(this, 'newPassword')]"
@@ -64,7 +64,7 @@
               v-model="obj.confirmPassword"
               :readonly="formState.readOnly"
               :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
-              prepend-icon="fa-key"
+              prepend-icon="$ayiKey"
               :label="$ay.t('ConfirmPassword')"
               :type="reveal ? 'text' : 'password'"
               :rules="[
@@ -263,7 +263,7 @@ function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "fa-key",
+    icon: "$ayiKey",
     title: "SetLoginPassword",
     helpUrl: "form-home-password",
     formData: {
@@ -275,7 +275,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 5489e204..dd3d1bfb 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -404,7 +404,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
@@ -422,7 +422,7 @@ function generateMenu(vm) {
   //change password and login
   menuOptions.menuItems.push({
     title: "SetLoginPassword",
-    icon: "fa-key",
+    icon: "$ayiKey",
     data: "home-password",
     key: "app:nav"
   });
diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue
index f31fa3dc..2a405b1c 100644
--- a/ayanova/src/views/ops-backup.vue
+++ b/ayanova/src/views/ops-backup.vue
@@ -62,7 +62,7 @@
             <v-col cols="12">
               <span class="title">{{ $ay.t("BackupFiles") }}</span>
               <v-btn @click="getBackupStatus" class="mb-6">
-                <v-icon>fa-sync</v-icon>
+                <v-icon>$ayiSync</v-icon>
               </v-btn>
 
               <v-data-table
@@ -384,7 +384,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue
index 2cd716d9..2afa3572 100644
--- a/ayanova/src/views/ops-jobs.vue
+++ b/ayanova/src/views/ops-jobs.vue
@@ -3,7 +3,7 @@
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col cols="12">
       <v-btn @click="getDataFromApi" class="mb-6">
-        <v-icon>fa-sync</v-icon>
+        <v-icon>$ayiSync</v-icon>
       </v-btn>
       <v-data-table
         :headers="headers"
@@ -183,7 +183,7 @@ function generateMenu(vm) {
     menuItems: [
       {
         title: "Copy",
-        icon: "fa-copy",
+        icon: "$ayiCopy",
         surface: false,
         key: FORM_KEY + ":copylog",
         vm: vm
diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue
index aa1bbd35..1dd3661f 100644
--- a/ayanova/src/views/ops-log.vue
+++ b/ayanova/src/views/ops-log.vue
@@ -9,7 +9,7 @@
         item-value="logname"
         :label="$ay.t('Log')"
         @input="logSelected"
-        append-outer-icon="fa-sync"
+        append-outer-icon="$ayiSync"
         @click:append-outer="getDataFromApi"
       >
       </v-select>
@@ -154,7 +154,7 @@ function generateMenu(vm) {
     menuItems: [
       {
         title: "Copy",
-        icon: "fa-copy",
+        icon: "$ayiCopy",
         surface: false,
         key: FORM_KEY + ":copylog",
         vm: vm
diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue
index 09cbd66d..33094f25 100644
--- a/ayanova/src/views/ops-metrics.vue
+++ b/ayanova/src/views/ops-metrics.vue
@@ -7,7 +7,7 @@
         :items="selectLists.dateFilterTokens"
         item-text="name"
         item-value="id"
-        append-outer-icon="fa-sync"
+        append-outer-icon="$ayiSync"
         @click:append-outer="getDataFromApi"
         @input="timePeriodChanged"
       ></v-select>
diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue
index bf6b9c69..7e03d644 100644
--- a/ayanova/src/views/ops-notification-settings.vue
+++ b/ayanova/src/views/ops-notification-settings.vue
@@ -415,7 +415,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
diff --git a/ayanova/src/views/ops-notify-queue.vue b/ayanova/src/views/ops-notify-queue.vue
index 8c7ff5e3..7715c731 100644
--- a/ayanova/src/views/ops-notify-queue.vue
+++ b/ayanova/src/views/ops-notify-queue.vue
@@ -3,7 +3,7 @@
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col cols="12">
       <v-btn @click="getDataFromApi" class="mb-6">
-        <v-icon>fa-sync</v-icon>
+        <v-icon>$ayiSync</v-icon>
       </v-btn>
 
       <v-data-table
@@ -17,7 +17,7 @@
       >
         <template v-slot:[`item.actions`]="{ item }">
           <v-icon small class="mr-2" @click="deleteItem(item)">
-            fa-trash
+            $ayiTrashAlt
           </v-icon>
         </template></v-data-table
       >
@@ -194,7 +194,7 @@ function generateMenu(vm) {
     menuItems: [
       //   {
       //     title: "Copy",
-      //     icon: "fa-copy",
+      //     icon: "$ayiCopy",
       //     surface: false,
       //     key: FORM_KEY + ":copylog",
       //     vm: vm
diff --git a/ayanova/src/views/ops-profile.vue b/ayanova/src/views/ops-profile.vue
index e8c2a90f..59ccafe8 100644
--- a/ayanova/src/views/ops-profile.vue
+++ b/ayanova/src/views/ops-profile.vue
@@ -3,7 +3,7 @@
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col cols="12">
       <v-btn @click="refreshProfile">
-        <v-icon>fa-sync</v-icon>
+        <v-icon>$ayiSync</v-icon>
       </v-btn>
     </v-col>
     <v-col cols="12">
@@ -94,7 +94,7 @@ function generateMenu(vm) {
     menuItems: [
       //   {
       //     title: "Copy"),
-      //     icon: "fa-copy",
+      //     icon: "$ayiCopy",
       //     surface: false,
       //     key: FORM_KEY + ":copylog",
       //     vm: vm
diff --git a/ayanova/src/views/ops-server-state.vue b/ayanova/src/views/ops-server-state.vue
index eb94b818..0428831b 100644
--- a/ayanova/src/views/ops-server-state.vue
+++ b/ayanova/src/views/ops-server-state.vue
@@ -262,7 +262,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index c74223ff..5e468037 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -687,7 +687,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Save",
-      icon: "fa-save",
+      icon: "$ayiSave",
       surface: true,
       key: FORM_KEY + ":save",
       vm: vm
@@ -697,7 +697,7 @@ function generateMenu(vm) {
   if (vm.rights.delete && vm.$route.params.recordid != 0) {
     menuOptions.menuItems.push({
       title: "Delete",
-      icon: "fa-trash-alt",
+      icon: "$ayiTrashAlt",
       surface: false,
       key: FORM_KEY + ":delete",
       vm: vm
@@ -727,7 +727,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       key: FORM_KEY + ":new",
       vm: vm
     });
@@ -736,7 +736,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "Duplicate",
-      icon: "fa-clone",
+      icon: "$ayiClone",
       key: FORM_KEY + ":duplicate",
       vm: vm
     });
diff --git a/ayanova/src/views/widgets.vue b/ayanova/src/views/widgets.vue
index 6b2a150c..efd812f2 100644
--- a/ayanova/src/views/widgets.vue
+++ b/ayanova/src/views/widgets.vue
@@ -125,7 +125,7 @@ function generateMenu(vm) {
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
-      icon: "fa-plus",
+      icon: "$ayiPlus",
       surface: true,
       key: FORM_KEY + ":new",
       vm: vm