diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index f90074a..f7662ec 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "Admin",
         "uri": null,
         "target": "self",
-        "icon": "fa fa-lock",
+        "icon": "lock",
         "order": 1,
         "from": "Admin",
         "permission": { "permission": 2, "category": null, "element": null },
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 89ca3d1..97dc1b5 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -100,7 +100,7 @@ echo $this->data['nav']->render();
                             <div class="form-group">
                                 <label for="iPassword">
                                     <?= $this->getHtml('PasswordRegex'); ?>
-                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="fa fa-info-circle"></i></i>
+                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="g-icon">info</i></i>
                                 </label>
 
                                 <input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
@@ -109,7 +109,7 @@ echo $this->data['nav']->render();
                             <div class="form-group">
                                 <label for="iLoginRetries">
                                     <?= $this->getHtml('LoginRetries'); ?>
-                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:LoginRetries'); ?>"><i class="fa fa-info-circle"></i></i>
+                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:LoginRetries'); ?>"><i class="g-icon">info</i></i>
                                 </label>
 
                                 <input id="iLoginRetries" name="settings_1000000005" type="number" value="<?= $this->printHtml($generalSettings['1000000005']->content); ?>" min="-1">
@@ -118,7 +118,7 @@ echo $this->data['nav']->render();
                             <div class="form-group">
                                 <label for="iTimeoutPeriod">
                                     <?= $this->getHtml('TimeoutPeriod'); ?>
-                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:TimeoutPeriod'); ?>"><i class="fa fa-info-circle"></i></i>
+                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:TimeoutPeriod'); ?>"><i class="g-icon">info</i></i>
                                 </label>
 
                                 <input id="iTimeoutPeriod" name="settings_1000000002" type="number" value="<?= $this->printHtml($generalSettings['1000000002']->content); ?>">
@@ -127,7 +127,7 @@ echo $this->data['nav']->render();
                             <div class="form-group">
                                 <label for="iPasswordChangeInterval">
                                     <?= $this->getHtml('PasswordChangeInterval'); ?>
-                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordChangeInterval'); ?>"><i class="fa fa-info-circle"></i></i>
+                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordChangeInterval'); ?>"><i class="g-icon">info</i></i>
                                 </label>
 
                                 <input id="iPasswordChangeInterval" name="settings_1000000003" type="number" value="<?= $this->printHtml($generalSettings['1000000003']->content); ?>">
@@ -136,7 +136,7 @@ echo $this->data['nav']->render();
                             <div class="form-group">
                                 <label for="iPasswordHistory">
                                     <?= $this->getHtml('PasswordHistory'); ?>
-                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordHistory'); ?>"><i class="fa fa-info-circle"></i></i>
+                                    <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordHistory'); ?>"><i class="g-icon">info</i></i>
                                 </label>
 
                                 <input id="iPasswordHistory" name="settings_1000000004" type="number" value="<?= $this->printHtml($generalSettings['1000000004']->content); ?>">
@@ -697,7 +697,7 @@ echo $this->data['nav']->render();
     <div class="tab">
         <div class="col-xs-12">
             <div class="portlet">
-                <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="g-icon download btn end-xs">download</i></div>
                     <div class="slider">
                     <table id="settingsList" class="default sticky">
                         <thead>
@@ -706,87 +706,87 @@ echo $this->data['nav']->render();
                             <td><?= $this->getHtml('ID', '0', '0'); ?>
                                 <label for="settingsList-sort-1">
                                     <input type="radio" name="settingsList-sort" id="settingsList-sort-1">
-                                    <i class="sort-asc fa fa-chevron-up"></i>
+                                    <i class="sort-asc g-icon">expand_less</i>
                                 </label>
                                 <label for="settingsList-sort-2">
                                     <input type="radio" name="settingsList-sort" id="settingsList-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('Name'); ?>
                                 <label for="settingsList-sort-3">
                                     <input type="radio" name="settingsList-sort" id="settingsList-sort-3">
-                                    <i class="sort-asc fa fa-chevron-up"></i>
+                                    <i class="sort-asc g-icon">expand_less</i>
                                 </label>
                                 <label for="settingsList-sort-4">
                                     <input type="radio" name="settingsList-sort" id="settingsList-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('Value'); ?>
                             <td><?= $this->getHtml('Unit'); ?>
                                 <label for="settingsList-sort-5">
                                     <input type="radio" name="settingsList-sort" id="settingsList-sort-5">
