diff --git a/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php b/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
index 9663834..47872b7 100755
--- a/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
+++ b/Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
@@ -295,7 +295,7 @@ $isNew = $currentSetting->id === 0;
                             foreach ($table['match'] as $match) :
                     ?>
                     <tr>
-                        <td><i class="fa fa-times btn remove-form"></i>
+                        <td><i class="g-icon btn remove-form">close</i>
                         <td><?= $table['src']; ?>
                         <td><?= $table['dest']; ?>
                         <td><?= $match['src_field']['primary'] ? 'yes' : 'no'; ?>
diff --git a/Theme/Backend/exchange-export-list.tpl.php b/Theme/Backend/exchange-export-list.tpl.php
index cca6881..1f87c35 100755
--- a/Theme/Backend/exchange-export-list.tpl.php
+++ b/Theme/Backend/exchange-export-list.tpl.php
@@ -20,7 +20,7 @@ echo $this->data['nav']->render();
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Exports'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Exports'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="exportList" class="default sticky">
                 <thead>
@@ -28,14 +28,14 @@ echo $this->data['nav']->render();
                     <td class="wf-100"><?= $this->getHtml('Title'); ?>
                         <label for="exportList-sort-1">
                             <input type="radio" name="exportList-sort" id="exportList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="exportList-sort-2">
                             <input type="radio" name="exportList-sort" id="exportList-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>
                 <tbody>
                 <?php $count = 0; foreach ($interfaces as $key => $value) : ++$count;
diff --git a/Theme/Backend/exchange-import-list.tpl.php b/Theme/Backend/exchange-import-list.tpl.php
index a74ff8b..00737c8 100755
--- a/Theme/Backend/exchange-import-list.tpl.php
+++ b/Theme/Backend/exchange-import-list.tpl.php
@@ -20,7 +20,7 @@ echo $this->data['nav']->render();
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Imports'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Imports'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="importList" class="default sticky">
                 <thead>
@@ -28,14 +28,14 @@ echo $this->data['nav']->render();
                     <td class="wf-100"><?= $this->getHtml('Title'); ?>
                         <label for="importList-sort-1">
                             <input type="radio" name="importList-sort" id="importList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="importList-sort-2">
                             <input type="radio" name="importList-sort" id="importList-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>
                 <tbody>
                 <?php $count = 0; foreach ($interfaces as $key => $value) : ++$count;
diff --git a/Theme/Backend/exchange-log-list.tpl.php b/Theme/Backend/exchange-log-list.tpl.php
index e98ee11..3bd6ad7 100755
--- a/Theme/Backend/exchange-log-list.tpl.php
+++ b/Theme/Backend/exchange-log-list.tpl.php
@@ -22,7 +22,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Logs'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Logs'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="exchangeLogs" class="default sticky">
                 <thead>
@@ -30,74 +30,74 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="exchangeLogs-sort-1">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="exchangeLogs-sort-2">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-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('Type'); ?>
                         <label for="exchangeLogs-sort-3">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="exchangeLogs-sort-4">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-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('Subtype'); ?>
                         <label for="exchangeLogs-sort-5">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="exchangeLogs-sort-6">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-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 class="wf-100"><?= $this->getHtml('Exchange'); ?>
                         <label for="exchangeLogs-sort-7">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="exchangeLogs-sort-8">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-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('CreatedBy'); ?>
                         <label for="exchangeLogs-sort-9">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="exchangeLogs-sort-0">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-0">
-                            <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('CreatedAt'); ?>
                         <label for="exchangeLogs-sort-11">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="exchangeLogs-sort-12">
                             <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-12">
-                            <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 ($logs as $key => $value) :