diff --git a/ayanova/src/components/attachment-control.vue b/ayanova/src/components/attachment-control.vue
index bfffe234..9ded17ba 100644
--- a/ayanova/src/components/attachment-control.vue
+++ b/ayanova/src/components/attachment-control.vue
@@ -86,7 +86,7 @@
 
                       <v-list-item-action>
                         <v-btn large @click="openEditMenu(item, $event)" icon>
-                          <v-icon>fa-edit</v-icon>
+                          <v-icon>$ayiEdit</v-icon>
                         </v-btn>
                       </v-list-item-action>
                     </v-list-item>
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 93ee5b8a..f02a42dd 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -114,9 +114,9 @@
                     <div class="text-center">
                       <v-icon v-if="c.v === false" small>far fa-square</v-icon>
                       <v-icon v-else-if="c.v === true" small
-                        >far fa-check-square</v-icon
+                        >far $ayiCheckSquare</v-icon
                       >
-                      <v-icon v-else small>far fa-minus-square</v-icon>
+                      <v-icon v-else small>far $ayiMinus-square</v-icon>
                     </div>
                   </template>
                   <template v-else-if="c.t == 7">
@@ -201,9 +201,9 @@
             >
               <v-icon v-if="!props.someItems" large>far fa-square</v-icon>
               <v-icon v-if="props.someItems && !props.everyItem" large
-                >far fa-minus-square</v-icon
+                >far $ayiMinus-square</v-icon
               >
-              <v-icon v-if="props.everyItem" large>far fa-check-square</v-icon>
+              <v-icon v-if="props.everyItem" large>far $ayiCheckSquare</v-icon>
             </div>
           </template>
 
@@ -288,9 +288,9 @@
                                 >far fa-square</v-icon
                               >
                               <v-icon v-else-if="c.v === true" small
-                                >far fa-check-square</v-icon
+                                >far $ayiCheckSquare</v-icon
                               >
-                              <v-icon v-else small>far fa-minus-square</v-icon>
+                              <v-icon v-else small>far $ayiMinus-square</v-icon>
                             </div>
                           </template>
                           <template v-else-if="c.t == 7">
diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index f62fbb12..9ff68d07 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -146,7 +146,7 @@ export default {
         return null;
       }
       if (this.value != 0) {
-        return "fa-edit";
+        return "$ayiEdit";
       }
       return "fa-plus";
     },
diff --git a/ayanova/src/components/report-selector-control.vue b/ayanova/src/components/report-selector-control.vue
index 1dc12886..8c8c0dbf 100644
--- a/ayanova/src/components/report-selector-control.vue
+++ b/ayanova/src/components/report-selector-control.vue
@@ -26,7 +26,7 @@
                 <v-list-item-title>{{ item.name }}</v-list-item-title>
                 <v-list-item-action>
                   <v-btn icon @click.stop="editReport(item.id)">
-                    <v-icon color="primary">fa-edit</v-icon>
+                    <v-icon color="primary">$ayiEdit</v-icon>
                   </v-btn>
                 </v-list-item-action>
               </v-list-item>
diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
index b479fabc..5d0c6375 100644
--- a/ayanova/src/components/wiki-control.vue
+++ b/ayanova/src/components/wiki-control.vue
@@ -20,14 +20,14 @@
             :outlined="currentView == view.DESIGN_VIEW"
             @click="currentView = view.DESIGN_VIEW"
           >
-            <v-icon>fa-edit</v-icon>
+            <v-icon>$ayiEdit</v-icon>
           </v-btn>
           <v-btn
             text
             :outlined="currentView == view.SPLIT_VIEW"
             @click="currentView = view.SPLIT_VIEW"
           >
-            <v-icon>fa-columns</v-icon>
+            <v-icon>$ayiColumns</v-icon>
           </v-btn>
         </div>
       </template>
@@ -41,20 +41,20 @@
           <v-col v-if="showDesigner()" :cols="12">
             <div>
               <v-btn depressed tile @click="editClick('bold')">
-                <v-icon>fa-bold</v-icon></v-btn
+                <v-icon>$ayiBold</v-icon></v-btn
               >
               <v-btn depressed tile @click="editClick('italic')">
-                <v-icon>fa-italic</v-icon></v-btn
+                <v-icon>$ayiItalic</v-icon></v-btn
               >
               <v-btn depressed tile @click="editClick('strike')">
-                <v-icon>fa-strikethrough</v-icon></v-btn
+                <v-icon>$ayiStrikethrough</v-icon></v-btn
               >
 
               <!-- HEADINGS -->
               <v-menu offset-y>
                 <template v-slot:activator="{ on }">
                   <v-btn depressed tile v-on="on">
