diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
index bf57356..968cbc1 100755
--- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/base.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}
                         ]
                     }
-                ]' formaction=""><i class="fa fa-book"></i></button>
+                ]' formaction=""><i class="g-icon">book</i></button>
                 <div class="advancedInput wf-100" id="<?= $this->id; ?>">
                     <input autocomplete="off" spellcheck="false" class="input" type="text" id="i<?= $this->id; ?>" placeholder="&#xf007; Guest"
                         data-emptyAfter="true"
@@ -22,10 +22,10 @@
                         <table class="default">
                             <thead>
                                 <tr>
-                                    <td>Type<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td>ID<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td>Name<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td>Email<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                    <td>Type<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td>Name<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td>Email<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                             <tbody>
                                 <template id="<?= $this->id; ?>-rowElement" class="rowTemplate">
                                     <tr tabindex="-1">
@@ -46,7 +46,7 @@
     <div class="box" id="<?= $this->id; ?>-tags" data-limit="0" data-active="true">
         <template id="<?= $this->id; ?>-tagTemplate">
             <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>-list">
-                <i class="fa fa-times close"></i>
+                <i class="g-icon close">close</i>
                 <span style="display: none;" data-name="type_prefix" data-tpl-value="/type_prefix" data-value=""></span>
                 <span data-tpl-text="/id" data-name="<?= $this->printHtml($this->name); ?>-id" data-tpl-value="/id" data-value=""></span>
                 <span data-tpl-text="/name/0" data-tpl-value="/name/0" data-value=""></span>
diff --git a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
index faea5cb..e6866ec 100755
--- a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
@@ -39,7 +39,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/profile-list.tpl.php b/Theme/Backend/profile-list.tpl.php
index 43da842..8001329 100755
--- a/Theme/Backend/profile-list.tpl.php
+++ b/Theme/Backend/profile-list.tpl.php
@@ -26,7 +26,7 @@ $next     = empty($accounts) ? '{/base}profile/list' : '{/base}/profile/list?{?}
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Profiles'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Profiles'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="profileList" class="default sticky">
                 <thead>
@@ -35,26 +35,26 @@ $next     = empty($accounts) ? '{/base}profile/list' : '{/base}/profile/list?{?}
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="profileList-sort-1">
                             <input type="radio" name="profileList-sort" id="profileList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="profileList-sort-2">
                             <input type="radio" name="profileList-sort" id="profileList-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('Activity'); ?>
                         <label for="profileList-sort-3">
                             <input type="radio" name="profileList-sort" id="profileList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="profileList-sort-4">
                             <input type="radio" name="profileList-sort" id="profileList-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;