diff --git a/Theme/Backend/Components/Compound/compound.tpl.php b/Theme/Backend/Components/Compound/compound.tpl.php
index 36db618..e26f8e2 100644
--- a/Theme/Backend/Components/Compound/compound.tpl.php
+++ b/Theme/Backend/Components/Compound/compound.tpl.php
@@ -22,14 +22,14 @@
 
     <div class="col-xs-12 col-md-6">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Notes', 'Editor', 'Backend'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Notes', 'Editor', 'Backend'); ?><i class="g-icon download btn end-xs">download</i></div>
                 <div class="slider">
                 <table 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('Title', 'Editor', '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('Title', 'Editor', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                     <tbody id="iEditorInput-tags" class="tags" data-limit="0" data-active="true" data-form="<?= $this->form; ?>">
                         <template id="iEditorInput-tagTemplate">
                             <tr data-tpl-value="/id" data-value="" data-uuid="" data-name="editor-list">
diff --git a/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php b/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
index 9aa3a3d..429d033 100755
--- a/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
+++ b/Theme/Backend/Components/Editor/inline-editor-tools.tpl.php
@@ -1,31 +1,31 @@
 <div id="<?= $this->renderId(); ?>" class="slider click">
     <ul class="h-list">
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-undo"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-repeat"></i>
-        <li><i data-editor-button="bold" class="btn editor-button fa fa-lg fa-bold"></i>
-        <li><i data-editor-button="italic" class="btn editor-button fa fa-lg fa-italic"></i>
-        <li><i data-editor-button="underline" class="btn editor-button fa fa-lg fa-underline"></i>
-        <li><i data-editor-button="strikethrough" class="btn editor-button fa fa-lg fa-strikethrough"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-subscript"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-superscript"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-paint-brush"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-pencil"></i>
-        <li><i data-editor-button="ulist" class="btn editor-button fa fa-lg fa-list-ul"></i>
-        <li><i data-editor-button="olist" class="btn editor-button fa fa-lg fa-list-ol"></i>
-        <li><i data-editor-button="indent" class="btn editor-button fa fa-lg fa-indent"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-dedent"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-align-left"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-align-justify"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-align-right"></i>
-        <li><i data-editor-button="table" class="btn editor-button fa fa-lg fa-table"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-image"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-camera"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-bar-chart"></i>
-        <li><i data-editor-button="link" class="btn editor-button fa fa-lg fa-link"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-unlink"></i>
-        <li><i data-editor-button="code" class="btn editor-button fa fa-lg fa-code"></i>
-        <li><i data-editor-button="quote" class="btn editor-button fa fa-lg fa-quote-right"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-calendar"></i>
-        <li><i data-editor-button="a" class="btn editor-button fa fa-lg fa-clock"></i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">undo</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">redo</i>
+        <li><i data-editor-button="bold" class="btn editor-button g-icon">format_bold</i>
+        <li><i data-editor-button="italic" class="btn editor-button g-icon">format_italic</i>
+        <li><i data-editor-button="underline" class="btn editor-button g-icon">format_underlined</i>
+        <li><i data-editor-button="strikethrough" class="btn editor-button g-icon">strikethrough_s</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">subscript</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">superscript</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">brush</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">edit</i>
+        <li><i data-editor-button="ulist" class="btn editor-button g-icon">format_list_bullted</i>
+        <li><i data-editor-button="olist" class="btn editor-button g-icon">format_list_numbered</i>
+        <li><i data-editor-button="indent" class="btn editor-button g-icon">format_indent_increase</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">format_indent_decrease</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">format_align_left</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">format_align_justify</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">format_align_right</i>
+        <li><i data-editor-button="table" class="btn editor-button g-icon">table</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">image</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">photo_camera</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">insert_chart</i>
+        <li><i data-editor-button="link" class="btn editor-button g-icon">link</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">link_off</i>
+        <li><i data-editor-button="code" class="btn editor-button g-icon">code</i>
+        <li><i data-editor-button="quote" class="btn editor-button g-icon">format_quote</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">calendar_month</i>
+        <li><i data-editor-button="a" class="btn editor-button g-icon">schedule</i>
     </ul>
 </div>
\ No newline at end of file
diff --git a/Theme/Backend/editor-list.tpl.php b/Theme/Backend/editor-list.tpl.php
index 45f6397..956d72b 100755
--- a/Theme/Backend/editor-list.tpl.php
+++ b/Theme/Backend/editor-list.tpl.php
@@ -37,7 +37,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12">
         <div class="box">
             <ul class="crumbs-2">
-                <li data-href="<?= UriFactory::build('{/base}/editor/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('{/base}/editor/list?path=/Accounts/' . $accountDir); ?>"><i class="fa fa-home"></i></a>
+                <li data-href="<?= UriFactory::build('{/base}/editor/list?path=/Accounts/' . $accountDir); ?>"><a href="<?= UriFactory::build('{/base}/editor/list?path=/Accounts/' . $accountDir); ?>"><i class="g-icon">home</i></a>
                 <li data-href="<?= UriFactory::build('{/base}/editor/list?path=/'); ?>"><a href="<?= UriFactory::build('{/base}/editor/list?path=/'); ?>">/</a></li>
                 <?php
                     $subPath    = '';
@@ -68,7 +68,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Documents'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Documents'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="editorList" class="default sticky">
             <thead>
@@ -81,44 +81,44 @@ echo $this->data['nav']->render(); ?>
                 <td class="wf-100"><?= $this->getHtml('Title'); ?>
                     <label for="editorList-sort-1">
                             <input type="radio" name="editorList-sort" id="editorList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="editorList-sort-2">
                             <input type="radio" name="editorList-sort" id="editorList-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('Creator'); ?>
                     <label for="editorList-sort-3">
                             <input type="radio" name="editorList-sort" id="editorList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="editorList-sort-4">
                             <input type="radio" name="editorList-sort" id="editorList-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('Created'); ?>
                     <label for="editorList-sort-5">
                             <input type="radio" name="editorList-sort" id="editorList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="editorList-sort-6">
                             <input type="radio" name="editorList-sort" id="editorList-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 if (!empty($parentPath)) : $url = UriFactory::build('{/base}/editor/list?path=' . $parentPath); ?>
                         <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>
+                            <td data-label="<?= $this->getHtml('Type'); ?>"><a href="<?= $url; ?>"><i class="g-icon">folder_open</i></a>
                             <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>">..
                             </a>
                             <td>
@@ -132,7 +132,7 @@ echo $this->data['nav']->render(); ?>
                                 <input type="checkbox" id="editorList-<?= $key; ?>" name="editorselect">
                                 <span class="checkmark"></span>
                             </label>
-                    <td><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
+                    <td><a href="<?= $url; ?>"><i class="g-icon">folder_open</i></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
                     <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->id); ?>"><?= $this->printHtml($value->createdBy->name1); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>
@@ -144,7 +144,7 @@ echo $this->data['nav']->render(); ?>
                                 <input type="checkbox" id="editorList-<?= $key; ?>" name="editorselect">
                                 <span class="checkmark"></span>
                             </label>
-                    <td><i class="fa fa-file-o"></i>
+                    <td><i class="g-icon">article</i>
                     <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->title); ?></a>
                     <td data-label="<?= $this->getHtml('Creator'); ?>"><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->id); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
                     <td data-label="<?= $this->getHtml('Created'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>