diff --git a/Theme/Backend/resource-create.tpl.php b/Theme/Backend/resource-create.tpl.php
index 8387665..dac8a62 100755
--- a/Theme/Backend/resource-create.tpl.php
+++ b/Theme/Backend/resource-create.tpl.php
@@ -73,9 +73,9 @@ use phpOMS\Uri\UriFactory;
             <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('User', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                        <td><?= $this->getHtml('Email', '0', '0'); ?><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('User', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                        <td><?= $this->getHtml('Email', '0', '0'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
                 <tbody>
                     <?php $c = 0; foreach ([] as $key => $value) : ++$c; $url = UriFactory::build('{/base}/admin/account/settings?{?}&id=' . $value->id); ?>
                     <tr data-href="<?= $url; ?>">
diff --git a/Theme/Backend/resource-list.tpl.php b/Theme/Backend/resource-list.tpl.php
index 8a8d360..7e39d2c 100755
--- a/Theme/Backend/resource-list.tpl.php
+++ b/Theme/Backend/resource-list.tpl.php
@@ -94,10 +94,10 @@ $next = $tableView->getNextLink(
             <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
             <div class="portlet-foot">
                 <?php if ($this->getData('hasPrevious')) : ?>
-                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="fa fa-chevron-left"></i></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="g-icon">chevron_left</i></a>
                 <?php endif; ?>
                 <?php if ($this->getData('hasNext')) : ?>
-                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="fa fa-chevron-right"></i></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="g-icon">chevron_right</i></a>
                 <?php endif; ?>
             </div>
             <?php endif; ?>