diff --git a/bin/v-list-user-log b/bin/v-list-user-log
index 5f0b9004..f8581341 100755
--- a/bin/v-list-user-log
+++ b/bin/v-list-user-log
@@ -24,6 +24,7 @@ json_list() {
     echo "{"
     for str in $logs; do
         eval $str
+        CMD=${CMD//\"/\\\"}
         echo -n '    "'$ID'": {
         "CMD": "'$CMD'",
         "UNDO": "'$UNDO'",
diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index 9904b4a4..20ee17ed 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -556,6 +556,7 @@ if [ "$clamd" = 'no' ]; then
 fi
 if [ "$spamd" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/spamassassin//")
+    software=$(echo "$software" | sed -e "s/libmail-dkim-perl//")
 fi
 if [ "$dovecot" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/dovecot-imapd//")
diff --git a/upd/switch_rpath.sh b/upd/switch_rpath.sh
index 98dd1bd7..3b082049 100755
--- a/upd/switch_rpath.sh
+++ b/upd/switch_rpath.sh
@@ -27,6 +27,8 @@ for ip in $(ls /usr/local/vesta/data/ips); do
 done
 echo "</IfModule>" >> $conf
 
+sed -i "s/LogFormat \"%h/LogFormat \"%a/g" /etc/apache2/apache2.conf
+
 # Restarting apache
 /usr/sbin/apachectl restart > /dev/null 2>&1
 
diff --git a/web/css/styles.min.css b/web/css/styles.min.css
index 3f2eeb3e..28d8e59a 100644
--- a/web/css/styles.min.css
+++ b/web/css/styles.min.css
@@ -595,15 +595,6 @@ a {
   text-decoration: line-through;
 }
 
-.unselectable {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
 .clearfix:before,
 .clearfix:after {
   content: '';
@@ -839,8 +830,6 @@ input[type="checkbox"] {
   font-size: 12px;
   padding: 0;
   color: #7f7f7f;
-  max-height: 95%;
-  overflow: auto;
 }
 .notification-container .unseen {
   color: #ABABAB;
@@ -851,33 +840,21 @@ input[type="checkbox"] {
   border-bottom: 1px solid #555;
   padding: 10px 15px 24px;
 }
-.notification-container li.empty {
-  padding-top: 50px;
-  height: 50px;
-  font-size: 15px;
-  font-style: italic;
-  text-align: center;
-  color: #999;
-}
-
 .notification-container .mark-seen {
-  background: rgba(0, 0, 0, 0) url("/images/sprite.png?1446554103") repeat scroll -426px 165px;
-  border: 3px solid #454545;
+  background-color: #abc04b;
+  border: 2px solid #454545;
+  border-radius: 10px;
   cursor: pointer;
   display: none;
   float: right;
-  height:11px;
+  height: 7px;
   margin-right: -5px;
   margin-top: 0;
-  width: 11px;
-  opacity: 0.5;
-  border-radius: 10px;
+  width: 7px;
 }
 .notification-container .mark-seen:hover {
   background-color: #333;
-  border-color: #333;
-
-  opacity: 0.8;
+  border-color: #abc04b;
 }
 .notification-container .mark-seen:active {
   background-color: #777;
@@ -1151,13 +1128,13 @@ div.l-content > div.l-separator:nth-of-type(4) {
 
 .l-sort-toolbar td.toggle-all {
   padding-top: 7px;
-  padding-right: 40px;
+  padding-right: 20px;
 }
 
 .l-sort-toolbar .sort-by {
   cursor: pointer;
   padding-top: 7px;
-  padding-right: 40px;
+  padding-left: 40px;
 }
 .l-sort-toolbar .sort-by:hover {
   color: #555;
@@ -1369,9 +1346,11 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 
 
-.l-unit--outdated {
-  background-color: #9B3D35;
-  color: #fff;
+.units .l-unit.l-unit--outdated {
+  background-color: #ffcaca;
+  color: #555;
+  border-left: 5px solid #ff6f6f;
+  border-bottom: 1px solid #fff;
 }
 
 .l-unit--suspended .l-unit__name,
@@ -1381,6 +1360,13 @@ div.l-content > div.l-separator:nth-of-type(4) {
   color: #c0c0c0;
 }
 
+.l-unit--outdated .l-unit__name {
+  color: #333;
+}
+.l-unit--outdated b {
+  color: #555;
+}
+
 .l-unit--suspended .l-percent {
   border-color: #fff;
 }
@@ -1404,7 +1390,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 
 .l-unit--outdated.selected {
   background: #765D5D !important;
-  color: #FEF482 !important;
+  color: #333 !important;
 }
 
 
@@ -1417,7 +1403,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 .l-unit--suspended.selected .l-percent__fill,
 .l-unit--suspended.selected .l-unit__name,
 .l-unit--suspended.selected .l-unit__name span {
-  color: #b2ac87 !important;
+  color: #333 !important;
 }
 
 .l-unit.selected .l-percent {
@@ -1507,7 +1493,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 
 .l-unit.l-unit--outdated .l-unit__date {
-  color: #fff7ae;
+  color: #d24c4c;
   font-size: 10px;
   letter-spacing: 3px;
   text-transform: uppercase;
@@ -3122,6 +3108,7 @@ form#vstobjects.suspended {
 .l-sort-toolbar__search-box {
   float: right !important;
   padding-top: 3px;
+  padding-right: 0 !important;
 }
 .ui-dialog .ui-dialog-buttonpane button:nth-of-type(2) {
   -background-color: #dfdedd;
diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php
index 293d65fc..d4dd8406 100644
--- a/web/inc/i18n/ar.php
+++ b/web/inc/i18n/ar.php
@@ -584,6 +584,7 @@ $LANG['ar'] = array(
     'Starred' => 'المحدد بنجمة',
     'Name' => 'الاسم',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'مدير الملفات',
     'size' => 'الحجم',
@@ -751,8 +752,6 @@ $LANG['ar'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
-
 // Texts below doesn't exist in en.php
     '%s rule' => 'قواعد %s',
     'MainDomain' => 'النطاق الرئيسي',
diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php
index acfcd354..b92ba1e4 100644
--- a/web/inc/i18n/bs.php
+++ b/web/inc/i18n/bs.php
@@ -584,6 +584,7 @@ $LANG['bs'] = array(
     'Starred' => 'Označen zvjezdicom',
     'Name' => 'Ime',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'veličina',
@@ -750,5 +751,4 @@ $LANG['bs'] = array(
 
     'maximum characters length, including prefix' => 'maksimalna dužina sme biti %s karaktera, uključujući i prefix',
 
-    'no notifications' => 'no notifications',
 );
\ No newline at end of file
diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php
index fda878fe..0282b34e 100644
--- a/web/inc/i18n/cn.php
+++ b/web/inc/i18n/cn.php
@@ -585,6 +585,8 @@ $LANG['cn'] = array(
     'Starred' => '星标',
     'Name' => '名称',
 
+    'save to favorites' => 'save to favorites',
+
     'File Manager' => '文件管理',
     'type' => '类型',
     'size' => '大小',
@@ -751,5 +753,4 @@ $LANG['cn'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php
index 41c7824f..fedead97 100644
--- a/web/inc/i18n/cz.php
+++ b/web/inc/i18n/cz.php
@@ -585,6 +585,7 @@ $LANG['cz'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -752,5 +753,4 @@ $LANG['cz'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php
index b37ec339..b0820a13 100644
--- a/web/inc/i18n/da.php
+++ b/web/inc/i18n/da.php
@@ -586,6 +586,7 @@ $LANG['da'] = array(
     'Starred' => 'Starred',
     'Name' => 'Navn',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -753,5 +754,4 @@ $LANG['da'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php
index 64e5ba67..57e8b392 100644
--- a/web/inc/i18n/de.php
+++ b/web/inc/i18n/de.php
@@ -584,6 +584,7 @@ $LANG['de'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -751,5 +752,4 @@ $LANG['de'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php
index 4ef5064e..1c37f336 100644
--- a/web/inc/i18n/el.php
+++ b/web/inc/i18n/el.php
@@ -585,6 +585,7 @@ $LANG['el'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -752,5 +753,4 @@ $LANG['el'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php
index 2d7c1654..8389b2c0 100644
--- a/web/inc/i18n/en.php
+++ b/web/inc/i18n/en.php
@@ -584,6 +584,7 @@ $LANG['en'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -751,5 +752,4 @@ $LANG['en'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php
index 5392ed9d..64aa64a2 100644
--- a/web/inc/i18n/es.php
+++ b/web/inc/i18n/es.php
@@ -585,6 +585,7 @@ $LANG['es'] = array(
     'Starred' => 'Favorito',
     'Name' => 'Nombre',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Editor de Archivos',
     'size' => 'tamaño',
@@ -749,5 +750,4 @@ $LANG['es'] = array(
 
     'maximum characters length, including prefix' => 'usar un máximo de %s, incluyendo prefijo',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php
index 6fd2b953..6ad370e5 100644
--- a/web/inc/i18n/fa.php
+++ b/web/inc/i18n/fa.php
@@ -587,6 +587,7 @@ $LANG['fa'] = [
     'Starred' => 'ستاره دار',
     'Name' => 'نام',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'مدیریت پرونده',
     'size' => 'اندازه',
@@ -754,8 +755,6 @@ $LANG['fa'] = [
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
-
 // Texts below doesn't exist in en.php
     '70 خط اخر  %s.%s.log' => 'هفتاد خط انتهايي از %s.%s.log',
 ];
diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php
index 6e767e8a..d2bcac02 100644
--- a/web/inc/i18n/fi.php
+++ b/web/inc/i18n/fi.php
@@ -586,6 +586,7 @@ $LANG['fi'] = array(
     'Starred' => 'Starred',
     'Name' => 'Nimi',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Tiedostonhallinta',
     'size' => 'koko',
@@ -753,7 +754,6 @@ $LANG['fi'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 // Texts below doesn't exist in en.php
     'traffic' => 'tiedonsiirto',
     'disk' => 'levytila',
diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php
index 8f30c309..06556240 100644
--- a/web/inc/i18n/fr.php
+++ b/web/inc/i18n/fr.php
@@ -584,6 +584,7 @@ $LANG['fr'] = array(
     'Starred' => 'Favoris',
     'Name' => 'Nom',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Fichiers',
     'size' => 'taille',
@@ -751,7 +752,6 @@ $LANG['fr'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 // Texts below doesn't exist in en.php
     'disk' => 'disque',
     'traffic' => 'traffic',
diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php
index 00bc3c58..4c6f067e 100644
--- a/web/inc/i18n/hu.php
+++ b/web/inc/i18n/hu.php
@@ -588,6 +588,7 @@ $LANG['hu'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -755,7 +756,6 @@ $LANG['hu'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 // Texts below doesn't exist in en.php
     'Bandwidth Usage eth1' => 'eth1 sávszélesség használat',
 );
diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php
index e9729f6c..1d786b7b 100644
--- a/web/inc/i18n/id.php
+++ b/web/inc/i18n/id.php
@@ -587,6 +587,7 @@ $LANG['id'] = array(
     'Starred' => 'Bintangi',
     'Name' => 'Nama',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'ukuran',
@@ -754,5 +755,4 @@ $LANG['id'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php
index 2f66a224..7cb191d1 100644
--- a/web/inc/i18n/it.php
+++ b/web/inc/i18n/it.php
@@ -585,6 +585,7 @@ $LANG['it'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -752,5 +753,4 @@ $LANG['it'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php
index 893013bd..194b505a 100644
--- a/web/inc/i18n/ja.php
+++ b/web/inc/i18n/ja.php
@@ -584,6 +584,7 @@ $LANG['ja'] = array(
     'Starred' => 'スター付き',
     'Name' => '名前',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'ファイルマネージャー',
     'size' => '容量',
@@ -751,5 +752,4 @@ $LANG['ja'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php
index ba68a7fa..43e5e62d 100644
--- a/web/inc/i18n/ka.php
+++ b/web/inc/i18n/ka.php
@@ -584,6 +584,7 @@ $LANG['ka'] = array(
     'Starred' => 'ვარსკვლავებით',
     'Name' => 'სახელით',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'ფაილები',
     'type' => 'ტიპი',
@@ -751,5 +752,4 @@ $LANG['ka'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php
index 95a7bd1e..a40b8767 100644
--- a/web/inc/i18n/nl.php
+++ b/web/inc/i18n/nl.php
@@ -585,6 +585,7 @@ $LANG['nl'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -752,5 +753,4 @@ $LANG['nl'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php
index e699f644..94cdd33e 100644
--- a/web/inc/i18n/no.php
+++ b/web/inc/i18n/no.php
@@ -585,6 +585,7 @@ $LANG['no'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -752,5 +753,4 @@ $LANG['no'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php
index 284c1e2b..4f62331a 100644
--- a/web/inc/i18n/pl.php
+++ b/web/inc/i18n/pl.php
@@ -584,6 +584,7 @@ $LANG['pl'] = array(
     'Starred' => 'Gwiazdka',
     'Name' => 'Nazwa',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Manager Plików',
     'size' => 'rozmiar',
@@ -751,5 +752,4 @@ $LANG['pl'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php
index 40d685fc..b90dffc1 100644
--- a/web/inc/i18n/pt-BR.php
+++ b/web/inc/i18n/pt-BR.php
@@ -584,6 +584,7 @@ $LANG['pt-BR'] = array(
     'Starred' => 'Estreado',
     'Name' => 'Nome',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Gerenciador de Arquivos',
     'size' => 'tamanho',
@@ -751,5 +752,4 @@ $LANG['pt-BR'] = array(
 
     'maximum characters length, including prefix' => 'comprimento máximo de % caracteres, incluindo o prefixo',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php
index affc82bf..0ed59d57 100644
--- a/web/inc/i18n/pt.php
+++ b/web/inc/i18n/pt.php
@@ -584,6 +584,7 @@ $LANG['pt'] = array(
     'Starred' => 'Estreado',
     'Name' => 'Nome',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'tamanho',
@@ -751,5 +752,4 @@ $LANG['pt'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php
index 98c34208..e7340254 100644
--- a/web/inc/i18n/ro.php
+++ b/web/inc/i18n/ro.php
@@ -586,6 +586,7 @@ $LANG['ro'] = array(
     'Starred' => 'Importante',
     'Name' => 'Nume',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Manager de fișiere',
     'size' => 'mărime',
@@ -753,5 +754,4 @@ $LANG['ro'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s caractere, incluzând prefixul',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php
index 80347c4f..f60b5696 100644
--- a/web/inc/i18n/ru.php
+++ b/web/inc/i18n/ru.php
@@ -585,6 +585,7 @@ $LANG['ru'] = array(
     'Starred' => 'Избранные',
     'Name' => 'Имя',
 
+    'save to favorites' => 'добавить в избранное',
 
     'File Manager' => 'Файлы',
     'size' => 'размер',
@@ -752,5 +753,4 @@ $LANG['ru'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php
index 3475a6fd..6681f2ff 100644
--- a/web/inc/i18n/se.php
+++ b/web/inc/i18n/se.php
@@ -584,6 +584,7 @@ $LANG['se'] = array(
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -751,5 +752,4 @@ $LANG['se'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php
index 42a313ff..b405c234 100644
--- a/web/inc/i18n/tr.php
+++ b/web/inc/i18n/tr.php
@@ -585,6 +585,7 @@ $LANG['tr'] = array(
     'Starred' => 'Yıldızlı',
     'Name' => 'İsim',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Dosya Yöneticisi',
     'size' => 'boyut',
@@ -752,5 +753,4 @@ $LANG['tr'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php
index 1c946dd8..84b0a506 100644
--- a/web/inc/i18n/tw.php
+++ b/web/inc/i18n/tw.php
@@ -608,6 +608,8 @@ $LANG['tw'] = array(
     'Starred' => '加註星號',
     'Name' => '名稱',
 
+    'save to favorites' => 'save to favorites',
+
     'File Manager' => '檔案管理器',
     'size' => '大小',
     'date' => '日期',
@@ -774,5 +776,4 @@ $LANG['tw'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php
index 2ce7e1cf..75595b61 100644
--- a/web/inc/i18n/ua.php
+++ b/web/inc/i18n/ua.php
@@ -585,6 +585,7 @@ $LANG['ua'] = array(
     'Starred' => 'Вибране',
     'Name' => "Ім'я",
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Файловий менеджер',
     'size' => 'розмір',
@@ -752,5 +753,4 @@ $LANG['ua'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
\ No newline at end of file
diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php
index 23b7eac6..aee1a977 100644
--- a/web/inc/i18n/vi.php
+++ b/web/inc/i18n/vi.php
@@ -584,6 +584,7 @@ $LANG['vi'] = array(
     'Starred' => 'Đánh dấu',
     'Name' => 'Tên',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'Quản lý tệp',
     'size' => 'size',
@@ -750,5 +751,4 @@ $LANG['vi'] = array(
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index 2a0d56b3..4bea20c0 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -19,7 +19,7 @@
                 }
               ?>
               </td>
-              <td class="l-sort-toolbar__search-box">
+              <td class="l-sort-toolbar__search-box step-left">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                   <input type="text" name="q" class="search-input" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" />
@@ -30,10 +30,7 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
-              <td class="step-right">
+              <td class="">
                 <form action="/bulk/cron/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <div class="l-select">
@@ -48,6 +45,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
@@ -122,7 +122,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index 57c9c7bd..cdcac786 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -52,9 +52,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/db/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -68,6 +65,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
@@ -150,7 +150,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index 344c9d3d..5ce29219 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -23,9 +23,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/dns/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -39,6 +36,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+	      <td class="sort-by">
+		<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+	      </td>
             </tr>
           </table>
         </div>
@@ -112,7 +112,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
 
         </div>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index 3238b526..a74b8574 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -96,7 +96,7 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center jump-small-top">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
index 2c0609bf..889de6a2 100644
--- a/web/templates/admin/list_firewall.html
+++ b/web/templates/admin/list_firewall.html
@@ -28,9 +28,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/firewall/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -42,6 +39,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
@@ -111,7 +111,7 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index ab4dfb3d..7da9fa2c 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -24,9 +24,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/ip/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -39,6 +36,9 @@
                 </div>
                 <input type="submit" class="l-sort-toolbar__filter-apply" value="" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
@@ -92,7 +92,7 @@ sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites'][
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index df9fd863..02536441 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -30,9 +30,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -46,6 +43,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
@@ -131,7 +131,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index b61c6007..5433d732 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -29,9 +29,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -45,6 +42,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
@@ -124,7 +124,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index 5c9e7359..65a09e4b 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -20,9 +20,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/package/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,6 +31,9 @@
                 </div>
                 <input type="submit" class="l-sort-toolbar__filter-apply" value="" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
@@ -88,7 +88,7 @@ sort-star="<?if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo '1'; else ec
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index 888a069c..13aef07f 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -182,7 +182,7 @@
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index 199db9af..b3b627e7 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -28,9 +28,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/user/" method="post" id="objects">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -51,6 +48,9 @@
                   </div>
                   <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
@@ -131,7 +131,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index d0404e2f..f802dce2 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -23,9 +23,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/web/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -39,6 +36,9 @@
                 </div>
                 <input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
@@ -168,7 +168,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 61b14f09..796eda31 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -30,10 +30,7 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
-              <td class="step-right">
+              <td class="">
                 <form action="/bulk/cron/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <div class="l-select">
@@ -46,6 +43,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
@@ -109,7 +109,7 @@ sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-nam
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index c4b09ab9..63972dba 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -53,9 +53,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/db/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -67,6 +64,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
@@ -139,7 +139,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
           </div>
           <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index 14921866..f8b52125 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -23,9 +23,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/dns/" method="post">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -37,6 +34,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
@@ -100,7 +100,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index 10a840c0..367ee50b 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -94,7 +94,7 @@
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center jump-small-top">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 5ce0d17e..9c5ce842 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -30,9 +30,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -44,6 +41,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
@@ -119,7 +119,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index 53d802c6..fd5fd925 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -29,9 +29,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -43,6 +40,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
@@ -112,7 +112,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index 4aae3494..270ff301 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -147,7 +147,7 @@
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html
index aa70d794..58dfbef9 100644
--- a/web/templates/user/list_stats.html
+++ b/web/templates/user/list_stats.html
@@ -71,7 +71,7 @@
             <?=translate_date($key)?>
           </div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index ac9b4c50..d10666dc 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -28,9 +28,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/user/" method="post" id="objects">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -49,6 +46,9 @@
                   </div>
                   <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
@@ -119,7 +119,7 @@ sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<?if($_SESSION['favourites']['
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index e0f29ccd..ce4e7de6 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -23,9 +23,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/web/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -37,6 +34,9 @@
                 </div>
                 <input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
@@ -158,7 +158,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
-            <i class="l-icon-star"></i>
+            <i class="l-icon-star" title="<?=__('save to favorites')?>"></i>
           </div>
         </div>
         <!-- /.l-unit__col -->