diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index bf7bb80d..7a0d4f12 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -50,10 +50,6 @@ CURRENT TODOs
 @@@@@@@@@@@ ROADMAP STAGE 2:
 
 
-todo: now that we have case insensitive should I port that shit over to the datagrid filter as well?
-	- yes, obviously.. Git r done and move on
-
-
 todo: Should all icons be specified from a central location for future proofing and consistency?
 	- Not sure after initial look at it if this is a good idea or not, think about again
 		- consider the finished product and how many forms etc
diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index 0617b3a7..097b0cb4 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -16,7 +16,7 @@
           <!-- TOP LEVEL HOLDER -->
           <template v-if="!item.route">
             <v-list-group
-              :prepend-icon="'fa-' + item.icon"
+              :prepend-icon="item.icon"
               :value="false"
               :key="item.key"
             >
@@ -51,9 +51,7 @@
                         :to="subsub.route"
                       >
                         <v-list-item-action>
-                          <v-icon v-if="subsub.icon">{{
-                            "fa-" + subsub.icon
-                          }}</v-icon>
+                          <v-icon v-if="subsub.icon">{{ subsub.icon }}</v-icon>
                         </v-list-item-action>
                         <v-list-item-title
                           v-text="subsub.title"
@@ -68,9 +66,7 @@
                   <div class="pl-3" :key="subitem.key">
                     <v-list-item :to="subitem.route">
                       <v-list-item-action>
