diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 9987e05..e15f4e7 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "EquipmentManagement",
         "uri": null,
         "target": "self",
-        "icon": "fa fa-wrench",
+        "icon": "build",
         "order": 80,
         "from": "EquipmentManagement",
         "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 ef6e347..b458b13 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', 'Attribute', 'Backend'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('AttributeTypes', 'Attribute', 'Backend'); ?><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/equipment-list.tpl.php b/Theme/Backend/equipment-list.tpl.php
index 4bfbba5..9f280f6 100755
--- a/Theme/Backend/equipment-list.tpl.php
+++ b/Theme/Backend/equipment-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('Equipments'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Equipments'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="iSalesClientList" class="default sticky">
                 <thead>
@@ -31,50 +31,50 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="iSalesClientList-sort-1">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-2">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-2">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Status'); ?>
                         <label for="iSalesClientList-sort-3">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-4">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-4">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="iSalesClientList-sort-5">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-6">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-6">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Type'); ?>
                         <label for="iSalesClientList-sort-7">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iSalesClientList-sort-8">
                             <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-8">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                 <tbody>
                 <?php
diff --git a/tests/Models/NullEquipmentTest.php b/tests/Models/NullEquipmentTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/NullInspectionTest.php b/tests/Models/NullInspectionTest.php
old mode 100644
new mode 100755