diff --git a/Theme/Backend/bill-create.tpl.php b/Theme/Backend/bill-create.tpl.php
index d8e30bc..55f2a5b 100755
--- a/Theme/Backend/bill-create.tpl.php
+++ b/Theme/Backend/bill-create.tpl.php
@@ -89,7 +89,7 @@ echo $this->data['nav']->render(); ?>
                                     <label for="iSource"><?= $this->getHtml('Source'); ?></label>
                                     <span class="input">
                                         <button type="button" formaction="">
-                                            <i class="fa fa-book"></i>
+                                            <i class="g-icon">book</i>
                                         </button>
                                         <input type="text" id="iSource" name="bill_source"<?= $disabled; ?>>
                                     </span>
@@ -110,7 +110,7 @@ echo $this->data['nav']->render(); ?>
                                         <div class="ipt-first">
                                             <span class="input">
                                                 <button type="button" formaction="">
-                                                    <i class="fa fa-book"></i>
+                                                    <i class="g-icon">book</i>
                                                 </button>
                                                 <input type="text" id="iClient" name="bill_client" value="<?= $bill->client?->number ?? $bill->supplier?->number; ?>"<?= $disabled; ?>>
                                             </span>
@@ -266,7 +266,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12">
                     <section class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table
                             id="invoiceElements"
                             class="default sticky"
@@ -291,12 +291,12 @@ echo $this->data['nav']->render(); ?>
                             <template class="oms-invoice-add">
                                 <tr data-id="">
                                     <td>
-                                        <i class="fa fa-chevron-up order-up"></i>
-                                        <i class="fa fa-chevron-down order-down"></i>
-                                        <i class="fa fa-times btn remove-form"></i>
+                                        <i class="g-icon order-up">expand_less</i>
+                                        <i class="g-icon order-down">expand_more</i>
+                                        <i class="g-icon btn remove-form">close</i>
                                     <td><span class="input">
                                         <button type="button" formaction="">
-                                            <label><i class="fa fa-book"></i></label>
+                                            <label><i class="g-icon">book</i></label>
                                         </button><input type="text" autocomplete="off"></span>
                                     <td><textarea autocomplete="off"></textarea>
                                     <td><input type="number" step="any" value="" autocomplete="off">
@@ -311,11 +311,11 @@ echo $this->data['nav']->render(); ?>
                                 <?php foreach ($elements as $element) : ?>
                                 <tr>
                                     <td><?php if ($editable) : ?>
-                                        <i class="fa fa-chevron-up order-up"></i>
-                                        <i class="fa fa-chevron-down order-down"></i>
-                                        <i class="fa fa-times btn remove-form"></i>
+                                        <i class="g-icon order-up">expand_less</i>
+                                        <i class="g-icon order-down">expand_more</i>
+                                        <i class="g-icon btn remove-form">close</i>
                                         <?php endif; ?>
-                                    <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input name="" type="text" value="<?= $element->itemNumber; ?>" required<?= $disabled; ?>></span>
+                                    <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input name="" type="text" value="<?= $element->itemNumber; ?>" required<?= $disabled; ?>></span>
                                     <td><textarea required<?= $disabled; ?>><?= $element->itemName; ?></textarea>
                                     <td><input name="" type="number" step="any" value="<?= $element->getQuantity(); ?>" required<?= $disabled; ?>>
                                     <td><input name="" type="number" step="0.01"<?= $disabled; ?>>
@@ -327,10 +327,10 @@ echo $this->data['nav']->render(); ?>
                                 <?php endforeach; ?>
                             <?php if ($editable) : ?>
                                 <tr data-id="0">
-                                    <td><i class="fa fa-chevron-up order-up"></i>
-                                        <i class="fa fa-chevron-down order-down"></i>
-                                        <i class="fa fa-times btn remove-form"></i>
-                                    <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" autocomplete="off"></span>
+                                    <td><i class="g-icon order-up">expand_less</i>
+                                        <i class="g-icon order-down">expand_more</i>
+                                        <i class="g-icon btn remove-form">close</i>
+                                    <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="text" autocomplete="off"></span>
                                     <td><textarea autocomplete="off"></textarea>
                                     <td><input type="number" step="any" value="" autocomplete="off">
                                     <td><input type="number" step="0.01" value="" autocomplete="off">
