diff --git a/Theme/Backend/surveys-create.tpl.php b/Theme/Backend/surveys-create.tpl.php
index b5ad6f5..82f81d5 100755
--- a/Theme/Backend/surveys-create.tpl.php
+++ b/Theme/Backend/surveys-create.tpl.php
@@ -54,7 +54,7 @@ echo $this->data['nav']->render(); ?>
                                         <tr><td><select id="iResponsibility" name="responsibility">
                                                 <option value=""><?= $this->getHtml('Questionee'); ?>
                                                 <option value=""><?= $this->getHtml('Manager'); ?>
-                                            </select><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iPerm" name="permission"></span><td><button><?= $this->getHtml('Add', '0', '0'); ?></button>
+                                            </select><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="text" id="iPerm" name="permission"></span><td><button><?= $this->getHtml('Add', '0', '0'); ?></button>
                                     </table>
                             </div>
                             <div class="portlet-foot">
diff --git a/Theme/Backend/surveys-list.tpl.php b/Theme/Backend/surveys-list.tpl.php
index b800ac5..17b1eab 100755
--- a/Theme/Backend/surveys-list.tpl.php
+++ b/Theme/Backend/surveys-list.tpl.php
@@ -38,7 +38,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12">
         <div class="box">
             <ul class="crumbs-2">
-                <li data-href="<?= UriFactory::build('{/base}/survey/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('{/base}/survey/list?path=/Accounts/' . $accountDir); ?>"><i class="fa fa-home"></i></a>
+                <li data-href="<?= UriFactory::build('{/base}/survey/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('{/base}/survey/list?path=/Accounts/' . $accountDir); ?>"><i class="g-icon">home</i></a>
                 <li data-href="<?= UriFactory::build('{/base}/survey/list?path=/'); ?>"><a href="<?= UriFactory::build('{/base}/survey/list?path=/'); ?>">/</a></li>
                 <?php
                     $subPath    = '';
@@ -69,7 +69,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Surveys'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Surveys'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="surveyList" class="default sticky">
                 <thead>
@@ -82,50 +82,50 @@ echo $this->data['nav']->render(); ?>
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="surveyList-sort-1">
                             <input type="radio" name="surveyList-sort" id="surveyList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="surveyList-sort-2">
                             <input type="radio" name="surveyList-sort" id="surveyList-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('Tag'); ?>
                         <label for="surveyList-sort-3">
                             <input type="radio" name="surveyList-sort" id="surveyList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="surveyList-sort-4">
                             <input type="radio" name="surveyList-sort" id="surveyList-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('Creator'); ?>
                         <label for="surveyList-sort-5">
                             <input type="radio" name="surveyList-sort" id="surveyList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="surveyList-sort-6">
                             <input type="radio" name="surveyList-sort" id="surveyList-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('Created'); ?>
                         <label for="surveyList-sort-7">
                             <input type="radio" name="surveyList-sort" id="surveyList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="surveyList-sort-8">
                             <input type="radio" name="surveyList-sort" id="surveyList-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>
                 <tbody>
                 <?php if (!empty($parentPath)) :
@@ -133,7 +133,7 @@ echo $this->data['nav']->render(); ?>
                 ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td>
-                        <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
+                        <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="g-icon">folder_open</i></a>
                         <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>">..</a>
                         <td>
                         <td>
@@ -149,7 +149,7 @@ echo $this->data['nav']->render(); ?>
                                 <input type="checkbox" id="surveyList-<?= $key; ?>" name="surveyselect">
                                 <span class="checkmark"></span>
                             </label>
-                    <td><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
+                    <td><a href="<?= $url; ?>"><i class="g-icon">folder_open</i></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                     <td>
                     <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->id); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>