diff --git a/Theme/Backend/monitoring-logs-single.tpl.php b/Theme/Backend/monitoring-logs-single.tpl.php
index 8ce6cf1..8658a50 100755
--- a/Theme/Backend/monitoring-logs-single.tpl.php
+++ b/Theme/Backend/monitoring-logs-single.tpl.php
@@ -37,52 +37,52 @@ echo $this->data['nav']->render(); ?>
             <div class="portlet-head"><?= $this->getHtml('Logs'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
-                    <label><i class="fa fa-anchor"></i> <?= $this->getHtml('ID', '0', '0'); ?></label>
+                    <label><i class="g-icon">anchor</i> <?= $this->getHtml('ID', '0', '0'); ?></label>
                     <label><?= $this->printHtml((string) ($this->request->getData('id') ?? 0)); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-clock-o"></i <?= $this->getHtml('Time'); ?>></label>
+                    <label><i class="g-icon">schedule</i <?= $this->getHtml('Time'); ?>></label>
                     <label><?= $this->printHtml($log[0] ?? ''); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-globe"></i> <?= $this->getHtml('Uri'); ?></label>
+                    <label><i class="g-icon">public</i> <?= $this->getHtml('Uri'); ?></label>
                     <label><?= $this->printHtml($log[8] ?? ''); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-wifi"></i> <?= $this->getHtml('Source'); ?></label>
+                    <label><i class="g-icon">wifi</i> <?= $this->getHtml('Source'); ?></label>
                     <label><?= $this->printHtml($log[2] ?? ''); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-<?= $this->printHtml(\in_array($log[1] ?? '', ['notice', 'info', 'debug']) ? 'info-circle' : 'warning'); ?>"></i> <?= $this->getHtml('Level'); ?></label>
+                    <label><i class="g-icon"><?= $this->printHtml(\in_array($log[1] ?? '', ['notice', 'info', 'debug']) ? 'info' : 'warning'); ?></i> <?= $this->getHtml('Level'); ?></label>
                     <label><?= $this->printHtml($log[1] ?? ''); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-commenting"></i> <?= $this->getHtml('Message'); ?></label>
+                    <label><i class="g-icon">chat</i> <?= $this->getHtml('Message'); ?></label>
                     <label><?= $this->printHtml($log[7] ?? ''); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-file-o"></i> <?= $this->getHtml('File'); ?></label>
+                    <label><i class="g-icon">article</i> <?= $this->getHtml('File'); ?></label>
                     <label><?= $this->printHtml($log[8] ?? ''); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-commenting"></i> <?= $this->getHtml('Line'); ?></label>
+                    <label><i class="g-icon">chat</i> <?= $this->getHtml('Line'); ?></label>
                     <label><?= $this->printHtml($log[3] ?? ''); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-laptop"></i> <?= $this->getHtml('OS'); ?></label>
+                    <label><i class="g-icon">laptop_mac</i> <?= $this->getHtml('OS'); ?></label>
                     <label><?= $this->printHtml($log[5] ?? ''); ?></label>
                 </div>
 
                 <div class="form-group">
-                    <label><i class="fa fa-pencil"></i> <?= $this->getHtml('Version'); ?></label>
+                    <label><i class="g-icon">edit</i> <?= $this->getHtml('Version'); ?></label>
                     <label><?= $this->printHtml($log[4] ?? ''); ?></label>
                 </div>
 
diff --git a/Theme/Backend/monitoring-logs.tpl.php b/Theme/Backend/monitoring-logs.tpl.php
index 326b111..04516ab 100755
--- a/Theme/Backend/monitoring-logs.tpl.php
+++ b/Theme/Backend/monitoring-logs.tpl.php
@@ -24,7 +24,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Modules'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Modules'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table class="default">
                 <thead>
@@ -37,10 +37,10 @@ echo $this->data['nav']->render(); ?>
                         <?php foreach ($logs as $key => $value) :
                         $url = \phpOMS\Uri\UriFactory::build('{/base}/admin/monitoring/log/single?{?}&id=' . $key); ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href=<?= $url; ?>><i class="fa fa-clock-o"></i> <?= $this->printHtml($value[0] ?? ''); ?></a>
-                    <td><a href=<?= $url; ?>><i class="fa fa-<?= $this->printHtml(\in_array($value[1], ['notice', 'info', 'debug']) ? 'info-circle' : 'warning'); ?>"></i> <?= $this->printHtml($value[1] ?? ''); ?></a>
-                    <td><a href=<?= $url; ?>><i class="fa fa-wifi"></i> <?= $this->printHtml($value[2] ?? ''); ?></a>
-                    <td><a href=<?= $url; ?>><i class="fa fa-commenting"></i> <?= $this->printHtml($value[7] ?? ''); ?></a>
+                    <td><a href=<?= $url; ?>><i class="g-icon">schedule</i> <?= $this->printHtml($value[0] ?? ''); ?></a>
+                    <td><a href=<?= $url; ?>><i class="g-icon"><?= $this->printHtml(\in_array($value[1], ['notice', 'info', 'debug']) ? 'info' : 'warning'); ?></i> <?= $this->printHtml($value[1] ?? ''); ?></a>
+                    <td><a href=<?= $url; ?>><i class="g-icon">wifi</i> <?= $this->printHtml($value[2] ?? ''); ?></a>
+                    <td><a href=<?= $url; ?>><i class="g-icon">chat</i> <?= $this->printHtml($value[7] ?? ''); ?></a>
                         <?php endforeach;
                         if (!isset($key)) : ?>
                 <tr>
diff --git a/Theme/Backend/monitoring-security-file-list.tpl.php b/Theme/Backend/monitoring-security-file-list.tpl.php
index f4e338a..bf80d6c 100755
--- a/Theme/Backend/monitoring-security-file-list.tpl.php
+++ b/Theme/Backend/monitoring-security-file-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->data['nav']->render(); ?>
     <div class="box col-xs-12 wf-100">
         <div class="slider">
         <table class="default sticky">
-            <caption><?= $this->getHtml('Files'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+            <caption><?= $this->getHtml('Files'); ?><i class="g-icon end-xs download btn">download</i></caption>
             <thead>
             <tr>
                 <td class="wf-100"><?= $this->getHtml('File'); ?>
diff --git a/Theme/Backend/monitoring-security.tpl.php b/Theme/Backend/monitoring-security.tpl.php
index 980c933..be102fa 100755
--- a/Theme/Backend/monitoring-security.tpl.php
+++ b/Theme/Backend/monitoring-security.tpl.php
@@ -65,7 +65,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Inspection'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Inspection'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="fileList" class="default">
                 <thead>
@@ -73,74 +73,74 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('Status'); ?>
                         <label for="fileList-sort-1">
                             <input type="radio" name="fileList-sort" id="fileList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="fileList-sort-2">
                             <input type="radio" name="fileList-sort" id="fileList-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('File'); ?>
                         <label for="fileList-sort-3">
                             <input type="radio" name="fileList-sort" id="fileList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="fileList-sort-4">
                             <input type="radio" name="fileList-sort" id="fileList-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('Unicode'); ?>
                         <label for="fileList-sort-5">
                             <input type="radio" name="fileList-sort" id="fileList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="fileList-sort-6">
                             <input type="radio" name="fileList-sort" id="fileList-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('Deprecated'); ?>
                         <label for="fileList-sort-7">
                             <input type="radio" name="fileList-sort" id="fileList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="fileList-sort-8">
                             <input type="radio" name="fileList-sort" id="fileList-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('Modified'); ?>
                         <label for="fileList-sort-9">
                             <input type="radio" name="fileList-sort" id="fileList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="fileList-sort-10">
                             <input type="radio" name="fileList-sort" id="fileList-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('Integrity'); ?>
                         <label for="fileList-sort-11">
                             <input type="radio" name="fileList-sort" id="fileList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="fileList-sort-12">
                             <input type="radio" name="fileList-sort" id="fileList-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