diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 4b16ec5..58f39c8 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -25,7 +25,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Apps'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Apps'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="appList" class="default sticky">
                 <thead>
@@ -33,26 +33,26 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="appList-sort-1">
                             <input type="radio" name="appList-sort" id="appList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="appList-sort-2">
                             <input type="radio" name="appList-sort" id="appList-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="appList-sort-3">
                             <input type="radio" name="appList-sort" id="appList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="appList-sort-4">
                             <input type="radio" name="appList-sort" id="appList-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;
diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php
index c228925..b70ce3b 100755
--- a/Theme/Backend/qa-question.tpl.php
+++ b/Theme/Backend/qa-question.tpl.php
@@ -40,7 +40,7 @@ echo $this->data['nav']->render();
                                 ]
                             }
                         ]' href="#">
-                            <i class="fa fa-chevron-up qa-vote<?= $this->printHtml($question->getAccountVoteScore($this->request->header->account) > 0 ? ' voted' : ' open'); ?>"></i>
+                            <i class="g-icon qa-vote<?= $this->printHtml($question->getAccountVoteScore($this->request->header->account) > 0 ? ' voted' : ' open'); ?>">expand_less</i>
                         </a>
                         <span class="counter"><?= $question->getVoteScore(); ?></span>
                         <span class="text">Score</span>
@@ -52,7 +52,7 @@ echo $this->data['nav']->render();
                                 ]
                             }
                         ]' href="#">
-                            <i class="fa fa-chevron-down qa-vote<?= $this->printHtml($question->getAccountVoteScore($this->request->header->account) < 0 ? ' voted' : ' open'); ?>"></i>
+                            <i class="g-icon qa-vote<?= $this->printHtml($question->getAccountVoteScore($this->request->header->account) < 0 ? ' voted' : ' open'); ?>">expand_more</i>
                         </a>
                     </div>
                     <div class="counter-container">
@@ -112,7 +112,7 @@ echo $this->data['nav']->render();
                                     ]
                                 }
                             ]' href="#">
-                            <i class="fa fa-chevron-up qa-vote<?= $answer->getAccountVoteScore($this->request->header->account) > 0 ? ' voted' : ' open'; ?>"></i>
+                            <i class="g-icon qa-vote<?= $answer->getAccountVoteScore($this->request->header->account) > 0 ? ' voted' : ' open'; ?>">expand_less</i>
                         </a>
                         <span class="counter"><?= $answer->getVoteScore(); ?></span>
                         <span class="text">Score</span>
@@ -124,7 +124,7 @@ echo $this->data['nav']->render();
                                     ]
                                 }
                         ]' href="#">
-                            <i class="fa fa-chevron-down qa-vote<?= $answer->getAccountVoteScore($this->request->header->account) < 0 ? ' voted' : ' open'; ?>"></i>
+                            <i class="g-icon qa-vote<?= $answer->getAccountVoteScore($this->request->header->account) < 0 ? ' voted' : ' open'; ?>">expand_more</i>
                         </a>
                     </div>
                     <div class="counter-container">
@@ -136,7 +136,7 @@ echo $this->data['nav']->render();
                                     ]
                                 }
                         ]' href="#">
-                            <i class="fa fa-check qa-accept"></i>
+                            <i class="g-icon qa-accept">check</i>
                         </a>
                         <span class="text"><?= $this->printHtml($answer->isAccepted ? 'Accepted' : 'Accept'); ?></span>
                     </div>
diff --git a/Theme/Backend/qa-tag-list.tpl.php b/Theme/Backend/qa-tag-list.tpl.php
index 08c6c85..79e9e93 100755
--- a/Theme/Backend/qa-tag-list.tpl.php
+++ b/Theme/Backend/qa-tag-list.tpl.php
@@ -23,7 +23,7 @@ echo $this->data['nav']->render();
         <div class="box wf-100">
             <div class="slider">
             <table class="default sticky">
-                <caption><?= $this->getHtml('Badges'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                <caption><?= $this->getHtml('Badges'); ?><i class="g-icon end-xs download btn">download</i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>