diff --git a/Theme/Backend/attribute-type-list.tpl.php b/Theme/Backend/attribute-type-list.tpl.php
index ebaff40..25aa7e4 100644
--- a/Theme/Backend/attribute-type-list.tpl.php
+++ b/Theme/Backend/attribute-type-list.tpl.php
@@ -22,7 +22,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('AttributeTypes'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('AttributeTypes'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="iAttributeTypeList" class="default sticky">
                 <thead>
@@ -30,26 +30,26 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="iAttributeTypeList-sort-1">
                             <input type="radio" name="iAttributeTypeList-sort" id="iAttributeTypeList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iAttributeTypeList-sort-2">
                             <input type="radio" name="iAttributeTypeList-sort" id="iAttributeTypeList-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 class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="iAttributeTypeList-sort-2">
                             <input type="radio" name="iAttributeTypeList-sort" id="iAttributeTypeList-sort-2">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iAttributeTypeList-sort-3">
                             <input type="radio" name="iAttributeTypeList-sort" id="iAttributeTypeList-sort-3">
-                            <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
diff --git a/Theme/Backend/attribute-type.tpl.php b/Theme/Backend/attribute-type.tpl.php
index 12edd81..1df3045 100755
--- a/Theme/Backend/attribute-type.tpl.php
+++ b/Theme/Backend/attribute-type.tpl.php
@@ -40,7 +40,7 @@ echo $this->data['nav']->render(); ?>
 
     <div class="col-xs-12 col-md-6">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Language', '0', '0'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Language', '0', '0'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table class="default">
                 <thead>
                     <tr>
@@ -51,8 +51,8 @@ echo $this->data['nav']->render(); ?>
                 <tbody>
                     <?php $c = 0; foreach ($l11ns as $key => $value) : ++$c; ?>
                     <tr>
-                        <td><a href="#"><i class="fa fa-times"></i></a>
-                        <td><a href="#"><i class="fa fa-cogs"></i></a>
+                        <td><a href="#"><i class="g-icon">close</i></a>
+                        <td><a href="#"><i class="g-icon">settings</i></a>
                         <td><?= ISO639Enum::getByName('_' . \strtoupper($value->getLanguage())); ?>
                         <td><?= $value->content; ?>
                     <?php endforeach; ?>
diff --git a/Theme/Backend/supplier-create.tpl.php b/Theme/Backend/supplier-create.tpl.php
index 4a6a3b7..c2eb748 100755
--- a/Theme/Backend/supplier-create.tpl.php
+++ b/Theme/Backend/supplier-create.tpl.php
@@ -38,7 +38,7 @@ echo $this->data['nav']->render(); ?>
                     <form>
                         <table class="layout wf-100">
                             <tr><td><label for="iId"><?= $this->getHtml('ID', '0', '0'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" id="iId" min="1" name="id" required></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="number" id="iId" min="1" name="id" required></span>
                             <tr><td><label for="iName1"><?= $this->getHtml('Name1'); ?></label>
                             <tr><td><input type="text" id="iName1" name="name1" placeholder="&#xf040;" required>
                             <tr><td><label for="iName2"><?= $this->getHtml('Name2'); ?></label>
@@ -118,7 +118,7 @@ echo $this->data['nav']->render(); ?>
                     <form>
                         <table class="layout wf-100">
                             <tr><td><label for="iSource"><?= $this->getHtml('ID'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iSource" name="source" type="text" placeholder=""></span>
                             <tr><td><label for="iSegment"><?= $this->getHtml('Segment'); ?></label>
                             <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
                             <tr><td><label for="iProductgroup"><?= $this->getHtml('Productgroup'); ?></label>
@@ -169,7 +169,7 @@ echo $this->data['nav']->render(); ?>
             ?>
             <div class="box w-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/supplier-list.tpl.php b/Theme/Backend/supplier-list.tpl.php
index d1384f4..fb4c83a 100755
--- a/Theme/Backend/supplier-list.tpl.php
+++ b/Theme/Backend/supplier-list.tpl.php
@@ -22,7 +22,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Suppliers'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Suppliers'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="iPurchaseSupplierList" class="default sticky">
                 <thead>
@@ -30,74 +30,74 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="iPurchaseSupplierList-sort-1">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseSupplierList-sort-2">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-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 class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="iPurchaseSupplierList-sort-3">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseSupplierList-sort-4">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-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('City'); ?>
                         <label for="iPurchaseSupplierList-sort-5">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseSupplierList-sort-6">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-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('Zip'); ?>
                         <label for="iPurchaseSupplierList-sort-7">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseSupplierList-sort-8">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-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('Address'); ?>
                         <label for="iPurchaseSupplierList-sort-9">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseSupplierList-sort-10">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-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><?= $this->getHtml('Country'); ?>
                         <label for="iPurchaseSupplierList-sort-11">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseSupplierList-sort-12">
                             <input type="radio" name="iPurchaseSupplierList-sort" id="iPurchaseSupplierList-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 ($suppliers as $key => $value) : ++$count;
diff --git a/Theme/Backend/supplier-profile-bills.tpl.php b/Theme/Backend/supplier-profile-bills.tpl.php
index 6ceed99..2e44a10 100644
--- a/Theme/Backend/supplier-profile-bills.tpl.php
+++ b/Theme/Backend/supplier-profile-bills.tpl.php
@@ -21,7 +21,7 @@ $bills = $this->data['newestInvoices'] ?? [];
 <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>
             <table id="billList" class="default">
                 <thead>
                 <tr>
@@ -32,134 +32,134 @@ $bills = $this->data['newestInvoices'] ?? [];
                     <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;
diff --git a/Theme/Backend/supplier-profile-items.tpl.php b/Theme/Backend/supplier-profile-items.tpl.php
index e94f1fe..0a063f2 100644
--- a/Theme/Backend/supplier-profile-items.tpl.php
+++ b/Theme/Backend/supplier-profile-items.tpl.php
@@ -22,7 +22,7 @@ $items = $this->data['items'] ?? [];
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Items'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Items'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table id="iPurchaseItemList" class="default">
                 <thead>
                 <tr>
@@ -33,98 +33,98 @@ $items = $this->data['items'] ?? [];
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="iPurchaseItemList-sort-1">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseItemList-sort-2">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-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 class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="iPurchaseItemList-sort-3">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseItemList-sort-4">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-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('Quantity'); ?>
                         <label for="iPurchaseItemList-sort-5">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseItemList-sort-6">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-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('UnitPrice'); ?>
                         <label for="iPurchaseItemList-sort-7">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseItemList-sort-8">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-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('Discount'); ?>
                         <label for="iPurchaseItemList-sort-11">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseItemList-sort-12">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-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><?= $this->getHtml('Discount%'); ?>
                         <label for="iPurchaseItemList-sort-13">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseItemList-sort-14">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-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><?= $this->getHtml('DiscountBonus'); ?>
                         <label for="iPurchaseItemList-sort-15">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-sort-15">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseItemList-sort-16">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-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('TotalPrice'); ?>
                         <label for="iPurchaseItemList-sort-9">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iPurchaseItemList-sort-10">
                             <input type="radio" name="iPurchaseItemList-sort" id="iPurchaseItemList-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>
                 <tbody>
                 <?php
diff --git a/Theme/Backend/supplier-profile.tpl.php b/Theme/Backend/supplier-profile.tpl.php
index 38bbfd2..bb56341 100755
--- a/Theme/Backend/supplier-profile.tpl.php
+++ b/Theme/Backend/supplier-profile.tpl.php
@@ -75,7 +75,7 @@ echo $this->data['nav']->render();
                             <div class="portlet-body">
                                 <table class="layout wf-100">
                                     <tr><td><label for="iId"><?= $this->getHtml('ID', '0', '0'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" id="iId" min="1" name="id" value="<?= $this->printHtml($supplier->number); ?>" disabled></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input type="number" id="iId" min="1" name="id" value="<?= $this->printHtml($supplier->number); ?>" disabled></span>
                                     <tr><td><label for="iName1"><?= $this->getHtml('Name1'); ?></label>
                                     <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($supplier->account->name1); ?>" required>
                                     <tr><td><label for="iName2"><?= $this->getHtml('Name2'); ?></label>
@@ -93,7 +93,7 @@ echo $this->data['nav']->render();
                     <section class="portlet">
                         <div class="portlet-head">
                             <?= $this->getHtml('Contact'); ?>
-                            <a class="end-xs" href=""><i class="fa fa-envelope-o btn"></i></a>
+                            <a class="end-xs" href=""><i class="g-icon btn">mail</i></a>
                         </div>
                         <div class="portlet-body">
                             <table class="layout wf-100">
@@ -111,7 +111,7 @@ echo $this->data['nav']->render();
                         <div class="portlet-head">
                             <?= $this->getHtml('Address'); ?>
                             <span class="clickPopup end-xs">
-                                <label for="addressDropdown"><i class="fa fa-print btn"></i></label>
+                                <label for="addressDropdown"><i class="g-icon btn">print</i></label>
                                 <input id="addressDropdown" name="addressDropdown" type="checkbox">
                                 <div class="popup">
                                     <ul>
@@ -122,7 +122,7 @@ echo $this->data['nav']->render();
                                                     <label for="id1">
                                                         <a href="" class="button">Word</a>
                                                         <span></span>
-                                                        <i class="fa fa-chevron-right expand"></i>
+                                                        <i class="g-icon expand">chevron_right</i>
                                                     </label>
                                                 <li>Letter
                                             </ul>
@@ -492,7 +492,7 @@ echo $this->data['nav']->render();
                             <form>
                                 <table class="layout wf-100">
                                     <tr><td><label for="iSource"><?= $this->getHtml('ID'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iSource" name="source" type="text" placeholder=""></span>
                                     <tr><td><label for="iSegment"><?= $this->getHtml('Segment'); ?></label>
                                     <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
                                     <tr><td><label for="iProductgroup"><?= $this->getHtml('Productgroup'); ?></label>
@@ -529,7 +529,7 @@ echo $this->data['nav']->render();
                                                 <option>
                                             </select><td>
                                     <tr><td><label for="iSource"><?= $this->getHtml('ID'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iSource" name="source" type="text" placeholder=""></span>
                                     <tr><td><label for="iSegment"><?= $this->getHtml('Segment'); ?></label>
                                     <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
                                     <tr><td><label for="iProductgroup"><?= $this->getHtml('Productgroup'); ?></label>
@@ -567,9 +567,9 @@ echo $this->data['nav']->render();
                                 <table class="layout wf-100">
                                     <tbody>
                                     <tr><td><label for="iManager"><?= $this->getHtml('AreaManager'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iManager" name="source" type="text" placeholder=""></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iManager" name="source" type="text" placeholder=""></span>
                                     <tr><td><label for="iSource"><?= $this->getHtml('ID'); ?></label>
-                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iSource" name="source" type="text" placeholder=""></span>
                                     <tr><td><label for="iSegment"><?= $this->getHtml('Segment'); ?></label>
                                     <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
                                     <tr><td><label for="iProductgroup"><?= $this->getHtml('Productgroup'); ?></label>
@@ -609,7 +609,7 @@ echo $this->data['nav']->render();
             ?>
                     <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