@@ -465,9 +465,9 @@ echo $this->data['nav']->render(); ?>
                             <template class="oms-payment-add">
                                 <tr data-id="">
                                     <td><?php if ($editable) : ?>
-                                        <i class="fa fa-chevron-up order-up"></i>
-                                        <i class="fa fa-chevron-down order-down"></i>
-                                        <i class="fa fa-times btn remove-form"></i>
+                                        <i class="g-icon order-up">expand_less</i>
+                                        <i class="g-icon order-down">expand_more</i>
+                                        <i class="g-icon btn remove-form">close</i>
                                         <?php endif; ?>
                                     <td><input type="datetime-local" autocomplete="off" required>
                                     <td><input type="number" value="" autocomplete="off" required>
@@ -525,7 +525,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>
                         <table class="default">
                             <thead>
                             <tr>
diff --git a/Theme/Backend/purchase-bill-list.tpl.php b/Theme/Backend/purchase-bill-list.tpl.php
index a516aeb..3569cde 100755
--- a/Theme/Backend/purchase-bill-list.tpl.php
+++ b/Theme/Backend/purchase-bill-list.tpl.php
@@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="billList" class="default sticky">
                 <thead>
@@ -33,122 +33,122 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="billList-sort-1">
                             <input type="radio" name="billList-sort" id="billList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-2">
                             <input type="radio" name="billList-sort" id="billList-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="billList-sort-3">
                             <input type="radio" name="billList-sort" id="billList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-4">
                             <input type="radio" name="billList-sort" id="billList-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('SupplierID'); ?>
                         <label for="billList-sort-5">
                             <input type="radio" name="billList-sort" id="billList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-6">
                             <input type="radio" name="billList-sort" id="billList-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('Supplier'); ?>
                         <label for="billList-sort-7">
                             <input type="radio" name="billList-sort" id="billList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-8">
                             <input type="radio" name="billList-sort" id="billList-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 class="wf-100"><?= $this->getHtml('Address'); ?>
                         <label for="billList-sort-9">
                             <input type="radio" name="billList-sort" id="billList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-10">
                             <input type="radio" name="billList-sort" id="billList-sort-10">
-                            <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('Postal'); ?>
                         <label for="billList-sort-11">
                             <input type="radio" name="billList-sort" id="billList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-12">
                             <input type="radio" name="billList-sort" id="billList-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>
                     <td class="wf-100"><?= $this->getHtml('City'); ?>
                         <label for="billList-sort-13">
                             <input type="radio" name="billList-sort" id="billList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-14">
                             <input type="radio" name="billList-sort" id="billList-sort-14">
-                            <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('Country'); ?>
                         <label for="billList-sort-15">
                             <input type="radio" name="billList-sort" id="billList-sort-15">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-16">
                             <input type="radio" name="billList-sort" id="billList-sort-16">
-                            <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('Net'); ?>
                         <label for="billList-sort-7">
                             <input type="radio" name="billList-sort" id="billList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-18">
                             <input type="radio" name="billList-sort" id="billList-sort-18">
-                            <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="billList-sort-23">
                             <input type="radio" name="billList-sort" id="billList-sort-23">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-24">
                             <input type="radio" name="billList-sort" id="billList-sort-24">
