diff --git a/data/web/css/site/index.css b/data/web/css/site/index.css
index 10f7c0d7..41438a87 100644
--- a/data/web/css/site/index.css
+++ b/data/web/css/site/index.css
@@ -2,4 +2,7 @@
   #top {
     padding-top: 15px !important;
   }
-}
\ No newline at end of file
+}
+.ui-announcement-alert {
+  margin: 10px 0px 10px 0px;
+}
diff --git a/data/web/index.php b/data/web/index.php
index b2ed064b..49958375 100644
--- a/data/web/index.php
+++ b/data/web/index.php
@@ -33,7 +33,7 @@ $_SESSION['index_query_string'] = $_SERVER['QUERY_STRING'];
         <div class="panel-body">
           <div class="text-center mailcow-logo"><img src="<?=($main_logo = customize('get', 'main_logo')) ? $main_logo : '/img/cow_mailcow.svg';?>" alt="mailcow"></div>
           <?php if (!empty($UI_TEXTS['ui_announcement_text']) && in_array($UI_TEXTS['ui_announcement_type'], array('info', 'warning', 'danger')) && $UI_TEXTS['ui_announcement_active'] == 1) { ?>
-          <div class="alert alert-<?=$UI_TEXTS['ui_announcement_type'];?> rot-enc"><?=str_rot13($UI_TEXTS['ui_announcement_text']);?></div>
+          <div class="alert alert-<?=$UI_TEXTS['ui_announcement_type'];?> rot-enc ui-announcement-alert"><?=str_rot13($UI_TEXTS['ui_announcement_text']);?></div>
           <?php } ?>
           <legend><?= isset($_SESSION['oauth2_request']) ? $lang['oauth2']['authorize_app'] : $UI_TEXTS['main_name'];?></legend>
             <?php
diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js
index 14a217bc..101088c4 100644
--- a/data/web/js/site/mailbox.js
+++ b/data/web/js/site/mailbox.js
@@ -822,7 +822,7 @@ jQuery(function($){
               item.goto = '<span class="label label-success">Learn as ham</span>';
             }
             if (item.in_primary_domain !== "") {
-              item.domain = "↳ " + item.domain + " (" + item.in_primary_domain + ")";
+              item.domain = '<i class="bi bi-info-circle-fill alias-domain-info text-info" data-toggle="tooltip" title="' + lang.target_domain + ': ' + item.in_primary_domain + '"></i> ' + item.domain;
             }
           });
         }
@@ -854,6 +854,7 @@ jQuery(function($){
         },
         "ready.ft.table": function(e, ft){
           table_mailbox_ready(ft, 'alias_table');
+          $('.alias-domain-info').tooltip();
         },
         "after.ft.filtering": function(e, ft){
           table_mailbox_ready(ft, 'alias_table');