-                        <v-icon v-if="subitem.icon">{{
-                          "fa-" + subitem.icon
-                        }}</v-icon>
+                        <v-icon v-if="subitem.icon">{{ subitem.icon }}</v-icon>
                       </v-list-item-action>
                       <v-list-item-content>
                         <v-list-item-title>{{
@@ -90,7 +86,7 @@
             <div :key="item.key">
               <v-list-item :to="item.route">
                 <v-list-item-action v-if="item.icon">
-                  <v-icon>{{ "fa-" + item.icon }}</v-icon>
+                  <v-icon>{{ item.icon }}</v-icon>
                 </v-list-item-action>
                 <v-list-item-content>
                   <v-list-item-title>{{ item.title }}</v-list-item-title>
@@ -101,19 +97,6 @@
 
           <!-- end of entire list -->
         </template>
-
-        <!-- <v-list-item
-          v-for="item in navItems"
-          :key="item.route"
-          :to="item.route"
-        >
-          <v-list-item-action>
-            <v-icon>{{ "fa-" + item.icon }}</v-icon>
-          </v-list-item-action>
-          <v-list-item-content>
-            <v-list-item-title>{{ item.title }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item> -->
       </v-list>
       <!-- </v-card> -->
     </v-navigation-drawer>
@@ -142,7 +125,7 @@
             @click="clickMenuItem(item)"
           >
             <v-icon :color="item.color ? item.color : ''">
-              {{ "fa-" + item.icon }}
+              {{ item.icon }}
             </v-icon>
           </v-btn>
         </template>
@@ -174,7 +157,7 @@
                   <v-icon
                     v-if="item.icon"
                     :color="item.color ? item.color : ''"
-                    >{{ "fa-" + item.icon }}</v-icon
+                    >{{ item.icon }}</v-icon
                   >
                 </v-list-item-action>
                 <v-list-item-content>
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 2347d500..ec5f51ce 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -45,7 +45,7 @@ export default function initialize() {
             //DASHBOARD
             sub.push({
               title: window.$gz.translation.get("Dashboard"),
-              icon: "tachometer-alt",
+              icon: "fa-tachometer-alt",
               route: "/home-dashboard",
               key: key++
             });
@@ -71,7 +71,7 @@ export default function initialize() {
             ) {
               sub.push({
                 title: window.$gz.translation.get("Search"),
-                icon: "search",
+                icon: "fa-search",
                 route: "/home-search",
                 key: key++
               });
@@ -80,7 +80,7 @@ export default function initialize() {
             //SCHEDULE (personal)
             sub.push({
               title: window.$gz.translation.get("Schedule"),
-              icon: "calendar-day",
+              icon: "fa-calendar-day",
               route: "/home-schedule",
               key: key++
             });
@@ -88,7 +88,7 @@ export default function initialize() {
             //MEMOS
             sub.push({
               title: window.$gz.translation.get("MemoList"),
-              icon: "inbox",
+              icon: "fa-inbox",
               route: "/home-memos",
               key: key++
             });
@@ -96,7 +96,7 @@ export default function initialize() {
             //REMINDERS (SCHEDULE MARKERS)
             sub.push({
               title: window.$gz.translation.get("ReminderList"),
-              icon: "sticky-note",
+              icon: "fa-sticky-note",
               route: "/home-reminders",
               key: key++
             });
@@ -104,7 +104,7 @@ export default function initialize() {
             //USER SETTINGS
             sub.push({
               title: window.$gz.translation.get("UserSettings"),
-              icon: "user-cog",
+              icon: "fa-user-cog",
               route: "/home-user-settings",
               key: key++
             });
@@ -113,7 +113,7 @@ export default function initialize() {
             // //USER TRANSLATE
             // sub.push({
             //   title: window.$gz.translation.get("Translation"),
-            //   icon: "language",
+            //   icon: "fa-language",
             //   route: "/home-translation",
             //   key: key++
             // });
@@ -121,7 +121,7 @@ export default function initialize() {
             // //SET LOGIN
             // sub.push({
             //   title: window.$gz.translation.get("SetLoginPassword"),
-            //   icon: "key",
+            //   icon: "fa-key",
             //   route: "/home-password",
             //   key: key++
             // });
@@ -145,7 +145,7 @@ export default function initialize() {
             ) {
               sub.push({
                 title: window.$gz.translation.get("NotifySubscriptionList"),
-                icon: "bullhorn",
+                icon: "fa-bullhorn",
                 route: "/home-notify-subscriptions",
                 key: key++
               });
@@ -154,7 +154,7 @@ export default function initialize() {
             //HOME
             addNavItem(
               window.$gz.translation.get("Home"),
-              "home",
+              "fa-home",
               undefined,
               sub,
               key++
@@ -181,7 +181,7 @@ export default function initialize() {
             //CUSTOMERS subitem
             sub.push({
               title: window.$gz.translation.get("ClientList"),
-              icon: "address-card",
+              icon: "fa-address-card",
               route: "/cust-customers",
               key: key++
             });
@@ -189,7 +189,7 @@ export default function initialize() {
             //HEAD OFFICES subitem
             sub.push({
               title: window.$gz.translation.get("HeadOfficeList"),
-              icon: "sitemap",
+              icon: "fa-sitemap",
               route: "/cust-headoffices",
               key: key++
             });
@@ -197,7 +197,7 @@ export default function initialize() {
             // ** CUSTOMER (TOP)
             addNavItem(
               window.$gz.translation.get("ClientList"),
-              "address-book",
+              "fa-address-book",
               undefined,
               sub,
               key++
@@ -232,7 +232,7 @@ export default function initialize() {
             ) {
               sub.push({
                 title: window.$gz.translation.get("Schedule"),
-                icon: "calendar-alt",
+                icon: "fa-calendar-alt",
                 route: "/svc-schedule",
                 key: key++
               });
@@ -251,7 +251,7 @@ export default function initialize() {
             ) {
               sub.push({
                 title: window.$gz.translation.get("WorkorderServiceList"),
-                icon: "tools",
+                icon: "fa-tools",
                 route: "/svc-workorders",
                 key: key++
               });
@@ -262,7 +262,7 @@ export default function initialize() {
             //there used to be an array for 3rd level shit but that's whack yo! ;)
             // subSub.push({
             //   title: window.$gz.translation.get("WorkorderServiceTemplate"),
-            //   icon: "stamp",
+            //   icon: "fa-stamp",
             //   route: "/svc-workorder-templates",
             //   key: key++
             // });
@@ -272,7 +272,7 @@ export default function initialize() {
             //so there is no separate role check here as the service group role check supersedes this
             sub.push({
               title: window.$gz.translation.get("WorkorderQuoteList"),
-              icon: "edit",
+              icon: "fa-edit",
               route: "/svc-quotes",
               key: key++
             });
@@ -292,7 +292,7 @@ export default function initialize() {
                 title: window.$gz.translation.get(
                   "WorkorderPreventiveMaintenanceList"
                 ),
-                icon: "business-time",
+                icon: "fa-business-time",
                 route: "/svc-pm-list",
                 key: key++
               });
@@ -311,7 +311,7 @@ export default function initialize() {
             ) {
               sub.push({
                 title: window.$gz.translation.get("UnitList"),
-                icon: "fan",
+                icon: "fa-fan",
                 route: "/svc-units",
                 key: key++
               });
@@ -319,7 +319,7 @@ export default function initialize() {
               //UNIT MODELS subitem
               sub.push({
                 title: window.$gz.translation.get("UnitModels"),
-                icon: "dice-d20",
+                icon: "fa-dice-d20",
                 route: "/svc-unit-models",
                 key: key++
               });
@@ -337,7 +337,7 @@ export default function initialize() {
             ) {
               sub.push({
                 title: window.$gz.translation.get("LoanItemList"),
-                icon: "plug",
+                icon: "fa-plug",
                 route: "/svc-loaners",
                 key: key++
               });
@@ -356,7 +356,7 @@ export default function initialize() {
             ) {
               sub.push({
                 title: window.$gz.translation.get("ContractList"),
-                icon: "file-contract",
+                icon: "fa-file-contract",
                 route: "/svc-contracts",
                 key: key++
               });
@@ -375,7 +375,7 @@ export default function initialize() {
             ) {
               sub.push({
                 title: window.$gz.translation.get("ClientServiceRequestList"),
-                icon: "child",
+                icon: "fa-child",
                 route: "/svc-csr-list",
                 key: key++
               });
@@ -384,7 +384,7 @@ export default function initialize() {
             //**** Service (TOP GROUP)
             addNavItem(
               window.$gz.translation.get("Service"),
-              "toolbox",
+              "fa-toolbox",
               undefined,
               sub,
               key++
@@ -406,7 +406,7 @@ export default function initialize() {
             //PARTS (part list)
             sub.push({
               title: window.$gz.translation.get("PartList"),
-              icon: "boxes",
+              icon: "fa-boxes",
               route: "/inv-parts",
               key: key++
             });
@@ -414,7 +414,7 @@ export default function initialize() {
             //INVENTORY
             sub.push({
               title: window.$gz.translation.get("PartByWarehouseInventoryList"),
-              icon: "pallet",
+              icon: "fa-pallet",
               route: "/inv-part-inventory",
               key: key++
             });
@@ -422,7 +422,7 @@ export default function initialize() {
             //PART REQUESTS
             sub.push({
               title: window.$gz.translation.get("WorkorderItemPartRequestList"),
-              icon: "paper-plane",
+              icon: "fa-paper-plane",
               route: "/inv-part-requests",
               key: key++
             });
@@ -430,7 +430,7 @@ export default function initialize() {
             //PURCHASE ORDERS
             sub.push({
               title: window.$gz.translation.get("InventoryPurchaseOrders"),
-              icon: "shipping-fast",
+              icon: "fa-shipping-fast",
               route: "/inv-purchase-orders",
               key: key++
             });
@@ -442,7 +442,7 @@ export default function initialize() {
               title: window.$gz.translation.get(
                 "InventoryPurchaseOrderReceipts"
               ),
-              icon: "dolly-flatbed",
+              icon: "fa-dolly-flatbed",
               route: "/inv-purchase-order-receipts",
               key: key++
             });
@@ -456,7 +456,7 @@ export default function initialize() {
               title: window.$gz.translation.get(
                 "InventoryPartInventoryAdjustments"
               ),
-              icon: "dolly",
+              icon: "fa-dolly",
               route: "/inv-adjustments",
               key: key++
             });
@@ -464,7 +464,7 @@ export default function initialize() {
             //**** INVENTORY (TOP GROUP)
             addNavItem(
               window.$gz.translation.get("Inventory"),
-              "box",
+              "fa-box",
               undefined,
               sub,
               key++
@@ -485,7 +485,7 @@ export default function initialize() {
           ) {
             addNavItem(
               window.$gz.translation.get("VendorList"),
-              "store",
+              "fa-store",
               "/vendors",
               [],
               key++
@@ -505,7 +505,7 @@ export default function initialize() {
             //FAKE subitem as is still TBD
             sub.push({
               title: window.$gz.translation.get("Accounting"),
-              icon: "calculator",
+              icon: "fa-calculator",
               route: "/acc-accounting",
               key: key++
             });
@@ -513,7 +513,7 @@ export default function initialize() {
             // ** ACCOUNTING (TOP)
             addNavItem(
               window.$gz.translation.get("Accounting"),
-              "calculator",
+              "fa-calculator",
               undefined,
               sub,
               key++
@@ -533,7 +533,7 @@ export default function initialize() {
             // GLOBAL SETTINGS
             sub.push({
               title: window.$gz.translation.get("AdministrationGlobalSettings"),
-              icon: "cogs",
+              icon: "fa-cogs",
               route: "/adm-global-settings",
               key: key++
             });
@@ -541,7 +541,7 @@ export default function initialize() {
             // LICENSE
             sub.push({
               title: window.$gz.translation.get("HelpLicense"),
-              icon: "ticket-alt",
+              icon: "fa-ticket-alt",
               route: "/adm-license",
               key: key++
             });
@@ -549,7 +549,7 @@ export default function initialize() {
             // USERS
             sub.push({
               title: window.$gz.translation.get("UserList"),
-              icon: "users",
+              icon: "fa-users",
               route: "/adm-users",
               key: key++
             });
@@ -559,7 +559,7 @@ export default function initialize() {
             //TRANSLATION
             sub.push({
               title: window.$gz.translation.get("Translation"),
-              icon: "language",
+              icon: "fa-language",
               route: "/adm-translation",
               key: key++
             });
@@ -567,7 +567,7 @@ export default function initialize() {
             //REPORT TEMPLATES
             sub.push({
               title: window.$gz.translation.get("ReportList"),
-              icon: "th-list",
+              icon: "fa-th-list",
               route: "/adm-report-templates",
               key: key++
             });
@@ -575,7 +575,7 @@ export default function initialize() {
             //FILES IN DATABASE
             sub.push({
               title: window.$gz.translation.get("Attachments"),
-              icon: "folder",
+              icon: "fa-folder",
               route: "/adm-attachments",
               key: key++
             });
@@ -583,7 +583,7 @@ export default function initialize() {
             //EVENT LOG / HISTORY
             sub.push({
               title: window.$gz.translation.get("History"),
-              icon: "history",
+              icon: "fa-history",
               route: "/adm-history",
               key: key++
             });
@@ -591,7 +591,7 @@ export default function initialize() {
             //KPI / METRICS / CHARTS AND STUFF
             sub.push({
               title: window.$gz.translation.get("Statistics"),
-              icon: "chart-line",
+              icon: "fa-chart-line",
               route: "/adm-statistics",
               key: key++
             });
@@ -599,7 +599,7 @@ export default function initialize() {
             // ** ADMINISTRATION (TOP)
             addNavItem(
               window.$gz.translation.get("Administration"),
-              "user-tie",
+              "fa-user-tie",
               undefined,
               sub,
               key++
@@ -619,7 +619,7 @@ export default function initialize() {
             // ARCHIVE
             sub.push({
               title: window.$gz.translation.get("Backup"),
-              icon: "file-archive",
+              icon: "fa-file-archive",
               route: "/ops-backup",
               key: key++
             });
@@ -633,7 +633,7 @@ export default function initialize() {
             // JOBS
             sub.push({
               title: window.$gz.translation.get("ServerJobs"),
-              icon: "robot",
+              icon: "fa-robot",
               route: "/ops-jobs",
               key: key++
             });
@@ -641,7 +641,7 @@ export default function initialize() {
             // LOGS
             sub.push({
               title: window.$gz.translation.get("ServerLog"),
-              icon: "history",
+              icon: "fa-history",
               route: "/ops-log",
               key: key++
             });
@@ -649,7 +649,7 @@ export default function initialize() {
             //METRICS
             sub.push({
               title: window.$gz.translation.get("ServerMetrics"),
-              icon: "file-medical-alt",
+              icon: "fa-file-medical-alt",
               route: "/ops-metrics",
               key: key++
             });
@@ -657,7 +657,7 @@ export default function initialize() {
             //NOTIFICATION CONFIG AND HISTORY
             sub.push({
               title: window.$gz.translation.get("NotificationSettings"),
-              icon: "bullhorn",
+              icon: "fa-bullhorn",
               route: "/ops-notification-settings",
               key: key++
             });
@@ -665,7 +665,7 @@ export default function initialize() {
             // ** OPERATIONS (TOP)
             addNavItem(
               window.$gz.translation.get("Operations"),
-              "server",
+              "fa-server",
               undefined,
               sub,
               key++
@@ -685,7 +685,7 @@ export default function initialize() {
           ) {
             addNavItem(
               window.$gz.translation.get("WidgetList"),
-              "vial",
+              "fa-vial",
               "/widgets",
               [],
               key++
@@ -710,7 +710,7 @@ export default function initialize() {
             //CSR LIST subitem
             sub.push({
               title: window.$gz.translation.get("ClientServiceRequestList"),
-              icon: "child",
+              icon: "fa-child",
               route: "/customer-csr-list",
               key: key++
             });
@@ -718,7 +718,7 @@ export default function initialize() {
             //WORKORDERS subitem
             sub.push({
               title: window.$gz.translation.get("WorkorderServiceList"),
-              icon: "tools",
+              icon: "fa-tools",
               route: "/customer-workorders",
               key: key++
             });
@@ -727,7 +727,7 @@ export default function initialize() {
 
             addNavItem(
               window.$gz.translation.get("Home"),
-              "home",
+              "fa-home",
               undefined,
               sub,
               key++