diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 7d4578d..3da25d6 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "ItemManagement",
         "uri": null,
         "target": "self",
-        "icon": "fa fa-usd",
+        "icon": "local_mall",
         "order": 35,
         "from": "ItemManagement",
         "permission": { "permission": 2, "category": null, "element": null },
diff --git a/Theme/Backend/attribute-type-list.tpl.php b/Theme/Backend/attribute-type-list.tpl.php
index 754e036..96b9abd 100755
--- 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 391c75f..6e6ce67 100755
--- a/Theme/Backend/attribute-type.tpl.php
+++ b/Theme/Backend/attribute-type.tpl.php
@@ -73,7 +73,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>
@@ -84,8 +84,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/item-create.tpl.php b/Theme/Backend/item-create.tpl.php
index da0e211..e0a2503 100755
--- a/Theme/Backend/item-create.tpl.php
+++ b/Theme/Backend/item-create.tpl.php
@@ -48,7 +48,7 @@ echo $this->data['nav']->render(); ?>
                                 <table class="layout wf-100">
                                     <tbody>
                                     <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="" required></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="" required></span>
                                     <tr><td><label for="iSegment"><?= $this->getHtml('Segment'); ?></label>
                                     <tr><td><input id="iSegment" name="segment" type="text" placeholder="" required>
                                     <tr><td><label for="iProductgroup"><?= $this->getHtml('Productgroup'); ?></label>
@@ -58,7 +58,7 @@ echo $this->data['nav']->render(); ?>
                                     <tr><td><label for="iArticlegroup"><?= $this->getHtml('Articlegroup'); ?></label>
                                     <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="" required>
                                     <tr><td><label for="iSSuccessor"><?= $this->getHtml('Successor'); ?></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><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>" name="create-item">
                                 </table>
                             </form>
@@ -102,7 +102,7 @@ echo $this->data['nav']->render(); ?>
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Name'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
                             <tr><td><label for="iPTradingUnit"><?= $this->getHtml('Unit'); ?></label>
                             <tr><td><select id="iPTracking" name="tracking">
                                         <option>
@@ -125,7 +125,7 @@ echo $this->data['nav']->render(); ?>
                                         <option>
                                     </select>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Property'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Translation'); ?></label>
                             <tr><td><input id="iPCustomsId" name="customsid" type="text" placeholder="">
                             <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
@@ -144,7 +144,7 @@ echo $this->data['nav']->render(); ?>
                                         <option>
                                     </select>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Value'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Translation'); ?></label>
                             <tr><td><input id="iPCustomsId" name="customsid" type="text" placeholder="">
                             <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
@@ -160,7 +160,7 @@ echo $this->data['nav']->render(); ?>
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Name'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
                             <tr><td><label for="iPTradingUnit"><?= $this->getHtml('Unit'); ?></label>
                             <tr><td><select id="iPTracking" name="tracking">
                                         <option>
@@ -183,7 +183,7 @@ echo $this->data['nav']->render(); ?>
                                         <option>
                                     </select>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Attribute'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Translation'); ?></label>
                             <tr><td><input id="iPCustomsId" name="customsid" type="text" placeholder="">
                             <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
@@ -202,7 +202,7 @@ echo $this->data['nav']->render(); ?>
                                         <option>
                                     </select>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Value'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iPCustomsId" name="customsid" type="text" placeholder=""></span>
                             <tr><td><label for="iPCustomsId"><?= $this->getHtml('Translation'); ?></label>
                             <tr><td><input id="iPCustomsId" name="customsid" type="text" placeholder="">
                             <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
@@ -298,7 +298,7 @@ echo $this->data['nav']->render(); ?>
                         <table class="layout wf-100">
                             <tbody>
                             <tr><td><label for="iSupplierId"><?= $this->getHtml('Supplier'); ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSupplierId" name="supplierid" type="text" placeholder="" required></span>
+                            <tr><td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i></button><input id="iSupplierId" name="supplierid" type="text" placeholder="" required></span>
                             <tr><td><label for="iPrice">GTIN</label>
                             <tr><td><input id="iPrice" name="price" type="text" placeholder="">
                             <tr><td><label for="iPPriceUnit"><?= $this->getHtml('PriceUnit'); ?></label>
@@ -448,7 +448,7 @@ echo $this->data['nav']->render(); ?>
                         <table class="layout wf-100">
                             <tbody>
                             <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="iDiscount"><?= $this->getHtml('Quantity'); ?></label>
                             <tr><td><input id="iDiscount" name="discount" type="number" step="any" min="0" placeholder="">
                             <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
