diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 9554f48..38dda46 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "Organization",
         "uri": null,
         "target": "self",
-        "icon": "fa fa-database",
+        "icon": "database",
         "order": 2,
         "from": "Organization",
         "permission": { "permission": 2, "category": null, "element": null },
diff --git a/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup.tpl.php b/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup.tpl.php
index dd2f30f..1d3658f 100755
--- a/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup.tpl.php
+++ b/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup.tpl.php
@@ -29,7 +29,7 @@
                         "key": 1, "listener": "click", "selector": "#acc-table tbody tr", "action": [
                             {"key": 1, "type": "dom.getvalue", "base": "self", "selector": ""},
                             {"key": 2, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-idlist", "value": "{0/id}", "data": ""},
-                            {"key": 3, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-taglist", "value": "<span id=\"{$id}-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"fa fa-times\"></i> {0/name/0}, {0/name/1}<span>", "data": ""},
+                            {"key": 3, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-taglist", "value": "<span id=\"{$id}-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"g-icon\">close</i> {0/name/0}, {0/name/1}<span>", "data": ""},
                             {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#{$id}", "value": "", "data": ""}
                         ]
                     }
diff --git a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php
index 60f45b6..7a55240 100755
--- a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php
+++ b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php
@@ -11,7 +11,7 @@
                         {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1}
                     ]
                 }
-            ]' formaction=""><i class="fa fa-book"></i></button>
+            ]' formaction=""><i class="g-icon">book</i></button>
             <div class="advancedInput wf-100" id="<?= $this->id; ?>">
                 <input autocomplete="off" class="input" type="text" id="i<?= $this->id; ?>"
                     data-emptyAfter="true"
@@ -21,8 +21,8 @@
                     <table class="default">
                         <thead>
                             <tr>
-                                <td>ID<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td>Name<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                <td>Name<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                         <tbody>
                             <template id="<?= $this->id; ?>-rowElement" class="rowTemplate">
                                 <tr tabindex="-1">
@@ -41,7 +41,7 @@
 <div class="box" id="<?= $this->id; ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->id; ?>-tagTemplate">
         <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>">
-            <i class="fa fa-times"></i>
+            <i class="g-icon">close</i>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
             <span data-tpl-text="/name" data-tpl-value="/name" data-value=""></span>
         </span>
diff --git a/Theme/Backend/Components/PositionTagSelector/position-selector-popup.tpl.php b/Theme/Backend/Components/PositionTagSelector/position-selector-popup.tpl.php
index 679fe61..2c9c166 100755
--- a/Theme/Backend/Components/PositionTagSelector/position-selector-popup.tpl.php
+++ b/Theme/Backend/Components/PositionTagSelector/position-selector-popup.tpl.php
@@ -29,7 +29,7 @@
                         "key": 1, "listener": "click", "selector": "#acc-table tbody tr", "action": [
                         {"key": 1, "type": "dom.getvalue", "base": "self", "selector": ""},
                         {"key": 2, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-idlist", "value": "{0/id}", "data": ""},
-                        {"key": 3, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-taglist", "value": "<span id=\"{$id}-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"fa fa-times\"></i> {0/name/0}, {0/name/1}<span>", "data": ""},
+                        {"key": 3, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-taglist", "value": "<span id=\"{$id}-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"g-icon\">close</i> {0/name/0}, {0/name/1}<span>", "data": ""},
                         {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#{$id}", "value": "", "data": ""}
                         ]
                     }
diff --git a/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php b/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php
index a3bdd2f..4b2e583 100755
--- a/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php
+++ b/Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php
@@ -11,7 +11,7 @@
                         {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1}
                     ]
                 }
-            ]' formaction=""><i class="fa fa-book"></i></button>
+            ]' formaction=""><i class="g-icon">book</i></button>
             <div class="advancedInput wf-100" id="<?= $this->id; ?>">
                 <input autocomplete="off" class="input" type="text" id="i<?= $this->id; ?>"
                     data-emptyAfter="true"
@@ -21,8 +21,8 @@
                     <table class="default">
                         <thead>
                             <tr>
-                                <td>ID<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td>Name<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                <td>Name<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                         <tbody>
                             <template id="<?= $this->id; ?>-rowElement" class="rowTemplate">
                                 <tr tabindex="-1">
@@ -41,7 +41,7 @@
 <div class="box" id="<?= $this->id; ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->id; ?>-tagTemplate">
         <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>">
-            <i class="fa fa-times"></i>
+            <i class="g-icon">close</i>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
             <span data-tpl-text="/name" data-tpl-value="/name" data-value=""></span>
         </span>
