diff --git a/Theme/Backend/Components/TagSelector/base.tpl.php b/Theme/Backend/Components/TagSelector/base.tpl.php
index 4ee35a0..4d65644 100755
--- a/Theme/Backend/Components/TagSelector/base.tpl.php
+++ b/Theme/Backend/Components/TagSelector/base.tpl.php
@@ -11,7 +11,7 @@
                         {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "title"}, "position": -1}
                     ]
                 }
-            ]' formaction=""><i class="fa fa-book"></i></button>
+            ]' formaction=""><i class="g-icon">book</i></button>
             <div class="advancedInput wf-100" id="<?= $this->id; ?>">
                 <input autocomplete="off" class="input" type="text" id="i<?= $this->id; ?>"
                     placeholder="&#xf007; Guest"
@@ -22,8 +22,8 @@
                     <table class="default">
                         <thead>
                             <tr>
-                                <td>ID<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td>Title<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                <td>Title<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">
@@ -42,7 +42,7 @@
 <div class="box" data-form="<?= $this->printHtml($this->getForm()); ?>" id="<?= $this->id; ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->id; ?>-tagTemplate">
         <span class="tag" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>" style="background: {/color};">
-            <i class="fa fa-times"></i>
+            <i class="g-icon">close</i>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
             <span data-tpl-text="/title" data-tpl-value="/title" data-value=""></span>
         </span>
diff --git a/Theme/Backend/tag-list.tpl.php b/Theme/Backend/tag-list.tpl.php
index 4d66328..d26bcd5 100755
--- a/Theme/Backend/tag-list.tpl.php
+++ b/Theme/Backend/tag-list.tpl.php
@@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Tags'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Tags'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table class="default sticky">
             <thead>
diff --git a/Theme/Backend/tag-single.tpl.php b/Theme/Backend/tag-single.tpl.php
index 38b6a47..d706d0e 100755
--- a/Theme/Backend/tag-single.tpl.php
+++ b/Theme/Backend/tag-single.tpl.php
@@ -47,7 +47,7 @@ echo $this->data['nav']->render(); ?>
 
     <div class="col-xs-12 col-md-6">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Language', '0', '0'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Language', '0', '0'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table class="default">
                 <thead>
                     <tr>
@@ -58,8 +58,8 @@ echo $this->data['nav']->render(); ?>
                 <tbody>
                     <?php $c = 0; foreach ($l11n as $key => $value) : ++$c; ?>
                     <tr>
-                        <td><a href="#"><i class="fa fa-times"></i></a>
-                        <td><a href="#"><i class="fa fa-cogs"></i></a>
+                        <td><a href="#"><i class="g-icon">close</i></a>
+                        <td><a href="#"><i class="g-icon">settings</i></a>
                         <td><?= ISO639Enum::getByName('_' . \strtoupper($value->getLanguage())); ?>
                         <td><?= $value->content; ?>
                     <?php endforeach; ?>