diff --git a/Theme/Backend/expense-list.tpl.php b/Theme/Backend/expense-list.tpl.php
index 6b18d5c..c7dda07 100644
--- a/Theme/Backend/expense-list.tpl.php
+++ b/Theme/Backend/expense-list.tpl.php
@@ -24,7 +24,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Expenses'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Expenses'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="iSalesClientList" class="default sticky">
                 <thead>
@@ -33,92 +33,92 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="iSalesClientList-sort-1">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-2">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-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('Status'); ?>
                         <label for="iSalesClientList-sort-3">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-4">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-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('Paid'); ?>
                         <label for="iSalesClientList-sort-3">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-4">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-4">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                     <td><?= $this->getHtml('Approved'); ?>
                         <label for="iSalesClientList-sort-3">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-4">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-4">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                     <td class="wf-100"><?= $this->getHtml('From'); ?>
                         <label for="iSalesClientList-sort-5">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-6">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-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('Amount'); ?>
                         <label for="iSalesClientList-sort-7">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-8">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-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('Start'); ?>
                         <label for="iSalesClientList-sort-7">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-8">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-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('End'); ?>
                         <label for="iSalesClientList-sort-7">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-8">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-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 $count = 0; foreach ($expenses as $key => $value) : ++$count;
@@ -128,8 +128,8 @@ echo $this->data['nav']->render(); ?>
                     <td>
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->id; ?></a>
                     <td data-label="<?= $this->getHtml('Status'); ?>"><a href="<?= $url; ?>"><?= $this->getHtml(':status' . $value->status); ?></a>
-                    <td class="centerText" data-label="<?= $this->getHtml('Paid'); ?>"><a href="<?= $url; ?>"><i class="fa <?= $value->paid ? 'fa-checkmark' : 'fa-times'; ?>"></i></a>
-                    <td class="centerText" data-label="<?= $this->getHtml('Approved'); ?>"><a href="<?= $url; ?>"><i class="fa <?= $value->approved ? 'fa-checkmark' : 'fa-times'; ?>"></i></a>
+                    <td class="centerText" data-label="<?= $this->getHtml('Paid'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $value->paid ? 'check' : 'close'; ?></i></a>
+                    <td class="centerText" data-label="<?= $this->getHtml('Approved'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $value->approved ? 'check' : 'close'; ?></i></a>
                     <td data-label="<?= $this->getHtml('From'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->from->name1, $value->from->name2, $value->from->name3])); ?></a>
                     <td data-label="<?= $this->getHtml('Amount'); ?>"><a href="<?= $url; ?>"><?= $this->getCurrency($value->gross); ?></a>
                     <td data-label="<?= $this->getHtml('Start'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->start->format('Y-m-d')); ?></a>
diff --git a/Theme/Backend/expense-single.tpl.php b/Theme/Backend/expense-single.tpl.php
index 43d1c97..0a953d1 100644
--- a/Theme/Backend/expense-single.tpl.php
+++ b/Theme/Backend/expense-single.tpl.php
@@ -84,7 +84,7 @@ echo $this->data['nav']->render(); ?>
 
     <div class="col-xs-12 col-md-6">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Notes'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Notes'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="iSalesClientList" class="default sticky">
                 <thead>
@@ -93,14 +93,14 @@ echo $this->data['nav']->render(); ?>
                     <td class="wf-100"><?= $this->getHtml('Title'); ?>
                         <label for="iSalesClientList-sort-1">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-2">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-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>
             </table>
@@ -111,7 +111,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Expenses'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Expenses'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="iSalesClientList" class="default sticky">
                 <thead>
@@ -120,14 +120,14 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="iSalesClientList-sort-1">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-2">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-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>
             </table>