diff --git a/Theme/Backend/Components/UnitTagSelector/unit-selector-popup.tpl.php b/Theme/Backend/Components/UnitTagSelector/unit-selector-popup.tpl.php
index ef548ee..d246b17 100755
--- a/Theme/Backend/Components/UnitTagSelector/unit-selector-popup.tpl.php
+++ b/Theme/Backend/Components/UnitTagSelector/unit-selector-popup.tpl.php
@@ -29,7 +29,7 @@
                         "key": 1, "listener": "click", "selector": "#acc-table tbody tr", "action": [
                         {"key": 1, "type": "dom.getvalue", "base": "self", "selector": ""},
                         {"key": 2, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-idlist", "value": "{0/id}", "data": ""},
-                        {"key": 3, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-taglist", "value": "<span id=\"{$id}-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"fa fa-times\"></i> {0/name/0}, {0/name/1}<span>", "data": ""},
+                        {"key": 3, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-taglist", "value": "<span id=\"{$id}-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"g-icon\">close</i> {0/name/0}, {0/name/1}<span>", "data": ""},
                         {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#{$id}", "value": "", "data": ""}
                         ]
                     }
diff --git a/Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php b/Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php
index 167a6dd..9e0283d 100755
--- a/Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php
+++ b/Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php
@@ -11,7 +11,7 @@
                         {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name"}, "position": -1}
                     ]
                 }
-            ]' formaction=""><i class="fa fa-book"></i></button>
+            ]' formaction=""><i class="g-icon">book</i></button>
             <div class="advancedInput wf-100" id="<?= $this->id; ?>">
                 <input autocomplete="off" class="input" type="text" id="i<?= $this->id; ?>"
                     data-emptyAfter="true"
@@ -21,8 +21,8 @@
                     <table class="default">
                         <thead>
                             <tr>
-                                <td>ID<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td>Name<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                <td>Name<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                         <tbody>
                             <template id="<?= $this->id; ?>-rowElement" class="rowTemplate">
                                 <tr tabindex="-1">
@@ -41,7 +41,7 @@
 <div class="box" id="<?= $this->id; ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->id; ?>-tagTemplate">
         <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>">
-            <i class="fa fa-times"></i>
+            <i class="g-icon">close</i>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
             <span data-tpl-text="/name" data-tpl-value="/name" data-value=""></span>
         </span>
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index 88f0347..ad1301b 100755
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -34,7 +34,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Departments'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Departments'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="departmentList" class="default sticky">
                 <thead>
@@ -42,50 +42,50 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="departmentList-sort-1">
                             <input type="radio" name="departmentList-sort" id="departmentList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="departmentList-sort-2">
                             <input type="radio" name="departmentList-sort" id="departmentList-sort-2">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="departmentList-sort-3">
                             <input type="radio" name="departmentList-sort" id="departmentList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="departmentList-sort-4">
                             <input type="radio" name="departmentList-sort" id="departmentList-sort-4">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Parent'); ?>
                         <label for="departmentList-sort-5">
                             <input type="radio" name="departmentList-sort" id="departmentList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="departmentList-sort-6">
                             <input type="radio" name="departmentList-sort" id="departmentList-sort-6">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Unit'); ?>
                         <label for="departmentList-sort-7">
                             <input type="radio" name="departmentList-sort" id="departmentList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="departmentList-sort-8">
                             <input type="radio" name="departmentList-sort" id="departmentList-sort-8">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                 <tbody>
                 <?php $c = 0;
diff --git a/Theme/Backend/position-list.tpl.php b/Theme/Backend/position-list.tpl.php
index b1008f4..76f7208 100755
--- a/Theme/Backend/position-list.tpl.php
+++ b/Theme/Backend/position-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Positions'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Positions'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="positionList" class="default sticky">
                 <thead>
@@ -36,50 +36,50 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="positionList-sort-1">
                             <input type="radio" name="positionList-sort" id="positionList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="positionList-sort-2">
                             <input type="radio" name="positionList-sort" id="positionList-sort-2">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="positionList-sort-3">
                             <input type="radio" name="positionList-sort" id="positionList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="positionList-sort-4">
                             <input type="radio" name="positionList-sort" id="positionList-sort-4">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Parent'); ?>
                         <label for="positionList-sort-5">
                             <input type="radio" name="positionList-sort" id="positionList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="positionList-sort-6">
                             <input type="radio" name="positionList-sort" id="positionList-sort-6">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Department'); ?>
                         <label for="positionList-sort-7">
                             <input type="radio" name="positionList-sort" id="positionList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="positionList-sort-8">
                             <input type="radio" name="positionList-sort" id="positionList-sort-8">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                 <tbody>
                 <?php $count = 0; foreach ($positions as $key => $value) : ++$count;
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php
index 688753b..864e8f3 100755
--- a/Theme/Backend/unit-list.tpl.php
+++ b/Theme/Backend/unit-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Units'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Units'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="unitList" class="default sticky">
                 <thead>
@@ -36,50 +36,50 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="unitList-sort-1">
                             <input type="radio" name="unitList-sort" id="unitList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="unitList-sort-2">
                             <input type="radio" name="unitList-sort" id="unitList-sort-2">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Logo'); ?>
                         <label for="unitList-sort-3">
                             <input type="radio" name="unitList-sort" id="unitList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="unitList-sort-4">
                             <input type="radio" name="unitList-sort" id="unitList-sort-4">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="unitList-sort-5">
                             <input type="radio" name="unitList-sort" id="unitList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="unitList-sort-6">
                             <input type="radio" name="unitList-sort" id="unitList-sort-6">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Parent'); ?>
                         <label for="unitList-sort-7">
                             <input type="radio" name="unitList-sort" id="unitList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="unitList-sort-8">
                             <input type="radio" name="unitList-sort" id="unitList-sort-8">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                 <tbody>
                 <?php foreach ($units as $key => $value) :