diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 2f5ba5e..88e0f45 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "Home",
         "uri": null,
         "target": "self",
-        "icon": "fa fa-home",
+        "icon": "home",
         "order": 10,
         "from": "Home",
         "permission": { "permission": 2, "category": null, "element": null },
@@ -23,7 +23,7 @@
         "uri": "api/logout",
         "target": "self",
         "action": "[{\"key\": 1, \"listener\": \"click\", \"action\": [{\"key\": 1, \"type\": \"event.prevent\"}, {\"key\": 2, \"type\": \"message.request\", \"uri\": \"api/logout\", \"method\": \"POST\", \"request_type\": \"raw\"}, {\"key\": 3, \"type\": \"dom.reload\"}]}]",
-        "icon": "fa fa-power-off",
+        "icon": "power_settings_new",
         "order": 999,
         "from": "Home",
         "permission": {
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 663950e..ef210f6 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -82,7 +82,7 @@ echo $this->data['nav']->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Applications'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Applications'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                             <table id="settingsList" class="default sticky">
                                 <thead>
@@ -91,33 +91,33 @@ 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 class="wf-100"><?= $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>
                                 <tbody>
                                 <?php $count = 0;
                                     foreach ($applications as $key => $application) : ++$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'); ?>"><?= $application->id; ?>
                                     <td data-label="<?= $this->getHtml('Name'); ?>"><?= $this->printHtml($application->name); ?>
                                 <?php endforeach; ?>
@@ -136,7 +136,7 @@ echo $this->data['nav']->render(); ?>
             <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>
@@ -145,58 +145,58 @@ 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('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'); ?>"><?= $this->printHtml($setting->name); ?>
                                 <td data-label="<?= $this->getHtml('Value'); ?>"><?= $this->printHtml($setting->content); ?>