diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 122e6b0..b65e2cd 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -32,7 +32,7 @@ use phpOMS\Views\View;
 final class BackendController extends Controller
 {
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -53,7 +53,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -83,7 +83,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -113,7 +113,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -134,7 +134,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -155,7 +155,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -176,7 +176,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -198,7 +198,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
@@ -219,7 +219,7 @@ final class BackendController extends Controller
     }
 
     /**
-     * Routing end-point for application behaviour.
+     * Routing end-point for application behavior.
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php
index 557844b..6181a0f 100755
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@@ -17,7 +17,7 @@ namespace Modules\Messages\Models;
 use phpOMS\Stdlib\Base\Enum;
 
 /**
- * Permision state enum.
+ * Permission category enum.
  *
  * @package Modules\Messages\Models
  * @license OMS License 2.0
diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php
index a8a25c7..da49961 100755
--- a/Theme/Backend/mail-create.tpl.php
+++ b/Theme/Backend/mail-create.tpl.php
@@ -18,12 +18,12 @@ echo $this->data['nav']->render(); ?>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <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 style="width: 1%"><button class="simple"><i class="g-icon">book</i></button><td><input type="text" placeholder="<?= $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="<?= $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="<?= $this->getHtml('BCC'); ?>" name="bcc">
+                <tr><td><td><input type="text" placeholder="<?= $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>
+                <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="" style="display: none" name="mail"></textarea>
                 <tr><td><td><input type="submit" value="<?= $this->getHtml('Send', '0', '0'); ?>" name="send-mail"> <input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>" name="save-mail">
             </table>
         </form>
diff --git a/Theme/Backend/mail-dashboard.tpl.php b/Theme/Backend/mail-dashboard.tpl.php
index 8e5378f..a91f0fe 100755
--- a/Theme/Backend/mail-dashboard.tpl.php
+++ b/Theme/Backend/mail-dashboard.tpl.php
@@ -33,7 +33,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12 col-md-9">
         <div class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Messages'); ?><i class="g-icon download btn end-xs">download</i></div>
-            <table id="profileList" class="default">
+            <table id="profileList" class="default sticky">
             <thead>
             <tr>
                 <td><span class="check"><input type="checkbox" name="profile-list"></span>
@@ -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="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/messages/mail/create'); ?>"><?= $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 2419da3..3d7b7c6 100755
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -21,13 +21,13 @@ 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="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><?= $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">
+    <table class="default sticky">
         <caption><?= $this->getHtml('Messages'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index 2419da3..3d7b7c6 100755
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -21,13 +21,13 @@ 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="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><?= $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">
+    <table class="default sticky">
         <caption><?= $this->getHtml('Messages'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>
diff --git a/Theme/Backend/mail-template.tpl.php b/Theme/Backend/mail-template.tpl.php
index fdad2be..43ee419 100644
--- a/Theme/Backend/mail-template.tpl.php
+++ b/Theme/Backend/mail-template.tpl.php
@@ -23,13 +23,13 @@ echo $this->data['nav']->render(); ?>
     <div class="box">
         <ul class="tab-links">
             <?php foreach ($mail->l11n as $idx => $l11n) : ?>
-            <li<?= $idx === 1 ? ' class="active"' : ''; ?>><label for="c-tab-<?= $idx; ?>"><?= $this->printHtml(ISO639Enum::getBy2Code($l11n->language)); ?></label></li>
+            <li<?= $idx === 1 ? ' class="active"' : ''; ?>><label for="c-tab-<?= $idx; ?>"><?= $this->printHtml(ISO639Enum::getBy2Code($l11n->language)); ?></label>
             <?php endforeach; ?>
         </ul>
     </div>
     <div class="tab-content">
         <?php foreach ($mail->l11n as $idx => $l11n) : ?>
-        <input type="radio" id="c-tab-<?= $idx; ?>" name="tabular-1"<?= $l11n === $this->response->header->l11n->language ? ' checked' : ''; ?>>
+        <input type="radio" id="c-tab-<?= $idx; ?>" name="tabular-1"<?= $l11n->language === $this->response->header->l11n->language ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
diff --git a/Theme/Backend/mail-templates.tpl.php b/Theme/Backend/mail-templates.tpl.php
index a5cd364..5665caf 100755
--- a/Theme/Backend/mail-templates.tpl.php
+++ b/Theme/Backend/mail-templates.tpl.php
@@ -25,7 +25,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12 col-md-9">
         <div class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Templates'); ?><i class="g-icon download btn end-xs">download</i></div>
-            <table id="profileList" class="default">
+            <table id="profileList" class="default sticky">
                 <thead>
                 <tr>
                     <td><span class="check"><input type="checkbox" name="profile-list"></span>
@@ -46,7 +46,7 @@ echo $this->data['nav']->render(); ?>
                 <?php endif; ?>
             </table>
         </div>
-        <div class="portlet-foot">
+        <div class="box">
             <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
             <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
         </div>
@@ -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="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/messages/template/create'); ?>"><?= $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 2419da3..e5c3313 100755
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -21,13 +21,13 @@ 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="g-icon">edit</i> <?= $this->getHtml('Create', '0', '0'); ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('messages/mail/create'); ?>"><i class="g-icon">stylus</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">
+    <table class="default sticky">
         <caption><?= $this->getHtml('Messages'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>