@@ -594,7 +594,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/item-list.tpl.php b/Theme/Backend/item-list.tpl.php
index 869f7c8..e21b607 100755
--- a/Theme/Backend/item-list.tpl.php
+++ b/Theme/Backend/item-list.tpl.php
@@ -23,7 +23,7 @@ echo $this->data['nav']->render(); ?>
 <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>
             <div class="slider">
             <table id="iSalesItemList" class="default sticky">
                 <thead>
@@ -32,98 +32,98 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('Number'); ?>
                         <label for="iSalesItemList-sort-1">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-2">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-3">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-4">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-5">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-6">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-7">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-8">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Price'); ?>
                         <label for="iSalesItemList-sort-9">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-10">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Available'); ?>
                         <label for="iSalesItemList-sort-11">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-12">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Reserved'); ?>
                         <label for="iSalesItemList-sort-13">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-14">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Ordered'); ?>
                         <label for="iSalesItemList-sort-15">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-15">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-16">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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>
 
                 <tbody>
diff --git a/Theme/Backend/item-profile.tpl.php b/Theme/Backend/item-profile.tpl.php
index 1d3d1d2..7423c8b 100755
--- a/Theme/Backend/item-profile.tpl.php
+++ b/Theme/Backend/item-profile.tpl.php
@@ -86,7 +86,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($item->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($item->number); ?>" disabled></span>
                                     <tr><td><label for="iName1"><?= $this->getHtml('Name1'); ?></label>
                                     <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($item->getL11n('name1')->content); ?>" spellcheck="false" required>
                                     <tr><td><label for="iName2"><?= $this->getHtml('Name2'); ?></label>
@@ -180,7 +180,7 @@ echo $this->data['nav']->render();
                             <section class="portlet">
                                 <div class="portlet-head row middle-xs">
                                     <span><?= $this->getHtml('Notes'); ?></span>
-                                    <label for="c-tab-12" class="right-xs btn"><i class="fa fa-pencil"></i></a>
+                                    <label for="c-tab-12" class="right-xs btn"><i class="g-icon">edit</i></a>
                                 </div>
                                 <div class="slider">
                                 <table id="iNotesItemList" class="default">
@@ -205,7 +205,7 @@ echo $this->data['nav']->render();
                             <section class="portlet">
                                 <div class="portlet-head row middle-xs">
                                     <span><?= $this->getHtml('Files'); ?></span>
-                                    <label for="c-tab-13" class="right-xs btn"><i class="fa fa-pencil"></i></a>
+                                    <label for="c-tab-13" class="right-xs btn"><i class="g-icon">edit</i></a>
                                 </div>
                                 <div class="slider">
                                 <table id="iFilesItemList" class="default">
@@ -491,7 +491,7 @@ echo $this->data['nav']->render();
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
                         <form id="item-edit" action="<?= UriFactory::build('{/api}itemmgmt/item'); ?>" method="post">
-                            <div class="portlet-head"><?= $this->getHtml('Pricing'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                            <div class="portlet-head"><?= $this->getHtml('Pricing'); ?><i class="g-icon download btn end-xs">download</i></div>
                             <div class="portlet-body">
                                 <div class="form-group">
                                     <label for="iAttributesLanguage"><?= $this->getHtml('CustomerGroup'); ?></label>
@@ -547,14 +547,14 @@ echo $this->data['nav']->render();
 
                 <div class="col-xs-12">
                     <section class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Prices'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Prices'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                         <table id="iSalesItemList" class="default">
                             <thead>
                                 <tr>
                                     <td>
-                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                                     <td><?= $this->getHtml('Price'); ?>
                                     <td><?= $this->getHtml('Quantity'); ?>
                                     <td><?= $this->getHtml('Discount'); ?>
@@ -578,7 +578,7 @@ echo $this->data['nav']->render();
                                 foreach ($prices as $key => $value) : ++$c;
                                     $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id); ?>
                                     <tr data-href="<?= $url; ?>">
-                                        <td><a href="#"><i class="fa fa-times"></i></a>
+                                        <td><a href="#"><i class="g-icon">close</i></a>
                                         <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
                                         <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                                         <td><a href="<?= $url; ?>"><?= $this->printHtml($value->price->getAmount()); ?></a>
@@ -654,7 +654,7 @@ echo $this->data['nav']->render();
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
                         <form id="item-edit" action="<?= UriFactory::build('{/api}itemmgmt/item'); ?>" method="post">
-                            <div class="portlet-head"><?= $this->getHtml('Pricing'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                            <div class="portlet-head"><?= $this->getHtml('Pricing'); ?><i class="g-icon download btn end-xs">download</i></div>
                             <div class="portlet-body">
                                 <div class="form-group">
                                     <label for="iAttributesLanguage"><?= $this->getHtml('CustomerGroup'); ?></label>
@@ -710,20 +710,20 @@ echo $this->data['nav']->render();
 
                 <div class="col-xs-12">
                     <section class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Prices'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Prices'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table id="iSalesItemList" class="default">
                             <thead>
                                 <tr>
                                     <td>
-                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                             <tbody>
                                 <?php $c = 0;
                                 $l11ns   = [];
                                 foreach ($l11ns as $key => $value) : ++$c;
                                     $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id); ?>
                                     <tr data-href="<?= $url; ?>">
-                                        <td><a href="#"><i class="fa fa-times"></i></a>
+                                        <td><a href="#"><i class="g-icon">close</i></a>
                                         <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
                                         <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                                 <?php endforeach; ?>
@@ -972,7 +972,7 @@ echo $this->data['nav']->render();
             <div class="row">
                 <div class="col-xs-12">
                     <div class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                         <table class="default">
                             <colgroup>
diff --git a/Theme/Backend/purchase-item-list.tpl.php b/Theme/Backend/purchase-item-list.tpl.php
index 8aa86fa..25e14e5 100755
--- a/Theme/Backend/purchase-item-list.tpl.php
+++ b/Theme/Backend/purchase-item-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('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>
             <div class="slider">
             <table id="iPurchaseItemList" class="default sticky">
                 <thead>
@@ -31,98 +31,98 @@ echo $this->data['nav']->render(); ?>
                     <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><?= $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('Name'); ?>
                         <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 class="wf-100"><?= $this->getHtml('Name'); ?>
                         <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('Price'); ?>
                         <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>
                     <td><?= $this->getHtml('Available'); ?>
                         <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('Reserved'); ?>
                         <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('Ordered'); ?>
                         <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>
                 <tbody>
                 <?php $count = 0; foreach ($items as $key => $value) : ++$count;
diff --git a/Theme/Backend/sales-item-list.tpl.php b/Theme/Backend/sales-item-list.tpl.php
index bebd255..bc1d206 100755
--- a/Theme/Backend/sales-item-list.tpl.php
+++ b/Theme/Backend/sales-item-list.tpl.php
@@ -23,7 +23,7 @@ echo $this->data['nav']->render(); ?>
 <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>
             <div class="slider">
             <table id="iSalesItemList" class="default sticky">
                 <thead>
@@ -32,98 +32,98 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="iSalesItemList-sort-1">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-2">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-3">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-4">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-5">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-6">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-7">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-8">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Price'); ?>
                         <label for="iSalesItemList-sort-9">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-10">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Available'); ?>
                         <label for="iSalesItemList-sort-11">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-12">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Reserved'); ?>
                         <label for="iSalesItemList-sort-13">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-14">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Ordered'); ?>
                         <label for="iSalesItemList-sort-15">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-15">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-16">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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>
 
                 <tbody>
diff --git a/Theme/Backend/sales-item-profile.tpl.php b/Theme/Backend/sales-item-profile.tpl.php
index c414264..f7b7105 100755
--- a/Theme/Backend/sales-item-profile.tpl.php
+++ b/Theme/Backend/sales-item-profile.tpl.php
@@ -71,7 +71,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($item->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($item->number); ?>" disabled></span>
                                     <tr><td><label for="iName1"><?= $this->getHtml('Name1'); ?></label>
                                     <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($item->getL11n('name1')->content); ?>" spellcheck="false" required>
                                     <tr><td><label for="iName2"><?= $this->getHtml('Name2'); ?></label>
@@ -458,20 +458,20 @@ echo $this->data['nav']->render();
 
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Localizations'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Localizations'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table id="groupTable" class="default">
                             <thead>
                                 <tr>
                                     <td>
-                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td class="wf-100"><?= $this->getHtml('Localization'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td class="wf-100"><?= $this->getHtml('Localization'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                             <tbody>
                                 <?php $c = 0;
                                 foreach ($itemL11n as $key => $value) : ++$c;
                                     $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id); ?>
                                     <tr data-href="<?= $url; ?>">
-                                        <td><a href="#"><i class="fa fa-times"></i></a>
+                                        <td><a href="#"><i class="g-icon">close</i></a>
                                         <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
                                         <td><a href="<?= $url; ?>"><?= $this->printHtml($value->type->title); ?></a>
                                         <td><a href="<?= $url; ?>"><?= $this->printHtml($value->description); ?></a>
@@ -536,20 +536,20 @@ echo $this->data['nav']->render();
 
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Groups'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Groups'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table id="groupTable" class="default">
                             <thead>
                                 <tr>
                                     <td>
-                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                             <tbody>
                                 <?php $c = 0;
                                 foreach ($Attribute as $key => $value) : ++$c;
                                     $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id); ?>
                                     <tr data-href="<?= $url; ?>">
-                                        <td><a href="#"><i class="fa fa-times"></i></a>
+                                        <td><a href="#"><i class="g-icon">close</i></a>
                                         <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
                                         <td><a href="<?= $url; ?>"><?= $this->printHtml($value->type->getL11n()); ?></a>
                                         <td><a href="<?= $url; ?>"><?= $value->value->getValue() instanceof \DateTime ? $value->value->getValue()->format('Y-m-d') : $this->printHtml((string) $value->value->getValue()); ?></a>
@@ -618,20 +618,20 @@ echo $this->data['nav']->render();
 
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
-                        <div class="portlet-head"><?= $this->getHtml('Prices'); ?><i class="lni lni-download download btn end-xs"></i></div>
+                        <div class="portlet-head"><?= $this->getHtml('Prices'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table id="iSalesItemList" class="default">
                             <thead>
                                 <tr>
                                     <td>
-                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                    <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                             <tbody>
                                 <?php $c = 0;
                                 $l11ns   = [];
                                 foreach ($l11ns as $key => $value) : ++$c;
                                     $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id); ?>
                                     <tr data-href="<?= $url; ?>">
-                                        <td><a href="#"><i class="fa fa-times"></i></a>
+                                        <td><a href="#"><i class="g-icon">close</i></a>
                                         <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
                                         <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                                         <?php endforeach; ?>
@@ -750,19 +750,19 @@ echo $this->data['nav']->render();
 
                 <div class="col-xs-12 col-md-6 col-lg-4">
                     <table id="groupTable" class="box table default">
-                        <caption><?= $this->getHtml('Prices'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                        <caption><?= $this->getHtml('Prices'); ?><i class="g-icon end-xs download btn">download</i></caption>
                         <thead>
                             <tr>
                                 <td>
-                                <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                         <tbody>
                             <?php $c = 0;
                             $l11ns   = [];
                             foreach ($l11ns as $key => $value) : ++$c;
                                 $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->id); ?>
                                 <tr data-href="<?= $url; ?>">
-                                    <td><a href="#"><i class="fa fa-times"></i></a>
+                                    <td><a href="#"><i class="g-icon">close</i></a>
                                     <td><a href="<?= $url; ?>"><?= $value->id; ?></a>
                                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                                     <?php endforeach; ?>
@@ -951,7 +951,7 @@ echo $this->data['nav']->render();
             <div class="row">
                 <div class="col-xs-12">
                     <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/stock-item-list.tpl.php b/Theme/Backend/stock-item-list.tpl.php
index e9b441f..8e75edc 100755
--- a/Theme/Backend/stock-item-list.tpl.php
+++ b/Theme/Backend/stock-item-list.tpl.php
@@ -23,7 +23,7 @@ echo $this->data['nav']->render(); ?>
 <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>
             <div class="slider">
             <table id="iSalesItemList" class="default sticky">
                 <thead>
@@ -32,86 +32,86 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('Number'); ?>
                         <label for="iSalesItemList-sort-1">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-2">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-3">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-4">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-5">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-6">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Name'); ?>
                         <label for="iSalesItemList-sort-7">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-8">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Available'); ?>
                         <label for="iSalesItemList-sort-11">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-12">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Reserved'); ?>
                         <label for="iSalesItemList-sort-13">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-14">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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('Ordered'); ?>
                         <label for="iSalesItemList-sort-15">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-sort-15">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesItemList-sort-16">
                             <input type="radio" name="iSalesItemList-sort" id="iSalesItemList-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>
 
                 <tbody>