diff --git a/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php b/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php
index 754b8ca..7e2b5eb 100755
--- a/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php
+++ b/Admin/Settings/Theme/Backend/modules-nav-list.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('Navigation'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Navigation'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="navElements" class="default sticky">
                 <thead>
@@ -33,62 +33,62 @@ echo $this->data['nav']->render();
                     <td><?= $this->getHtml('App'); ?>
                         <label for="navElements-sort-1">
                             <input type="radio" name="navElements-sort" id="navElements-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-2">
                             <input type="radio" name="navElements-sort" id="navElements-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('ID', '0', '0'); ?>
                         <label for="navElements-sort-1">
                             <input type="radio" name="navElements-sort" id="navElements-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-2">
                             <input type="radio" name="navElements-sort" id="navElements-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('Order'); ?>
                         <label for="navElements-sort-1">
                             <input type="radio" name="navElements-sort" id="navElements-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-2">
                             <input type="radio" name="navElements-sort" id="navElements-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="navElements-sort-1">
                             <input type="radio" name="navElements-sort" id="navElements-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-2">
                             <input type="radio" name="navElements-sort" id="navElements-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('Link'); ?>
                         <label for="navElements-sort-1">
                             <input type="radio" name="navElements-sort" id="navElements-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navElements-sort-2">
                             <input type="radio" name="navElements-sort" id="navElements-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>
                 </thead>
                 <tbody>
diff --git a/Admin/Settings/Theme/Backend/settings-nav.tpl.php b/Admin/Settings/Theme/Backend/settings-nav.tpl.php
index 19ebb78..8745fb1 100755
--- a/Admin/Settings/Theme/Backend/settings-nav.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings-nav.tpl.php
@@ -105,7 +105,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Routes'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Routes'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="navList" class="default sticky">
                 <thead>
@@ -113,74 +113,74 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('Status'); ?>
                         <label for="navList-sort-1">
                             <input type="radio" name="navList-sort" id="navList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-2">
                             <input type="radio" name="navList-sort" id="navList-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('App'); ?>
                         <label for="navList-sort-1">
                             <input type="radio" name="navList-sort" id="navList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-2">
                             <input type="radio" name="navList-sort" id="navList-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('Module'); ?>
                         <label for="navList-sort-5">
                             <input type="radio" name="navList-sort" id="navList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-6">
                             <input type="radio" name="navList-sort" id="navList-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('Route'); ?>
                         <label for="navList-sort-3">
                             <input type="radio" name="navList-sort" id="navList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-4">
                             <input type="radio" name="navList-sort" id="navList-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('Destination'); ?>
                         <label for="navList-sort-3">
                             <input type="radio" name="navList-sort" id="navList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-4">
                             <input type="radio" name="navList-sort" id="navList-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('Methods'); ?>
                         <label for="navList-sort-5">
                             <input type="radio" name="navList-sort" id="navList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-6">
                             <input type="radio" name="navList-sort" id="navList-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>
                 <tbody>
                 <?php $count = 0;
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 33635ed..09cf055 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -28,7 +28,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Navigation'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Navigation'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="navList" class="default sticky">
                 <thead>
@@ -36,98 +36,98 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="navList-sort-1">
                             <input type="radio" name="navList-sort" id="navList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-2">
                             <input type="radio" name="navList-sort" id="navList-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('PageId'); ?>
                         <label for="navList-sort-3">
                             <input type="radio" name="navList-sort" id="navList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-4">
                             <input type="radio" name="navList-sort" id="navList-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="navList-sort-5">
                             <input type="radio" name="navList-sort" id="navList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-6">
                             <input type="radio" name="navList-sort" id="navList-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="navList-sort-7">
                             <input type="radio" name="navList-sort" id="navList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-8">
                             <input type="radio" name="navList-sort" id="navList-sort-8">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td class="wf-100"><?= $this->getHtml('Subtype'); ?>
                         <label for="navList-sort-9">
                             <input type="radio" name="navList-sort" id="navList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-10">
                             <input type="radio" name="navList-sort" id="navList-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('Uri'); ?>
                         <label for="navList-sort-13">
                             <input type="radio" name="navList-sort" id="navList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-14">
                             <input type="radio" name="navList-sort" id="navList-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('Provider'); ?>
                         <label for="navList-sort-15">
                             <input type="radio" name="navList-sort" id="navList-sort-15">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-16">
                             <input type="radio" name="navList-sort" id="navList-sort-16">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Parent'); ?>
                         <label for="navList-sort-17">
                             <input type="radio" name="navList-sort" id="navList-sort-17">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="navList-sort-18">
                             <input type="radio" name="navList-sort" id="navList-sort-18">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                 <tbody>
                 <?php $count = 0;
diff --git a/Theme/Backend/mid-side.tpl.php b/Theme/Backend/mid-side.tpl.php
index a75350f..36aa337 100755
--- a/Theme/Backend/mid-side.tpl.php
+++ b/Theme/Backend/mid-side.tpl.php
@@ -21,7 +21,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE]))
     <div>
         <h1>
             <?= $this->getHtml('Navigation', 'Navigation'); ?>