-                                    <i class="sort-asc fa fa-chevron-up"></i>
+                                    <i class="sort-asc g-icon">expand_less</i>
                                 </label>
                                 <label for="settingsList-sort-6">
                                     <input type="radio" name="settingsList-sort" id="settingsList-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('App'); ?>
                                 <label for="settingsList-sort-5">
                                     <input type="radio" name="settingsList-sort" id="settingsList-sort-5">
-                                    <i class="sort-asc fa fa-chevron-up"></i>
+                                    <i class="sort-asc g-icon">expand_less</i>
                                 </label>
                                 <label for="settingsList-sort-6">
                                     <input type="radio" name="settingsList-sort" id="settingsList-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('Module'); ?>
                                 <label for="settingsList-sort-5">
                                     <input type="radio" name="settingsList-sort" id="settingsList-sort-5">
-                                    <i class="sort-asc fa fa-chevron-up"></i>
+                                    <i class="sort-asc g-icon">expand_less</i>
                                 </label>
                                 <label for="settingsList-sort-6">
                                     <input type="radio" name="settingsList-sort" id="settingsList-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('Group'); ?>
                                 <label for="settingsList-sort-7">
                                     <input type="radio" name="settingsList-sort" id="settingsList-sort-7">
-                                    <i class="sort-asc fa fa-chevron-up"></i>
+                                    <i class="sort-asc g-icon">expand_less</i>
                                 </label>
                                 <label for="settingsList-sort-8">
                                     <input type="radio" name="settingsList-sort" id="settingsList-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>
                             <td><?= $this->getHtml('Account'); ?>
                                 <label for="settingsList-sort-9">
                                     <input type="radio" name="settingsList-sort" id="settingsList-sort-9">
-                                    <i class="sort-asc fa fa-chevron-up"></i>
+                                    <i class="sort-asc g-icon">expand_less</i>
                                 </label>
                                 <label for="settingsList-sort-10">
                                     <input type="radio" name="settingsList-sort" id="settingsList-sort-10">
-                                    <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;
@@ -796,7 +796,7 @@ echo $this->data['nav']->render();
                             foreach ($settings as $key => $setting) : ++$count;
                         ?>
                         <tr tabindex="0">
-                            <td><i class="fa fa-cogs"></i>
+                            <td><i class="g-icon">settings</i>
                             <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><?= $setting->id; ?>
                             <td data-label="<?= $this->getHtml('Name'); ?>">
                                 <?php
diff --git a/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php b/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
index ac454db..839550d 100644
--- a/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
+++ b/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php
@@ -40,7 +40,7 @@ $categories  = ISO639Enum::getConstants();
                                             {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
                                         ]
                                     }
