diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index ed84363..4550f82 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "Messages",
         "uri": "{/base}/messages/dashboard?{?}",
         "target": "self",
-        "icon": "fa fa-envelope",
+        "icon": "mail",
         "order": 10,
         "from": "Messages",
         "permission": { "permission": 2, "category": null, "element": null },
diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php
index 48c99db..a8a25c7 100755
--- a/Theme/Backend/mail-create.tpl.php
+++ b/Theme/Backend/mail-create.tpl.php
@@ -18,9 +18,9 @@ echo $this->data['nav']->render(); ?>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getHtml('To'); ?>" name="to">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getHtml('CC'); ?>" name="cc">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->getHtml('BCC'); ?>" name="bcc">
+                <tr><td style="width: 1%"><button class="simple"><i class="g-icon">book</i></button><td><input type="text" placeholder="&#xf007; <?= $this->getHtml('To'); ?>" name="to">
+                <tr><td style="width: 1%"><button class="simple"><i class="g-icon">book</i></button><td><input type="text" placeholder="&#xf007; <?= $this->getHtml('CC'); ?>" name="cc">
+                <tr><td style="width: 1%"><button class="simple"><i class="g-icon">book</i></button><td><input type="text" placeholder="&#xf007; <?= $this->getHtml('BCC'); ?>" name="bcc">
                 <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->getHtml('Subject'); ?>" name="subject">
                 <tr><td><td><input type="file" name="files" multiple>
                 <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="&#xf040;" style="display: none" name="mail"></textarea>
diff --git a/Theme/Backend/mail-dashboard.tpl.php b/Theme/Backend/mail-dashboard.tpl.php
index 0567579..8e5378f 100755
--- a/Theme/Backend/mail-dashboard.tpl.php
+++ b/Theme/Backend/mail-dashboard.tpl.php
@@ -32,7 +32,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-9">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Messages'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Messages'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table id="profileList" class="default">
             <thead>
             <tr>
@@ -66,7 +66,7 @@ echo $this->data['nav']->render(); ?>
 
     <div class="col-xs-12 col-md-3">
         <div class="box">
-            <a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/messages/mail/create'); ?>"><i class="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
         </div>
 
         <div class="portlet">
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index b57295c..2419da3 100755
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -21,14 +21,14 @@ echo $this->data['nav']->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete'); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><i class="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+        <li><a href=""><i class="g-icon">delete</i> <?= $this->getHtml('Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="default">
-        <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+        <caption><?= $this->getHtml('Messages'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox" name=""></span>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index b57295c..2419da3 100755
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -21,14 +21,14 @@ echo $this->data['nav']->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete'); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><i class="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+        <li><a href=""><i class="g-icon">delete</i> <?= $this->getHtml('Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="default">
-        <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+        <caption><?= $this->getHtml('Messages'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox" name=""></span>
diff --git a/Theme/Backend/mail-templates.tpl.php b/Theme/Backend/mail-templates.tpl.php
index c35b605..a5cd364 100755
--- a/Theme/Backend/mail-templates.tpl.php
+++ b/Theme/Backend/mail-templates.tpl.php
@@ -24,7 +24,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-9">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Templates'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Templates'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table id="profileList" class="default">
                 <thead>
                 <tr>
@@ -54,7 +54,7 @@ echo $this->data['nav']->render(); ?>
 
     <div class="col-xs-12 col-md-3">
         <div class="box">
-            <a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/messages/template/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/messages/template/create'); ?>"><i class="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
         </div>
 
         <div class="portlet">
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index b57295c..2419da3 100755
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -21,14 +21,14 @@ echo $this->data['nav']->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete'); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><i class="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+        <li><a href=""><i class="g-icon">delete</i> <?= $this->getHtml('Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="default">
-        <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+        <caption><?= $this->getHtml('Messages'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox" name=""></span>