-                    <v-icon>fa-heading</v-icon>
+                    <v-icon>$ayiHeading</v-icon>
                   </v-btn>
                 </template>
                 <v-list>
@@ -94,19 +94,19 @@
 
               <!-- MORE BUTTONS -->
               <v-btn depressed tile class="ml-1" @click="editClick('line')">
-                <v-icon>fa-minus</v-icon></v-btn
+                <v-icon>$ayiMinus</v-icon></v-btn
               >
               <v-btn depressed tile @click="editClick('quote')">
-                <v-icon>fa-quote-left</v-icon></v-btn
+                <v-icon>$ayiQuoteLeft</v-icon></v-btn
               >
               <v-btn depressed tile @click="editClick('ul')">
-                <v-icon>fa-list-ul</v-icon></v-btn
+                <v-icon>$ayiListUl</v-icon></v-btn
               >
               <v-btn depressed tile @click="editClick('ol')">
-                <v-icon>fa-list-ol</v-icon></v-btn
+                <v-icon>$ayiListOl</v-icon></v-btn
               >
               <v-btn depressed tile @click="editClick('task')">
-                <v-icon>fa-check-square</v-icon></v-btn
+                <v-icon>$ayiCheckSquare</v-icon></v-btn
               >
 
               <!-- TABLES -->
@@ -117,7 +117,7 @@
               >
                 <template v-slot:activator="{ on }">
                   <v-btn depressed tile class="ml-1" v-on="on">
-                    <v-icon>fa-table</v-icon>
+                    <v-icon>$ayiTable</v-icon>
                   </v-btn>
                 </template>
                 <v-card width="300">
@@ -130,11 +130,11 @@
                       v-model="tableMenuColumns"
                       min="1"
                       max="10"
-                      prepend-icon="fa-arrows-alt-h"
+                      prepend-icon="$ayiArrowsAltH"
                     ></v-slider>
 
                     <v-slider
-                      prepend-icon="fa-arrows-alt-v"
+                      prepend-icon="$ayiArrowsAltV"
                       class="mt-8"
                       thumb-size="24"
                       thumb-label="always"
@@ -160,7 +160,7 @@
 
               <!-- LINK -->
               <v-btn depressed tile @click="openLinkMenu">
-                <v-icon>fa-link</v-icon>
+                <v-icon>$ayiLink</v-icon>
               </v-btn>
               <v-menu
                 min-width="300"
@@ -202,7 +202,7 @@
               <!-- IMAGE -->
 
               <v-btn depressed tile @click="openImageMenu">
-                <v-icon>fa-image</v-icon>
+                <v-icon>$ayiImage</v-icon>
               </v-btn>
               <v-menu
                 min-width="360"
