diff --git a/web/css/styles.min.css b/web/css/styles.min.css
index e0a3e1127..fa27dd582 100644
--- a/web/css/styles.min.css
+++ b/web/css/styles.min.css
@@ -2929,6 +2929,7 @@ form#vstobjects.suspended {
   padding: 3px 14px 3px 27px;
   position: absolute;
   text-transform: uppercase;
+  white-space: nowrap;
   word-break: keep-all;
   z-index: -1;
 }
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 0dcac926d..043f14e76 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/schedule/backup/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Create Backup'))?>"></a>
+        <a href="/schedule/backup/" class="l-sort__create-btn" title="<?=__('Create Backup')?>"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
index abdb28d02..39790652e 100644
--- a/web/templates/admin/list_backup_detail.html
+++ b/web/templates/admin/list_backup_detail.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="l-sort__create-btn restore" title="<?=str_replace(' ', '&nbsp;', __('Restore All'))?>"></a>
+        <a href="/schedule/restore/?backup=<?=htmlentities($_GET['backup'])?>" class="l-sort__create-btn restore" title="<?=__('Restore All')?>"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html
index 28d075746..8a00c9bab 100644
--- a/web/templates/admin/list_backup_exclusions.html
+++ b/web/templates/admin/list_backup_exclusions.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/edit/backup/exclusions/" class="l-sort__create-btn edit" title="<?=str_replace(' ', '&nbsp;', __('Configure'))?>"></a>
+        <a href="/edit/backup/exclusions/" class="l-sort__create-btn edit" title="<?=__('Configure')?>"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index 4ec2de21f..2a0d56b3f 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/cron/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Cron Job'))?>"></a>
+        <a href="/add/cron/" class="l-sort__create-btn" title="<?=__('Add Cron Job')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index 63fdcae18..57c9c7bd0 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/db/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Database'))?>"></a>
+        <a href="/add/db/" class="l-sort__create-btn" title="<?=__('Add Database')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Database')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index 649e3073e..75142a663 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/" title="<?=__('Add DNS Domain')?>" class="l-sort__create-btn"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-expire" sort_as_int="1"><span class="name"><?=__('Expire')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index f43cad2a4..9935c9d5b 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Record'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=__('Add DNS Record')?>" class="l-sort__create-btn"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
index 8f00ed112..defa4c8e5 100644
--- a/web/templates/admin/list_firewall.html
+++ b/web/templates/admin/list_firewall.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/firewall/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Rule'))?>"></a>
+        <a href="/add/firewall/" class="l-sort__create-btn" title="<?=__('Add Rule')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-action"><span class="name active"><?=__('Action')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-protocol"><span class="name"><?=__('Protocol')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_firewall_banlist.html b/web/templates/admin/list_firewall_banlist.html
index cac651a16..7e3baf262 100644
--- a/web/templates/admin/list_firewall_banlist.html
+++ b/web/templates/admin/list_firewall_banlist.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/firewall/banlist/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Ban IP Address'))?>"></a>
+        <a href="/add/firewall/banlist/" class="l-sort__create-btn" title="<?=__('Ban IP Address')?>"></a>
 
         <div class="l-sort-toolbar clearfix">
           <table>
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index 3d4c78fc6..ab4dfb3d1 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/ip/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add IP'))?>"></a>
+        <a href="/add/ip/" class="l-sort__create-btn" title="<?=__('Add IP')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-ip"><span class="name"><?=__('ip')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 21a68ef5c..df9fd863e 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Domain'))?>"></a>
+        <a href="/add/mail/" class="l-sort__create-btn" title="<?=__('Add Mail Domain')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index b506f9dbd..92238dff2 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
+        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=__('Add Mail Account')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index 8980b3c82..5c9e7359e 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/package/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Package'))?>"></a>
+        <a href="/add/package/" class="l-sort__create-btn" title="<?=__('Add Package')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Package Name')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
index 189d7d908..f035c609c 100644
--- a/web/templates/admin/list_services.html
+++ b/web/templates/admin/list_services.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/edit/server/" class="l-sort__create-btn edit" title="<?=str_replace(' ', '&nbsp;', __('Configure'))?>"></a>
+        <a href="/edit/server/" class="l-sort__create-btn edit" title="<?=__('Configure')?>"></a>
 
         <div class="l-sort-toolbar clearfix">
           <table>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index d52d80986..6f081c242 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -2,9 +2,9 @@
       <div class="l-sort clearfix noselect">
         <?php
           if ($user == 'admin') {
-            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.str_replace(' ', '&nbsp;', __('Add User')).'"></a>';
+            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.__('Add User').'"></a>';
           } else {
-            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.str_replace(' ', '&nbsp;', __('Add Web Domain')).'"></a>';
+            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.__('Add Web Domain').'"></a>';
           }
         ?>
         <ul class="context-menu sort-order" style="display:none;">
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index a707f006a..43291d994 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/web/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Web Domain'))?>"></a>
+        <a href="/add/web/" class="l-sort__create-btn" title="<?=__('Add Web Domain')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 568d045c2..61b14f091 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/cron/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Cron Job'))?>"></a>
+        <a href="/add/cron/" class="l-sort__create-btn" title="<?=__('Add Cron Job')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index f4e13f29c..c4b09ab99 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/db/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Database'))?>"></a>
+        <a href="/add/db/" class="l-sort__create-btn" title="<?=__('Add Database')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Database')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index 22dcbc552..c1de2ca8c 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
-        <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/" title="<?=__('Add DNS Domain')?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/" title="<?=__('Add DNS Domain')?>" class="l-sort__create-btn"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-expire" sort_as_int="1"><span class="name"><?=__('Expire')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index ec3f2936c..10a840c03 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Record'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/?domain=<?=htmlentities($_GET['domain'])?>" title="<?=__('Add DNS Record')?>" class="l-sort__create-btn"></a>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 2d3dd836e..5ce0d17e7 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Domain'))?>"></a>
+        <a href="/add/mail/" class="l-sort__create-btn" title="<?=__('Add Mail Domain')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index f76787797..6f1c33bdd 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
+        <a href="/add/mail/?domain=<?=htmlentities($_GET['domain'])?>" class="l-sort__create-btn" title="<?=__('Add Mail Account')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index 3087bc65d..c1ca37e58 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -2,9 +2,9 @@
       <div class="l-sort clearfix noselect">
         <?php
           if ($user == 'admin') {
-            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.str_replace(' ', '&nbsp;', __('Add User')).'"></a>';
+            echo '<a class="l-sort__create-btn" href="/add/user/" title="'.__('Add User').'"></a>';
           } else {
-            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.str_replace(' ', '&nbsp;', __('Add Web Domain')).'"></a>';
+            echo '<a class="l-sort__create-btn" href="/add/web/" title="'.__('Add Web Domain').'"></a>';
           }
         ?>
         <ul class="context-menu sort-order" style="display:none;">
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index fc5de9032..a3f69330b 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -1,6 +1,6 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
-        <a href="/add/web/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Web Domain'))?>"></a>
+        <a href="/add/web/" class="l-sort__create-btn" title="<?=__('Add Web Domain')?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
           <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
           <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>