-                                ]'><i class="fa fa-book"></i></button>
+                                ]'><i class="g-icon">book</i></button>
                                 <input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="&#xf007; Guest" data-action='[
                                     {
                                         "key": 1, "listener": "keyup", "action": [
@@ -56,7 +56,7 @@ $categories  = ISO639Enum::getConstants();
                                             {"key": 1, "type": "validate.keypress", "pressed": "13|9"},
                                             {"key": 2, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/group?search={!#<?= $this->id; ?>}", "method": "GET", "request_type": "json"},
                                             {"key": 3, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->id; ?>-idlist", "value": "{0/id}", "data": ""},
-                                            {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->id; ?>-taglist", "value": "<span id=\"<?= $this->id; ?>-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"fa fa-times\"></i> {0/name}</span>", "data": ""},
+                                            {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->id; ?>-taglist", "value": "<span id=\"<?= $this->id; ?>-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"g-icon\">close</i> {0/name}</span>", "data": ""},
                                             {"key": 5, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->id; ?>", "value": "", "data": ""}
                                         ]
                                     }
@@ -194,7 +194,7 @@ $categories  = ISO639Enum::getConstants();
 
     <div class="col-xs-12 col-md-6">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Permissions', 'Admin', 'Backend'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Permissions', 'Admin', 'Backend'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="attributeTable" class="default"
                 data-tag="form"
@@ -205,16 +205,16 @@ $categories  = ISO639Enum::getConstants();
                     <tr>
                         <td>
                         <td><?= $this->getHtml('ID', '0', '0'); ?>
-                        <td><?= $this->getHtml('Account', 'Admin', 'Backend'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                        <td><?= $this->getHtml('Category', 'Admin', 'Backend'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                        <td><?= $this->getHtml('Element', 'Admin', 'Backend'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                        <td><?= $this->getHtml('Account', 'Admin', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                        <td><?= $this->getHtml('Category', 'Admin', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                        <td><?= $this->getHtml('Element', 'Admin', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                 <tbody>
                     <template class="oms-add-tpl-attribute">
                         <tr data-id="" draggable="false">
                             <td>
-                                <i class="fa fa-cogs btn update-form"></i>
+                                <i class="g-icon btn update-form">settings</i>
                                 <input id="attributeTable-remove-0" type="checkbox" class="hidden">
-                                <label for="attributeTable-remove-0" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                <label for="attributeTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                 <span class="checked-visibility">
                                     <label for="attributeTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                     <label for="attributeTable-remove-0" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
@@ -229,10 +229,10 @@ $categories  = ISO639Enum::getConstants();
                     foreach ($permissions as $key => $value) : ++$c; ?>
                         <tr data-id="<?= $value->id; ?>">
                             <td>
-                                <i class="fa fa-cogs btn update-form"></i>
+                                <i class="g-icon btn update-form">settings</i>
                                 <?php if (!$value->type->isRequired) : ?>
                                 <input id="attributeTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
-                                <label for="attributeTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                <label for="attributeTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                 <span class="checked-visibility">
                                     <label for="attributeTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                     <label for="attributeTable-remove-<?= $value->id; ?>" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
diff --git a/Theme/Backend/Components/GroupTagSelector/group-selector-popup.tpl.php b/Theme/Backend/Components/GroupTagSelector/group-selector-popup.tpl.php
index c96ee11..90eafe1 100755
--- a/Theme/Backend/Components/GroupTagSelector/group-selector-popup.tpl.php
+++ b/Theme/Backend/Components/GroupTagSelector/group-selector-popup.tpl.php
@@ -28,7 +28,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/GroupTagSelector/group-selector.tpl.php b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
index 0c29b94..06f900a 100755
--- a/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
+++ b/Theme/Backend/Components/GroupTagSelector/group-selector.tpl.php
@@ -12,7 +12,7 @@
                             {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
                         ]
                     }
-                ]'><i class="fa fa-book"></i></button>
+                ]'><i class="g-icon">book</i></button>
                 <input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="&#xf007; Guest" data-action='[
                     {
                         "key": 1, "listener": "keyup", "action": [
@@ -28,7 +28,7 @@
                             {"key": 1, "type": "validate.keypress", "pressed": "13|9"},
                             {"key": 2, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/group?search={!#<?= $this->id; ?>}", "method": "GET", "request_type": "json"},
                             {"key": 3, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->id; ?>-idlist", "value": "{0/id}", "data": ""},
-                            {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->id; ?>-taglist", "value": "<span id=\"<?= $this->id; ?>-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"fa fa-times\"></i> {0/name}</span>", "data": ""},
+                            {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->id; ?>-taglist", "value": "<span id=\"<?= $this->id; ?>-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"g-icon\">close</i> {0/name}</span>", "data": ""},
                             {"key": 5, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->id; ?>", "value": "", "data": ""}
                         ]
                     }
diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index f158743..4a11dca 100755
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -44,42 +44,42 @@ echo $this->data['nav']->render(); ?>
                     <div class="form-group">
                         <label for="iUsername"><?= $this->getHtml('Username'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="fa fa-user"></i></button>
+                                    <button class="inactive" type="button"><i class="g-icon">person</i></button>
                                     <input id="iUsername" name="name" type="text" autocomplete="off" spellcheck="false">
                                 </span>
                     </div>
                     <div class="form-group">
                         <label for="iName1"><?= $this->getHtml('Name1'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="fa fa-user"></i></button>
+                                    <button class="inactive" type="button"><i class="g-icon">person</i></button>
                                     <input id="iName1" name="name1" type="text" autocomplete="off" spellcheck="false" required>
                                 </span>
                     </div>
                     <div class="form-group">
                         <label for="iName2"><?= $this->getHtml('Name2'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="fa fa-user"></i></button>
+                                    <button class="inactive" type="button"><i class="g-icon">person</i></button>
                                     <input id="iName2" name="name2" type="text" autocomplete="off" spellcheck="false">
                                 </span>
                     </div>
                     <div class="form-group">
                         <label for="iName3"><?= $this->getHtml('Name3'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="fa fa-user"></i></button>
+                                    <button class="inactive" type="button"><i class="g-icon">person</i></button>
                                     <input id="iName3" name="name3" type="text" autocomplete="off" spellcheck="false">
                                 </span>
                     </div>
                     <div class="form-group">
                         <label for="iEmail"><?= $this->getHtml('Email'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="fa fa-envelope-o"></i></button>
+                                    <button class="inactive" type="button"><i class="g-icon">mail</i></button>
                                     <input id="iEmail" name="email" type="email" autocomplete="off" spellcheck="false">
                                 </span>
                     </div>
                     <div class="form-group">
                         <label for="iPassword"><?= $this->getHtml('Password'); ?></label>
                         <span class="input">
-                                    <button class="inactive" type="button"><i class="fa fa-lock"></i></button>
+                                    <button class="inactive" type="button"><i class="g-icon">lock</i></button>
                                     <input id="iPassword" name="password" type="password">
                                 </span>
                     </div>
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index e962287..cd0b093 100755
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -109,10 +109,10 @@ echo $this->data['nav']->render(); ?>
             <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
             <div class="portlet-foot">
                 <?php if ($this->getData('hasPrevious')) : ?>
-                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="fa fa-chevron-left"></i></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="g-icon">chevron_left</i></a>
                 <?php endif; ?>
                 <?php if ($this->getData('hasNext')) : ?>
-                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="fa fa-chevron-right"></i></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="g-icon">chevron_right</i></a>
                 <?php endif; ?>
             </div>
             <?php endif; ?>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index 2831a3a..52fcf32 100755
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -101,35 +101,35 @@ echo $this->data['nav']->render(); ?>
                                 <div class="form-group">
                                     <label for="iUsername"><?= $this->getHtml('Username'); ?></label>
                                     <span class="input">
-                                        <button class="inactive" type="button"><i class="fa fa-user"></i></button>
+                                        <button class="inactive" type="button"><i class="g-icon">person</i></button>
                                         <input id="iUsername" name="name" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->login); ?>">
                                     </span>
                                 </div>
                                 <div class="form-group">
                                     <label for="iName1"><?= $this->getHtml('Name1'); ?></label>
                                     <span class="input">
-                                        <button class="inactive" type="button"><i class="fa fa-user"></i></button>
+                                        <button class="inactive" type="button"><i class="g-icon">person</i></button>
                                         <input id="iName1" name="name1" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->name1); ?>" required>
                                     </span>
                                 </div>
                                 <div class="form-group">
                                     <label for="iName2"><?= $this->getHtml('Name2'); ?></label>
                                     <span class="input">
-                                        <button class="inactive" type="button"><i class="fa fa-user"></i></button>
+                                        <button class="inactive" type="button"><i class="g-icon">person</i></button>
                                         <input id="iName2" name="name2" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->name2); ?>">
                                     </span>
                                 </div>
                                 <div class="form-group">
                                     <label for="iName3"><?= $this->getHtml('Name3'); ?></label>
                                     <span class="input">
-                                        <button class="inactive" type="button"><i class="fa fa-user"></i></button>
+                                        <button class="inactive" type="button"><i class="g-icon">person</i></button>
                                         <input id="iName3" name="name3" type="text" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->name3); ?>">
                                     </span>
                                 </div>
                                 <div class="form-group">
                                     <label for="iEmail"><?= $this->getHtml('Email'); ?></label>
                                     <span class="input">
-                                        <button class="inactive" type="button"><i class="fa fa-envelope-o"></i></button>
+                                        <button class="inactive" type="button"><i class="g-icon">mail</i></button>
                                         <input id="iEmail" name="email" type="email" autocomplete="off" spellcheck="false" value="<?= $this->printHtml($account->getEmail()); ?>">
                                     </span>
                                 </div>
@@ -138,7 +138,7 @@ echo $this->data['nav']->render(); ?>
                                     <div class="ipt-wrap">
                                         <div class="ipt-first">
                                             <span class="input">
-                                                <button class="inactive" type="button"><i class="fa fa-lock"></i></button>
+                                                <button class="inactive" type="button"><i class="g-icon">lock</i></button>
                                                 <input id="iPassword" name="password" type="password">
                                             </span>
                                         </div>
@@ -188,13 +188,13 @@ echo $this->data['nav']->render(); ?>
 
                 <div class="col-xs-12">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Groups'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Groups'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table id="groupTable" class="default">
                             <thead>
                                 <tr>
                                     <td>
-                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                             <tbody>
                                 <?php
                                     $c      = 0;
@@ -203,7 +203,7 @@ echo $this->data['nav']->render(); ?>
                                         $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id);
                                 ?>
                                 <tr data-href="<?= $url; ?>">
-                                    <td><a href="#"><i class="fa fa-times"></i></a>
+                                    <td><a href="#"><i class="g-icon">close</i></a>
                                     <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
                                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                                 <?php endforeach; ?>
@@ -331,7 +331,7 @@ echo $this->data['nav']->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                             <table id="permissionTable" class="default"
                                 data-tag="form"
@@ -341,20 +341,20 @@ echo $this->data['nav']->render(); ?>
                                 <thead>
                                     <tr>
                                         <td>
-                                        <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Unit'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('App'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Module'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Type'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Ele'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Comp'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                        <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Unit'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('App'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Module'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Type'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Ele'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Comp'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                                         <td class="wf-100"><?= $this->getHtml('Perm'); ?>
                                 <tbody>
                                     <template class="oms-add-tpl-permission">
                                         <tr data-id="" draggable="false">
-                                            <td><i class="fa fa-cogs btn update-form"></i>
+                                            <td><i class="g-icon btn update-form">settings</i>
                                                 <input id="permissionTable-remove-0" type="checkbox" class="hidden">
-                                                <label for="permissionTable-remove-0" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                                <label for="permissionTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                                 <span class="checked-visibility">
                                                     <label for="permissionTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                                     <label for="permissionTable-remove-0" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
@@ -379,9 +379,9 @@ echo $this->data['nav']->render(); ?>
                                     foreach ($permissions as $key => $value) : ++$c;
                                         $permission = $value->getPermission(); ?>
                                     <tr data-id="<?= $value->id; ?>">
-                                        <td><i class="fa fa-cogs btn update-form"></i>
+                                        <td><i class="g-icon btn update-form">settings</i>
                                             <input id="permissionTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
-                                            <label for="permissionTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                            <label for="permissionTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                             <span class="checked-visibility">
                                                 <label for="permissionTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                                 <label for="permissionTable-remove-<?= $value->id; ?>" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
@@ -941,10 +941,10 @@ echo $this->data['nav']->render(); ?>
                     <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
                         <div class="portlet-foot">
                             <?php if ($this->getData('hasPrevious')) : ?>
-                                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="fa fa-chevron-left"></i></a>
+                                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="g-icon">chevron_left</i></a>
                             <?php endif; ?>
                             <?php if ($this->getData('hasNext')) : ?>
-                                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="fa fa-chevron-right"></i></a>
+                                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="g-icon">chevron_right</i></a>
                             <?php endif; ?>
                         </div>
                     <?php endif; ?>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index a9bd1dc..7f1ef5f 100755
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -106,10 +106,10 @@ echo $this->data['nav']->render(); ?>
             <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
             <div class="portlet-foot">
                 <?php if ($this->getData('hasPrevious')) : ?>
-                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="fa fa-chevron-left"></i></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="g-icon">chevron_left</i></a>
                 <?php endif; ?>
                 <?php if ($this->getData('hasNext')) : ?>
-                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="fa fa-chevron-right"></i></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="g-icon">chevron_right</i></a>
                 <?php endif; ?>
             </div>
             <?php endif; ?>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index cff410d..32786d8 100755
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -116,7 +116,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Accounts'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Accounts'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table id="accountTable" class="default"
                             data-tag="form"
                             data-ui-element="tr"
@@ -125,15 +125,15 @@ echo $this->data['nav']->render(); ?>
                             <thead>
                                 <tr>
                                     <td>
-                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                             <tbody>
                             <template class="oms-add-tpl-account">
                                 <tr data-id="" draggable="false">
                                     <td>
-                                        <i class="fa fa-times btn remove-form"></i>
+                                        <i class="g-icon btn remove-form">close</i>
                                         <input id="accountTable-remove-0" type="checkbox" class="hidden">
-                                        <label for="accountTable-remove-0" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                        <label for="accountTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                         <span class="checked-visibility">
                                             <label for="accountTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                             <label for="accountTable-remove-0" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
@@ -148,7 +148,7 @@ echo $this->data['nav']->render(); ?>
                                     $url = UriFactory::build('{/base}/admin/account/settings?{?}&id=' . $value->id); ?>
                                 <tr data-id="<?= $value->id; ?>">
                                     <td><input id="accountTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
-                                        <label for="accountTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                        <label for="accountTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                         <span class="checked-visibility">
                                             <label for="accountTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                             <label for="accountTable-remove-<?= $value->id; ?>" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
@@ -280,7 +280,7 @@ echo $this->data['nav']->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                             <table id="permissionTable" class="default"
                                 data-tag="form"
@@ -290,20 +290,20 @@ echo $this->data['nav']->render(); ?>
                                 <thead>
                                     <tr>
                                         <td>
-                                        <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Unit'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('App'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Module'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Type'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Ele'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                        <td><?= $this->getHtml('Comp'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                        <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Unit'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('App'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Module'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Type'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Ele'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                        <td><?= $this->getHtml('Comp'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                                         <td class="wf-100"><?= $this->getHtml('Perm'); ?>
                                 <tbody>
                                     <template class="oms-add-tpl-permission">
                                         <tr data-id="" draggable="false">
-                                            <td><i class="fa fa-cogs btn update-form"></i>
+                                            <td><i class="g-icon btn update-form">settings</i>
                                                 <input id="permissionTable-remove-0" type="checkbox" class="hidden">
-                                                <label for="permissionTable-remove-0" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                                <label for="permissionTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                                 <span class="checked-visibility">
                                                     <label for="permissionTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                                     <label for="permissionTable-remove-0" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
@@ -328,9 +328,9 @@ echo $this->data['nav']->render(); ?>
                                     foreach ($permissions as $key => $value) : ++$c;
                                         $permission = $value->getPermission(); ?>
                                     <tr data-id="<?= $value->id; ?>">
-                                        <td><i class="fa fa-cogs btn update-form"></i>
+                                        <td><i class="g-icon btn update-form">settings</i>
                                             <input id="permissionTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
-                                            <label for="permissionTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                            <label for="permissionTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                             <span class="checked-visibility">
                                                 <label for="permissionTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                                 <label for="permissionTable-remove-<?= $value->id; ?>" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
@@ -374,7 +374,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table class="default fixed">
                             <thead>
                             <tr>
diff --git a/Theme/Backend/modules-hook-list.tpl.php b/Theme/Backend/modules-hook-list.tpl.php
index ed7536d..eb3ac29 100755
--- a/Theme/Backend/modules-hook-list.tpl.php
+++ b/Theme/Backend/modules-hook-list.tpl.php
@@ -24,7 +24,7 @@ echo $this->data['nav']->render();
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Hooks'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Hooks'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="navElements" class="default sticky">
                 <thead>
@@ -33,38 +33,38 @@ echo $this->data['nav']->render();
                     <td><?= $this->getHtml('App'); ?>
                         <label for="navElements-sort-1">
                             <input type="radio" name="navElements-sort" id="navElements-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-2">
                             <input type="radio" name="navElements-sort" id="navElements-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('Trigger'); ?>
                         <label for="navElements-sort-5">
                             <input type="radio" name="navElements-sort" id="navElements-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-6">
                             <input type="radio" name="navElements-sort" id="navElements-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('Destination'); ?>
                         <label for="navElements-sort-7">
                             <input type="radio" name="navElements-sort" id="navElements-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-8">
                             <input type="radio" name="navElements-sort" id="navElements-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>
                 </thead>
                 <tbody>
diff --git a/Theme/Backend/modules-log.tpl.php b/Theme/Backend/modules-log.tpl.php
index bdf714b..bcdd340 100755
--- a/Theme/Backend/modules-log.tpl.php
+++ b/Theme/Backend/modules-log.tpl.php
@@ -29,7 +29,7 @@ echo $this->data['nav']->render();
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table class="default">
                 <colgroup>
diff --git a/Theme/Backend/modules-route-list.tpl.php b/Theme/Backend/modules-route-list.tpl.php
index e50f165..c31924d 100755
--- a/Theme/Backend/modules-route-list.tpl.php
+++ b/Theme/Backend/modules-route-list.tpl.php
@@ -26,7 +26,7 @@ echo $this->data['nav']->render();
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Routes'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Routes'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="navElements" class="default sticky">
                 <thead>
@@ -35,50 +35,50 @@ echo $this->data['nav']->render();
                     <td><?= $this->getHtml('App'); ?>
                         <label for="navElements-sort-1">
                             <input type="radio" name="navElements-sort" id="navElements-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-2">
                             <input type="radio" name="navElements-sort" id="navElements-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('Verb'); ?>
                         <label for="navElements-sort-3">
                             <input type="radio" name="navElements-sort" id="navElements-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-4">
                             <input type="radio" name="navElements-sort" id="navElements-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('Route'); ?>
                         <label for="navElements-sort-5">
                             <input type="radio" name="navElements-sort" id="navElements-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-6">
                             <input type="radio" name="navElements-sort" id="navElements-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('Destination'); ?>
                         <label for="navElements-sort-7">
                             <input type="radio" name="navElements-sort" id="navElements-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-8">
                             <input type="radio" name="navElements-sort" id="navElements-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>
                 </thead>
                 <tbody>
diff --git a/Theme/Backend/modules-settings.tpl.php b/Theme/Backend/modules-settings.tpl.php
index 89a1bc0..f6c5af9 100755
--- a/Theme/Backend/modules-settings.tpl.php
+++ b/Theme/Backend/modules-settings.tpl.php
@@ -27,7 +27,7 @@ else : ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="settingsList" class="default sticky">
                 <thead>
@@ -36,82 +36,82 @@ else : ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="settingsList-sort-1">
                             <input type="radio" name="settingsList-sort" id="settingsList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="settingsList-sort-2">
                             <input type="radio" name="settingsList-sort" id="settingsList-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('Name'); ?>
                         <label for="settingsList-sort-3">
                             <input type="radio" name="settingsList-sort" id="settingsList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="settingsList-sort-4">
                             <input type="radio" name="settingsList-sort" id="settingsList-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('Value'); ?>
                     <td><?= $this->getHtml('Unit'); ?>
                         <label for="settingsList-sort-5">
                             <input type="radio" name="settingsList-sort" id="settingsList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="settingsList-sort-6">
                             <input type="radio" name="settingsList-sort" id="settingsList-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('App'); ?>
                         <label for="settingsList-sort-5">
                             <input type="radio" name="settingsList-sort" id="settingsList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="settingsList-sort-6">
                             <input type="radio" name="settingsList-sort" id="settingsList-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('Group'); ?>
                         <label for="settingsList-sort-7">
                             <input type="radio" name="settingsList-sort" id="settingsList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="settingsList-sort-8">
                             <input type="radio" name="settingsList-sort" id="settingsList-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>
                     <td><?= $this->getHtml('Account'); ?>
                         <label for="settingsList-sort-9">
                             <input type="radio" name="settingsList-sort" id="settingsList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="settingsList-sort-10">
                             <input type="radio" name="settingsList-sort" id="settingsList-sort-10">
-                            <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 ($settings as $key => $setting) : ++$count;
                 ?>
                 <tr tabindex="0">
-                    <td><i class="fa fa-cogs"></i>
+                    <td><i class="g-icon">settings</i>
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><?= $setting->id; ?>
                     <td data-label="<?= $this->getHtml('Name'); ?>">
                         <?php
diff --git a/Theme/Backend/page-list.tpl.php b/Theme/Backend/page-list.tpl.php
index 6702bbb..e424cfd 100755
--- a/Theme/Backend/page-list.tpl.php
+++ b/Theme/Backend/page-list.tpl.php
@@ -39,54 +39,54 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="accountList-r1-asc">
                             <input id="accountList-r1-asc" name="accountList-sort" type="radio">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="accountList-r1-desc">
                             <input id="accountList-r1-desc" name="accountList-sort" type="radio">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                     <td><?= $this->getHtml('Status'); ?>
                         <label for="accountList-r2-asc">
                             <input id="accountList-r2-asc" name="accountList-sort" type="radio">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="accountList-r2-desc">
                             <input id="accountList-r2-desc" name="accountList-sort" type="radio">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="accountList-r3-asc">
                             <input id="accountList-r3-asc" name="accountList-sort" type="radio">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="accountList-r3-desc">
                             <input id="accountList-r3-desc" name="accountList-sort" type="radio">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-filter-table.tpl.php'; ?>
                     <td><?= $this->getHtml('Activity'); ?>
                         <label for="accountList-r4-asc">
                             <input id="accountList-r4-asc" name="accountList-sort" type="radio">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="accountList-r4-desc">
                             <input id="accountList-r4-desc" name="accountList-sort" type="radio">
-                            <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('Created'); ?>
                         <label for="accountList-r5-asc">
                             <input id="accountList-r5-asc" name="accountList-sort" type="radio">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="accountList-r5-desc">
                             <input id="accountList-r5-desc" name="accountList-sort" type="radio">
-                            <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; foreach ($accounts as $key => $value) : ++$c;
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index 11c0935..1ac0429 100755
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -79,7 +79,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
                                 <div class="form-group">
                                     <label for="iPassword">
                                         <?= $this->getHtml('PasswordRegex'); ?>
-                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="fa fa-info-circle"></i></i>
+                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="g-icon">info</i></i>
                                     </label>
 
                                     <input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
@@ -88,7 +88,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
                                 <div class="form-group">
                                     <label for="iLoginRetries">
                                         <?= $this->getHtml('LoginRetries'); ?>
-                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:LoginRetries'); ?>"><i class="fa fa-info-circle"></i></i>
+                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:LoginRetries'); ?>"><i class="g-icon">info</i></i>
                                     </label>
 
                                     <input id="iLoginRetries" name="settings_1000000005" type="number" value="<?= $this->printHtml($generalSettings['1000000005']->content); ?>" min="-1">
@@ -97,7 +97,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
                                 <div class="form-group">
                                     <label for="iTimeoutPeriod">
                                         <?= $this->getHtml('TimeoutPeriod'); ?>
-                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:TimeoutPeriod'); ?>"><i class="fa fa-info-circle"></i></i>
+                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:TimeoutPeriod'); ?>"><i class="g-icon">info</i></i>
                                     </label>
 
                                     <input id="iTimeoutPeriod" name="settings_1000000002" type="number" value="<?= $this->printHtml($generalSettings['1000000002']->content); ?>">
@@ -106,7 +106,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
                                 <div class="form-group">
                                     <label for="iPasswordChangeInterval">
                                         <?= $this->getHtml('PasswordChangeInterval'); ?>
-                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordChangeInterval'); ?>"><i class="fa fa-info-circle"></i></i>
+                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordChangeInterval'); ?>"><i class="g-icon">info</i></i>
                                     </label>
 
                                     <input id="iPasswordChangeInterval" name="settings_1000000003" type="number" value="<?= $this->printHtml($generalSettings['1000000003']->content); ?>">
@@ -115,7 +115,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
                                 <div class="form-group">
                                     <label for="iPasswordHistory">
                                         <?= $this->getHtml('PasswordHistory'); ?>
-                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordHistory'); ?>"><i class="fa fa-info-circle"></i></i>
+                                        <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordHistory'); ?>"><i class="g-icon">info</i></i>
                                     </label>
 
                                     <input id="iPasswordHistory" name="settings_1000000004" type="number" value="<?= $this->printHtml($generalSettings['1000000004']->content); ?>">
@@ -641,7 +641,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
             <div class="row">
                 <div class="col-xs-12">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                         <table id="settingsList" class="default sticky">
                             <thead>
@@ -650,63 +650,63 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
                                     <label for="settingsList-sort-1">
                                         <input type="radio" name="settingsList-sort" id="settingsList-sort-1">
-                                        <i class="sort-asc fa fa-chevron-up"></i>
+                                        <i class="sort-asc g-icon">expand_less</i>
                                     </label>
                                     <label for="settingsList-sort-2">
                                         <input type="radio" name="settingsList-sort" id="settingsList-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('Name'); ?>
                                     <label for="settingsList-sort-3">
                                         <input type="radio" name="settingsList-sort" id="settingsList-sort-3">
-                                        <i class="sort-asc fa fa-chevron-up"></i>
+                                        <i class="sort-asc g-icon">expand_less</i>
                                     </label>
                                     <label for="settingsList-sort-4">
                                         <input type="radio" name="settingsList-sort" id="settingsList-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('Value'); ?>
                                 <td><?= $this->getHtml('Module'); ?>
                                     <label for="settingsList-sort-5">
                                         <input type="radio" name="settingsList-sort" id="settingsList-sort-5">
-                                        <i class="sort-asc fa fa-chevron-up"></i>
+                                        <i class="sort-asc g-icon">expand_less</i>
                                     </label>
                                     <label for="settingsList-sort-6">
                                         <input type="radio" name="settingsList-sort" id="settingsList-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('Group'); ?>
                                     <label for="settingsList-sort-7">
                                         <input type="radio" name="settingsList-sort" id="settingsList-sort-7">
-                                        <i class="sort-asc fa fa-chevron-up"></i>
+                                        <i class="sort-asc g-icon">expand_less</i>
                                     </label>
                                     <label for="settingsList-sort-8">
                                         <input type="radio" name="settingsList-sort" id="settingsList-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>
                                 <td><?= $this->getHtml('Account'); ?>
                                     <label for="settingsList-sort-9">
                                         <input type="radio" name="settingsList-sort" id="settingsList-sort-9">
-                                        <i class="sort-asc fa fa-chevron-up"></i>
+                                        <i class="sort-asc g-icon">expand_less</i>
                                     </label>
                                     <label for="settingsList-sort-10">
                                         <input type="radio" name="settingsList-sort" id="settingsList-sort-10">
-                                        <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;
@@ -716,7 +716,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
                                 foreach ($settings as $key => $setting) : ++$count;
                             ?>
                             <tr tabindex="0">
-                                <td><i class="fa fa-cogs"></i>
+                                <td><i class="g-icon">settings</i>
                                 <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><?= $setting->id; ?>
                                 <td data-label="<?= $this->getHtml('Name'); ?>"><?= $this->printHtml($setting->name); ?>
                                 <td data-label="<?= $this->getHtml('Value'); ?>"><?= $this->printHtml($setting->content); ?>