diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 56431b4..5cde0d0 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -25,7 +25,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Types'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Types'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="typeList" class="default sticky">
                 <thead>
@@ -33,38 +33,38 @@ echo $this->data['nav']->render(); ?>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
                         <label for="typeList-sort-1">
                             <input type="radio" name="typeList-sort" id="typeList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="typeList-sort-2">
                             <input type="radio" name="typeList-sort" id="typeList-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('keyword'); ?>
                         <label for="typeList-sort-3">
                             <input type="radio" name="typeList-sort" id="typeList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="typeList-sort-4">
                             <input type="radio" name="typeList-sort" id="typeList-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="typeList-sort-5">
                             <input type="radio" name="typeList-sort" id="typeList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="typeList-sort-6">
                             <input type="radio" name="typeList-sort" id="typeList-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/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
index 6eb154e..8f3cb54 100755
--- a/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
+++ b/Theme/Backend/Components/InlinePreview/inline-preview.tpl.php
@@ -11,7 +11,7 @@
                         {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
                     ]
                 }
-            ]' formaction=""><i class="fa fa-book"></i></button>
+            ]' formaction=""><i class="g-icon">book</i></button>
             <div class="advancedInput wf-100" id="<?= $this->id; ?>">
                 <input autocomplete="off" class="input" type="text" id="i<?= $this->id; ?>"
                     data-emptyAfter="true"
@@ -21,9 +21,9 @@
                     <table class="default">
                         <thead>
                             <tr>
-                                <td>ID<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td>Name<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td>Extension<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                <td>Name<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                                <td>Extension<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                         <tbody>
                             <template id="<?= $this->id; ?>-rowElement" class="rowTemplate">
                                 <tr tabindex="-1">
@@ -43,7 +43,7 @@
 <div class="box" id="<?= $this->id; ?>-tags" data-limit="0" data-active="true">
     <template id="<?= $this->id; ?>-tagTemplate">
         <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>">
-            <i class="fa fa-times close"></i>
+            <i class="g-icon close">close</i>
             <span style="display: none;" data-name="type_prefix" data-tpl-value="/type_prefix" data-value=""></span>
             <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
             <span data-tpl-text="/name/0" data-tpl-value="/name/0" data-value=""></span>
diff --git a/Theme/Backend/Components/Media/archive.tpl.php b/Theme/Backend/Components/Media/archive.tpl.php
index c71700c..8c71ff5 100755
--- a/Theme/Backend/Components/Media/archive.tpl.php
+++ b/Theme/Backend/Components/Media/archive.tpl.php
@@ -33,7 +33,7 @@ declare(strict_types=1);
                         echo '<tr>';
                         echo '<td>'
                             . \str_repeat('&nbsp;', (\substr_count(\trim($stat['name'], '/'), '/')) * 8)
-                            . ($stat['name'][\strlen($stat['name']) - 1] === '/' ? '<i class="fa fa-folder-open-o"></i> ' : '<i class="fa fa-file-o"></i> ')
+                            . ($stat['name'][\strlen($stat['name']) - 1] === '/' ? '<i class="g-icon">folder_open</i> ' : '<i class="g-icon">article</i> ')
                             . $stat['name'];
                     }
                 ?>
diff --git a/Theme/Backend/Components/Media/collection_raw.tpl.php b/Theme/Backend/Components/Media/collection_raw.tpl.php
index 6163b5a..dbfaa9c 100644
--- a/Theme/Backend/Components/Media/collection_raw.tpl.php
+++ b/Theme/Backend/Components/Media/collection_raw.tpl.php
@@ -2,7 +2,7 @@
 <html>
 <style>html, body, iframe { margin: 0; padding: 0; border: 0; text-align: center; } svg { width: 90%; fill: #efefef; }</style>
 <body>
-<svg fill="#1C2033" version="1.1" id="lni_lni-folder" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+<svg fill="#1C2033" version="1.1" id="folder_svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
 	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <path d="M61,19.6v-3.3c0-3.4-2.7-6.1-6.1-6.1H32.7l-0.3-0.8c-0.7-1.8-2.4-2.9-4.3-2.9H7.9c-3.4,0-6.1,2.7-6.1,6.1v38.9
 	c0,3.4,2.7,6.1,6.1,6.1h48.3c3.4,0,6.1-2.7,6.1-6.1V22.7C62.3,21.5,61.8,20.4,61,19.6z M54.9,14.6c0.9,0,1.6,0.7,1.6,1.6v1.9H35.9
diff --git a/Theme/Backend/Components/Media/list.tpl.php b/Theme/Backend/Components/Media/list.tpl.php
index 328d827..d558ea9 100755
--- a/Theme/Backend/Components/Media/list.tpl.php
+++ b/Theme/Backend/Components/Media/list.tpl.php
@@ -25,7 +25,7 @@ $next     = empty($this->media)
     : '{%}?{?}&mpivot=' . \end($this->media)->id . '&mptype=n';
 ?>
 <div class="portlet">
-    <div class="portlet-head"><?= $this->getHtml('Media', 'Media'); ?><i class="lni lni-download download btn end-xs"></i></div>
+    <div class="portlet-head"><?= $this->getHtml('Media', 'Media'); ?><i class="g-icon download btn end-xs">download</i></div>
     <div class="slider">
     <table class="default">
         <thead>
@@ -45,7 +45,7 @@ $next     = empty($this->media)
                 $icon          = $fileIconFunction($extensionType);
         ?>
         <tr data-href="<?= $url; ?>">
-            <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
+            <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $this->printHtml($icon); ?></i></a>
             <td data-label="<?= $this->getHtml('Path'); ?>"><a class="content" href="<?= UriFactory::build('{/base}/media/list?{?}&path=' . $value->getVirtualPath()); ?>"><?= $this->printHtml($value->getVirtualPath()); ?></a>
             <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
             <td data-label="<?= $this->getHtml('Extension'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->extension); ?></a>
diff --git a/Theme/Backend/Components/Upload/upload-list.tpl.php b/Theme/Backend/Components/Upload/upload-list.tpl.php
index 8578f1e..8c1c46d 100755
--- a/Theme/Backend/Components/Upload/upload-list.tpl.php
+++ b/Theme/Backend/Components/Upload/upload-list.tpl.php
@@ -36,8 +36,8 @@ use phpOMS\Uri\UriFactory;
                                             <table id="iMediaInput-table" class="default">
                                                 <thead>
                                                     <tr>
-                                                        <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', 'Media', 'Backend'); ?><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', 'Media', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                                                 <tbody>
                                                     <template id="iMediaInput-rowElement" class="rowTemplate">
                                                         <tr tabindex="-1">
@@ -62,14 +62,14 @@ use phpOMS\Uri\UriFactory;
         </div>
 
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Files', 'Media', 'Backend'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Files', 'Media', 'Backend'); ?><i class="g-icon download btn end-xs">download</i></div>
                 <div class="slider">
                 <table id="iFiles" 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', 'Media', 'Backend'); ?><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', 'Media', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                     <tbody
                         id="iMediaInput-tags"
                         class="tags"
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index e13b4a4..bf55520 100755
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -55,7 +55,7 @@ $next     = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id='
         <div class="box">
             <ul class="crumbs-2">
                 <li data-href="<?= $uri = UriFactory::build('{/base}/media/list?path=/Accounts/' . $accountDir); ?>">