-            <i class="fa fa-minus min"></i><i class="fa fa-plus max vh"></i>
+            <i class="g-icon min">remove</i><i class="g-icon max vh">add</i>
         </h1>
         <div class="bc-1">
             <ul id="ms-nav" role="list">
diff --git a/Theme/Backend/side.tpl.php b/Theme/Backend/side.tpl.php
index 7f256d5..b33a0f5 100755
--- a/Theme/Backend/side.tpl.php
+++ b/Theme/Backend/side.tpl.php
@@ -28,9 +28,9 @@ if (isset($this->nav[NavigationType::SIDE])) : ?>
             <ul>
                 <li><label for="nav-<?= $this->printHtml($parent['nav_name']); ?>">
                     <?php if (isset($parent['nav_icon'])) : ?>
-                        <i class="<?= $this->printHtml($parent['nav_icon']); ?>"></i>
+                        <i class="g-icon"><?= $this->printHtml($parent['nav_icon']); ?></i>
                     <?php endif; ?>
-                    <span><?= $this->getHtml($parent['nav_name'], 'Navigation'); ?></span><i class="fa lni lni-chevron-right expand"></i></label>
+                    <span><?= $this->getHtml($parent['nav_name'], 'Navigation'); ?></span><i class="g-icon expand">chevron_right</i></label>
                     <?php if (isset($this->nav[NavigationType::SIDE][LinkType::LINK])) :
                         foreach ($this->nav[NavigationType::SIDE][LinkType::LINK] as $key2 => $link) :
                             if ($link['nav_parent'] === $key) :
diff --git a/Theme/Backend/splash.tpl.php b/Theme/Backend/splash.tpl.php
index e58d11f..a2f0ec6 100755
--- a/Theme/Backend/splash.tpl.php
+++ b/Theme/Backend/splash.tpl.php
@@ -22,7 +22,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])) :
                 <section class="box w-33 floatLeft">
                     <div class="inner centerText">
                         <a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>">
-                            <p><i class="fa-5x <?= $this->printHtml($link['nav_icon']); ?>"></i></p>
+                            <p><i class="g-icon"><?= $this->printHtml($link['nav_icon']); ?></i></p>
                             <p><?= $this->getHtml($link['nav_name'], 'Navigation'); ?></p>
                         </a>
                     </div>
diff --git a/Theme/Backend/top.tpl.php b/Theme/Backend/top.tpl.php
index c9d2493..74eb509 100755
--- a/Theme/Backend/top.tpl.php
+++ b/Theme/Backend/top.tpl.php
@@ -28,7 +28,12 @@ if (isset($this->nav[NavigationType::TOP])) : ?>
             href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"
             <?= $link['nav_action'] !== null ? ' data-action=\'' . $link['nav_action'] . '\'' : ''; ?>>
                 <?php if (isset($link['nav_icon'])) : ?>
-                    <i class="<?= $this->printHtml($link['nav_icon']); ?> infoIcon"><?php if (isset($unread[$link['nav_from']]) && $unread[$link['nav_from']] > 0) : ?><span class="badge"><?= $unread[$link['nav_from']]; ?></span><?php endif; ?></i>
+                    <i class="g-icon infoIcon">
+                        <?= $this->printHtml($link['nav_icon']); ?>
+                        <?php if (isset($unread[$link['nav_from']]) && $unread[$link['nav_from']] > 0) : ?>
+                            <span class="badge"><?= $unread[$link['nav_from']]; ?></span>
+                        <?php endif; ?>
+                    </i>
                 <?php endif; ?>
                 <span class="link"><?= $this->getHtml($link['nav_name'], 'Navigation'); ?><span></a>
         <?php endforeach; endforeach; ?>