diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 5d9fa7a..13239fa 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "Warehousing",
         "uri": null,
         "target": "self",
-        "icon": "fa fa-cube",
+        "icon": "deployed_code",
         "order": 50,
         "from": "WarehouseManagement",
         "permission": { "permission": 2, "category": null, "element": null },
diff --git a/Theme/Backend/stock-list.tpl.php b/Theme/Backend/stock-list.tpl.php
index efdd558..1582bbd 100755
--- a/Theme/Backend/stock-list.tpl.php
+++ b/Theme/Backend/stock-list.tpl.php
@@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Stocks'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Stocks'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="stockList" class="default sticky">
                 <thead>
diff --git a/Theme/Backend/stock-location-list.tpl.php b/Theme/Backend/stock-location-list.tpl.php
index f5907fd..6ef94e8 100755
--- a/Theme/Backend/stock-location-list.tpl.php
+++ b/Theme/Backend/stock-location-list.tpl.php
@@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Locations'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Locations'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="stockList" class="default sticky">
                 <thead>
diff --git a/Theme/Backend/stock-type-list.tpl.php b/Theme/Backend/stock-type-list.tpl.php
index 5627633..96bc843 100644
--- a/Theme/Backend/stock-type-list.tpl.php
+++ b/Theme/Backend/stock-type-list.tpl.php
@@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Stocks'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Stocks'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="stockList" class="default sticky">
                 <thead>
diff --git a/Theme/Backend/stock-type-profile.tpl.php b/Theme/Backend/stock-type-profile.tpl.php
index f684710..e90cd64 100644
--- a/Theme/Backend/stock-type-profile.tpl.php
+++ b/Theme/Backend/stock-type-profile.tpl.php
@@ -31,7 +31,7 @@ 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>
             <div class="slider">
             <table id="localizationTable" class="default sticky fixed-5"
                 data-tag="form"
@@ -42,16 +42,16 @@ echo $this->data['nav']->render();
                     <tr>
                         <td>
                         <td><?= $this->getHtml('ID', '0', '0'); ?>
-                        <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('Language'); ?><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('Name'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                        <td><?= $this->getHtml('Language'); ?><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>
                     <template class="oms-add-tpl-attribute">
                         <tr data-id="" draggable="false">
                             <td>
-                                <i class="fa fa-cogs btn update-form"></i>
+                                <i class="g-icon btn update-form">settings</i>
                                 <input id="attributeTable-remove-0" type="checkbox" class="hidden">
-                                <label for="attributeTable-remove-0" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                <label for="attributeTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                 <span class="checked-visibility">
                                     <label for="attributeTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                     <label for="attributeTable-remove-0" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
@@ -68,10 +68,10 @@ echo $this->data['nav']->render();
                     foreach ($itemL11n as $value) : ++$c; ?>
                         <tr data-id="<?= $value->id; ?>">
                             <td>
-                                <i class="fa fa-cogs btn update-form"></i>
+                                <i class="g-icon btn update-form">settings</i>
                                 <?php if (!$value->type->isRequired) : ?>
                                 <input id="localizationTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
-                                <label for="localizationTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="fa fa-times btn form-action"></i></label>
+                                <label for="localizationTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
                                 <span class="checked-visibility">
                                     <label for="localizationTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
                                     <label for="localizationTable-remove-<?= $value->id; ?>" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>