-                    <a href="<?= $uri; ?>"><i class="fa fa-home"></i></a>
+                    <a href="<?= $uri; ?>"><i class="g-icon">home</i></a>
                 <li data-href="<?= $uri = UriFactory::build('{/base}/media/list?path=/'); ?>">
                     <a href="<?= $uri; ?>">/</a>
                 <?php
@@ -89,7 +89,7 @@ $next     = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id='
     <div class="col-xs-12">
         <div class="portlet">
             <div class="portlet-head">
-                <?= $this->getHtml('Media'); ?><i class="fa fa-download end-xs download btn"></i>
+                <?= $this->getHtml('Media'); ?><i class="g-icon end-xs download btn">download</i>
             </div>
             <div class="slider">
             <table id="iMediaList" class="default sticky">
@@ -103,66 +103,66 @@ $next     = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id='
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <label for="iMediaList-sort-1">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iMediaList-sort-2">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-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('Tag'); ?>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Type'); ?>
                         <label for="iMediaList-sort-3">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iMediaList-sort-4">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-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('Size'); ?>
                         <label for="iMediaList-sort-5">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iMediaList-sort-6">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-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('Creator'); ?>
                         <label for="iMediaList-sort-7">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iMediaList-sort-8">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-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('Created'); ?>
                         <label for="iMediaList-sort-9">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="iMediaList-sort-10">
                             <input type="radio" name="iMediaList-sort" id="iMediaList-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>
                 <tbody>
                     <?php if (!empty($parentPath)) :
@@ -171,7 +171,7 @@ $next     = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id='
                         <tr tabindex="0" data-href="<?= $url; ?>">
                             <td>
                             <td data-label="<?= $this->getHtml('Type'); ?>">
-                                <a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
+                                <a href="<?= $url; ?>"><i class="g-icon">folder_open</i></a>
                             <td data-label="<?= $this->getHtml('Name'); ?>">
                                 <a href="<?= $url; ?>">..
                             </a>
@@ -203,7 +203,7 @@ $next     = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id='
                                 <span class="checkmark"></span>
                             </label>
                         <td data-label="<?= $this->getHtml('Type'); ?>">
-                            <a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
+                            <a href="<?= $url; ?>"><i class="g-icon"><?= $this->printHtml($icon); ?></i></a>
                         <td data-label="<?= $this->getHtml('Name'); ?>">
                             <a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                         <td data-label="<?= $this->getHtml('Tag'); ?>"><?php $tags = $value->getTags(); foreach ($tags as $tag) : ?>
diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php
index f7f0aa7..4b0a8d0 100755
--- a/Theme/Backend/media-single.tpl.php
+++ b/Theme/Backend/media-single.tpl.php
@@ -52,7 +52,7 @@ echo $this->data['nav']->render();
     <div class="col-xs-12">
         <div class="box">
             <ul class="crumbs-2">
-                <li data-href="<?= UriFactory::build('{/app}/media/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('{/app}/media/list?path=/Accounts/' . $accountDir); ?>"><i class="fa fa-home"></i></a>
+                <li data-href="<?= UriFactory::build('{/app}/media/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('{/app}/media/list?path=/Accounts/' . $accountDir); ?>"><i class="g-icon">home</i></a>
                 <li data-href="<?= UriFactory::build('{/app}/media/list?path=/'); ?>"><a href="<?= UriFactory::build('{/app}/media/list?path=/'); ?>">/</a></li>
                 <?php
                     $subPath    = '';