@@ -565,7 +565,7 @@ export default {
         case this.view.HIDDEN_VIEW:
           return "$ayiEye";
         case this.view.WIKI_VIEW:
-          return "fa-columns";
+          return "$ayiColumns";
         case this.view.SPLIT_VIEW:
           return "fa-feather";
         case this.view.DESIGN_VIEW:
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index b9dee89a..bcdb5f2e 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -14,9 +14,12 @@ Vue.component("font-awesome-icon", FontAwesomeIcon); // Register component globa
 import {
   faAddressBook,
   faAddressCard,
+  faArrowsAltH,
+  faArrowsAltV,
   faBars,
   faBell,
   faBinoculars,
+  faBold,
   faBox,
   faBoxes,
   faBullhorn,
@@ -27,13 +30,16 @@ import {
   faCalendarDay,
   faCaretDown,
   faCheckCircle,
+  faCheckSquare,
   faChevronDown,
   faChild,
   faCogs,
+  faColumns,
   faDiceD20,
   faDolly,
   faDollyFlatbed,
   faDoorOpen,
+  faEdit,
   faEllipsisV,
   faEye,
   faEyeSlash,
@@ -58,12 +64,19 @@ import {
   faGenderless,
   faGlasses,
   faGlobe,
+  faHeading,
   faHistory,
   faHome,
+  faImage,
   faInbox,
   faInfoCircle,
+  faItalic,
   faKey,
   faLanguage,
+  faLink,
+  faListOl,
+  faListUl,
+  faMinus,
   faPallet,
   faPaperclip,
   faPaperPlane,
@@ -71,6 +84,7 @@ import {
   faPencilRuler,
   faPlug,
   faQuestionCircle,
+  faQuoteLeft,
   faRobot,
   faRocket,
   faSearch,
@@ -83,6 +97,8 @@ import {
   faSlidersH,
   faStickyNote,
   faStore,
+  faStrikethrough,
+  faTable,
   faTachometerAlt,
   faThList,
   faTicketAlt,
@@ -100,9 +116,12 @@ Vue.component("font-awesome-icon", FontAwesomeIcon);
 library.add(
   faAddressBook,
   faAddressCard,
+  faArrowsAltH,
+  faArrowsAltV,
   faBars,
   faBell,
   faBinoculars,
+  faBold,
   faBox,
   faBoxes,
   faBullhorn,
@@ -113,13 +132,16 @@ library.add(
   faCalendarDay,
   faCaretDown,
   faCheckCircle,
+  faCheckSquare,
   faChevronDown,
   faChild,
   faCogs,
+  faColumns,
   faDiceD20,
   faDolly,
   faDollyFlatbed,
   faDoorOpen,
+  faEdit,
   faEllipsisV,
   faEye,
   faEyeSlash,
@@ -144,12 +166,19 @@ library.add(
   faGenderless,
   faGlasses,
   faGlobe,
+  faHeading,
   faHistory,
   faHome,
+  faImage,
   faInbox,
   faInfoCircle,
+  faItalic,
   faKey,
   faLanguage,
+  faLink,
+  faListOl,
+  faListUl,
+  faMinus,
   faPallet,
   faPaperclip,
   faPaperPlane,
@@ -157,6 +186,7 @@ library.add(
   faPencilRuler,
   faPlug,
   faQuestionCircle,
+  faQuoteLeft,
   faRobot,
   faRocket,
   faSearch,
@@ -169,6 +199,8 @@ library.add(
   faSlidersH,
   faStickyNote,
   faStore,
+  faStrikethrough,
+  faTable,
   faTachometerAlt,
   faThList,
   faTicketAlt,
@@ -194,6 +226,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "address-card"]
     }
   },
+  ayiArrowsAltH: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "arrows-alt-h"]
+    }
+  },
+  ayiArrowsAltV: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "arrows-alt-v"]
+    }
+  },
   ayiBell: {
     component: FontAwesomeIcon,
     props: {
@@ -206,6 +250,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "binoculars"]
     }
   },
+  ayiBold: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "bold"]
+    }
+  },
   ayiBox: {
     component: FontAwesomeIcon,
     props: {
@@ -260,6 +310,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "check-circle"]
     }
   },
+  ayiCheckSquare: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "check-square"]
+    }
+  },
   ayiChild: {
     component: FontAwesomeIcon,
     props: {
@@ -272,6 +328,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "cogs"]
     }
   },
+  ayiColumns: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "columns"]
+    }
+  },
   ayiCustomize: {
     component: FontAwesomeIcon,
     props: {
@@ -302,6 +364,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "door-open"]
     }
   },
+  ayiEdit: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "edit"]
+    }
+  },
   ayiEye: {
     component: FontAwesomeIcon,
     props: {
@@ -446,6 +514,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "globe"]
     }
   },
+  ayiHeading: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "heading"]
+    }
+  },
   ayiHistory: {
     component: FontAwesomeIcon,
     props: {
@@ -458,6 +532,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "home"]
     }
   },
+  ayiImage: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "image"]
+    }
+  },
   ayiInbox: {
     component: FontAwesomeIcon,
     props: {
@@ -470,6 +550,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "info-circle"]
     }
   },
+  ayiItalic: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "italic"]
+    }
+  },
   ayiKey: {
     component: FontAwesomeIcon,
     props: {
@@ -482,6 +568,30 @@ const CUSTOM_ICONS = {
       icon: ["fas", "language"]
     }
   },
+  ayiLink: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "link"]
+    }
+  },
+  ayiListOl: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "list-ol"]
+    }
+  },
+  ayiListUl: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "list-ul"]
+    }
+  },
+  ayiMinus: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "minus"]
+    }
+  },
   ayiPallet: {
     component: FontAwesomeIcon,
     props: {
@@ -524,6 +634,12 @@ const CUSTOM_ICONS = {
       icon: ["fas", "question-circle"]
     }
   },
+  ayiQuoteLeft: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "quote-left"]
+    }
+  },
   ayiRobot: {
     component: FontAwesomeIcon,
     props: {
@@ -590,6 +706,18 @@ const CUSTOM_ICONS = {
       icon: ["fas", "store"]
     }
   },
+  ayiStrikethrough: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "strikethrough"]
+    }
+  },
+  ayiTable: {
+    component: FontAwesomeIcon,
+    props: {
+      icon: ["fas", "table"]
+    }
+  },
   ayiTachometer: {
     component: FontAwesomeIcon,
     props: {