-                            <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/purchase-bill.tpl.php b/Theme/Backend/purchase-bill.tpl.php
index f84badb..4372b27 100755
--- a/Theme/Backend/purchase-bill.tpl.php
+++ b/Theme/Backend/purchase-bill.tpl.php
@@ -57,7 +57,7 @@ echo $this->data['nav']->render(); ?>
                             <div class="portlet-body">
                                 <table class="layout wf-100">
                                     <tr><td><label for="iSource"><?= $this->getHtml('Source'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iSource" name="source"></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="text" id="iSource" name="source"></span>
                                     <tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>
                                     <tr><td><select id="iType" name="type">
                                                 <option><?= $this->getHtml('Invoice'); ?>
@@ -67,7 +67,7 @@ echo $this->data['nav']->render(); ?>
                                                 <option><?= $this->getHtml('CreditNote'); ?>
                                             </select>
                                     <tr><td><label for="iClient"><?= $this->getHtml('Client'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iClient" name="client"></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="text" id="iClient" name="client"></span>
                                     <tr><td><label for="iDelivery"><?= $this->getHtml('Delivery'); ?></label>
                                     <tr><td><input type="datetime-local" id="iDelivery" name="delivery">
                                     <tr><td><label for="iDue"><?= $this->getHtml('Due'); ?></label>
@@ -147,7 +147,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                         <table class="default" id="invoice-item-list">
                             <thead>
@@ -165,8 +165,8 @@ echo $this->data['nav']->render(); ?>
                             <tbody>
                             <?php foreach ($elements as $element) : ?>
                             <tr>
-                                <td><i class="fa fa-plus add"></i> <i class="fa fa-chevron-up order-up"></i> <i class="fa fa-chevron-down order-down"></i>
-                                <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input name="" type="text" value="<?= $element->itemNumber; ?>" required></span>
+                                <td><i class="g-icon add">add</i> <i class="g-icon order-up">expand_less</i> <i class="g-icon order-down">expand_more</i>
+                                <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input name="" type="text" value="<?= $element->itemNumber; ?>" required></span>
                                 <td><textarea required><?= $element->itemName; ?></textarea>
                                 <td><input name="" type="number" min="0" value="<?= $element->quantity; ?>" required>
                                 <td><input name="" type="text" value="<?= $this->getCurrency($element->singleSalesPriceNet); ?>">
@@ -177,8 +177,8 @@ echo $this->data['nav']->render(); ?>
                                 <td><?= $this->getCurrency($element->totalSalesPriceNet); ?>
                             <?php endforeach; ?>
                             <tr>
-                                <td><i class="fa fa-plus"></i> <i class="fa fa-chevron-up order-up"></i> <i class="fa fa-chevron-down order-down"></i>
-                                <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input name="" type="text" required></span>
+                                <td><i class="g-icon">add</i> <i class="g-icon order-up">expand_less</i> <i class="g-icon order-down">expand_more</i>
+                                <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input name="" type="text" required></span>
                                 <td><textarea required></textarea>
                                 <td><input name="" type="number" min="0" value="0" required>
                                 <td><input name="" type="text">
@@ -289,7 +289,7 @@ echo $this->data['nav']->render(); ?>
 
                 <div class="col-xs-12 col-md-6 col-lg-8">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Media'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Media'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table class="default" id="invoice-item-list">
                             <thead>
                             <tr>
@@ -313,7 +313,7 @@ echo $this->data['nav']->render(); ?>
                             ?>
                             <tr data-href="<?= $url; ?>">
                                 <td>
-                                <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
+                                <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $this->printHtml($icon); ?></i></a>
                                 <td><a href="<?= $url; ?>"><?= $file->name; ?></a>
                                 <td><a href="<?= $url; ?>"><?= $file->extension; ?></a>
                             <?php endforeach; ?>
@@ -328,7 +328,7 @@ echo $this->data['nav']->render(); ?>
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Logs'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                            <caption><?= $this->getHtml('Logs'); ?><i class="g-icon end-xs download btn">download</i></caption>
                             <thead>
                             <tr>
                                 <td>IP
diff --git a/Theme/Backend/sales-bill-list.tpl.php b/Theme/Backend/sales-bill-list.tpl.php
index a71e9e0..22a39af 100755
--- a/Theme/Backend/sales-bill-list.tpl.php
+++ b/Theme/Backend/sales-bill-list.tpl.php
@@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="billList" class="default sticky">
                 <thead>
@@ -33,134 +33,134 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="billList-sort-1">
                             <input type="radio" name="billList-sort" id="billList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-2">
                             <input type="radio" name="billList-sort" id="billList-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="billList-sort-3">
                             <input type="radio" name="billList-sort" id="billList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-4">
                             <input type="radio" name="billList-sort" id="billList-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('ClientID'); ?>
                         <label for="billList-sort-5">
                             <input type="radio" name="billList-sort" id="billList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-6">
                             <input type="radio" name="billList-sort" id="billList-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('Client'); ?>
                         <label for="billList-sort-7">
                             <input type="radio" name="billList-sort" id="billList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-8">
                             <input type="radio" name="billList-sort" id="billList-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 class="wf-100"><?= $this->getHtml('Address'); ?>
                         <label for="billList-sort-9">
                             <input type="radio" name="billList-sort" id="billList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-10">
                             <input type="radio" name="billList-sort" id="billList-sort-10">
-                            <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('Postal'); ?>
                         <label for="billList-sort-11">
                             <input type="radio" name="billList-sort" id="billList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-12">
                             <input type="radio" name="billList-sort" id="billList-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>
                     <td class="wf-100"><?= $this->getHtml('City'); ?>
                         <label for="billList-sort-13">
                             <input type="radio" name="billList-sort" id="billList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-14">
                             <input type="radio" name="billList-sort" id="billList-sort-14">
-                            <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('Country'); ?>
                         <label for="billList-sort-15">
                             <input type="radio" name="billList-sort" id="billList-sort-15">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-16">
                             <input type="radio" name="billList-sort" id="billList-sort-16">
-                            <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('Net'); ?>
                         <label for="billList-sort-7">
                             <input type="radio" name="billList-sort" id="billList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-18">
                             <input type="radio" name="billList-sort" id="billList-sort-18">
-                            <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('Profit'); ?>
                         <label for="billList-sort-21">
                             <input type="radio" name="billList-sort" id="billList-sort-21">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-22">
                             <input type="radio" name="billList-sort" id="billList-sort-22">
-                            <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="billList-sort-23">
                             <input type="radio" name="billList-sort" id="billList-sort-23">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-24">
                             <input type="radio" name="billList-sort" id="billList-sort-24">
-                            <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 ($bills as $key => $value) :
diff --git a/Theme/Backend/user-purchase-bill-dashboard.tpl.php b/Theme/Backend/user-purchase-bill-dashboard.tpl.php
index c66623b..1ad906e 100755
--- a/Theme/Backend/user-purchase-bill-dashboard.tpl.php
+++ b/Theme/Backend/user-purchase-bill-dashboard.tpl.php
@@ -23,7 +23,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Bills'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="billList" class="default sticky">
                 <thead>
@@ -35,122 +35,122 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="billList-sort-1">
                             <input type="radio" name="billList-sort" id="billList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-2">
                             <input type="radio" name="billList-sort" id="billList-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="billList-sort-3">
                             <input type="radio" name="billList-sort" id="billList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-4">
                             <input type="radio" name="billList-sort" id="billList-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('SupplierID'); ?>
                         <label for="billList-sort-5">
                             <input type="radio" name="billList-sort" id="billList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-6">
                             <input type="radio" name="billList-sort" id="billList-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('Supplier'); ?>
                         <label for="billList-sort-7">
                             <input type="radio" name="billList-sort" id="billList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-8">
                             <input type="radio" name="billList-sort" id="billList-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 class="wf-100"><?= $this->getHtml('Address'); ?>
                         <label for="billList-sort-9">
                             <input type="radio" name="billList-sort" id="billList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-10">
                             <input type="radio" name="billList-sort" id="billList-sort-10">
-                            <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('Postal'); ?>
                         <label for="billList-sort-11">
                             <input type="radio" name="billList-sort" id="billList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-12">
                             <input type="radio" name="billList-sort" id="billList-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>
                     <td class="wf-100"><?= $this->getHtml('City'); ?>
                         <label for="billList-sort-13">
                             <input type="radio" name="billList-sort" id="billList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-14">
                             <input type="radio" name="billList-sort" id="billList-sort-14">
-                            <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('Country'); ?>
                         <label for="billList-sort-15">
                             <input type="radio" name="billList-sort" id="billList-sort-15">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-16">
                             <input type="radio" name="billList-sort" id="billList-sort-16">
-                            <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('Gross'); ?>
                         <label for="billList-sort-7">
                             <input type="radio" name="billList-sort" id="billList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-18">
                             <input type="radio" name="billList-sort" id="billList-sort-18">
-                            <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('Date'); ?>
                         <label for="billList-sort-23">
                             <input type="radio" name="billList-sort" id="billList-sort-23">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="billList-sort-24">
                             <input type="radio" name="billList-sort" id="billList-sort-24">
-                            <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/user-purchase-bill.tpl.php b/Theme/Backend/user-purchase-bill.tpl.php
index 8a8e827..6328a73 100755
--- a/Theme/Backend/user-purchase-bill.tpl.php
+++ b/Theme/Backend/user-purchase-bill.tpl.php
@@ -56,7 +56,7 @@ echo $this->data['nav']->render(); ?>
                             <div class="portlet-body">
                                 <table class="layout wf-100">
                                     <tr><td><label for="iSource"><?= $this->getHtml('Source'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iSource" name="source"></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="text" id="iSource" name="source"></span>
                                     <tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>
                                     <tr><td><select id="iType" name="type">
                                                 <option><?= $this->getHtml('Invoice'); ?>
@@ -66,7 +66,7 @@ echo $this->data['nav']->render(); ?>
                                                 <option><?= $this->getHtml('CreditNote'); ?>
                                             </select>
                                     <tr><td><label for="iClient"><?= $this->getHtml('Client'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iClient" name="client"></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="text" id="iClient" name="client"></span>
                                     <tr><td><label for="iDelivery"><?= $this->getHtml('Delivery'); ?></label>
                                     <tr><td><input type="datetime-local" id="iDelivery" name="delivery">
                                     <tr><td><label for="iDue"><?= $this->getHtml('Due'); ?></label>
@@ -146,7 +146,7 @@ echo $this->data['nav']->render(); ?>
             <div class="row">
                 <div class="col-xs-12">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Invoice'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table class="default" id="invoice-item-list">
                             <thead>
                             <tr>
@@ -163,8 +163,8 @@ echo $this->data['nav']->render(); ?>
                             <tbody>
                             <?php foreach ($elements as $element) : ?>
                             <tr>
-                                <td><i class="fa fa-plus add"></i> <i class="fa fa-chevron-up order-up"></i> <i class="fa fa-chevron-down order-down"></i>
-                                <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input name="" type="text" value="<?= $element->itemNumber; ?>" required></span>
+                                <td><i class="g-icon add">add</i> <i class="g-icon order-up">expand_less</i> <i class="g-icon order-down">expand_more</i>
+                                <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input name="" type="text" value="<?= $element->itemNumber; ?>" required></span>
                                 <td><textarea required><?= $element->itemName; ?></textarea>
                                 <td><input name="" type="number" min="0" value="<?= $element->quantity; ?>" required>
                                 <td><input name="" type="text" value="<?= $this->getCurrency($element->singleSalesPriceNet); ?>">
@@ -175,8 +175,8 @@ echo $this->data['nav']->render(); ?>
                                 <td><?= $this->getCurrency($element->totalSalesPriceNet); ?>
                             <?php endforeach; ?>
                             <tr>
-                                <td><i class="fa fa-plus"></i> <i class="fa fa-chevron-up order-up"></i> <i class="fa fa-chevron-down order-down"></i>
-                                <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input name="" type="text" required></span>
+                                <td><i class="g-icon">add</i> <i class="g-icon order-up">expand_less</i> <i class="g-icon order-down">expand_more</i>
+                                <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input name="" type="text" required></span>
                                 <td><textarea required></textarea>
                                 <td><input name="" type="number" min="0" value="0" required>
                                 <td><input name="" type="text">
@@ -286,7 +286,7 @@ echo $this->data['nav']->render(); ?>
 
                 <div class="col-xs-12 col-md-6 col-lg-8">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Media'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Media'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table class="default" id="invoice-item-list">
                             <thead>
                             <tr>
@@ -310,7 +310,7 @@ echo $this->data['nav']->render(); ?>
                             ?>
                             <tr data-href="<?= $url; ?>">
                                 <td>
-                                <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
+                                <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $this->printHtml($icon); ?></i></a>
                                 <td><a href="<?= $url; ?>"><?= $file->name; ?></a>
                                 <td><a href="<?= $url; ?>"><?= $file->extension; ?></a>
                             <?php endforeach; ?>
@@ -325,7 +325,7 @@ echo $this->data['nav']->render(); ?>
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Logs'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                            <caption><?= $this->getHtml('Logs'); ?><i class="g-icon end-xs download btn">download</i></caption>
                             <thead>
                             <tr>
                                 <td>IP