diff --git a/packages/manager/apps/web/client/app/config/constants.config.js b/packages/manager/apps/web/client/app/config/constants.config.js
index 8d6868aaf898..d45b5f7d6100 100644
--- a/packages/manager/apps/web/client/app/config/constants.config.js
+++ b/packages/manager/apps/web/client/app/config/constants.config.js
@@ -112,6 +112,8 @@ module.exports = {
             'https://www.ovh.de/g1474.allgemeine-informationen-ovh-webhosting-mails',
           autoRenew: 'https://www.ovh.de/g1271.renew',
           emailsCreation: 'https://www.ovh.de/g1343.qssq',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/de-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052393',
           hostingPhpConfiguration:
             'https://www.ovh.de/g1999.webhosting_so_andern_sie_die_php-version_von_ihrem_kundencenter_aus',
           hostingPrivateDatabase:
@@ -157,6 +159,8 @@ module.exports = {
           emailsConfiguration:
             'https://www.ovh.es/g1474.correo-alojamiento-compartido-ovh',
           emailsCreation: 'https://www.ovh.es/g1343.qssq',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/es-es-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052400',
           hostingPhpConfiguration:
             'https://www.ovh.es/g1999.alojamiento_compartido_configurar_la_versión_de_PHP_desde_el_área_de_cliente',
           hostingPrivateDatabase:
@@ -253,7 +257,8 @@ module.exports = {
             'https://www.ovh.com/fr/g1990.mutualise_taches_automatisees_cron',
           hostingFtp:
             'https://docs.ovh.com/fr/hosting/connexion-espace-stockage-ftp-hebergement-web/',
-          hostingModule: 'https://docs.ovh.com/fr/hosting/modules-en-1-clic/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/fr-web-hosting-cms-update-admin-password?id=kb_article_view&sysparm_article=KB0064938',
           hostingScriptEmail:
             'https://www.ovh.com/fr/g1974.mutualise_suivi_des_emails_automatises',
           hostingStatsLogs:
@@ -363,6 +368,8 @@ module.exports = {
             'https://www.ovh.co.uk/g1474.ovh-mails-general-use',
           autoRenew: 'https://www.ovh.co.uk/g1271.renew',
           emailsCreation: 'https://www.ovh.co.uk/g1343.qssq',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-gb-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052396',
           hostingPhpConfiguration:
             'https://www.ovh.co.uk/g1999.hosting_how_to_configure_php_from_your_customer_account',
           hostingPrivateDatabase:
@@ -403,6 +410,8 @@ module.exports = {
         bulkChangeOwner:
           'https://www.ovh.ie/order/domain/#/legacy/domain/trade/list',
         guides: {
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-ie-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052397',
           hostingPhpConfiguration:
             'https://www.ovh.ie/g1999.hosting_how_to_configure_php_from_your_customer_account',
           works: {
@@ -442,6 +451,8 @@ module.exports = {
             'https://www.ovh.it/g1271.imposta_il_rinnovo_automatico_dei_tuoi_servizi_ovh',
           emailsCreateMailingListGuide:
             'https://www.ovh.it/g1596.mail_mutualise_guide_dutilisation_mailing-list',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/it-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052395',
           hostingPhpConfiguration:
             'https://www.ovh.it/g1999.configura_la_tua_versione_di_php_dal_tuo_Spazio_Cliente_OVH',
           hostingPrivateDatabase:
@@ -535,6 +546,8 @@ module.exports = {
           emailsConfiguration:
             'https://www.ovh.nl/g1474.algemene-informatie-ovh-webhosting-emails',
           emailsCreation: 'https://www.ovh.nl/g1343.qssq',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-nl-documentation-web-cloud?id=kb_browse_cat&kb_id=e17b4f25551974502d4c6e78b7421955',
           hostingPrivateDatabaseDBaaS: {
             beginner:
               'https://docs.ovh.com/nl/clouddb/aan-de-slag-met-clouddb/',
@@ -597,6 +610,8 @@ module.exports = {
           emailsCreation: 'https://www.ovh.pl/g1343.qssq',
           emailsCreateMailingListGuide:
             'https://www.ovh.pl/g1596.mail_mutualise_guide_dutilisation_mailing-list',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/pl-documentation-web-cloud?id=kb_browse_cat&kb_id=e17b4f25551974502d4c6e78b7421955',
           hostingPhpConfiguration:
             'https://www.ovh.pl/g1999.skonfiguruj_wersje_php_w_panelu_klienta',
           hostingPrivateDatabase: 'https://www.ovh.pl/g2023.prywatny_sql',
@@ -649,6 +664,8 @@ module.exports = {
           emailsCreation: 'https://www.ovh.pt/g1343.qssq',
           emailsCreateMailingListGuide:
             'https://www.ovh.pt/g1596.mail_mutualise_guide_dutilisation_mailing-list',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/pt-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052410',
           hostingPhpConfiguration:
             'https://www.ovh.pt/g1999.partilhado_configurar_a_versao_de_php_a_partir_do_seu_espaco_cliente',
           hostingPrivateDatabase:
@@ -847,6 +864,8 @@ module.exports = {
           all: 'https://docs.ovh.com/asia/en/',
           dnsForExternalDomain:
             'https://docs.ovh.com/asia/en/domains/create_a_dns_zone_for_a_domain_which_is_not_registered_at_ovh/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/asia-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052394',
           hostingPrivateDatabase:
             'https://docs.ovh.com/asia/en/hosting/getting-started-with-private-sql/',
           hostingPrivateDatabaseDBaaS: {
@@ -882,6 +901,8 @@ module.exports = {
           all: 'https://docs.ovh.com/asia/en/',
           dnsForExternalDomain:
             'https://docs.ovh.com/asia/en/domains/create_a_dns_zone_for_a_domain_which_is_not_registered_at_ovh/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/asia-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052394',
           hostingPrivateDatabase:
             'https://docs.ovh.com/asia/en/hosting/getting-started-with-private-sql/',
           hostingPrivateDatabaseDBaaS: {
@@ -917,6 +938,8 @@ module.exports = {
           all: 'https://docs.ovh.com/au/en/',
           dnsForExternalDomain:
             'https://docs.ovh.com/au/en/domains/create_a_dns_zone_for_a_domain_which_is_not_registered_at_ovh/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-au-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0040389',
           hostingPrivateDatabase:
             'https://docs.ovh.com/au/en/hosting/getting-started-with-private-sql/',
           hostingPrivateDatabaseDBaaS: {
@@ -953,6 +976,8 @@ module.exports = {
           all: 'https://docs.ovh.com/ca/en/',
           dnsForExternalDomain:
             'https://docs.ovh.com/ca/en/domains/create_a_dns_zone_for_a_domain_which_is_not_registered_at_ovh/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-ca-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052391',
           hostingPrivateDatabase:
             'https://docs.ovh.com/ca/en/hosting/getting-started-with-private-sql/',
           hostingPrivateDatabaseDBaaS: {
@@ -989,6 +1014,8 @@ module.exports = {
           all: 'https://docs.ovh.com/ca/fr/',
           dnsForExternalDomain:
             'https://docs.ovh.com/ca/fr/domains/creer-une-zone-dns-pour-un-domaine-externe/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-ca-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052391',
           hostingPrivateDatabase:
             'https://docs.ovh.com/ca/fr/hosting/premiers-pas-avec-sql-prive/',
           hostingPrivateDatabaseDBaaS: {
@@ -1024,6 +1051,8 @@ module.exports = {
           all: 'https://docs.ovh.com/sg/en/',
           dnsForExternalDomain:
             'https://docs.ovh.com/sg/en/domains/create_a_dns_zone_for_a_domain_which_is_not_registered_at_ovh/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-sg-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052404',
           hostingPrivateDatabase:
             'https://docs.ovh.com/asia/en/hosting/getting-started-with-private-sql/',
           hostingPrivateDatabaseDBaaS: {
@@ -1059,6 +1088,8 @@ module.exports = {
           all: 'https://docs.ovh.com/ca/en/',
           dnsForExternalDomain:
             'https://docs.ovh.com/ca/en/domains/create_a_dns_zone_for_a_domain_which_is_not_registered_at_ovh/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-ie-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052397',
           hostingPrivateDatabase:
             'https://docs.ovh.com/ca/en/hosting/getting-started-with-private-sql/',
           hostingPrivateDatabaseDBaaS: {
@@ -1095,6 +1126,8 @@ module.exports = {
           all: 'https://docs.ovh.com/us/es/',
           dnsForExternalDomain:
             'https://docs.ovh.com/us/es/domains/create_a_dns_zone_for_a_domain_which_is_not_registered_at_ovh/',
+          hostingModule:
+            'https://help.ovhcloud.com/csm/en-web-hosting-1-click-module-setting-up?id=kb_article_view&sysparm_article=KB0052401',
           hostingPrivateDatabase:
             'https://docs.ovh.com/us/es/hosting/getting-started-with-private-sql/',
           hostingPrivateDatabaseDBaaS: {
diff --git a/packages/manager/apps/web/client/app/domain-operation/operation-table/operation-table.html b/packages/manager/apps/web/client/app/domain-operation/operation-table/operation-table.html
index 649b8cdded69..07e59dfd8db7 100644
--- a/packages/manager/apps/web/client/app/domain-operation/operation-table/operation-table.html
+++ b/packages/manager/apps/web/client/app/domain-operation/operation-table/operation-table.html
@@ -84,7 +84,11 @@
     </oui-datagrid-column>
     <oui-datagrid-column
         data-title="::'domain_operations_table_header_status' | translate"
+        data-sortable
+        data-filterable
+        data-type="options"
         data-property="status"
+        data-type-options="$ctrl.operationStatusColumnOptions"
     >
         <span
             class="oui-badge"
@@ -197,7 +201,11 @@
     </oui-datagrid-column>
     <oui-datagrid-column
         data-title="::'domain_operations_table_header_status' | translate"
+        data-type="options"
+        data-type-options="$ctrl.operationStatusColumnOptions"
         data-property="status"
+        data-sortable
+        data-filterable
     >
         <span
             class="oui-badge"
diff --git a/packages/manager/apps/web/client/app/domain/domains.routing.js b/packages/manager/apps/web/client/app/domain/domains.routing.js
index 0b8670219b81..0ad40a14fcf6 100644
--- a/packages/manager/apps/web/client/app/domain/domains.routing.js
+++ b/packages/manager/apps/web/client/app/domain/domains.routing.js
@@ -1,5 +1,9 @@
 import { ListLayoutHelper } from '@ovh-ux/manager-ng-layout-helpers';
 import { getDomainOrderUrl } from './domains.order';
+import {
+  DOMAIN_PREFIX_PAGE_BUTTON_GO_TO_ORDER,
+  DOMAIN_PREFIX_LISTING_MANAGE_DOMAINS,
+} from '../domains/domains.constant';
 
 export default /* @ngInject */ ($stateProvider) => {
   $stateProvider.state('app.domain.index', {
@@ -65,7 +69,7 @@ export default /* @ngInject */ ($stateProvider) => {
           value: $translate.instant('domains_order'),
           onClick: () => {
             atInternet.trackClick({
-              name: 'web::domain::index::order',
+              name: `${DOMAIN_PREFIX_PAGE_BUTTON_GO_TO_ORDER}`,
               type: 'action',
             });
             $window.open(
@@ -79,5 +83,8 @@ export default /* @ngInject */ ($stateProvider) => {
         $state.go('app.domain.index.restore-renew', { domains }),
       hideBreadcrumb: () => true,
     },
+    atInternet: {
+      rename: DOMAIN_PREFIX_LISTING_MANAGE_DOMAINS,
+    },
   });
 };
diff --git a/packages/manager/apps/web/client/app/domain/list/export-csv/domains-export-to-csv.html b/packages/manager/apps/web/client/app/domain/list/export-csv/domains-export-to-csv.html
index e098e2c9370c..c7ca05f8fa76 100644
--- a/packages/manager/apps/web/client/app/domain/list/export-csv/domains-export-to-csv.html
+++ b/packages/manager/apps/web/client/app/domain/list/export-csv/domains-export-to-csv.html
@@ -11,7 +11,6 @@
         <div data-wizard-step>
             <p data-translate="domains_dashboard_tooltip_export_csv_expl"></p>
             <p data-translate="domains_dashboard_tooltip_export_csv_expl2"></p>
-
             <form name="csvExportAllDomains">
                 <oui-checkbox
                     id="opt-{{::$index}}"
diff --git a/packages/manager/apps/web/client/app/domain/list/list-domain-layout.controller.js b/packages/manager/apps/web/client/app/domain/list/list-domain-layout.controller.js
index a8240cfed2e3..50cb96348839 100644
--- a/packages/manager/apps/web/client/app/domain/list/list-domain-layout.controller.js
+++ b/packages/manager/apps/web/client/app/domain/list/list-domain-layout.controller.js
@@ -23,6 +23,14 @@ import {
   PRODUCT_TYPE,
 } from './list-domain-layout.constants';
 
+import {
+  DOMAIN_PREFIX_PAGE_BUTTON_RENEW_RESTORE_DOMAIN,
+  DOMAIN_PREFIX_PAGE_BUTTON_EXPORT_CSV_DOMAIN,
+  DOMAIN_PREFIX_PAGE_BUTTON_DATAGRID_LINK,
+  DOMAIN_PREFIX_PAGE_BUTTON_DATAGRID,
+  DOMAIN,
+} from '../../domains/domains.constant';
+
 export default class ListDomainLayoutCtrl extends ListLayoutHelper.ListLayoutCtrl {
   /* @ngInject */
   constructor(
@@ -35,6 +43,7 @@ export default class ListDomainLayoutCtrl extends ListLayoutHelper.ListLayoutCtr
     $scope,
     $timeout,
     $window,
+    atInternet,
   ) {
     super($q, ouiDatagridService);
     this.$translate = $translate;
@@ -53,12 +62,15 @@ export default class ListDomainLayoutCtrl extends ListLayoutHelper.ListLayoutCtr
     this.DOMAINS_BADGES_RENEWAL_MODE = DOMAINS_BADGES_RENEWAL_MODE;
     this.IDN_PREFIX = IDN_PREFIX;
     this.DOMAIN_OBJECT_KEYS = DOMAIN_OBJECT_KEYS;
+    this.DOMAIN_PREFIX_PAGE_BUTTON_RENEW_RESTORE_DOMAIN = DOMAIN_PREFIX_PAGE_BUTTON_RENEW_RESTORE_DOMAIN;
+    this.DOMAIN_PREFIX_PAGE_BUTTON_EXPORT_CSV_DOMAIN = DOMAIN_PREFIX_PAGE_BUTTON_EXPORT_CSV_DOMAIN;
     this.coreURLBuilder = coreURLBuilder;
     this.user = coreConfig.getUser();
     this.Domain = Domain;
     this.$scope = $scope;
     this.$timeout = $timeout;
     this.$window = $window;
+    this.atInternet = atInternet;
   }
 
   $onInit() {
@@ -270,6 +282,20 @@ export default class ListDomainLayoutCtrl extends ListLayoutHelper.ListLayoutCtr
     );
   }
 
+  trackDomainLinkClick(track) {
+    this.atInternet.trackClick({
+      name: `${DOMAIN_PREFIX_PAGE_BUTTON_DATAGRID_LINK}${track}::${DOMAIN}`,
+      type: 'action',
+    });
+  }
+
+  trackDomainButtonClick(track) {
+    this.atInternet.trackClick({
+      name: `${DOMAIN_PREFIX_PAGE_BUTTON_DATAGRID}::${track}::${DOMAIN}`,
+      type: 'action',
+    });
+  }
+
   static isDomainRenewableOrRestorable(domain) {
     return (
       ![
diff --git a/packages/manager/apps/web/client/app/domain/list/restore-renew/controller.js b/packages/manager/apps/web/client/app/domain/list/restore-renew/controller.js
index db99e3df2519..3d8a7de0aac5 100644
--- a/packages/manager/apps/web/client/app/domain/list/restore-renew/controller.js
+++ b/packages/manager/apps/web/client/app/domain/list/restore-renew/controller.js
@@ -1,11 +1,29 @@
-export default class webDomainRestoreRenewCtrl {
+import {
+  DOMAIN_PREFIX_POPUP_BUTTON_RENEW_GO_TO_ORDER,
+  DOMAIN_PREFIX_POPUP_BUTTON_RENEW_CANCEL,
+} from '../../../domains/domains.constant';
+
+export default class WebDomainRestoreRenewCtrl {
   /* @ngInject */
-  constructor($window, constants) {
+  constructor($window, constants, atInternet) {
     this.$window = $window;
     this.constants = constants;
+    this.atInternet = atInternet;
+  }
+
+  closeModal() {
+    this.atInternet.trackClick({
+      name: DOMAIN_PREFIX_POPUP_BUTTON_RENEW_CANCEL,
+      type: 'action',
+    });
+    return this.goBack();
   }
 
   redirectToRenew() {
+    this.atInternet.trackClick({
+      name: DOMAIN_PREFIX_POPUP_BUTTON_RENEW_GO_TO_ORDER,
+      type: 'action',
+    });
     this.$window.open(
       URI.expand(this.constants.renew, {
         serviceName: this.domains.map((domain) => domain.domain).join(' '),
diff --git a/packages/manager/apps/web/client/app/domain/list/restore-renew/routing.js b/packages/manager/apps/web/client/app/domain/list/restore-renew/routing.js
index c60dd0306aab..d937f0943122 100644
--- a/packages/manager/apps/web/client/app/domain/list/restore-renew/routing.js
+++ b/packages/manager/apps/web/client/app/domain/list/restore-renew/routing.js
@@ -1,3 +1,5 @@
+import { DOMAIN_PREFIX_POPUP_RENEW_RESTORE } from '../../../domains/domains.constant';
+
 export default /* @ngInject */ ($stateProvider) => {
   $stateProvider.state('app.domain.index.restore-renew', {
     url: '/restore-renew',
@@ -21,6 +23,9 @@ export default /* @ngInject */ ($stateProvider) => {
         component: 'webdomainRestoreRenewModale',
       },
     },
+    atInternet: {
+      rename: DOMAIN_PREFIX_POPUP_RENEW_RESTORE,
+    },
     layout: 'modal',
   });
 };
diff --git a/packages/manager/apps/web/client/app/domain/list/restore-renew/template.html b/packages/manager/apps/web/client/app/domain/list/restore-renew/template.html
index b22c385df1d1..3b64ea033368 100644
--- a/packages/manager/apps/web/client/app/domain/list/restore-renew/template.html
+++ b/packages/manager/apps/web/client/app/domain/list/restore-renew/template.html
@@ -4,14 +4,15 @@
     data-primary-action="$ctrl.redirectToRenew()"
     data-primary-label="{{:: 'domains_restore_renew_modal_confirm' | translate }}"
     data-primary-disabled="!$ctrl.domains.length"
-    data-secondary-action="$ctrl.goBack()"
+    data-secondary-action="$ctrl.closeModal()"
     data-secondary-label="{{:: 'domains_restore_renew_modal_cancel' | translate }}"
-    data-on-dismiss="$ctrl.goBack()"
+    data-on-dismiss="$ctrl.closeModal()"
 >
     <div data-ng-if="$ctrl.domains.length">
         <p
             data-ng-bind-html="'domains_restore_renew_modal_question' | translate"
         ></p>
+        <p>test</p>
         <p class="mb-5">
             <strong
                 data-translate="domains_restore_renew_modal_confirmation"
diff --git a/packages/manager/apps/web/client/app/domain/list/template.html b/packages/manager/apps/web/client/app/domain/list/template.html
index 6369670e6319..cff3582199fd 100644
--- a/packages/manager/apps/web/client/app/domain/list/template.html
+++ b/packages/manager/apps/web/client/app/domain/list/template.html
@@ -27,18 +27,25 @@
         <oui-datagrid-topbar data-ng-if="$ctrl.topbarOptions">
             <topbar-cta data-options="$ctrl.topbarOptions"></topbar-cta>
             <div class="d-inline" data-ng-if="$ctrl.resources.data.length">
-                <oui-button
-                    data-variant="secondary"
-                    data-disabled="!$ctrl.selectedRows.length"
+                <button
+                    class="oui-button oui-button_secondary"
+                    type="button"
+                    data-ng-disabled="!$ctrl.selectedRows.length"
                     data-ng-click="$ctrl.goToRestoreRenew($ctrl.selectedRows)"
+                    data-track-on="click"
+                    data-track-type="action"
+                    data-track-name="{{$ctrl.DOMAIN_PREFIX_PAGE_BUTTON_RENEW_RESTORE_DOMAIN}}"
                 >
                     <span data-translate="domains_action_restore_renew"></span>
-                </oui-button>
-
-                <oui-button
-                    data-variant="secondary"
+                </button>
+                <button
+                    class="oui-button oui-button_secondary"
+                    type="button"
                     data-ng-click="$ctrl.setActionMultiple('export-csv/domains-export-to-csv')"
                     data-ng-disabled="$ctrl.loading.domainsExportCsv"
+                    data-track-on="click"
+                    data-track-type="action"
+                    data-track-name="{{$ctrl.DOMAIN_PREFIX_PAGE_BUTTON_EXPORT_CSV_DOMAIN}}"
                 >
                     <span
                         data-translate="domains_dashboard_button_export"
@@ -48,7 +55,7 @@
                         data-translate="domains_dashboard_tooltip_export_csv_creation_doing"
                         data-ng-if="$ctrl.loading.domainsExportCsv"
                     ></span>
-                </oui-button>
+                </button>
             </div>
         </oui-datagrid-topbar>
         <oui-datagrid-column
@@ -62,6 +69,7 @@
             <a
                 data-ng-href="{{:: $ctrl.getServiceNameLink($row) }}"
                 data-ng-bind="$ctrl.constructor.convertToPunycode($value)"
+                data-ng-click="$ctrl.trackDomainLinkClick('domain_name')"
             ></a>
             <button
                 data-ng-if="$ctrl.isIdn($value)"
@@ -161,6 +169,7 @@
                     class="oui-link_icon"
                     data-ng-href="{{:: $ctrl.linkToOwnerPage($row.contactOwner.id, $row.domain)}}"
                     target="_top"
+                    data-ng-click="$ctrl.trackDomainLinkClick('contact-owner')"
                 >
                     <span data-ng-bind=":: $row.contactOwner.id"></span>
                 </a>
@@ -194,6 +203,7 @@
                 data-ng-if="$row.contactAdmin.id === $ctrl.user.auth.account"
                 data-ng-href="{{:: $ctrl.USER_ACCOUNT_INFOS_LINK }}"
                 target="_top"
+                data-ng-click="$ctrl.trackDomainLinkClick('contact-admin')"
             >
                 <span data-ng-bind=":: $row.contactAdmin.id"></span>
                 <span
@@ -219,6 +229,7 @@
                 data-ng-if="$row.contactBilling.id === $ctrl.user.auth.account"
                 data-ng-href="{{:: $ctrl.USER_ACCOUNT_INFOS_LINK }}"
                 target="_top"
+                data-ng-click="$ctrl.trackDomainLinkClick('contact-billing')"
             >
                 <span data-ng-bind=":: $row.contactBilling.id"></span>
                 <span
@@ -244,6 +255,7 @@
                 data-ng-if="$row.contactTech.id === $ctrl.user.auth.account"
                 data-ng-href="{{:: $ctrl.USER_ACCOUNT_INFOS_LINK }}"
                 target="_top"
+                data-ng-click="$ctrl.trackDomainLinkClick('contact-technical')"
             >
                 <span data-ng-bind=":: $row.contactTech.id"></span>
                 <span
@@ -285,6 +297,7 @@
                 data-href="{{:: $ctrl.getServiceNameLink($row)}}"
                 aria-label="{{:: 'domains_action_per_line_detail' | translate }}"
                 data-ng-if="![$ctrl.DOMAIN_STATUS.PENDING_INCOMING_TRANSFER, $ctrl.DOMAIN_STATUS.PENDING_CREATE].includes($row.state)"
+                data-ng-click="$ctrl.trackDomainButtonClick('domain-name-details')"
             >
                 <span data-translate="domains_action_per_line_detail"></span>
             </oui-action-menu-item>
@@ -292,6 +305,7 @@
                 data-on-click="$ctrl.goToRestoreRenew($row)"
                 aria-label="{{:: $row.state === $ctrl.DOMAIN_STATUS.RESTORABLE ? 'domains_action_per_line_restore' : 'domains_action_per_line_renew' | translate }}"
                 data-ng-if="$ctrl.constructor.isDomainRenewableOrRestorable($row)"
+                data-ng-click="$ctrl.trackDomainButtonClick('renew')"
             >
                 <span
                     data-translate="{{ $row.state === $ctrl.DOMAIN_STATUS.RESTORABLE ? 'domains_action_per_line_restore' : 'domains_action_per_line_renew' }}"
@@ -301,6 +315,7 @@
                 data-href="{{:: $ctrl.CANCEL_LINK + $row.domain }}"
                 aria-label="{{:: 'domains_action_per_line_cancellation' | translate }}"
                 data-ng-if="$ctrl.constructor.isDomainCancellable($row)"
+                data-ng-click="$ctrl.trackDomainButtonClick('terminate')"
                 top
             >
                 <span
@@ -311,6 +326,7 @@
                 data-on-click="$ctrl.goToResiliateCancelation($row)"
                 aria-label="{{:: 'domains_action_per_line_resiliation_cancellation' | translate }}"
                 data-ng-if="$row.contactAdmin.id === $ctrl.user.auth.account && $row.renewalState === $ctrl.DOMAIN_RENEWABLE_STATE.CANCELLATION_REQUESTED"
+                data-ng-click="$ctrl.trackDomainButtonClick('cancel-terminate')"
                 top
             >
                 <span
@@ -321,6 +337,7 @@
                 data-on-click="$ctrl.goToRenewManagementEnable($row)"
                 aria-label="{{:: 'domains_action_per_line_autorenew_activate' | translate }}"
                 data-ng-if="$row.renewalState === $ctrl.DOMAIN_RENEWABLE_STATE.MANUAL_RENEW"
+                data-ng-click="$ctrl.trackDomainButtonClick('enable-automatic-renewal')"
             >
                 <span
                     data-translate="domains_action_per_line_autorenew_activate"
@@ -330,6 +347,7 @@
                 data-on-click="$ctrl.goToRenewManagementDisable($row)"
                 aria-label="{{:: 'domains_action_per_line_autorenew_deactivate' | translate }}"
                 data-ng-if="$row.renewalState === $ctrl.DOMAIN_RENEWABLE_STATE.AUTOMATIC_RENEW"
+                data-ng-click="$ctrl.trackDomainButtonClick('disable-automatic-renewal')"
             >
                 <span
                     data-translate="domains_action_per_line_autorenew_deactivate"
@@ -337,6 +355,7 @@
             </oui-action-menu-item>
             <oui-action-menu-item
                 data-on-click="$ctrl.goToContactManagementEdit($row.domain)"
+                data-ng-click="$ctrl.trackDomainButtonClick('manage-contact')"
                 aria-label="{{:: 'common_manage_contacts' | translate }}"
             >
                 <span data-translate="common_manage_contacts"></span>
diff --git a/packages/manager/apps/web/client/app/domains/domains.constant.js b/packages/manager/apps/web/client/app/domains/domains.constant.js
new file mode 100644
index 000000000000..500cd4537066
--- /dev/null
+++ b/packages/manager/apps/web/client/app/domains/domains.constant.js
@@ -0,0 +1,39 @@
+export const WEB_DOMAIN = 'web::domain::';
+export const BUTTON = 'button';
+export const CANCEL = 'cancel';
+export const DATAGRID = 'datagrid';
+export const DOMAIN = 'domain';
+export const DOMAINS = 'domains';
+export const ERROR = 'error';
+export const EXPORT_CSV = 'export-csv';
+export const EXPORT_CSV_DOMAINS = 'export-domains-csv';
+export const GO_TO_ORDER = 'go-to-order';
+export const LINK_DETAILS = 'link_details';
+export const LISTING = 'listing';
+export const MANAGE_DOMAINS = 'manage_domains';
+export const PAGE = 'page';
+export const POPUP = 'pop-up';
+export const RENEW_RESTORE = 'renew_restore';
+export const SUCCESS = 'success';
+
+export const DOMAIN_PREFIX_LISTING = `${WEB_DOMAIN}::${LISTING}`;
+export const DOMAIN_PREFIX_LISTING_MANAGE_DOMAINS = `${DOMAIN_PREFIX_LISTING}::${MANAGE_DOMAINS}`;
+
+export const DOMAIN_PREFIX_LISTING_EXPORT = `${WEB_DOMAIN}::${LISTING}::${EXPORT_CSV}`;
+export const DOMAIN_PREFIX_LISTING_EXPORT_SUCCESS = `${DOMAIN_PREFIX_LISTING_EXPORT}::${SUCCESS}`;
+export const DOMAIN_PREFIX_LISTING_EXPORT_ERROR = `${DOMAIN_PREFIX_LISTING_EXPORT}::${ERROR}`;
+
+export const DOMAIN_PREFIX_PAGE_BUTTON = `${WEB_DOMAIN}::${PAGE}::${BUTTON}`;
+export const DOMAIN_PREFIX_PAGE_BUTTON_GO_TO_ORDER = `${WEB_DOMAIN}::${PAGE}::${BUTTON}::${GO_TO_ORDER}::${DOMAIN}`;
+export const DOMAIN_PREFIX_PAGE_BUTTON_EXPORT_CSV_DOMAIN = `${WEB_DOMAIN}::${PAGE}::${BUTTON}::${EXPORT_CSV}::${DOMAIN}`;
+export const DOMAIN_PREFIX_PAGE_BUTTON_RENEW_RESTORE_DOMAIN = `${WEB_DOMAIN}::${PAGE}::${BUTTON}::${RENEW_RESTORE}-${DOMAIN}`;
+export const DOMAIN_PREFIX_PAGE_BUTTON_DATAGRID_LINK = `${WEB_DOMAIN}::${DATAGRID}::${LINK_DETAILS}_`;
+export const DOMAIN_PREFIX_PAGE_BUTTON_DATAGRID = `${WEB_DOMAIN}::${DATAGRID}::${BUTTON}`;
+
+export const DOMAIN_PREFIX_POPUP_BUTTON = `${WEB_DOMAIN}::${POPUP}::${BUTTON}`;
+export const DOMAIN_PREFIX_POPUP_RENEW_RESTORE = `${WEB_DOMAIN}::${POPUP}::${RENEW_RESTORE}::${DOMAIN}`;
+export const DOMAIN_PREFIX_POPUP_EXPORT_CSV = `${WEB_DOMAIN}::${POPUP}::${EXPORT_CSV}::${DOMAIN}`;
+export const DOMAIN_PREFIX_POPUP_BUTTON_RENEW_CANCEL = `${DOMAIN_PREFIX_POPUP_BUTTON}::${RENEW_RESTORE}::${DOMAINS}::${CANCEL}`;
+export const DOMAIN_PREFIX_POPUP_BUTTON_RENEW_GO_TO_ORDER = `${WEB_DOMAIN}::${POPUP}::${BUTTON}::${RENEW_RESTORE}-${DOMAINS}::${GO_TO_ORDER}`;
+export const DOMAIN_PREFIX_POPUP_BUTTON_EXPORT_CSV_DOMAIN = `${DOMAIN_PREFIX_POPUP_BUTTON}::${EXPORT_CSV_DOMAINS}`;
+export const DOMAIN_PREFIX_POPUP_BUTTON_CANCEL_EXPORT_CSV_DOMAIN = `${DOMAIN_PREFIX_POPUP_BUTTON_EXPORT_CSV_DOMAIN}::${CANCEL}`;
diff --git a/packages/manager/apps/web/client/app/domains/domains.routes.js b/packages/manager/apps/web/client/app/domains/domains.routes.js
index 1d3a669fcab9..fe759ea07908 100644
--- a/packages/manager/apps/web/client/app/domains/domains.routes.js
+++ b/packages/manager/apps/web/client/app/domains/domains.routes.js
@@ -1,3 +1,5 @@
+import { DOMAIN_PREFIX_LISTING_MANAGE_DOMAINS } from './domains.constant';
+
 angular.module('App').config(($stateProvider, $urlRouterProvider) => {
   $stateProvider.state('app.domain.all', {
     url: '/bulk',
@@ -17,6 +19,9 @@ angular.module('App').config(($stateProvider, $urlRouterProvider) => {
       ],
       hideBreadcrumb: () => true,
     },
+    atInternet: {
+      rename: DOMAIN_PREFIX_LISTING_MANAGE_DOMAINS,
+    },
     translations: { value: ['../domain', '../domains'], format: 'json' },
   });
 
diff --git a/packages/manager/apps/web/client/app/domains/export-csv/domains-export-to-csv.controller.js b/packages/manager/apps/web/client/app/domains/export-csv/domains-export-to-csv.controller.js
index 26994dbf3b12..7b822b2de318 100644
--- a/packages/manager/apps/web/client/app/domains/export-csv/domains-export-to-csv.controller.js
+++ b/packages/manager/apps/web/client/app/domains/export-csv/domains-export-to-csv.controller.js
@@ -6,21 +6,37 @@ import map from 'lodash/map';
 import size from 'lodash/size';
 import trim from 'lodash/trim';
 import uniq from 'lodash/uniq';
+import {
+  DOMAIN_PREFIX_LISTING_EXPORT_ERROR,
+  DOMAIN_PREFIX_LISTING_EXPORT_SUCCESS,
+  DOMAIN_PREFIX_POPUP_BUTTON_EXPORT_CSV_DOMAIN,
+  DOMAIN_PREFIX_POPUP_EXPORT_CSV,
+} from '../domains.constant';
 
 angular.module('App').controller(
   'DomainsToCsvCtrl',
   class DomainsToCsvCtrl {
     /* @ngInject */
-    constructor($scope, $rootScope, $q, $translate, Domain, exportCsv) {
+    constructor(
+      $scope,
+      $rootScope,
+      $q,
+      $translate,
+      Domain,
+      exportCsv,
+      atInternet,
+    ) {
       this.$scope = $scope;
       this.$rootScope = $rootScope;
       this.$q = $q;
       this.$translate = $translate;
       this.Domain = Domain;
       this.exportCsv = exportCsv;
+      this.atInternet = atInternet;
     }
 
     $onInit() {
+      this.atInternet.trackPage({ name: DOMAIN_PREFIX_POPUP_EXPORT_CSV });
       this.exportResults = {
         data: null,
         success: false,
@@ -110,14 +126,26 @@ angular.module('App').controller(
         this.exportStatus.doing = false;
         this.exportResults.data = data;
         this.exportResults.success = true;
+        this.atInternet.trackPage({
+          name: DOMAIN_PREFIX_LISTING_EXPORT_SUCCESS,
+        });
       });
       this.$scope.$on('domain.csv.export.error', () => {
         this.exportStatus.doing = false;
         this.exportResults.error = true;
+        this.atInternet.trackPage({
+          name: DOMAIN_PREFIX_LISTING_EXPORT_ERROR,
+        });
       });
 
       this.$scope.closeExport = () => this.closeExport();
-      this.$scope.exportAccounts = () => this.exportAccountsToCsv();
+      this.$scope.exportAccounts = () => {
+        this.atInternet.trackClick({
+          name: DOMAIN_PREFIX_POPUP_BUTTON_EXPORT_CSV_DOMAIN,
+          type: 'action',
+        });
+        return this.exportAccountsToCsv();
+      };
     }
 
     /**
diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_de_DE.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_de_DE.json
index 4fd014a73950..616038fca63c 100644
--- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_de_DE.json
+++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_de_DE.json
@@ -850,7 +850,7 @@
   "hosting_configuration_tab_sql_data_base_state": "Status",
   "hosting_configuration_tab_sql_data_base_server": "Server",
   "hosting_configuration_tab_sql_data_base_version": "Version",
-  "hosting_tab_MODULES_guide_help": "Benötigen Sie Hilfe bei der Installation Ihres 1 Klick Moduls?",
+  "hosting_tab_MODULES_guide_help": "Sie benötigen Hilfe bei der Änderung des Passworts Ihres 1-Klick-Moduls?",
   "hosting_configuration_tab_modules_module_name": "Modul",
   "hosting_configuration_tab_modules_module_path": "Pfad",
   "hosting_configuration_tab_modules_status_maintenance": "Für Ihr Hosting sind gerade Wartungsarbeiten im Gange. Bitte versuchen Sie es später erneut.",
diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_en_GB.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_en_GB.json
index f8a9284c4227..fa2d13631411 100644
--- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_en_GB.json
+++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_en_GB.json
@@ -850,7 +850,7 @@
   "hosting_configuration_tab_sql_data_base_state": "Status ",
   "hosting_configuration_tab_sql_data_base_server": "Server",
   "hosting_configuration_tab_sql_data_base_version": "Version",
-  "hosting_tab_MODULES_guide_help": "Need help installing your 1-click module?",
+  "hosting_tab_MODULES_guide_help": "Need help changing your module password in 1 click?",
   "hosting_configuration_tab_modules_module_name": "Module",
   "hosting_configuration_tab_modules_module_path": "Path",
   "hosting_configuration_tab_modules_status_maintenance": "Maintenance is in progress for your hosting plan. Please try again later.",
diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_es_ES.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_es_ES.json
index 826e2eff0161..9224c3767366 100644
--- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_es_ES.json
+++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_es_ES.json
@@ -850,7 +850,7 @@
   "hosting_configuration_tab_sql_data_base_state": "Estado",
   "hosting_configuration_tab_sql_data_base_server": "Servidor",
   "hosting_configuration_tab_sql_data_base_version": "Versión",
-  "hosting_tab_MODULES_guide_help": "¿Necesita ayuda para instalar su módulo en un clic?",
+  "hosting_tab_MODULES_guide_help": "¿Necesita ayuda para cambiar la contraseña de su módulo en un clic?",
   "hosting_configuration_tab_modules_module_name": "Módulo",
   "hosting_configuration_tab_modules_module_path": "Ruta",
   "hosting_configuration_tab_modules_status_maintenance": "El alojamiento está en mantenimiento. Por favor, inténtelo de nuevo más tarde.",
diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_CA.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_CA.json
index 80f27c1f50fd..2b0263eaf46a 100644
--- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_CA.json
+++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_CA.json
@@ -850,7 +850,7 @@
   "hosting_configuration_tab_sql_data_base_state": "Etat",
   "hosting_configuration_tab_sql_data_base_server": "Serveur",
   "hosting_configuration_tab_sql_data_base_version": "Version",
-  "hosting_tab_MODULES_guide_help": "Besoin d'aide pour installer votre module en 1 clic ?",
+  "hosting_tab_MODULES_guide_help": "Besoin d'aide pour changer le mot de passe de votre module en 1 clic ?",
   "hosting_configuration_tab_modules_module_name": "Module",
   "hosting_configuration_tab_modules_module_path": "Chemin",
   "hosting_configuration_tab_modules_status_maintenance": "Votre hébergement est en cours de maintenance. Veuillez réessayer plus tard.",
diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json
index 80f27c1f50fd..2b0263eaf46a 100644
--- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json
+++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json
@@ -850,7 +850,7 @@
   "hosting_configuration_tab_sql_data_base_state": "Etat",
   "hosting_configuration_tab_sql_data_base_server": "Serveur",
   "hosting_configuration_tab_sql_data_base_version": "Version",
-  "hosting_tab_MODULES_guide_help": "Besoin d'aide pour installer votre module en 1 clic ?",
+  "hosting_tab_MODULES_guide_help": "Besoin d'aide pour changer le mot de passe de votre module en 1 clic ?",
   "hosting_configuration_tab_modules_module_name": "Module",
   "hosting_configuration_tab_modules_module_path": "Chemin",
   "hosting_configuration_tab_modules_status_maintenance": "Votre hébergement est en cours de maintenance. Veuillez réessayer plus tard.",
diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_it_IT.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_it_IT.json
index aa2b74149753..3b1f432d2ecc 100644
--- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_it_IT.json
+++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_it_IT.json
@@ -850,7 +850,7 @@
   "hosting_configuration_tab_sql_data_base_state": "Stato",
   "hosting_configuration_tab_sql_data_base_server": "Server",
   "hosting_configuration_tab_sql_data_base_version": "Versione",
-  "hosting_tab_MODULES_guide_help": "Bisogno di aiuto per installare il tuo modulo in 1 click?",
+  "hosting_tab_MODULES_guide_help": "Hai bisogno di aiuto per modificare la password del tuo modulo in 1 click?",
   "hosting_configuration_tab_modules_module_name": "Modulo",
   "hosting_configuration_tab_modules_module_path": "Percorso",
   "hosting_configuration_tab_modules_status_maintenance": "Il tuo hosting è in manutenzione. Ti preghiamo di riprovare più tardi",
diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pl_PL.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pl_PL.json
index 1f377ba03830..c67455a74533 100644
--- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pl_PL.json
+++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pl_PL.json
@@ -850,7 +850,7 @@
   "hosting_configuration_tab_sql_data_base_state": "Status",
   "hosting_configuration_tab_sql_data_base_server": "Serwer",
   "hosting_configuration_tab_sql_data_base_version": "Wersja",
-  "hosting_tab_MODULES_guide_help": "Potrzebujesz pomocy w instalacji modułu?",
+  "hosting_tab_MODULES_guide_help": "Potrzebujesz pomocy w zmianie hasła do modułu?",
   "hosting_configuration_tab_modules_module_name": "Moduł",
   "hosting_configuration_tab_modules_module_path": "Ścieżka",
   "hosting_configuration_tab_modules_status_maintenance": "Trwają prace konserwacyjne Twojego hostingu. Spróbuj ponownie później.",
diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pt_PT.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pt_PT.json
index 77b437d3c290..d20becc3e46e 100644
--- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pt_PT.json
+++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pt_PT.json
@@ -850,7 +850,7 @@
   "hosting_configuration_tab_sql_data_base_state": "Estado",
   "hosting_configuration_tab_sql_data_base_server": "Servidor",
   "hosting_configuration_tab_sql_data_base_version": "Versão",
-  "hosting_tab_MODULES_guide_help": "Precisa de ajuda para instalar o módulo 1 clique?",
+  "hosting_tab_MODULES_guide_help": "Precisa de ajuda para alterar a palavra-passe do módulo 1 clique?",
   "hosting_configuration_tab_modules_module_name": "Módulo ",
   "hosting_configuration_tab_modules_module_path": "Caminho",
   "hosting_configuration_tab_modules_status_maintenance": "O seu alojamento está em curso de manutenção. Tente novamente mais tarde.",
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/private-database.controller.js b/packages/manager/apps/web/client/app/private-database/dashboard/private-database.controller.js
index 0f8700b6f94d..2d931ad664da 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/private-database.controller.js
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/private-database.controller.js
@@ -22,6 +22,7 @@ export default class PrivateDatabaseCtrl {
     databaseLink,
     hasConfiguration,
     logsLink,
+    isLogsToCustomerFeatureAvailable,
     metricsLink,
     Hosting,
     PrivateDatabase,
@@ -47,6 +48,7 @@ export default class PrivateDatabaseCtrl {
     this.hasConfiguration = hasConfiguration;
     this.hostingService = Hosting;
     this.logsLink = logsLink;
+    this.isLogsToCustomerFeatureAvailable = isLogsToCustomerFeatureAvailable;
     this.metricsLink = metricsLink;
     this.privateDatabaseExtensionService = PrivateDatabaseExtension;
     this.privateDatabaseService = PrivateDatabase;
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/private-database.html b/packages/manager/apps/web/client/app/private-database/dashboard/private-database.html
index 86d940343016..10f5357aa1e3 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/private-database.html
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/private-database.html
@@ -229,11 +229,15 @@
                     <span data-translate="privateDatabase_tab_METRICS"></span>
                 </oui-header-tabs-item>
                 <oui-header-tabs-item
-                    data-ng-if="database.serviceInfos.status !== 'expired'"
+                    data-ng-if=":: ctrl.isLogsToCustomerFeatureAvailable && database.serviceInfos.status !== 'expired'"
                     href="{{ ctrl.logsLink }}"
                     active="ctrl.currentActiveLink() === ctrl.logsLink"
                 >
                     <span data-translate="privateDatabase_tab_LOGS"></span>
+                    <span
+                        class="oui-badge oui-badge_s oui-badge_success"
+                        data-translate="privateDatabase_beta_status"
+                    ></span>
                 </oui-header-tabs-item>
                 <oui-header-tabs-item
                     data-ng-if="database.serviceInfos.status !== 'expired' && !isLegacyDatabase() && !hasConfiguration"
@@ -254,6 +258,7 @@
             </oui-header-tabs>
         </div>
         <div ui-view></div>
+        <div data-ui-view="privateDatabaseLogsView"></div>
     </div>
 
     <div id="currentAction" class="modal fade currentAction" role="dialog">
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/private-database.module.js b/packages/manager/apps/web/client/app/private-database/dashboard/private-database.module.js
index b96207d757b6..adda029a4280 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/private-database.module.js
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/private-database.module.js
@@ -2,7 +2,7 @@ import routing from './private-database.routing';
 
 import configuration from '../configuration/configuration.module';
 import database from '../database/database.module';
-import logs from '../logs/logs.module';
+import logs from '../logs/private-database-logs.module';
 import metrics from '../metrics/metrics.module';
 import orderCloudDb from '../order/clouddb';
 import state from '../state/state.module';
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/private-database.routing.js b/packages/manager/apps/web/client/app/private-database/dashboard/private-database.routing.js
index 01081280e96b..d02e74b895c7 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/private-database.routing.js
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/private-database.routing.js
@@ -68,6 +68,12 @@ export default /* @ngInject */ ($stateProvider) => {
       currentActiveLink: /* @ngInject */ ($state, $transition$) => () =>
         $state.href($state.current.name, $transition$.params()),
       breadcrumb: /* @ngInject */ (serviceName) => serviceName,
+      isLogsToCustomerFeatureAvailable: /* @ngInject */ (ovhFeatureFlipping) =>
+        ovhFeatureFlipping
+          .checkFeatureAvailability('private-database:logs-to-customer')
+          .then((feature) =>
+            feature.isFeatureAvailable('private-database:logs-to-customer'),
+          ),
     },
   });
 
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_de_DE.json b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_de_DE.json
index 537659aff39b..631d35a0b3ea 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_de_DE.json
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_de_DE.json
@@ -504,5 +504,6 @@
   "privateDatabase_tabs_list_extensions_enable_error": "Beim Einrichten der Erweiterung ist ein Fehler aufgetreten.",
   "privateDatabase_tabs_list_extensions_disable_success": "Die Erweiterung wurde erfolgreich deaktiviert.",
   "privateDatabase_tabs_list_extensions_disable_error": "Bei der Deaktivierung der Erweiterung ist ein Fehler aufgetreten.",
-  "privateDatabase_order_sql_period_sub_title": "Wie lange möchten Sie sie benutzen? "
+  "privateDatabase_order_sql_period_sub_title": "Wie lange möchten Sie sie benutzen? ",
+  "privateDatabase_beta_status": "Beta"
 }
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_en_GB.json b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_en_GB.json
index a57d73a0b8fe..59a67831e837 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_en_GB.json
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_en_GB.json
@@ -504,5 +504,6 @@
   "privateDatabase_tabs_list_extensions_enable_error": "An error has occurred enabling your extension.",
   "privateDatabase_tabs_list_extensions_disable_success": "Extension correctly disabled.",
   "privateDatabase_tabs_list_extensions_disable_error": "An error has occurred disabling the extension.",
-  "privateDatabase_order_sql_period_sub_title": "How long do you want to use it for?"
+  "privateDatabase_order_sql_period_sub_title": "How long do you want to use it for?",
+  "privateDatabase_beta_status": "Beta"
 }
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_es_ES.json b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_es_ES.json
index 8b0e7215b517..25b7e96bac6b 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_es_ES.json
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_es_ES.json
@@ -502,5 +502,6 @@
   "privateDatabase_tabs_list_extensions_enable_error": "Se ha producido un error al activar la extensión.",
   "privateDatabase_tabs_list_extensions_disable_success": "La extensión se ha desactivado correctamente.",
   "privateDatabase_tabs_list_extensions_disable_error": "Se ha producido un error al desactivar la extensión.",
-  "privateDatabase_order_sql_period_sub_title": "¿Por cuánto tiempo quiere utilizarlas?"
+  "privateDatabase_order_sql_period_sub_title": "¿Por cuánto tiempo quiere utilizarlas?",
+  "privateDatabase_beta_status": "Beta"
 }
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_fr_CA.json b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_fr_CA.json
index bec981b8d3b1..9e61dbd128da 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_fr_CA.json
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_fr_CA.json
@@ -504,5 +504,6 @@
   "privateDatabase_tabs_list_extensions_enable_error": "Une erreur est survenue lors de l'action de l'extension.",
   "privateDatabase_tabs_list_extensions_disable_success": "Extension correctement désactivée.",
   "privateDatabase_tabs_list_extensions_disable_error": "Une erreur est survenue lors de la désactivation de l'extension.",
-  "privateDatabase_order_sql_period_sub_title": "Combien de temps désirez-vous l'utiliser ?"
+  "privateDatabase_order_sql_period_sub_title": "Combien de temps désirez-vous l'utiliser ?",
+  "privateDatabase_beta_status": "Beta"
 }
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_fr_FR.json b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_fr_FR.json
index bec981b8d3b1..9e61dbd128da 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_fr_FR.json
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_fr_FR.json
@@ -504,5 +504,6 @@
   "privateDatabase_tabs_list_extensions_enable_error": "Une erreur est survenue lors de l'action de l'extension.",
   "privateDatabase_tabs_list_extensions_disable_success": "Extension correctement désactivée.",
   "privateDatabase_tabs_list_extensions_disable_error": "Une erreur est survenue lors de la désactivation de l'extension.",
-  "privateDatabase_order_sql_period_sub_title": "Combien de temps désirez-vous l'utiliser ?"
+  "privateDatabase_order_sql_period_sub_title": "Combien de temps désirez-vous l'utiliser ?",
+  "privateDatabase_beta_status": "Beta"
 }
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_it_IT.json b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_it_IT.json
index b3414ae67a48..fa27a38f009e 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_it_IT.json
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_it_IT.json
@@ -504,5 +504,6 @@
   "privateDatabase_tabs_list_extensions_enable_error": "Si è verificato un errore durante l'attivazione dell'estensione.",
   "privateDatabase_tabs_list_extensions_disable_success": "Estensione disattivata correttamente.",
   "privateDatabase_tabs_list_extensions_disable_error": "Si è verificato un errore durante la disattivazione dell'estensione.",
-  "privateDatabase_order_sql_period_sub_title": "Per quanto tempo vuoi utilizzarla?"
+  "privateDatabase_order_sql_period_sub_title": "Per quanto tempo vuoi utilizzarla?",
+  "privateDatabase_beta_status": "Beta"
 }
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_pl_PL.json b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_pl_PL.json
index e29ec1fb7277..2b18b755a6fc 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_pl_PL.json
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_pl_PL.json
@@ -504,5 +504,6 @@
   "privateDatabase_tabs_list_extensions_enable_error": "Wystąpił błąd podczas aktywowania rozszerzenia.",
   "privateDatabase_tabs_list_extensions_disable_success": "Rozszerzenie poprawnie dezaktywowane.",
   "privateDatabase_tabs_list_extensions_disable_error": "Wystąpił błąd podczas aktywowania rozszerzenia.",
-  "privateDatabase_order_sql_period_sub_title": "Jak długo chcesz korzystać z bazy?"
+  "privateDatabase_order_sql_period_sub_title": "Jak długo chcesz korzystać z bazy?",
+  "privateDatabase_beta_status": "Wersja beta"
 }
diff --git a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_pt_PT.json b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_pt_PT.json
index b7bf8db347d2..bc112bb728e5 100644
--- a/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_pt_PT.json
+++ b/packages/manager/apps/web/client/app/private-database/dashboard/translations/Messages_pt_PT.json
@@ -504,5 +504,6 @@
   "privateDatabase_tabs_list_extensions_enable_error": "Erro ao processar ativação da extensão",
   "privateDatabase_tabs_list_extensions_disable_success": "Extensão desativada",
   "privateDatabase_tabs_list_extensions_disable_error": "Erro ao processar desativação da extensão",
-  "privateDatabase_order_sql_period_sub_title": "Durante quanto tempo deseja utilizá-las?"
+  "privateDatabase_order_sql_period_sub_title": "Durante quanto tempo deseja utilizá-las?",
+  "privateDatabase_beta_status": "Beta"
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/data-streams/index.js b/packages/manager/apps/web/client/app/private-database/logs/data-streams/index.js
new file mode 100644
index 000000000000..aace592d7d3c
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/data-streams/index.js
@@ -0,0 +1,27 @@
+import angular from 'angular';
+import '@uirouter/angularjs';
+import 'oclazyload';
+
+const moduleName = 'ovhManagerPrivateDatabaseLogsDataStreamsLazyLoading';
+
+angular.module(moduleName, ['oc.lazyLoad', 'ui.router']).config(
+  /* @ngInject */ ($stateProvider) => {
+    $stateProvider.state(
+      'app.private-database.dashboard.logs.data-streams.**',
+      {
+        url: '',
+        lazyLoad: ($transition$) => {
+          const $ocLazyLoad = $transition$.injector().get('$ocLazyLoad');
+
+          return import('./private-database-data-streams.module').then(
+            (mod) => {
+              return $ocLazyLoad.inject(mod.default || mod);
+            },
+          );
+        },
+      },
+    );
+  },
+);
+
+export default moduleName;
diff --git a/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.component.js b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.component.js
new file mode 100644
index 000000000000..779904d37657
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.component.js
@@ -0,0 +1,13 @@
+import controller from './private-database-data-streams.controller';
+import template from './private-database-data-streams.template.html';
+
+export default {
+  bindings: {
+    projectId: '<',
+    kind: '<',
+    goBack: '<',
+    trackClick: '<',
+  },
+  controller,
+  template,
+};
diff --git a/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.constants.js b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.constants.js
new file mode 100644
index 000000000000..42d74628edda
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.constants.js
@@ -0,0 +1,12 @@
+export const PRIVATE_DATABASE_DATA_STREAMS_TRACKING_HITS = {
+  LISTING_PAGE: 'web::private-database::dashboard::logs::data-streams',
+  ADD_DATA_STREAM:
+    'web::private-database::dashboard::logs::data-streams::add-datastream',
+  GO_BACK:
+    'web::private-database::dashboard::logs::data-streams::back-previous-page',
+  LDP_DETAIL:
+    'web::private-database::dashboard::logs::data-streams::ldp-detail',
+  SUBSCRIBE: 'web::private-database::dashboard::logs::data-streams::subscribe',
+  UNSUBSCRIBE:
+    'web::private-database::dashboard::logs::data-streams::unsubscribe',
+};
diff --git a/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.controller.js b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.controller.js
new file mode 100644
index 000000000000..43c9c3eb5e0a
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.controller.js
@@ -0,0 +1,19 @@
+import { PRIVATE_DATABASE_DATA_STREAMS_TRACKING_HITS } from './private-database-data-streams.constants';
+
+export default class PrivateDatabasedataStreamsCtrl {
+  /* @ngInject */
+  constructor($stateParams) {
+    this.$stateParams = $stateParams;
+  }
+
+  $onInit() {
+    this.productId = this.$stateParams.productId;
+    this.PRIVATE_DATABASE_DATA_STREAMS_TRACKING_HITS = PRIVATE_DATABASE_DATA_STREAMS_TRACKING_HITS;
+    this.logSubscriptionApiData = {
+      url: `/hosting/privateDatabase/${this.productId}/log/subscription`,
+      params: {
+        kind: this.kind,
+      },
+    };
+  }
+}
diff --git a/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.module.js b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.module.js
new file mode 100644
index 000000000000..92fafb5563cc
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.module.js
@@ -0,0 +1,15 @@
+import angular from 'angular';
+import '@uirouter/angularjs';
+import 'angular-translate';
+
+import component from './private-database-data-streams.component';
+import routing from './private-database-data-streams.routing';
+
+const moduleName = 'ovhManagerPrivateDatabaseDataStreams';
+angular
+  .module(moduleName, ['pascalprecht.translate', 'ui.router'])
+  .config(routing)
+  .component('privateDatabaseDataStreams', component)
+  .run(/* @ngTranslationsInject:json ../translations */);
+
+export default moduleName;
diff --git a/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.routing.js b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.routing.js
new file mode 100644
index 000000000000..54b921676a6a
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.routing.js
@@ -0,0 +1,29 @@
+import { PRIVATE_DATABASE_DATA_STREAMS_TRACKING_HITS } from './private-database-data-streams.constants';
+
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('app.private-database.dashboard.logs.data-streams', {
+    url: '',
+    params: {
+      kind: null,
+    },
+    views: {
+      'privateDatabaseLogsView@app.private-database.dashboard':
+        'privateDatabaseDataStreams',
+    },
+    atInternet: {
+      rename: PRIVATE_DATABASE_DATA_STREAMS_TRACKING_HITS.LISTING_PAGE,
+    },
+    resolve: {
+      breadcrumb: () => null,
+      kind: /* @ngInject */ ($transition$) => $transition$.params().kind,
+      goBack: /* @ngInject  */ ($state, kind, trackClick) => () => {
+        trackClick(PRIVATE_DATABASE_DATA_STREAMS_TRACKING_HITS.GO_BACK);
+        $state.go(
+          'app.private-database.dashboard.logs',
+          { kind },
+          { reload: true },
+        );
+      },
+    },
+  });
+};
diff --git a/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.template.html b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.template.html
new file mode 100644
index 000000000000..6de2f480c1d9
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/data-streams/private-database-data-streams.template.html
@@ -0,0 +1,10 @@
+<div data-ovh-alert></div>
+
+<log-to-customer-list
+    data-log-subscription-api-data="$ctrl.logSubscriptionApiData"
+    data-description="{{ 'private_database_data_streams_description_' + $ctrl.kind | translate }}"
+    data-go-back="$ctrl.goBack"
+    data-tracking-hits="$ctrl.PRIVATE_DATABASE_DATA_STREAMS_TRACKING_HITS"
+    data-track-click="$ctrl.trackClick"
+>
+</log-to-customer-list>
diff --git a/packages/manager/apps/web/client/app/private-database/logs/index.js b/packages/manager/apps/web/client/app/private-database/logs/index.js
new file mode 100644
index 000000000000..85765547b646
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/index.js
@@ -0,0 +1,22 @@
+import angular from 'angular';
+import '@uirouter/angularjs';
+import 'oclazyload';
+
+const moduleName = 'ovhManagerPrivateDatabaseLogsLazyLoading';
+
+angular.module(moduleName, ['ui.router', 'oc.lazyLoad']).config(
+  /* @ngInject */ ($stateProvider) => {
+    $stateProvider.state('app.private-database.dashboard.logs.**', {
+      url: '/logs',
+      lazyLoad: ($transition$) => {
+        const $ocLazyLoad = $transition$.injector().get('$ocLazyLoad');
+
+        return import('./private-database-logs.module').then((mod) =>
+          $ocLazyLoad.inject(mod.default || mod),
+        );
+      },
+    });
+  },
+);
+
+export default moduleName;
diff --git a/packages/manager/apps/web/client/app/private-database/logs/logs.module.js b/packages/manager/apps/web/client/app/private-database/logs/logs.module.js
deleted file mode 100644
index d41b59715128..000000000000
--- a/packages/manager/apps/web/client/app/private-database/logs/logs.module.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import routing from './logs.routing';
-
-const moduleName = 'ovhManagerPrivateDatabaseLogs';
-
-angular
-  .module(moduleName, [])
-  .config(routing)
-  .run(/* @ngTranslationsInject:json ./translations */);
-
-export default moduleName;
diff --git a/packages/manager/apps/web/client/app/private-database/logs/logs.routing.js b/packages/manager/apps/web/client/app/private-database/logs/logs.routing.js
deleted file mode 100644
index c4f6b5d0bf30..000000000000
--- a/packages/manager/apps/web/client/app/private-database/logs/logs.routing.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import template from './private-database-logs.html';
-import controller from './private-database-logs.controller';
-
-export default /* @ngInject */ ($stateProvider) => {
-  $stateProvider.state('app.private-database.dashboard.logs', {
-    url: '/logs',
-    template,
-    controller,
-    controllerAs: 'listCtrl',
-    resolve: {
-      breadcrumb: /* @ngInject */ ($translate) =>
-        $translate.instant('private_database_logs'),
-    },
-  });
-};
diff --git a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.component.js b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.component.js
new file mode 100644
index 000000000000..1dcc3f9574ed
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.component.js
@@ -0,0 +1,14 @@
+import template from './private-database-logs.template.html';
+import controller from './private-database-logs.controller';
+
+export default {
+  bindings: {
+    projectId: '<',
+    goToListingPage: '<',
+    logKindsList: '<',
+    kind: '<',
+    trackClick: '<',
+  },
+  template,
+  controller,
+};
diff --git a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.constants.js b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.constants.js
new file mode 100644
index 000000000000..29fd2baf6bd9
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.constants.js
@@ -0,0 +1,50 @@
+export const PRIVATE_DATABASE_LOGS_SERVICE_GUIDE_LINK = {
+  DEFAULT:
+    'https://help.ovhcloud.com/csm/en-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062040',
+  FR:
+    'https://help.ovhcloud.com/csm/fr-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062007',
+  DE:
+    'https://help.ovhcloud.com/csm/de-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062033',
+  ES:
+    'https://help.ovhcloud.com/csm/es-es-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062037',
+  WE:
+    'https://help.ovhcloud.com/csm/en-ie-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062032',
+  IE:
+    'https://help.ovhcloud.com/csm/en-ie-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062032',
+  IT:
+    'https://help.ovhcloud.com/csm/it-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062041',
+  PL:
+    'https://help.ovhcloud.com/csm/pl-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062043',
+  PT:
+    'https://help.ovhcloud.com/csm/pt-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062035',
+  GB:
+    'https://help.ovhcloud.com/csm/en-gb-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062031',
+  CA:
+    'https://help.ovhcloud.com/csm/en-ca-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062034',
+  QC:
+    'https://help.ovhcloud.com/csm/fr-ca-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062008',
+  WS:
+    'https://help.ovhcloud.com/csm/es-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062042',
+  AU:
+    'https://help.ovhcloud.com/csm/en-au-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062036',
+  SG:
+    'https://help.ovhcloud.com/csm/en-sg-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062039',
+  ASIA:
+    'https://help.ovhcloud.com/csm/asia-web-cloud-db-retrieve-logs?id=kb_article_view&sysparm_article=KB0062038',
+};
+
+export const PRIVATE_DATABASE_LOGS_KINDS_KEYS = {
+  dbms: ['message'],
+};
+
+export const PRIVATE_DATABASE_LOGS_TRACKING_HITS = {
+  LOGS_PAGE: 'web::private-database::dashboard::logs',
+  TRANSFER: 'web::private-database::dashboard::logs::subscribe',
+  STOP_TRANSFER: 'web::private-database::dashboard::logs::unsubscribe',
+  SUBSCRIBE_OTHER_ACCOUNT:
+    'web::private-database::dashboard::logs::subscribe-other-datastream',
+  CREATE_ACCOUNT: 'web::private-database::dashboard::logs::create-account',
+  CREATE_DATA_STREAM:
+    'web::private-database::dashboard::logs::create-data-stream',
+  GRAYLOG_WATCH: 'web::private-database::dashboard::logs::graylog',
+};
diff --git a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.controller.js b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.controller.js
index 9baa0b682e4c..f8f477b66a6a 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.controller.js
+++ b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.controller.js
@@ -1,49 +1,24 @@
-export default class PrivateDatabaseLogsCtrl {
+import {
+  PRIVATE_DATABASE_LOGS_SERVICE_GUIDE_LINK,
+  PRIVATE_DATABASE_LOGS_TRACKING_HITS,
+  PRIVATE_DATABASE_LOGS_KINDS_KEYS,
+} from './private-database-logs.constants';
+
+export default class PrivateDatabaseLogsController {
   /* @ngInject */
-  constructor($scope, $stateParams, TailLogs, PrivateDatabaseLogsService) {
-    this.$scope = $scope;
+  constructor(coreConfig, $stateParams) {
+    this.user = coreConfig.getUser();
     this.$stateParams = $stateParams;
-    this.TailLogs = TailLogs;
-    this.privateDatabaseLogsService = PrivateDatabaseLogsService;
-    this.loader = true;
-
-    $scope.$on('$destroy', () => {
-      if (this.logger) {
-        this.logger.stop();
-      }
-    });
   }
 
   $onInit() {
-    this.loader = true;
     this.productId = this.$stateParams.productId;
-
-    this.logger = new this.TailLogs({
-      source: () =>
-        this.privateDatabaseLogsService
-          .getLogs(this.productId)
-          .then((logs) => logs.url),
-      delay: 2000,
-    });
-
-    this.startLog();
-    this.loader = false;
-  }
-
-  $onDestroy() {
-    this.logger.stop();
-  }
-
-  stopLog() {
-    this.logger.stop();
-  }
-
-  startLog() {
-    this.logger.log();
-  }
-
-  getLogs() {
-    this.logger = this.logger.logs;
-    return this.logger;
+    this.PRIVATE_DATABASE_LOGS_TRACKING_HITS = PRIVATE_DATABASE_LOGS_TRACKING_HITS;
+    this.logApiUrl = `/hosting/privateDatabase/${this.productId}/log/url`;
+    this.logSubscriptionUrl = `/hosting/privateDatabase/${this.productId}/log/subscription`;
+    this.logServiceGuideLink =
+      PRIVATE_DATABASE_LOGS_SERVICE_GUIDE_LINK[this.user.ovhSubsidiary] ||
+      PRIVATE_DATABASE_LOGS_SERVICE_GUIDE_LINK.DEFAULT;
+    this.logKindsKeys = PRIVATE_DATABASE_LOGS_KINDS_KEYS;
   }
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.html b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.html
deleted file mode 100644
index f83d2d4c262a..000000000000
--- a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div>
-    <div data-ovh-alert="{{alerts.main}}"></div>
-
-    <h2 data-translate="privateDatabase_tabs_logs_list_title"></h2>
-
-    <tail-logs>
-        <div
-            class="row ml-0"
-            data-ng-repeat="log in listCtrl.logger.logs track by $index"
-            data-ng-class="{
-                'text-muted'   : false,
-                'text-primary' : false,
-                'text-warning' : false,
-                'text-danger'  : false
-            }"
-        >
-            <span
-                class="col-md-2"
-                data-ng-bind="log.message.timestamp | date:'short'"
-            ></span>
-            <span class="col-md-1" data-ng-bind="log.message.stream"></span>
-            <span class="col-md-9" data-ng-bind="log.message.message"></span>
-        </div>
-
-        <div
-            data-translate="privateDatabase_tabs_logs_list_no_logs"
-            data-ng-if="listCtrl.logger.logs.length === 0"
-        ></div>
-    </tail-logs>
-</div>
diff --git a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.module.js b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.module.js
new file mode 100644
index 000000000000..372b69b7aab1
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.module.js
@@ -0,0 +1,23 @@
+import '@ovh-ux/manager-log-to-customer';
+import routing from './private-database-logs.routing';
+import service from './private-database-logs.service';
+import component from './private-database-logs.component';
+import dataStreams from './data-streams';
+
+const moduleName = 'ovhManagerPrivateDatabaseLogs';
+
+angular
+  .module(moduleName, [
+    'ngTranslateAsyncLoader',
+    'oui',
+    'pascalprecht.translate',
+    'ui.router',
+    'ovhManagerLogToCustomer',
+    dataStreams,
+  ])
+  .config(routing)
+  .component('privateDatabaseLogs', component)
+  .service('logsService', service)
+  .run(/* @ngTranslationsInject:json ./translations */);
+
+export default moduleName;
diff --git a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.routing.js b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.routing.js
new file mode 100644
index 000000000000..882b597fcd9f
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.routing.js
@@ -0,0 +1,43 @@
+import { PRIVATE_DATABASE_LOGS_TRACKING_HITS } from './private-database-logs.constants';
+
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('app.private-database.dashboard.logs', {
+    url: '/logs',
+    views: {
+      privateDatabaseLogsView: 'privateDatabaseLogs',
+    },
+    atInternet: {
+      rename: PRIVATE_DATABASE_LOGS_TRACKING_HITS.LOGS_PAGE,
+    },
+    redirectTo: (transition) =>
+      transition
+        .injector()
+        .getAsync('isLogsToCustomerFeatureAvailable')
+        .then((isLogsToCustomerFeatureAvailable) =>
+          isLogsToCustomerFeatureAvailable
+            ? false
+            : {
+                state: 'app.private-database.dashboard.state',
+              },
+        ),
+    resolve: {
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('private_database_logs'),
+      logKindsList: /* @ngInject */ (logsService, serviceName) =>
+        logsService.getLogKinds(serviceName),
+      kind: /* @ngInject */ (logKindsList, $state) =>
+        $state.params.kind || logKindsList[0].name,
+      goToListingPage: /* @ngInject */ ($state, $transition$) => (params) =>
+        $state.go('app.private-database.dashboard.logs.data-streams', {
+          ...$transition$.params(),
+          ...params,
+        }),
+      trackClick: /* @ngInject */ (atInternet) => (hit) => {
+        atInternet.trackClick({
+          name: hit,
+          type: 'action',
+        });
+      },
+    },
+  });
+};
diff --git a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.service.js b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.service.js
index c830bb706c4f..2d460bbea9e2 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.service.js
+++ b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.service.js
@@ -1,19 +1,15 @@
-angular.module('services').service(
-  'PrivateDatabaseLogsService',
-  class PrivateDatabaseLogsService {
-    /* @ngInject */
-    constructor($http) {
-      this.$http = $http;
+export default class PrivateDatabaseLogsService {
+  /* @ngInject */
+  constructor($http, iceberg) {
+    this.$http = $http;
+    this.iceberg = iceberg;
+  }
 
-      this.apiVersion = 'apiv6';
-    }
-
-    getLogs(serviceName) {
-      return this.$http
-        .post(
-          `${this.apiVersion}/hosting/privateDatabase/${serviceName}/generateTemporaryLogsLink`,
-        )
-        .then((res) => res.data);
-    }
-  },
-);
+  getLogKinds(serviceName) {
+    return this.iceberg(`/hosting/privateDatabase/${serviceName}/log/kind`)
+      .query()
+      .expand('CachedObjectList-Pages')
+      .execute()
+      .$promise.then(({ data }) => data);
+  }
+}
diff --git a/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.template.html b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.template.html
new file mode 100644
index 000000000000..00fc7d6ca88d
--- /dev/null
+++ b/packages/manager/apps/web/client/app/private-database/logs/private-database-logs.template.html
@@ -0,0 +1,17 @@
+<div data-ovh-alert></div>
+
+<log-to-customer-live-tail
+    data-log-api-url="$ctrl.logApiUrl"
+    data-log-service-guide-link="$ctrl.logServiceGuideLink"
+    data-log-subscription-url="$ctrl.logSubscriptionUrl"
+    data-go-to-listing-page="$ctrl.goToListingPage"
+    data-log-kinds-list="$ctrl.logKindsList"
+    data-log-kinds-keys="$ctrl.logKindsKeys"
+    data-kind-init-value="$ctrl.kind"
+    data-track-click="$ctrl.trackClick"
+    data-tracking-hits="$ctrl.PRIVATE_DATABASE_LOGS_TRACKING_HITS"
+>
+    <main-description>
+        <span data-translate="private_database_logs_description_dbms"></span>
+    </main-description>
+</log-to-customer-live-tail>
diff --git a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_de_DE.json b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_de_DE.json
index 4981aca0ecfe..2df2ce646133 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_de_DE.json
+++ b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_de_DE.json
@@ -1,3 +1,5 @@
 {
-  "private_database_logs": "Logs"
+  "private_database_logs": "Logs",
+  "private_database_logs_description_dbms": "Im Folgenden finden Sie die von Ihrer Web Cloud Database generierten Logs in Echtzeit.",
+  "private_database_data_streams_description_dbms": "Wenn Sie die Logs Ihrer Web Cloud Database abonnieren, werden diese zur Logs Data Platform übertragen. Diese Plattform bietet Zugriff auf erweiterte Funktionen wie die Verwaltung von Warnungen, das Durchführen von Suchen oder die Verwaltung der Aufbewahrung."
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_en_GB.json b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_en_GB.json
index 4981aca0ecfe..fc99cf51704d 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_en_GB.json
+++ b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_en_GB.json
@@ -1,3 +1,5 @@
 {
-  "private_database_logs": "Logs"
+  "private_database_logs": "Logs",
+  "private_database_logs_description_dbms": "Below, you will find the real-time logs generated by your Web Cloud Database.",
+  "private_database_data_streams_description_dbms": "By subscribing to Webcloud Database logs, they will be transferred to the Logs Data Platform. This platform gives you access to advanced features such as alerting, search execution and retention management."
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_es_ES.json b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_es_ES.json
index 4981aca0ecfe..37d027af6b34 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_es_ES.json
+++ b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_es_ES.json
@@ -1,3 +1,5 @@
 {
-  "private_database_logs": "Logs"
+  "private_database_logs": "Logs",
+  "private_database_logs_description_dbms": "Incluimos a continuación los logs en tiempo real generados por su Web Cloud Database.",
+  "private_database_data_streams_description_dbms": "Al suscribirse a los logs de su Web Cloud Database, estos se transferirán a Logs Data Platform. Esta plataforma le permite acceder a funcionalidades avanzadas como la gestión de las alertas, la ejecución de las búsquedas o la gestión de las retenciones."
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_fr_CA.json b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_fr_CA.json
index 4981aca0ecfe..ab62c138ee41 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_fr_CA.json
+++ b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_fr_CA.json
@@ -1,3 +1,5 @@
 {
-  "private_database_logs": "Logs"
+  "private_database_logs": "Logs",
+  "private_database_logs_description_dbms": "Vous trouverez ci-dessous les logs en temps réel générés par votre Web Cloud Database.",
+  "private_database_data_streams_description_dbms": "En vous abonnant aux logs de votre Webcloud Database, ils seront transférés vers la Logs Data Platform. Cette plateforme vous donne accès à des fonctionnalités avancées telles que la gestion des alertes, l'exécution de recherches ou la gestion des rétentions."
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_fr_FR.json b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_fr_FR.json
index 4981aca0ecfe..ab62c138ee41 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_fr_FR.json
+++ b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_fr_FR.json
@@ -1,3 +1,5 @@
 {
-  "private_database_logs": "Logs"
+  "private_database_logs": "Logs",
+  "private_database_logs_description_dbms": "Vous trouverez ci-dessous les logs en temps réel générés par votre Web Cloud Database.",
+  "private_database_data_streams_description_dbms": "En vous abonnant aux logs de votre Webcloud Database, ils seront transférés vers la Logs Data Platform. Cette plateforme vous donne accès à des fonctionnalités avancées telles que la gestion des alertes, l'exécution de recherches ou la gestion des rétentions."
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_it_IT.json b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_it_IT.json
index 083e41436930..fdf2dc88fc71 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_it_IT.json
+++ b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_it_IT.json
@@ -1,3 +1,5 @@
 {
-  "private_database_logs": "Log"
+  "private_database_logs": "Log",
+  "private_database_logs_description_dbms": "Qui sotto troverai i log in tempo reale generati dal tuo Web Cloud Database.",
+  "private_database_data_streams_description_dbms": "Effettuando l’abbonamento ai log del tuo Webcloud Database, questi verranno trasferiti verso Logs Data Platform. Questa piattaforma offre accesso a funzionalità avanzate come configurazione degli alert, esecuzione di ricerche e gestione delle retention."
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_pl_PL.json b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_pl_PL.json
index f1e96d6b4cec..aba2cf802c07 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_pl_PL.json
+++ b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_pl_PL.json
@@ -1,3 +1,5 @@
 {
-  "private_database_logs": "Logi"
+  "private_database_logs": "Logi",
+  "private_database_logs_description_dbms": "Poniżej znajdziesz logi w czasie rzeczywistym generowane przez Web Cloud Database.",
+  "private_database_data_streams_description_dbms": "Po zasubskrybowaniu logów Webcloud Database zostaną one przeniesione do Logs Data Platform. Platforma ta zapewnia dostęp do zaawansowanych funkcji, takich jak zarządzanie alertami, wyszukiwanie lub zarządzanie czasem przechowywania."
 }
diff --git a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_pt_PT.json b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_pt_PT.json
index 4981aca0ecfe..7905fc4518a7 100644
--- a/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_pt_PT.json
+++ b/packages/manager/apps/web/client/app/private-database/logs/translations/Messages_pt_PT.json
@@ -1,3 +1,5 @@
 {
-  "private_database_logs": "Logs"
+  "private_database_logs": "Logs",
+  "private_database_logs_description_dbms": "Encontrará abaixo os logs em tempo real gerados pelo Web Cloud Database.",
+  "private_database_data_streams_description_dbms": "Ao subscrever os logs da sua Webcloud Database, eles serão transferidos para a Logs Data Platform. Esta plataforma dá-lhe acesso a funcionalidades avançadas tais como a gestão de alertas, a execução de pesquisas ou a gestão de retenções."
 }
diff --git a/packages/manager/apps/web/package.json b/packages/manager/apps/web/package.json
index 45595e25bba8..edc484a75aa6 100644
--- a/packages/manager/apps/web/package.json
+++ b/packages/manager/apps/web/package.json
@@ -31,6 +31,7 @@
     "@ovh-ux/manager-error-page": "^2.4.1",
     "@ovh-ux/manager-exchange": "^4.9.0",
     "@ovh-ux/manager-filters": "^1.1.1",
+    "@ovh-ux/manager-log-to-customer": "^2.3.2",
     "@ovh-ux/manager-ng-layout-helpers": "^2.9.1",
     "@ovh-ux/manager-office": "^2.12.0",
     "@ovh-ux/manager-phone-prefix": "^1.1.1",
@@ -38,6 +39,7 @@
     "@ovh-ux/manager-web-paas": "^2.0.0",
     "@ovh-ux/ng-at-internet": "^6.0.0",
     "@ovh-ux/ng-at-internet-ui-router-plugin": "^3.5.0",
+    "@ovh-ux/ng-log-live-tail": "^2.4.0",
     "@ovh-ux/ng-ovh-actions-menu": "^5.1.1",
     "@ovh-ux/ng-ovh-api-wrappers": "^5.1.0",
     "@ovh-ux/ng-ovh-chart": "^1.2.0",
diff --git a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_de_DE.json b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_de_DE.json
index 5dccb376e3cb..99948ce9029a 100644
--- a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_de_DE.json
+++ b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_de_DE.json
@@ -23,7 +23,7 @@
   "zimbra_account_add_input_password_label": "Passwort",
   "zimbra_account_add_input_password_helper": "Ihr Passwort muss mindestens Folgendes enthalten:",
   "zimbra_account_add_input_password_helper_rule_1": "10 Zeichen",
-  "zimbra_account_add_input_password_helper_rule_2": "1 Ziffer oder Sonderzeichen (€,!, &amp; …)",
+  "zimbra_account_add_input_password_helper_rule_2": "1 Ziffer und 1 Sonderzeichen ($,!, &amp;,...)",
   "zimbra_account_add_input_password_helper_rule_3": "1 Großbuchstabe",
   "zimbra_account_add_input_mandatory": "Die mit einem Stern * gekennzeichneten Felder sind Pflichtfelder.",
   "zimbra_account_add_button_save": "Speichern",
diff --git a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_en_GB.json b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_en_GB.json
index b3ae9efe87e3..5bc33825008e 100644
--- a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_en_GB.json
+++ b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_en_GB.json
@@ -23,7 +23,7 @@
   "zimbra_account_add_input_password_label": "Password",
   "zimbra_account_add_input_password_helper": "Your password must contain at least:",
   "zimbra_account_add_input_password_helper_rule_1": "10 characters",
-  "zimbra_account_add_input_password_helper_rule_2": "1 digit or special character (€, !, &amp;)",
+  "zimbra_account_add_input_password_helper_rule_2": "1 digit and 1 special character ($,!, &amp;,...)",
   "zimbra_account_add_input_password_helper_rule_3": "1 uppercase letter",
   "zimbra_account_add_input_mandatory": "Fields marked with an asterisk (*) are mandatory",
   "zimbra_account_add_button_save": "Save",
diff --git a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_es_ES.json b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_es_ES.json
index c4a3ece81a01..3b113a7ed3ae 100644
--- a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_es_ES.json
+++ b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_es_ES.json
@@ -23,7 +23,7 @@
   "zimbra_account_add_input_password_label": "Contraseña",
   "zimbra_account_add_input_password_helper": "La contraseña debe contener al menos:",
   "zimbra_account_add_input_password_helper_rule_1": "10 caracteres",
-  "zimbra_account_add_input_password_helper_rule_2": "1 cifra o carácter especial (€, !, &amp;...)",
+  "zimbra_account_add_input_password_helper_rule_2": "1 número y 1 carácter especial ($,!, &amp;,...)",
   "zimbra_account_add_input_password_helper_rule_3": "1 letra mayúscula",
   "zimbra_account_add_input_mandatory": "Los campos marcados con un asterisco (*) son obligatorios.",
   "zimbra_account_add_button_save": "Guardar",
diff --git a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_fr_CA.json b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_fr_CA.json
index 52b7615a758e..2c0b04697e2d 100644
--- a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_fr_CA.json
+++ b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_fr_CA.json
@@ -27,7 +27,7 @@
   "zimbra_account_add_input_password_label": "Mot de passe",
   "zimbra_account_add_input_password_helper": "Votre mot de passe doit contenir au minimum :",
   "zimbra_account_add_input_password_helper_rule_1": "10 caractères",
-  "zimbra_account_add_input_password_helper_rule_2": "1 chiffre ou caractère spécial (€, !, &,…)",
+  "zimbra_account_add_input_password_helper_rule_2": "1 chiffre et 1 caractère spécial ($, !, &,…)",
   "zimbra_account_add_input_password_helper_rule_3": "1 lettre majuscule",
   "zimbra_account_add_input_mandatory": "Les champs mentionnés avec un astérisque * sont obligatoires",
   "zimbra_account_add_button_save": "Enregistrer",
diff --git a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_fr_FR.json b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_fr_FR.json
index 52b7615a758e..2c0b04697e2d 100644
--- a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_fr_FR.json
+++ b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_fr_FR.json
@@ -27,7 +27,7 @@
   "zimbra_account_add_input_password_label": "Mot de passe",
   "zimbra_account_add_input_password_helper": "Votre mot de passe doit contenir au minimum :",
   "zimbra_account_add_input_password_helper_rule_1": "10 caractères",
-  "zimbra_account_add_input_password_helper_rule_2": "1 chiffre ou caractère spécial (€, !, &,…)",
+  "zimbra_account_add_input_password_helper_rule_2": "1 chiffre et 1 caractère spécial ($, !, &,…)",
   "zimbra_account_add_input_password_helper_rule_3": "1 lettre majuscule",
   "zimbra_account_add_input_mandatory": "Les champs mentionnés avec un astérisque * sont obligatoires",
   "zimbra_account_add_button_save": "Enregistrer",
diff --git a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_it_IT.json b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_it_IT.json
index 3369181034bd..352e74c68a4a 100644
--- a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_it_IT.json
+++ b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_it_IT.json
@@ -23,7 +23,7 @@
   "zimbra_account_add_input_password_label": "Password",
   "zimbra_account_add_input_password_helper": "La tua password deve contenere almeno:",
   "zimbra_account_add_input_password_helper_rule_1": "10 caratteri",
-  "zimbra_account_add_input_password_helper_rule_2": "1 cifra o carattere speciale (€, !, &amp;,…)",
+  "zimbra_account_add_input_password_helper_rule_2": "1 cifra e 1 carattere speciale ($,!, &amp;,...)",
   "zimbra_account_add_input_password_helper_rule_3": "1 lettera maiuscola",
   "zimbra_account_add_input_mandatory": "I campi contrassegnati con un asterisco * sono obbligatori",
   "zimbra_account_add_button_save": "Registra",
diff --git a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_pl_PL.json b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_pl_PL.json
index 7476c244b0d7..22ee211dc680 100644
--- a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_pl_PL.json
+++ b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_pl_PL.json
@@ -23,7 +23,7 @@
   "zimbra_account_add_input_password_label": "Hasło",
   "zimbra_account_add_input_password_helper": "Twoje hasło musi zawierać co najmniej:",
   "zimbra_account_add_input_password_helper_rule_1": "10 znaków",
-  "zimbra_account_add_input_password_helper_rule_2": "1 cyfrę lub znak specjalny (€, !, &amp;,etc.)",
+  "zimbra_account_add_input_password_helper_rule_2": "1 cyfra i 1 znak specjalny ($, !, &amp;,...)",
   "zimbra_account_add_input_password_helper_rule_3": "1 dużą literę",
   "zimbra_account_add_input_mandatory": "Pola oznaczone gwiazdką * są obowiązkowe",
   "zimbra_account_add_button_save": "Zapisz",
diff --git a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_pt_PT.json b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_pt_PT.json
index 2ed6240b4feb..0bb6907ab69b 100644
--- a/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_pt_PT.json
+++ b/packages/manager/apps/zimbra/public/translations/accounts/addAndEdit/Messages_pt_PT.json
@@ -23,7 +23,7 @@
   "zimbra_account_add_input_password_label": "Palavra-passe",
   "zimbra_account_add_input_password_helper": "A sua palavra-passe deve conter, no mínimo:",
   "zimbra_account_add_input_password_helper_rule_1": "10 caracteres",
-  "zimbra_account_add_input_password_helper_rule_2": "1 algarismo ou caráter especial (€, !, &amp;,...)",
+  "zimbra_account_add_input_password_helper_rule_2": "1 número e 1 caráter especial ($,!, &amp;,...)",
   "zimbra_account_add_input_password_helper_rule_3": "1 letra maiúscula",
   "zimbra_account_add_input_mandatory": "Os campos marcados com um asterisco são de preenchimento obrigatório",
   "zimbra_account_add_button_save": "Guardar ",
diff --git a/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_de_DE.json b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_de_DE.json
new file mode 100644
index 000000000000..677dd3841b17
--- /dev/null
+++ b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_de_DE.json
@@ -0,0 +1,8 @@
+{
+  "zimbra_auto_replies_delete_success_message": "Ihre Anfrage zur Löschung wurde registriert. Sie wird in einigen Augenblicken ausgeführt.",
+  "zimbra_auto_replies_delete_error_message": "Ihre Anfrage zum Löschen konnte nicht abgeschlossen werden. Bitte versuchen Sie es in einigen Augenblicken erneut.",
+  "zimbra_auto_replies_delete_modal_title": "Eine Auto-Antwort löschen",
+  "zimbra_auto_replies_delete_cancel": "Abbrechen",
+  "zimbra_auto_replies_delete_cta": "Löschen",
+  "zimbra_auto_replies_delete_modal_content": "Sind Sie sicher, dass Sie die Auto-Antwort löschen möchten?"
+}
diff --git a/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_en_GB.json b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_en_GB.json
new file mode 100644
index 000000000000..ff8f76363b82
--- /dev/null
+++ b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_en_GB.json
@@ -0,0 +1,8 @@
+{
+  "zimbra_auto_replies_delete_success_message": "Your deletion request has been processed. It will be executed in a few moments.",
+  "zimbra_auto_replies_delete_error_message": "Your deletion request could not be completed. Please try again in a few moments.",
+  "zimbra_auto_replies_delete_modal_title": "Delete an auto-reply",
+  "zimbra_auto_replies_delete_cancel": "Cancel",
+  "zimbra_auto_replies_delete_cta": "Delete",
+  "zimbra_auto_replies_delete_modal_content": "Are you sure you want to delete the auto-reply?"
+}
diff --git a/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_es_ES.json b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_es_ES.json
new file mode 100644
index 000000000000..05822f40019a
--- /dev/null
+++ b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_es_ES.json
@@ -0,0 +1,8 @@
+{
+  "zimbra_auto_replies_delete_success_message": "La solicitud de eliminación se ha enviado. Va a ejecutarse.",
+  "zimbra_auto_replies_delete_error_message": "No se ha podido completar la solicitud de eliminación. Por favor, vuelva a intentarlo en unos instantes.",
+  "zimbra_auto_replies_delete_modal_title": "Eliminar un contestador",
+  "zimbra_auto_replies_delete_cancel": "Cancelar",
+  "zimbra_auto_replies_delete_cta": "Eliminar",
+  "zimbra_auto_replies_delete_modal_content": "¿Seguro que quiere eliminar el contestador?"
+}
diff --git a/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_fr_CA.json b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_fr_CA.json
new file mode 100644
index 000000000000..fab2b877c075
--- /dev/null
+++ b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_fr_CA.json
@@ -0,0 +1,8 @@
+{
+  "zimbra_auto_replies_delete_success_message": "Votre demande de suppression a bien été prise en compte. Elle sera exécutée d'ici quelques instants.",
+  "zimbra_auto_replies_delete_error_message": "Votre demande de suppression n'a pas pu aboutir. Merci de réessayer dans quelques instants.",
+  "zimbra_auto_replies_delete_modal_title": "Supprimer un répondeur",
+  "zimbra_auto_replies_delete_cancel": "Annuler",
+  "zimbra_auto_replies_delete_cta": "Supprimer",
+  "zimbra_auto_replies_delete_modal_content": "Êtes-vous sûr de vouloir supprimer le répondeur ?"
+}
diff --git a/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_fr_FR.json b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_fr_FR.json
new file mode 100644
index 000000000000..fab2b877c075
--- /dev/null
+++ b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_fr_FR.json
@@ -0,0 +1,8 @@
+{
+  "zimbra_auto_replies_delete_success_message": "Votre demande de suppression a bien été prise en compte. Elle sera exécutée d'ici quelques instants.",
+  "zimbra_auto_replies_delete_error_message": "Votre demande de suppression n'a pas pu aboutir. Merci de réessayer dans quelques instants.",
+  "zimbra_auto_replies_delete_modal_title": "Supprimer un répondeur",
+  "zimbra_auto_replies_delete_cancel": "Annuler",
+  "zimbra_auto_replies_delete_cta": "Supprimer",
+  "zimbra_auto_replies_delete_modal_content": "Êtes-vous sûr de vouloir supprimer le répondeur ?"
+}
diff --git a/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_it_IT.json b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_it_IT.json
new file mode 100644
index 000000000000..2a8fce24b5f7
--- /dev/null
+++ b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_it_IT.json
@@ -0,0 +1,8 @@
+{
+  "zimbra_auto_replies_delete_success_message": "La richiesta di eliminazione è stata presa in carico. Sarà eseguita entro pochi minuti.",
+  "zimbra_auto_replies_delete_error_message": "Impossibile completare la richiesta di eliminazione. Ti preghiamo di riprovare più tardi.",
+  "zimbra_auto_replies_delete_modal_title": "Elimina una risposta automatica",
+  "zimbra_auto_replies_delete_cancel": "Annulla",
+  "zimbra_auto_replies_delete_cta": "Eliminare",
+  "zimbra_auto_replies_delete_modal_content": "Vuoi davvero eliminare la risposta automatica?"
+}
diff --git a/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_pl_PL.json b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_pl_PL.json
new file mode 100644
index 000000000000..f8f658687d9c
--- /dev/null
+++ b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_pl_PL.json
@@ -0,0 +1,8 @@
+{
+  "zimbra_auto_replies_delete_success_message": "Zlecenie usunięcia zostało przyjęte. Zostanie ona wykonana w ciągu kilku minut.",
+  "zimbra_auto_replies_delete_error_message": "Zlecenie usunięcia nie powiodło się. Spróbuj ponownie za kilka minut.",
+  "zimbra_auto_replies_delete_modal_title": "Usuń autoresponder",
+  "zimbra_auto_replies_delete_cancel": "Anuluj",
+  "zimbra_auto_replies_delete_cta": "Usuń",
+  "zimbra_auto_replies_delete_modal_content": "Czy na pewno chcesz usunąć autoresponder?"
+}
diff --git a/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_pt_PT.json b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_pt_PT.json
new file mode 100644
index 000000000000..a43cd352a07d
--- /dev/null
+++ b/packages/manager/apps/zimbra/public/translations/autoReplies/delete/Messages_pt_PT.json
@@ -0,0 +1,8 @@
+{
+  "zimbra_auto_replies_delete_success_message": "O seu pedido de eliminação foi corretamente tomado em conta. Será executada dentro de alguns instantes.",
+  "zimbra_auto_replies_delete_error_message": "O seu pedido de eliminação não foi bem-sucedido. Tente novamente mais tarde.",
+  "zimbra_auto_replies_delete_modal_title": "Eliminar uma resposta automática",
+  "zimbra_auto_replies_delete_cancel": "Anular",
+  "zimbra_auto_replies_delete_cta": "Suprimir",
+  "zimbra_auto_replies_delete_modal_content": "Tem a certeza de que quer eliminar a resposta automática?"
+}
diff --git a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_de_DE.json b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_de_DE.json
index 72cb8380079e..0f8196c300ef 100644
--- a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_de_DE.json
+++ b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_de_DE.json
@@ -51,5 +51,6 @@
   "zimbra_dashboard_redirections": "Weiterleitungen",
   "zimbra_dashboard_redirections_edit": "Weiterleitung bearbeiten",
   "zimbra_dashboard_redirections_delete": "Die Weiterleitung löschen",
-  "zimbra_dashboard_auto_replies": "Automatische Antworten"
+  "zimbra_dashboard_auto_replies": "Automatische Antworten",
+  "zimbra_dashboard_auto_replies_delete": "Eine Auto-Antwort löschen"
 }
diff --git a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_en_GB.json b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_en_GB.json
index a13494fcec21..1b8823462c87 100644
--- a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_en_GB.json
+++ b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_en_GB.json
@@ -51,5 +51,6 @@
   "zimbra_dashboard_redirections": "Redirections",
   "zimbra_dashboard_redirections_edit": "Modify redirection",
   "zimbra_dashboard_redirections_delete": "Delete redirection",
-  "zimbra_dashboard_auto_replies": "Auto-replies"
+  "zimbra_dashboard_auto_replies": "Auto-replies",
+  "zimbra_dashboard_auto_replies_delete": "Delete an auto-reply"
 }
diff --git a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_es_ES.json b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_es_ES.json
index 5f65e5c1cea5..15a971d97dd5 100644
--- a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_es_ES.json
+++ b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_es_ES.json
@@ -51,5 +51,6 @@
   "zimbra_dashboard_redirections": "Redirecciones",
   "zimbra_dashboard_redirections_edit": "Editar la redirección",
   "zimbra_dashboard_redirections_delete": "Eliminar la redirección",
-  "zimbra_dashboard_auto_replies": "Contestadores"
+  "zimbra_dashboard_auto_replies": "Contestadores",
+  "zimbra_dashboard_auto_replies_delete": "Eliminar un contestador"
 }
diff --git a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_fr_CA.json b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_fr_CA.json
index e52b1af6a220..dee4eb8abeea 100644
--- a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_fr_CA.json
+++ b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_fr_CA.json
@@ -43,5 +43,6 @@
   "zimbra_dashboard_tile_serviceConsumption_accountOffer": "Compte par offre",
   "zimbra_dashboard_tile_serviceConsumption_noAccountOffer": "Vous ne possedez actuellement aucune boite email.",
   "zimbra_dashboard_tile_usefulLinks_title": "Liens utiles",
-  "zimbra_dashboard_auto_replies": "Répondeurs"
+  "zimbra_dashboard_auto_replies": "Répondeurs",
+  "zimbra_dashboard_auto_replies_delete": "Supprimer un répondeur"
 }
diff --git a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_fr_FR.json b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_fr_FR.json
index e52b1af6a220..dee4eb8abeea 100644
--- a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_fr_FR.json
+++ b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_fr_FR.json
@@ -43,5 +43,6 @@
   "zimbra_dashboard_tile_serviceConsumption_accountOffer": "Compte par offre",
   "zimbra_dashboard_tile_serviceConsumption_noAccountOffer": "Vous ne possedez actuellement aucune boite email.",
   "zimbra_dashboard_tile_usefulLinks_title": "Liens utiles",
-  "zimbra_dashboard_auto_replies": "Répondeurs"
+  "zimbra_dashboard_auto_replies": "Répondeurs",
+  "zimbra_dashboard_auto_replies_delete": "Supprimer un répondeur"
 }
diff --git a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_it_IT.json b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_it_IT.json
index 0222ca571064..c884c7721359 100644
--- a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_it_IT.json
+++ b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_it_IT.json
@@ -51,5 +51,6 @@
   "zimbra_dashboard_redirections": "Reindirizzamenti",
   "zimbra_dashboard_redirections_edit": "Modifica il reindirizzamento",
   "zimbra_dashboard_redirections_delete": "Elimina il reindirizzamento",
-  "zimbra_dashboard_auto_replies": "Risposte automatiche"
+  "zimbra_dashboard_auto_replies": "Risposte automatiche",
+  "zimbra_dashboard_auto_replies_delete": "Elimina una risposta automatica"
 }
diff --git a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_pl_PL.json b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_pl_PL.json
index 7984ba1501cb..1007f298d129 100644
--- a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_pl_PL.json
+++ b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_pl_PL.json
@@ -51,5 +51,6 @@
   "zimbra_dashboard_redirections": "Przekierowania",
   "zimbra_dashboard_redirections_edit": "Zmodyfikuj przekierowanie",
   "zimbra_dashboard_redirections_delete": "Usuń przekierowanie",
-  "zimbra_dashboard_auto_replies": "Autoresponder"
+  "zimbra_dashboard_auto_replies": "Autoresponder",
+  "zimbra_dashboard_auto_replies_delete": "Usuń autoresponder"
 }
diff --git a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_pt_PT.json b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_pt_PT.json
index 51785f4eb848..09187d58ef9c 100644
--- a/packages/manager/apps/zimbra/public/translations/dashboard/Messages_pt_PT.json
+++ b/packages/manager/apps/zimbra/public/translations/dashboard/Messages_pt_PT.json
@@ -51,5 +51,6 @@
   "zimbra_dashboard_redirections": "Reencaminhamentos",
   "zimbra_dashboard_redirections_edit": "Modificar o reencaminhamento",
   "zimbra_dashboard_redirections_delete": "Eliminar o reencaminhamento",
-  "zimbra_dashboard_auto_replies": "Respostas automáticas"
+  "zimbra_dashboard_auto_replies": "Respostas automáticas",
+  "zimbra_dashboard_auto_replies_delete": "Eliminar uma resposta automática"
 }
diff --git a/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/ActionButtonAutoReply.component.tsx b/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/ActionButtonAutoReply.component.tsx
new file mode 100644
index 000000000000..ceae0fe3091a
--- /dev/null
+++ b/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/ActionButtonAutoReply.component.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { ManagerButton } from '@ovh-ux/manager-react-components';
+import { useSearchParams } from 'react-router-dom';
+import {
+  ODS_BUTTON_VARIANT,
+  ODS_ICON_NAME,
+  ODS_ICON_SIZE,
+} from '@ovhcloud/ods-components';
+
+import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
+import { OsdsIcon } from '@ovhcloud/ods-components/react';
+import { AutoRepliesItem } from './AutoReplies';
+import { useGenerateUrl, usePlatform } from '@/hooks';
+import { IAM_ACTIONS } from '@/utils/iamAction.constants';
+import { ResourceStatus } from '@/api/api.type';
+
+interface ActionButtonAutoReplyProps {
+  autoReplyItem: AutoRepliesItem;
+}
+
+const ActionButtonAutoReply: React.FC<ActionButtonAutoReplyProps> = ({
+  autoReplyItem,
+}) => {
+  const { platformUrn } = usePlatform();
+
+  const [searchParams] = useSearchParams();
+  const params = Object.fromEntries(searchParams.entries());
+
+  const hrefDeleteAutoReply = useGenerateUrl('./delete', 'href', {
+    deleteAutoReplyId: autoReplyItem.id,
+    ...params,
+  });
+
+  return (
+    <ManagerButton
+      href={hrefDeleteAutoReply}
+      inline
+      urn={platformUrn}
+      iamActions={[/* replace it with autoreply */ IAM_ACTIONS.account.delete]}
+      disabled={autoReplyItem.status !== ResourceStatus.READY ? true : null}
+      variant={ODS_BUTTON_VARIANT.ghost}
+      color={ODS_THEME_COLOR_INTENT.primary}
+    >
+      <OsdsIcon
+        name={ODS_ICON_NAME.BIN}
+        size={ODS_ICON_SIZE.xs}
+        color={ODS_THEME_COLOR_INTENT.primary}
+      ></OsdsIcon>
+    </ManagerButton>
+  );
+};
+
+export default ActionButtonAutoReply;
diff --git a/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/AutoReplies.tsx b/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/AutoReplies.tsx
index ee01b5ead825..d57a948f5489 100644
--- a/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/AutoReplies.tsx
+++ b/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/AutoReplies.tsx
@@ -3,17 +3,11 @@ import {
   DatagridColumn,
   Notifications,
 } from '@ovh-ux/manager-react-components';
-import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
-import {
-  ODS_BUTTON_SIZE,
-  ODS_BUTTON_VARIANT,
-  ODS_ICON_NAME,
-  ODS_ICON_SIZE,
-} from '@ovhcloud/ods-components';
-import { OsdsButton, OsdsIcon } from '@ovhcloud/ods-components/react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Outlet } from 'react-router-dom';
+import ActionButtonAutoReply from './ActionButtonAutoReply.component';
+import { ResourceStatus } from '@/api/api.type';
 
 export type AutoRepliesItem = {
   id: string;
@@ -21,6 +15,7 @@ export type AutoRepliesItem = {
   from: string;
   until: string;
   copyTo: string;
+  status: ResourceStatus;
 };
 
 const items: AutoRepliesItem[] = [
@@ -30,6 +25,7 @@ const items: AutoRepliesItem[] = [
     from: '11/02/2023',
     until: '11/02/2024',
     copyTo: 'copy@example1.com',
+    status: ResourceStatus.READY,
   },
   {
     id: '2',
@@ -37,6 +33,7 @@ const items: AutoRepliesItem[] = [
     from: '11/03/2023',
     until: '11/03/2024',
     copyTo: 'copy@example2.com',
+    status: ResourceStatus.ERROR,
   },
 ];
 const columns: DatagridColumn<AutoRepliesItem>[] = [
@@ -62,20 +59,7 @@ const columns: DatagridColumn<AutoRepliesItem>[] = [
   },
   {
     id: 'deleteButton',
-    cell: () => (
-      <OsdsButton
-        inline
-        size={ODS_BUTTON_SIZE.sm}
-        color={ODS_THEME_COLOR_INTENT.primary}
-        variant={ODS_BUTTON_VARIANT.ghost}
-      >
-        <OsdsIcon
-          name={ODS_ICON_NAME.BIN}
-          size={ODS_ICON_SIZE.xs}
-          color={ODS_THEME_COLOR_INTENT.primary}
-        ></OsdsIcon>
-      </OsdsButton>
-    ),
+    cell: (item) => <ActionButtonAutoReply autoReplyItem={item} />,
     label: '',
   },
 ];
diff --git a/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/ModalDeleteAutoReply.component.tsx b/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/ModalDeleteAutoReply.component.tsx
new file mode 100644
index 000000000000..a9f86e808596
--- /dev/null
+++ b/packages/manager/apps/zimbra/src/pages/dashboard/AutoReplies/ModalDeleteAutoReply.component.tsx
@@ -0,0 +1,110 @@
+import React from 'react';
+import { useSearchParams, useNavigate } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+import {
+  ODS_THEME_COLOR_INTENT,
+  ODS_THEME_TYPOGRAPHY_SIZE,
+  ODS_THEME_TYPOGRAPHY_LEVEL,
+  ODS_THEME_COLOR_HUE,
+} from '@ovhcloud/ods-common-theming';
+import { OsdsText } from '@ovhcloud/ods-components/react';
+import { useNotifications } from '@ovh-ux/manager-react-components';
+import { ApiError } from '@ovh-ux/manager-core-api';
+import { useMutation } from '@tanstack/react-query';
+import { ODS_BUTTON_VARIANT } from '@ovhcloud/ods-components';
+import { useGenerateUrl } from '@/hooks';
+import Modal from '@/components/Modals/Modal';
+
+export default function ModalDeleteDomain() {
+  const { t } = useTranslation('autoReplies/delete');
+  const navigate = useNavigate();
+
+  const [searchParams] = useSearchParams();
+  const deleteAutoReplyId = searchParams.get('deleteAutoReplyId');
+
+  const { addError, addSuccess } = useNotifications();
+
+  const goBackUrl = useGenerateUrl('..', 'path');
+  const onClose = () => navigate(goBackUrl);
+
+  const { mutate: deleteAutoReply, isPending: isSending } = useMutation({
+    mutationFn: (autoReplyId: string) => {
+      // call api
+      return Promise.resolve(autoReplyId);
+    },
+    onSuccess: () => {
+      addSuccess(
+        <OsdsText
+          color={ODS_THEME_COLOR_INTENT.text}
+          size={ODS_THEME_TYPOGRAPHY_SIZE._100}
+          level={ODS_THEME_TYPOGRAPHY_LEVEL.body}
+          hue={ODS_THEME_COLOR_HUE._500}
+        >
+          {t('zimbra_auto_replies_delete_success_message')}
+        </OsdsText>,
+        true,
+      );
+    },
+    onError: (error: ApiError) => {
+      addError(
+        <OsdsText
+          color={ODS_THEME_COLOR_INTENT.text}
+          size={ODS_THEME_TYPOGRAPHY_SIZE._100}
+          level={ODS_THEME_TYPOGRAPHY_LEVEL.body}
+          hue={ODS_THEME_COLOR_HUE._500}
+        >
+          {t('zimbra_auto_replies_delete_error_message', {
+            error: error?.response?.data?.message,
+          })}
+        </OsdsText>,
+        true,
+      );
+    },
+    onSettled: () => {
+      /* queryClient.invalidateQueries({
+        queryKey: getZimbraPlatformAutoRepliesQueryKey(platformId),
+      }); */
+
+      onClose();
+    },
+  });
+
+  const handleDeleteClick = () => {
+    deleteAutoReply(deleteAutoReplyId as string);
+  };
+
+  return (
+    <Modal
+      title={t('zimbra_auto_replies_delete_modal_title')}
+      color={ODS_THEME_COLOR_INTENT.error}
+      onDismissible={onClose}
+      dismissible={true}
+      secondaryButton={{
+        label: t('zimbra_auto_replies_delete_cancel'),
+        action: onClose,
+        testid: 'cancel-btn',
+        color: ODS_THEME_COLOR_INTENT.error,
+        variant: ODS_BUTTON_VARIANT.stroked,
+      }}
+      primaryButton={{
+        label: t('zimbra_auto_replies_delete_cta'),
+        action: handleDeleteClick,
+        disabled: isSending || !deleteAutoReplyId,
+        testid: 'delete-btn',
+        color: ODS_THEME_COLOR_INTENT.error,
+        variant: ODS_BUTTON_VARIANT.flat,
+      }}
+    >
+      <>
+        <OsdsText
+          color={ODS_THEME_COLOR_INTENT.text}
+          size={ODS_THEME_TYPOGRAPHY_SIZE._400}
+          level={ODS_THEME_TYPOGRAPHY_LEVEL.body}
+          hue={ODS_THEME_COLOR_HUE._500}
+        >
+          {t('zimbra_auto_replies_delete_modal_content')}
+        </OsdsText>
+      </>
+    </Modal>
+  );
+}
diff --git a/packages/manager/apps/zimbra/src/pages/dashboard/EmailAccounts/__test__/AddAndEditEmailAccount.spec.tsx b/packages/manager/apps/zimbra/src/pages/dashboard/EmailAccounts/__test__/AddAndEditEmailAccount.spec.tsx
index 5172b2574a21..142bcd98b720 100644
--- a/packages/manager/apps/zimbra/src/pages/dashboard/EmailAccounts/__test__/AddAndEditEmailAccount.spec.tsx
+++ b/packages/manager/apps/zimbra/src/pages/dashboard/EmailAccounts/__test__/AddAndEditEmailAccount.spec.tsx
@@ -143,8 +143,8 @@ describe('email account add and edit page', () => {
       });
     });
 
-    expect(inputPassword).toHaveAttribute('color', 'default');
-    expect(button).toBeEnabled();
+    expect(inputPassword).toHaveAttribute('color', 'error');
+    expect(button).toBeDisabled();
 
     await act(() => {
       // No uppercased + digit or special + 10 characters total
@@ -155,7 +155,7 @@ describe('email account add and edit page', () => {
     });
 
     expect(inputPassword).toHaveAttribute('color', 'error');
-    expect(button).not.toBeEnabled();
+    expect(button).toBeDisabled();
 
     await act(() => {
       // Uppercased + special + 10 characters total
@@ -165,8 +165,8 @@ describe('email account add and edit page', () => {
       });
     });
 
-    expect(inputPassword).toHaveAttribute('color', 'default');
-    expect(button).toBeEnabled();
+    expect(inputPassword).toHaveAttribute('color', 'error');
+    expect(button).toBeDisabled();
 
     await act(() => {
       // Uppercased + digit or special but 9 characters total
@@ -177,6 +177,17 @@ describe('email account add and edit page', () => {
     });
 
     expect(inputPassword).toHaveAttribute('color', 'error');
-    expect(button).not.toBeEnabled();
+    expect(button).toBeDisabled();
+
+    await act(() => {
+      // Uppercased + digit AND special + 10 characters total
+      inputPassword.odsValueChange.emit({
+        name: 'password',
+        value: 'Aaaaaaa1#a',
+      });
+    });
+
+    expect(inputPassword).toHaveAttribute('color', 'default');
+    expect(button).toBeEnabled();
   });
 });
diff --git a/packages/manager/apps/zimbra/src/pages/dashboard/EmailAccounts/account.constants.ts b/packages/manager/apps/zimbra/src/pages/dashboard/EmailAccounts/account.constants.ts
index 8eb4e82b4c13..e03de1e08d7d 100644
--- a/packages/manager/apps/zimbra/src/pages/dashboard/EmailAccounts/account.constants.ts
+++ b/packages/manager/apps/zimbra/src/pages/dashboard/EmailAccounts/account.constants.ts
@@ -3,5 +3,5 @@ import { FormInputRegexInterface } from '@/utils';
 export const formInputRegex: FormInputRegexInterface = {
   alias: /^(?:[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*)(?:(?:[.|+])(?:[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*))*$/,
   account: /^(?:[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*)(?:(?:[.|+])(?:[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*))*$/,
-  password: /^(?=.*[\d!@#$€%^&*()\\[\]{}\-_+=~`|:;"'<>,./?])(?=.*[A-Z])(?=(.*)).{10,64}$/,
+  password: /^(?=.*[!@#$%^&*()\\[\]{}\-_+=~`|:;"'<>,./?])(?=.*\d)(?=.*[A-Z])(?=(.*)).{10,64}$/,
 };
diff --git a/packages/manager/apps/zimbra/src/routes/routes.constants.ts b/packages/manager/apps/zimbra/src/routes/routes.constants.ts
index ec6aae1e1864..0144fde427ea 100644
--- a/packages/manager/apps/zimbra/src/routes/routes.constants.ts
+++ b/packages/manager/apps/zimbra/src/routes/routes.constants.ts
@@ -34,4 +34,5 @@ export const urls = {
   redirections_edit: '/:serviceName/redirections/edit',
   redirections_delete: '/:serviceName/redirections/delete',
   auto_replies: '/:serviceName/auto_replies',
+  auto_replies_delete: '/:serviceName/auto_replies/delete',
 };
diff --git a/packages/manager/apps/zimbra/src/routes/routes.tsx b/packages/manager/apps/zimbra/src/routes/routes.tsx
index 0ea36f3af209..c9968a57a05f 100644
--- a/packages/manager/apps/zimbra/src/routes/routes.tsx
+++ b/packages/manager/apps/zimbra/src/routes/routes.tsx
@@ -260,6 +260,17 @@ export const Routes: any = [
             ...lazyRouteConfig(() =>
               import('@/pages/dashboard/AutoReplies/AutoReplies'),
             ),
+            children: [
+              {
+                path: 'delete',
+                ...lazyRouteConfig(() =>
+                  import(
+                    '@/pages/dashboard/AutoReplies/ModalDeleteAutoReply.component'
+                  ),
+                ),
+                handle: { isOverridePage: true },
+              },
+            ],
           },
         ],
       },
diff --git a/packages/manager/apps/zimbra/src/utils/iamAction.constants.ts b/packages/manager/apps/zimbra/src/utils/iamAction.constants.ts
index a678e8f37993..c31fc82f84e1 100644
--- a/packages/manager/apps/zimbra/src/utils/iamAction.constants.ts
+++ b/packages/manager/apps/zimbra/src/utils/iamAction.constants.ts
@@ -11,6 +11,11 @@ export const IAM_ACTIONS = {
     create: `${IAM_ACTIONS_PREFIX}alias/create`,
     delete: `${IAM_ACTIONS_PREFIX}alias/delete`,
   },
+  autoReply: {
+    create: `${IAM_ACTIONS_PREFIX}autoReply/create`,
+    delete: `${IAM_ACTIONS_PREFIX}autoReply/delete`,
+    edit: `${IAM_ACTIONS_PREFIX}autoReply/edit`,
+  },
   domain: {
     create: `${IAM_ACTIONS_PREFIX}domain/create`,
     delete: `${IAM_ACTIONS_PREFIX}domain/delete`,
diff --git a/packages/manager/apps/zimbra/src/utils/test.provider.tsx b/packages/manager/apps/zimbra/src/utils/test.provider.tsx
index 73a0afa2c379..85d1ee0ef05a 100644
--- a/packages/manager/apps/zimbra/src/utils/test.provider.tsx
+++ b/packages/manager/apps/zimbra/src/utils/test.provider.tsx
@@ -29,6 +29,8 @@ import redirectionsTranslation from '@/public/translations/redirections/Messages
 import redirectionsAddAndEditTranslation from '@/public/translations/redirections/addAndEdit/Messages_fr_FR.json';
 import redirectionsDeleteTranslation from '@/public/translations/redirections/delete/Messages_fr_FR.json';
 import onboardingTranslation from '@/public/translations/onboarding/Messages_fr_FR.json';
+import autoRepliesTranslation from '@/public/translations/autoReplies/Messages_fr_FR.json';
+import autoRepliesDeleteTranslation from '@/public/translations/autoReplies/delete/Messages_fr_FR.json';
 import '@testing-library/jest-dom';
 import 'element-internals-polyfill';
 
@@ -57,6 +59,8 @@ i18n.use(initReactI18next).init({
       redirections: redirectionsTranslation,
       'redirections/addAndEdit': redirectionsAddAndEditTranslation,
       'redirections/delete': redirectionsDeleteTranslation,
+      autoReplies: autoRepliesTranslation,
+      'autoReplies/delete': autoRepliesDeleteTranslation,
       onboarding: onboardingTranslation,
     },
   },
diff --git a/packages/manager/modules/exchange/src/account/account.module.js b/packages/manager/modules/exchange/src/account/account.module.js
index 862275f9b897..ea07934d00e0 100644
--- a/packages/manager/modules/exchange/src/account/account.module.js
+++ b/packages/manager/modules/exchange/src/account/account.module.js
@@ -6,7 +6,7 @@ import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
 import routing from './account.routing';
 import service from './account.service';
 
-import alias from './alias/alias.module';
+import alias from './alias/account-alias.module';
 import add from './add/add.module';
 import updateAccount from './update/update.module';
 
diff --git a/packages/manager/modules/exchange/src/account/alias/account-alias.component.js b/packages/manager/modules/exchange/src/account/alias/account-alias.component.js
deleted file mode 100644
index 5f6d3700e60e..000000000000
--- a/packages/manager/modules/exchange/src/account/alias/account-alias.component.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import controller from './account-alias.controller';
-import template from './account-alias.html';
-
-export default {
-  controller,
-  template,
-  bindings: {
-    account: '<',
-    goToAccounts: '<',
-  },
-};
diff --git a/packages/manager/modules/exchange/src/account/alias/account-alias.controller.js b/packages/manager/modules/exchange/src/account/alias/account-alias.controller.js
deleted file mode 100644
index 3bc27b216710..000000000000
--- a/packages/manager/modules/exchange/src/account/alias/account-alias.controller.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import get from 'lodash/get';
-
-export default class ExchangeAccountAliasController {
-  /* @ngInject */
-  constructor(
-    $scope,
-    wucExchange,
-    exchangeAccount,
-    exchangeStates,
-    navigation,
-    messaging,
-    $translate,
-  ) {
-    this.$scope = $scope;
-
-    this.wucExchange = wucExchange;
-    this.exchangeAccount = exchangeAccount;
-    this.exchangeStates = exchangeStates;
-    this.navigation = navigation;
-    this.messaging = messaging;
-    this.$translate = $translate;
-  }
-
-  $onInit() {
-    this.$routerParams = this.wucExchange.getParams();
-    this.aliasesParams = {};
-    this.aliasMaxLimit = this.wucExchange.aliasMaxLimit;
-
-    this.$scope.$on(this.wucExchange.events.accountsChanged, () =>
-      this.refreshList(),
-    );
-  }
-
-  getAliases({ pageSize, offset }) {
-    this.aliasesParams.pageSize = pageSize;
-    this.aliasesParams.offset = offset;
-
-    return this.wucExchange
-      .getAliases(
-        this.$routerParams.organization,
-        this.$routerParams.productId,
-        this.account.primaryEmailAddress,
-        pageSize,
-        offset - 1,
-      )
-      .then((aliases) => {
-        this.aliases = aliases.list.results;
-
-        return {
-          data: this.aliases,
-          meta: {
-            totalCount: aliases.count,
-          },
-        };
-      })
-      .catch((error) => {
-        this.messaging.writeError(
-          this.$translate.instant('exchange_tab_ALIAS_error_message'),
-          error,
-        );
-        this.hide();
-      });
-  }
-
-  refreshList() {
-    this.wucExchange
-      .getAliases(
-        this.$routerParams.organization,
-        this.$routerParams.productId,
-        this.account.primaryEmailAddress,
-        this.aliasesParams.pageSize,
-        this.aliasesParams.offset - 1,
-      )
-      .then((aliases) => {
-        for (let i = 0; i < aliases.list.results.length; i += 1) {
-          this.aliases.splice(i, 1, aliases.list.results[i]);
-        }
-
-        for (
-          let i = aliases.list.results.length;
-          i < this.aliases.length;
-          i += 1
-        ) {
-          this.aliases.splice(i, 1);
-        }
-      })
-      .catch((error) => {
-        this.messaging.writeError(
-          this.$translate.instant('exchange_tab_ALIAS_error_message'),
-          error,
-        );
-        this.hide();
-      });
-  }
-
-  hide() {
-    this.goToAccounts();
-  }
-
-  openDeletingDialog(alias) {
-    this.navigation.setAction(
-      'exchange/account/alias/remove/account-alias-remove',
-      {
-        account: this.account,
-        alias,
-      },
-    );
-  }
-
-  openAddingDialog() {
-    this.navigation.setAction(
-      'exchange/account/alias/add/account-alias-add',
-      this.account,
-    );
-  }
-
-  getAddAliasTooltip() {
-    if (get(this.aliases, 'length', 0) >= this.aliasMaxLimit) {
-      return this.$translate.instant(
-        'exchange_tab_ALIAS_add_alias_limit_tooltip',
-        {
-          t0: this.aliasMaxLimit,
-        },
-      );
-    }
-
-    return null;
-  }
-}
diff --git a/packages/manager/modules/exchange/src/account/alias/account-alias.module.js b/packages/manager/modules/exchange/src/account/alias/account-alias.module.js
new file mode 100644
index 000000000000..fd1984ab6457
--- /dev/null
+++ b/packages/manager/modules/exchange/src/account/alias/account-alias.module.js
@@ -0,0 +1,22 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import routing from './account-alias.routing';
+import aliasAddModule from './add/account-alias-add.module';
+import aliasRemoveModule from './remove/account-alias-remove.module';
+
+const moduleName = 'ovhManagerExchangeDashboardAccountAlias';
+
+angular
+  .module(moduleName, [
+    ngTranslateAsyncLoader,
+    'oui',
+    'pascalprecht.translate',
+    aliasAddModule,
+    aliasRemoveModule,
+  ])
+  .config(routing);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/account/alias/account-alias.routing.js b/packages/manager/modules/exchange/src/account/alias/account-alias.routing.js
new file mode 100644
index 000000000000..e6b2bbf06cd3
--- /dev/null
+++ b/packages/manager/modules/exchange/src/account/alias/account-alias.routing.js
@@ -0,0 +1,16 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('exchange.dashboard.account.email.alias', {
+    url: '/alias',
+    component: 'exchangeAlias',
+    resolve: {
+      aliasType: /* @ngInject */ () => 'email',
+      goBack: /* @ngInject */ ($state) => () => $state.go('^'),
+      goToAliasAdd: /* @ngInject */ ($state) => () =>
+        $state.go('exchange.dashboard.account.email.alias.add'),
+      goToAliasRemove: /* @ngInject */ ($state) => (alias) =>
+        $state.go('exchange.dashboard.account.email.alias.remove', { alias }),
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('exchange_account_alias'),
+    },
+  });
+};
diff --git a/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.html b/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.html
deleted file mode 100644
index e9faa9f97419..000000000000
--- a/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<div data-ng-controller="ExchangeAddAccountAliasCtrl as ctrl">
-    <div
-        data-wizard
-        data-wizard-bread-crumb
-        data-wizard-on-cancel="resetAction"
-        data-wizard-on-finish="addAccountAlias"
-        data-wizard-title="'exchange_tab_ALIAS_add_alias_title' | translate"
-    >
-        <div
-            data-wizard-step
-            data-wizard-step-valid="ctrl.checkAliasValidity()"
-        >
-            <oui-spinner data-ng-if="!ctrl.availableDomains"></oui-spinner>
-
-            <div data-ng-if="ctrl.availableDomains">
-                <p
-                    data-ng-bind-html="'exchange_tab_ALIAS_add_alias_intro' | translate:{ t0: ctrl.selectedAccount.primaryEmailDisplayName }"
-                ></p>
-                <div
-                    class="form-group"
-                    data-ng-class="{'has-error': ctrl.takenEmailError}"
-                >
-                    <oui-radio-group data-model="ctrl.model.radio">
-                        <oui-radio name="smtp" value="ctrl.ALIAS_TYPE.SMTP">
-                            <oui-radio-label>
-                                <span
-                                    data-ng-bind=":: ctrl.SMTP_FIELD_LABEL"
-                                ></span>
-                            </oui-radio-label>
-                            <oui-radio-description
-                                data-ng-if="ctrl.model.radio === ctrl.ALIAS_TYPE.SMTP"
-                            >
-                                <div class="input-group mt-1">
-                                    <input
-                                        type="text"
-                                        class="form-control"
-                                        maxlength="256"
-                                        name="aliasInput"
-                                        placeholder="{{'exchange_tab_ALIAS_add_alias_placeholder' | translate}}"
-                                        data-ng-change="ctrl.checkTakenEmails()"
-                                        data-ng-model="ctrl.model.alias"
-                                        data-ng-pattern="/^[-\w]+((\.|\+)[-\w]+)*$/"
-                                    />
-                                    <span class="input-group-addon">@</span>
-                                    <select
-                                        class="form-control"
-                                        data-ng-change="ctrl.checkTakenEmails()"
-                                        data-ng-model="ctrl.model.domain"
-                                        data-ng-options="domain.displayName for domain in ctrl.availableDomains | orderBy:'formattedName'"
-                                    >
-                                    </select>
-                                </div>
-                                <small
-                                    class="help-block"
-                                    data-translate="exchange_tab_ALIAS_taken_error_message"
-                                    data-ng-if="ctrl.takenEmailError"
-                                ></small>
-                            </oui-radio-description>
-                        </oui-radio>
-                        <oui-radio name="x500" value="ctrl.ALIAS_TYPE.X500">
-                            <oui-radio-label>
-                                <span
-                                    data-translate="exchange_tab_ALIAS_add_alias_x500_label"
-                                ></span>
-                            </oui-radio-label>
-                            <oui-radio-description
-                                data-ng-if="ctrl.model.radio === ctrl.ALIAS_TYPE.X500"
-                            >
-                                <div class="d-flex flex-row mt-1">
-                                    <span
-                                        class="pr-2 align-self-center font-weight-bold"
-                                        data-ng-bind=":: ctrl.X500_PREFIX"
-                                    ></span>
-                                    <input
-                                        type="text"
-                                        class="oui-input"
-                                        name="x500Input"
-                                        placeholder="{{'exchange_tab_ALIAS_add_address_placeholder' | translate}}"
-                                        data-ng-model="ctrl.model.x500"
-                                    />
-                                </div>
-                            </oui-radio-description>
-                        </oui-radio>
-                    </oui-radio-group>
-                </div>
-                <div
-                    data-translate="exchange_tab_ALIAS_add_alias_valid_{{ctrl.model.radio}}"
-                ></div>
-            </div>
-        </div>
-
-        <div data-wizard-step>
-            <p data-translate="exchange_tab_ALIAS_add_alias_step2_intro"></p>
-
-            <dl class="dl-horizontal">
-                <dt
-                    data-translate="exchange_tab_ALIAS_add_alias_step2_alias_label"
-                ></dt>
-                <dd
-                    class="word-break"
-                    data-ng-bind="ctrl.getAlias() | wucSliceContent: 150"
-                ></dd>
-
-                <dt
-                    data-translate="exchange_tab_ALIAS_add_alias_step2_account_label"
-                ></dt>
-                <dd
-                    class="word-break"
-                    data-ng-bind="ctrl.selectedAccount.primaryEmailAddress | wucSliceContent: 150"
-                ></dd>
-            </dl>
-        </div>
-    </div>
-</div>
diff --git a/packages/manager/modules/exchange/src/account/alias/alias.module.js b/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.module.js
similarity index 59%
rename from packages/manager/modules/exchange/src/account/alias/alias.module.js
rename to packages/manager/modules/exchange/src/account/alias/add/account-alias-add.module.js
index 6bdbb3e33df6..bdc4442f7ce2 100644
--- a/packages/manager/modules/exchange/src/account/alias/alias.module.js
+++ b/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.module.js
@@ -3,17 +3,13 @@ import 'angular-translate';
 import '@ovh-ux/ui-kit';
 import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
 
-import routing from './alias.routing';
-import component from './account-alias.component';
+import routing from './account-alias-add.routing';
 
-import './account-alias.styles.scss';
-
-const moduleName = 'ovhManagerExchangeDashboardAccountAlias';
+const moduleName = 'ovhManagerExchangeDashboardAccountAliasAdd';
 
 angular
   .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
   .config(routing)
-  .component('exchangeAccountAlias', component)
   .run(/* @ngTranslationsInject:json ./translations */);
 
 export default moduleName;
diff --git a/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.routing.js b/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.routing.js
new file mode 100644
index 000000000000..592e6284df56
--- /dev/null
+++ b/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.routing.js
@@ -0,0 +1,15 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('exchange.dashboard.account.email.alias.add', {
+    url: '/add',
+    views: {
+      modal: {
+        component: 'exchangeAliasAdd',
+      },
+    },
+    layout: 'modal',
+    resolve: {
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('exchange_account_alias'),
+    },
+  });
+};
diff --git a/packages/manager/modules/exchange/src/account/alias/alias.routing.js b/packages/manager/modules/exchange/src/account/alias/alias.routing.js
deleted file mode 100644
index 8235e5d2f3b8..000000000000
--- a/packages/manager/modules/exchange/src/account/alias/alias.routing.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export default /* @ngInject */ ($stateProvider) => {
-  $stateProvider.state('exchange.dashboard.account.email.alias', {
-    url: '/alias',
-    component: 'exchangeAccountAlias',
-    params: {
-      account: {},
-    },
-    resolve: {
-      account: /* @ngInject */ ($transition$) => $transition$.params().account,
-      breadcrumb: /* @ngInject */ ($translate) =>
-        $translate.instant('exchange_account_alias'),
-    },
-  });
-};
diff --git a/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.html b/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.html
deleted file mode 100644
index febc10ed0561..000000000000
--- a/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div data-ng-controller="ExchangeRemoveAliasCtrl as ctrl">
-    <div
-        data-wizard
-        data-wizard-on-cancel="resetAction"
-        data-wizard-on-finish="submit"
-        data-wizard-title="'exchange_tab_ALIAS_remove_alias_title' | translate"
-    >
-        <div data-wizard-step>
-            <p data-translate="exchange_tab_ALIAS_remove_alias_intro"></p>
-            <dl class="dl-horizontal">
-                <dt data-translate="exchange_tab_ALIAS_remove_alias_label"></dt>
-                <dd
-                    class="word-break"
-                    data-ng-bind="ctrl.alias.displayName | wucSliceContent: 150"
-                ></dd>
-
-                <dt
-                    data-translate="exchange_tab_ALIAS_remove_account_label"
-                ></dt>
-                <dd
-                    class="word-break"
-                    data-ng-bind="ctrl.account.primaryEmailDisplayName | wucSliceContent: 150"
-                ></dd>
-            </dl>
-        </div>
-    </div>
-</div>
diff --git a/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.module.js b/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.module.js
new file mode 100644
index 000000000000..dc042db13d28
--- /dev/null
+++ b/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.module.js
@@ -0,0 +1,15 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import routing from './account-alias-remove.routing';
+
+const moduleName = 'ovhManagerExchangeDashboardAccountAliasRemove';
+
+angular
+  .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
+  .config(routing)
+  .run(/* @ngTranslationsInject:json ./translations */);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.routing.js b/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.routing.js
new file mode 100644
index 000000000000..2ee9da451d56
--- /dev/null
+++ b/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.routing.js
@@ -0,0 +1,15 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('exchange.dashboard.account.email.alias.remove', {
+    url: '/remove?alias',
+    views: {
+      modal: {
+        component: 'exchangeAliasRemove',
+      },
+    },
+    layout: 'modal',
+    resolve: {
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('exchange_account_alias'),
+    },
+  });
+};
diff --git a/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.component.js b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.component.js
new file mode 100644
index 000000000000..8172c23df4ce
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.component.js
@@ -0,0 +1,11 @@
+import controller from './exchange-alias-add.controller';
+import template from './exchange-alias-add.html';
+
+export default {
+  controller,
+  template,
+  bindings: {
+    goBack: '<',
+    aliasType: '<',
+  },
+};
diff --git a/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.constants.js b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.constants.js
similarity index 82%
rename from packages/manager/modules/exchange/src/account/alias/add/account-alias-add.constants.js
rename to packages/manager/modules/exchange/src/alias/add/exchange-alias-add.constants.js
index f0600312ff8b..b09b9fbb5e64 100644
--- a/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.constants.js
+++ b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.constants.js
@@ -1,6 +1,9 @@
 export const ALIAS_TYPE = {
   SMTP: 'smtp',
   X500: 'x500',
+  email: 'ACCOUNT',
+  group: 'MAILING_LIST',
+  shared: 'SHARED_ACCOUNT',
 };
 
 export const SMTP_FIELD_LABEL = 'SMTP (standard)';
diff --git a/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.controller.js b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.controller.js
similarity index 88%
rename from packages/manager/modules/exchange/src/account/alias/add/account-alias-add.controller.js
rename to packages/manager/modules/exchange/src/alias/add/exchange-alias-add.controller.js
index c1f88f3b9ce6..e70739494fee 100644
--- a/packages/manager/modules/exchange/src/account/alias/add/account-alias-add.controller.js
+++ b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.controller.js
@@ -8,21 +8,20 @@ import {
   SMTP_FIELD_LABEL,
   X500_PREFIX,
   X500_REGEX,
-} from './account-alias-add.constants';
+} from './exchange-alias-add.constants';
+import { ALIAS_TYPE_FOR_API_PATH } from '../exchange-alias.constants';
 
 export default class ExchangeAddAccountAliasCtrl {
   /* @ngInject */
-  constructor($scope, wucExchange, navigation, messaging, $translate) {
+  constructor($scope, wucExchange, messaging, $translate) {
     this.services = {
       $scope,
       wucExchange,
-      navigation,
       messaging,
       $translate,
     };
 
     this.$routerParams = wucExchange.getParams();
-    this.selectedAccount = navigation.currentActionData;
     this.data = null;
     this.SMTP_FIELD_LABEL = SMTP_FIELD_LABEL;
     this.ALIAS_TYPE = ALIAS_TYPE;
@@ -36,7 +35,9 @@ export default class ExchangeAddAccountAliasCtrl {
 
     $scope.addAccountAlias = () => this.addAccountAlias();
     $scope.aliasIsValid = () => this.aliasIsValid();
+  }
 
+  $onInit() {
     this.loadDomainData();
   }
 
@@ -45,8 +46,8 @@ export default class ExchangeAddAccountAliasCtrl {
       .getNewAliasOptions(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.selectedAccount.primaryEmailAddress,
-        'ACCOUNT',
+        this.$routerParams[this.aliasType],
+        ALIAS_TYPE[this.aliasType],
       )
       .then((data) => {
         if (isEmpty(data.availableDomains)) {
@@ -55,7 +56,7 @@ export default class ExchangeAddAccountAliasCtrl {
               'exchange_tab_ALIAS_add_no_domains',
             ),
           );
-          this.services.navigation.resetAction();
+          this.goBack();
         } else {
           this.availableDomains = data.availableDomains;
           this.takenEmails = data.takenEmails;
@@ -69,7 +70,7 @@ export default class ExchangeAddAccountAliasCtrl {
           ),
           err,
         );
-        this.services.navigation.resetAction();
+        this.goBack();
       });
   }
 
@@ -99,7 +100,8 @@ export default class ExchangeAddAccountAliasCtrl {
       .addAlias(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.selectedAccount.primaryEmailAddress,
+        this.$routerParams[this.aliasType],
+        ALIAS_TYPE_FOR_API_PATH[this.aliasType],
         this.getAlias(this.model),
       )
       .then(() => {
@@ -118,7 +120,7 @@ export default class ExchangeAddAccountAliasCtrl {
         );
       })
       .finally(() => {
-        this.services.navigation.resetAction();
+        this.goBack();
       });
   }
 
diff --git a/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.html b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.html
new file mode 100644
index 000000000000..e37bbd225f31
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.html
@@ -0,0 +1,109 @@
+<div
+    data-wizard
+    data-wizard-bread-crumb
+    data-wizard-on-cancel="$ctrl.goBack"
+    data-wizard-on-finish="addAccountAlias"
+    data-wizard-title="'exchange_tab_ALIAS_add_alias_title' | translate"
+>
+    <div data-wizard-step data-wizard-step-valid="$ctrl.checkAliasValidity()">
+        <oui-spinner data-ng-if="!$ctrl.availableDomains"></oui-spinner>
+
+        <div data-ng-if="$ctrl.availableDomains">
+            <p
+                data-ng-bind-html="'exchange_tab_ALIAS_add_alias_intro' | translate:{ t0: $ctrl.$routerParams[$ctrl.aliasType] }"
+            ></p>
+            <div
+                class="form-group"
+                data-ng-class="{'has-error': $ctrl.takenEmailError}"
+            >
+                <oui-radio-group data-model="$ctrl.model.radio">
+                    <oui-radio name="smtp" value="$ctrl.ALIAS_TYPE.SMTP">
+                        <oui-radio-label>
+                            <span
+                                data-ng-bind=":: $ctrl.SMTP_FIELD_LABEL"
+                            ></span>
+                        </oui-radio-label>
+                        <oui-radio-description
+                            data-ng-if="$ctrl.model.radio === $ctrl.ALIAS_TYPE.SMTP"
+                        >
+                            <div class="input-group mt-1">
+                                <input
+                                    type="text"
+                                    class="form-control"
+                                    maxlength="256"
+                                    name="aliasInput"
+                                    placeholder="{{'exchange_tab_ALIAS_add_alias_placeholder' | translate}}"
+                                    data-ng-change="$ctrl.checkTakenEmails()"
+                                    data-ng-model="$ctrl.model.alias"
+                                    data-ng-pattern="/^[-\w]+((\.|\+)[-\w]+)*$/"
+                                />
+                                <span class="input-group-addon">@</span>
+                                <select
+                                    class="form-control"
+                                    data-ng-change="$ctrl.checkTakenEmails()"
+                                    data-ng-model="$ctrl.model.domain"
+                                    data-ng-options="domain.displayName for domain in $ctrl.availableDomains | orderBy:'formattedName'"
+                                >
+                                </select>
+                            </div>
+                            <small
+                                class="help-block"
+                                data-translate="exchange_tab_ALIAS_taken_error_message"
+                                data-ng-if="$ctrl.takenEmailError"
+                            ></small>
+                        </oui-radio-description>
+                    </oui-radio>
+                    <oui-radio name="x500" value="$ctrl.ALIAS_TYPE.X500">
+                        <oui-radio-label>
+                            <span
+                                data-translate="exchange_tab_ALIAS_add_alias_x500_label"
+                            ></span>
+                        </oui-radio-label>
+                        <oui-radio-description
+                            data-ng-if="$ctrl.model.radio === $ctrl.ALIAS_TYPE.X500"
+                        >
+                            <div class="d-flex flex-row mt-1">
+                                <span
+                                    class="pr-2 align-self-center font-weight-bold"
+                                    data-ng-bind=":: $ctrl.X500_PREFIX"
+                                ></span>
+                                <input
+                                    type="text"
+                                    class="oui-input"
+                                    name="x500Input"
+                                    placeholder="{{'exchange_tab_ALIAS_add_address_placeholder' | translate}}"
+                                    data-ng-model="$ctrl.model.x500"
+                                />
+                            </div>
+                        </oui-radio-description>
+                    </oui-radio>
+                </oui-radio-group>
+            </div>
+            <div
+                data-translate="exchange_tab_ALIAS_add_alias_valid_{{$ctrl.model.radio}}"
+            ></div>
+        </div>
+    </div>
+
+    <div data-wizard-step>
+        <p data-translate="exchange_tab_ALIAS_add_alias_step2_intro"></p>
+
+        <dl class="dl-horizontal">
+            <dt
+                data-translate="exchange_tab_ALIAS_add_alias_step2_alias_label"
+            ></dt>
+            <dd
+                class="word-break"
+                data-ng-bind="$ctrl.getAlias() | wucSliceContent: 150"
+            ></dd>
+
+            <dt
+                data-translate="exchange_tab_ALIAS_add_alias_step2_account_label"
+            ></dt>
+            <dd
+                class="word-break"
+                data-ng-bind="$ctrl.$routerParams[$ctrl.aliasType] | wucSliceContent: 150"
+            ></dd>
+        </dl>
+    </div>
+</div>
diff --git a/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.module.js b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.module.js
new file mode 100644
index 000000000000..9579e2a84337
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/add/exchange-alias-add.module.js
@@ -0,0 +1,14 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import component from './exchange-alias-add.component';
+
+const moduleName = 'ovhManagerExchangeAliasAdd';
+
+angular
+  .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
+  .component('exchangeAliasAdd', component);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/alias/exchange-alias.component.js b/packages/manager/modules/exchange/src/alias/exchange-alias.component.js
new file mode 100644
index 000000000000..4496a10bd294
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/exchange-alias.component.js
@@ -0,0 +1,14 @@
+import controller from './exchange-alias.controller';
+import template from './exchange-alias.html';
+
+export default {
+  controller,
+  template,
+  bindings: {
+    exchange: '<',
+    aliasType: '<',
+    goBack: '<',
+    goToAliasAdd: '<',
+    goToAliasRemove: '<',
+  },
+};
diff --git a/packages/manager/modules/exchange/src/alias/exchange-alias.constants.js b/packages/manager/modules/exchange/src/alias/exchange-alias.constants.js
new file mode 100644
index 000000000000..e65afc538b3b
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/exchange-alias.constants.js
@@ -0,0 +1,9 @@
+export const ALIAS_TYPE_FOR_API_PATH = {
+  email: 'account',
+  group: 'mailingList',
+  shared: 'sharedAccount',
+};
+
+export default {
+  ALIAS_TYPE_FOR_API_PATH,
+};
diff --git a/packages/manager/modules/exchange/src/alias/exchange-alias.controller.js b/packages/manager/modules/exchange/src/alias/exchange-alias.controller.js
new file mode 100644
index 000000000000..067be20465c2
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/exchange-alias.controller.js
@@ -0,0 +1,91 @@
+import punycode from 'punycode';
+import { ALIAS_TYPE_FOR_API_PATH } from './exchange-alias.constants';
+
+export default class ExchangeAliasController {
+  /* @ngInject */
+  constructor(
+    $scope,
+    wucExchange,
+    exchangeAccount,
+    exchangeStates,
+    navigation,
+    messaging,
+    $translate,
+    ouiDatagridService,
+  ) {
+    this.$scope = $scope;
+
+    this.wucExchange = wucExchange;
+    this.exchangeAccount = exchangeAccount;
+    this.exchangeStates = exchangeStates;
+    this.navigation = navigation;
+    this.messaging = messaging;
+    this.$translate = $translate;
+    this.ouiDatagridService = ouiDatagridService;
+  }
+
+  $onInit() {
+    this.$routerParams = this.wucExchange.getParams();
+    this.aliasesParams = {};
+    this.aliasMaxLimit = this.wucExchange.aliasMaxLimit;
+
+    this.$scope.$on(this.wucExchange.events.accountsChanged, () =>
+      this.refreshDatagrid(),
+    );
+  }
+
+  getAliases({ pageSize, offset }) {
+    this.isLoading = true;
+    const pageOffset = Math.ceil(offset / pageSize);
+    return this.wucExchange
+      .getAliases(
+        this.$routerParams.organization,
+        this.$routerParams.productId,
+        this.$routerParams[this.aliasType],
+        ALIAS_TYPE_FOR_API_PATH[this.aliasType],
+        pageOffset,
+        pageSize,
+      )
+      .then((aliases) => {
+        this.aliases = aliases;
+        this.isLoading = false;
+        return aliases;
+      })
+      .catch((error) => {
+        this.messaging.writeError(
+          this.$translate.instant('exchange_tab_ALIAS_error_message'),
+          error,
+        );
+        this.goBack();
+      });
+  }
+
+  refreshDatagrid() {
+    this.ouiDatagridService.refresh('aliasDatagrid', true);
+  }
+
+  openDeletingDialog({ alias }) {
+    return this.goToAliasRemove(alias);
+  }
+
+  openAddingDialog() {
+    return this.goToAliasAdd();
+  }
+
+  getAddAliasTooltip() {
+    if (this.aliases?.length >= this.aliasMaxLimit) {
+      return this.$translate.instant(
+        'exchange_tab_ALIAS_add_alias_limit_tooltip',
+        {
+          t0: this.aliasMaxLimit,
+        },
+      );
+    }
+
+    return null;
+  }
+
+  static convertToPunycode(domain) {
+    return punycode.toUnicode(domain);
+  }
+}
diff --git a/packages/manager/modules/exchange/src/account/alias/account-alias.html b/packages/manager/modules/exchange/src/alias/exchange-alias.html
similarity index 67%
rename from packages/manager/modules/exchange/src/account/alias/account-alias.html
rename to packages/manager/modules/exchange/src/alias/exchange-alias.html
index ee9fca3ada40..19bc06a953cf 100644
--- a/packages/manager/modules/exchange/src/account/alias/account-alias.html
+++ b/packages/manager/modules/exchange/src/alias/exchange-alias.html
@@ -1,22 +1,33 @@
 <div class="row account-alias">
     <div class="col-md-9">
-        <oui-back-button
-            data-on-click="$ctrl.messaging.resetMessages(); $ctrl.hide()"
-        >
+        <oui-back-button data-on-click="$ctrl.goBack()">
             <span
                 data-translate="exchange_tab_ALIAS_back_button"
-                data-translate-values="{ t0: $ctrl.account.primaryEmailAddress}"
+                data-translate-values="{ t0: $ctrl.$routerParams[$ctrl.aliasType]}"
             ></span
         ></oui-back-button>
 
-        <oui-datagrid data-rows-loader="$ctrl.getAliases($config)">
+        <oui-datagrid
+            data-rows-loader="$ctrl.getAliases($config)"
+            id="aliasDatagrid"
+        >
+            <oui-datagrid-topbar>
+                <oui-button
+                    type="button"
+                    data-disabled="$ctrl.isLoading"
+                    class="float-right"
+                    data-on-click="$ctrl.refreshDatagrid()"
+                >
+                    <span class="oui-icon oui-icon-refresh"></span>
+                </oui-button>
+            </oui-datagrid-topbar>
             <oui-datagrid-column
                 data-title="'exchange_tab_ALIAS_header' | translate"
-                data-property="displayName"
+                data-property="alias"
             >
                 <span
                     class="account-alias-column d-inline-block text-wrap"
-                    data-ng-bind="$value"
+                    data-ng-bind="$ctrl.constructor.convertToPunycode($value)"
                 ></span>
             </oui-datagrid-column>
             <oui-datagrid-column
@@ -47,7 +58,7 @@
                 type="button"
                 data-ng-bind="'exchange_tab_ALIAS_add_button' | translate"
                 data-ng-click="$ctrl.openAddingDialog()"
-                data-ng-disabled="$ctrl.aliases.length >= $ctrl.aliasMaxLimit || !$ctrl.exchangeStates.constructor.isOk($ctrl.account)"
+                data-ng-disabled="$ctrl.aliases.length >= $ctrl.aliasMaxLimit || !$ctrl.exchangeStates.constructor.isOk($ctrl.exchange)"
             ></button>
         </div>
     </div>
diff --git a/packages/manager/modules/exchange/src/alias/exchange-alias.module.js b/packages/manager/modules/exchange/src/alias/exchange-alias.module.js
new file mode 100644
index 000000000000..8c488809aae7
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/exchange-alias.module.js
@@ -0,0 +1,25 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import component from './exchange-alias.component';
+import aliasAddModule from './add/exchange-alias-add.module';
+import aliasRemoveModule from './remove/exchange-alias-remove.module';
+
+import './exchange-alias.styles.scss';
+
+const moduleName = 'ovhManagerExchangeAlias';
+
+angular
+  .module(moduleName, [
+    ngTranslateAsyncLoader,
+    'oui',
+    'pascalprecht.translate',
+    aliasAddModule,
+    aliasRemoveModule,
+  ])
+  .component('exchangeAlias', component)
+  .run(/* @ngTranslationsInject:json ./translations */);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/account/alias/account-alias.styles.scss b/packages/manager/modules/exchange/src/alias/exchange-alias.styles.scss
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/account-alias.styles.scss
rename to packages/manager/modules/exchange/src/alias/exchange-alias.styles.scss
diff --git a/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.component.js b/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.component.js
new file mode 100644
index 000000000000..b5cd967dd152
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.component.js
@@ -0,0 +1,11 @@
+import controller from './exchange-alias-remove.controller';
+import template from './exchange-alias-remove.html';
+
+export default {
+  controller,
+  template,
+  bindings: {
+    goBack: '<',
+    aliasType: '<',
+  },
+};
diff --git a/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.controller.js b/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.controller.js
similarity index 73%
rename from packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.controller.js
rename to packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.controller.js
index ca304ca49dd4..eec1e4421678 100644
--- a/packages/manager/modules/exchange/src/account/alias/remove/account-alias-remove.controller.js
+++ b/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.controller.js
@@ -1,17 +1,16 @@
+import { ALIAS_TYPE_FOR_API_PATH } from '../exchange-alias.constants';
+
 export default class ExchangeRemoveAliasCtrl {
   /* @ngInject */
-  constructor($scope, wucExchange, navigation, $translate) {
+  constructor($scope, wucExchange, messaging, $translate) {
     this.services = {
       $scope,
+      messaging,
       wucExchange,
-      navigation,
       $translate,
     };
 
     this.$routerParams = wucExchange.getParams();
-    this.account = navigation.currentActionData.account;
-    this.alias = navigation.currentActionData.alias;
-
     $scope.submit = () => this.submit();
   }
 
@@ -20,8 +19,9 @@ export default class ExchangeRemoveAliasCtrl {
       .deleteAlias(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.account.primaryEmailAddress,
-        this.alias.alias,
+        this.$routerParams[this.aliasType],
+        ALIAS_TYPE_FOR_API_PATH[this.aliasType],
+        this.$routerParams.alias,
       )
       .then(() => {
         this.services.messaging.writeSuccess(
@@ -39,7 +39,7 @@ export default class ExchangeRemoveAliasCtrl {
         );
       })
       .finally(() => {
-        this.services.navigation.resetAction();
+        this.goBack();
       });
   }
 }
diff --git a/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.html b/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.html
new file mode 100644
index 000000000000..29c07c5e5ab1
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.html
@@ -0,0 +1,23 @@
+<div
+    data-wizard
+    data-wizard-on-cancel="$ctrl.goBack"
+    data-wizard-on-finish="submit"
+    data-wizard-title="'exchange_tab_ALIAS_remove_alias_title' | translate"
+>
+    <div data-wizard-step>
+        <p data-translate="exchange_tab_ALIAS_remove_alias_intro"></p>
+        <dl class="dl-horizontal">
+            <dt data-translate="exchange_tab_ALIAS_remove_alias_label"></dt>
+            <dd
+                class="word-break"
+                data-ng-bind="$ctrl.$routerParams.alias | wucSliceContent: 150"
+            ></dd>
+
+            <dt data-translate="exchange_tab_ALIAS_remove_account_label"></dt>
+            <dd
+                class="word-break"
+                data-ng-bind="$ctrl.$routerParams[$ctrl.aliasType] | wucSliceContent: 150"
+            ></dd>
+        </dl>
+    </div>
+</div>
diff --git a/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.module.js b/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.module.js
new file mode 100644
index 000000000000..f80460f901ec
--- /dev/null
+++ b/packages/manager/modules/exchange/src/alias/remove/exchange-alias-remove.module.js
@@ -0,0 +1,14 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import component from './exchange-alias-remove.component';
+
+const moduleName = 'ovhManagerExchangeAliasRemove';
+
+angular
+  .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
+  .component('exchangeAliasRemove', component);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/account/alias/translations/Messages_de_DE.json b/packages/manager/modules/exchange/src/alias/translations/Messages_de_DE.json
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/translations/Messages_de_DE.json
rename to packages/manager/modules/exchange/src/alias/translations/Messages_de_DE.json
diff --git a/packages/manager/modules/exchange/src/account/alias/translations/Messages_en_GB.json b/packages/manager/modules/exchange/src/alias/translations/Messages_en_GB.json
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/translations/Messages_en_GB.json
rename to packages/manager/modules/exchange/src/alias/translations/Messages_en_GB.json
diff --git a/packages/manager/modules/exchange/src/account/alias/translations/Messages_es_ES.json b/packages/manager/modules/exchange/src/alias/translations/Messages_es_ES.json
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/translations/Messages_es_ES.json
rename to packages/manager/modules/exchange/src/alias/translations/Messages_es_ES.json
diff --git a/packages/manager/modules/exchange/src/account/alias/translations/Messages_fr_CA.json b/packages/manager/modules/exchange/src/alias/translations/Messages_fr_CA.json
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/translations/Messages_fr_CA.json
rename to packages/manager/modules/exchange/src/alias/translations/Messages_fr_CA.json
diff --git a/packages/manager/modules/exchange/src/account/alias/translations/Messages_fr_FR.json b/packages/manager/modules/exchange/src/alias/translations/Messages_fr_FR.json
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/translations/Messages_fr_FR.json
rename to packages/manager/modules/exchange/src/alias/translations/Messages_fr_FR.json
diff --git a/packages/manager/modules/exchange/src/account/alias/translations/Messages_it_IT.json b/packages/manager/modules/exchange/src/alias/translations/Messages_it_IT.json
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/translations/Messages_it_IT.json
rename to packages/manager/modules/exchange/src/alias/translations/Messages_it_IT.json
diff --git a/packages/manager/modules/exchange/src/account/alias/translations/Messages_pl_PL.json b/packages/manager/modules/exchange/src/alias/translations/Messages_pl_PL.json
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/translations/Messages_pl_PL.json
rename to packages/manager/modules/exchange/src/alias/translations/Messages_pl_PL.json
diff --git a/packages/manager/modules/exchange/src/account/alias/translations/Messages_pt_PT.json b/packages/manager/modules/exchange/src/alias/translations/Messages_pt_PT.json
similarity index 100%
rename from packages/manager/modules/exchange/src/account/alias/translations/Messages_pt_PT.json
rename to packages/manager/modules/exchange/src/alias/translations/Messages_pt_PT.json
diff --git a/packages/manager/modules/exchange/src/dashboard/exchange.module.js b/packages/manager/modules/exchange/src/dashboard/exchange.module.js
index 71e0f7a8396e..ae2d6c247c42 100644
--- a/packages/manager/modules/exchange/src/dashboard/exchange.module.js
+++ b/packages/manager/modules/exchange/src/dashboard/exchange.module.js
@@ -32,6 +32,7 @@ import resource from '../resource/resource.module';
 import disclaimer from '../disclaimer/disclaimer.module';
 import shared from '../shared/shared.module';
 import task from '../task/task.module';
+import alias from '../alias/exchange-alias.module';
 
 import {
   EXCHANGE_MX_CONFIG,
@@ -70,6 +71,7 @@ angular
     disclaimer,
     shared,
     task,
+    alias,
   ])
   .constant('EXCHANGE_MX_CONFIG', EXCHANGE_MX_CONFIG)
   .constant('EXCHANGE_CONFIG_URL', EXCHANGE_CONFIG_URL)
diff --git a/packages/manager/modules/exchange/src/dashboard/exchange.template.js b/packages/manager/modules/exchange/src/dashboard/exchange.template.js
index 0bd88b8cf451..66cac1612ddc 100644
--- a/packages/manager/modules/exchange/src/dashboard/exchange.template.js
+++ b/packages/manager/modules/exchange/src/dashboard/exchange.template.js
@@ -5,8 +5,6 @@ import serviceDiskOrderSpaceTemplate from '../information/disk/service-disk-orde
 import disclaimerRemoveTemplate from '../disclaimer/remove/disclaimer-remove.html';
 import disclaimerUpdateTemplate from '../disclaimer/update/disclaimer-update.html';
 import disclaimerAddTemplate from '../disclaimer/add/disclaimer-add.html';
-import groupAliasRemoveTemplate from '../group/alias/remove/group-alias-remove.html';
-import groupAliasAddTemplate from '../group/alias/add/group-alias-add.html';
 import groupRemoveTemplate from '../group/remove/group-remove.html';
 import groupUpdateTemplate from '../group/update/group-update.html';
 import groupMemberRemoveTemplate from '../group/member/remove/group-member-remove.html';
@@ -49,9 +47,6 @@ import externalContactAddTemplate from '../external-contact/add/external-contact
 import officeAttachDialogTemplate from '../office-attach/dialog/office-attach-dialog.html';
 import officeAttachTemplate from '../office-attach/office-attach.html';
 import accountOrderTemplate from '../account/order/account-order.html';
-import accountAliasRemoveTemplate from '../account/alias/remove/account-alias-remove.html';
-import accountAliasTemplate from '../account/alias/account-alias.html';
-import accountAliasAddTemplate from '../account/alias/add/account-alias-add.html';
 import accountRemoveTemplate from '../account/remove/account-remove.html';
 import accountTemplate from '../account/account.html';
 import accountDelegationTemplate from '../account/delegation/account-delegation.html';
@@ -111,14 +106,6 @@ export default /* @ngInject */ ($templateCache) => {
     'exchange/disclaimer/add/disclaimer-add.html',
     disclaimerAddTemplate,
   );
-  $templateCache.put(
-    'exchange/group/alias/remove/group-alias-remove.html',
-    groupAliasRemoveTemplate,
-  );
-  $templateCache.put(
-    'exchange/group/alias/add/group-alias-add.html',
-    groupAliasAddTemplate,
-  );
   $templateCache.put(
     'exchange/group/remove/group-remove.html',
     groupRemoveTemplate,
@@ -281,18 +268,6 @@ export default /* @ngInject */ ($templateCache) => {
     'exchange/account/order/account-order.html',
     accountOrderTemplate,
   );
-  $templateCache.put(
-    'exchange/account/alias/remove/account-alias-remove.html',
-    accountAliasRemoveTemplate,
-  );
-  $templateCache.put(
-    'exchange/account/alias/account-alias.html',
-    accountAliasTemplate,
-  );
-  $templateCache.put(
-    'exchange/account/alias/add/account-alias-add.html',
-    accountAliasAddTemplate,
-  );
   $templateCache.put(
     'exchange/account/remove/account-remove.html',
     accountRemoveTemplate,
diff --git a/packages/manager/modules/exchange/src/dashboard/exchangeControllers.module.js b/packages/manager/modules/exchange/src/dashboard/exchangeControllers.module.js
index fec69c51c860..7014a1237da0 100644
--- a/packages/manager/modules/exchange/src/dashboard/exchangeControllers.module.js
+++ b/packages/manager/modules/exchange/src/dashboard/exchangeControllers.module.js
@@ -7,9 +7,6 @@ import ExchangeExternalContactsDeleteCtrl from '../external-contact/remove/exter
 import ExchangeExternalContactsModifyCtrl from '../external-contact/update/external-contact-update.controller';
 import ExchangeGroupAccountsCtrl from '../group/accounts/group-accounts.controller';
 import ExchangeAddGroupCtrl from '../group/add/group-add.controller';
-import ExchangeAddGroupAliasCtrl from '../group/alias/add/group-alias-add.controller';
-import ExchangeTabGroupAliasCtrl from '../group/alias/group-alias.controller';
-import ExchangeRemoveGroupAliasCtrl from '../group/alias/remove/group-alias-remove.controller';
 import ExchangeMailingListDelegationCtrl from '../group/delegation/group-delegation.controller';
 import ExchangeTabGroupsCtrl from '../group/group.controller';
 import ExchangeTabManagersByGroupsCtrl from '../group/manager/group-manager.controller';
@@ -34,8 +31,6 @@ import ExchangeUpdateResourceController from '../resource/update/resource-update
 import ExchangeAddSharedAccountCtrl from '../shared-account/add/shared-account-add.controller';
 import ExchangeSharedAccountDelegationCtrl from '../shared-account/delegation/shared-account-delegation.controller';
 import exchangeAccountCtlr from '../account/account.controller';
-import ExchangeAddAccountAliasCtrl from '../account/alias/add/account-alias-add.controller';
-import ExchangeRemoveAliasCtrl from '../account/alias/remove/account-alias-remove.controller';
 import ExchangeAccountDelegationCtrl from '../account/delegation/account-delegation.controller';
 import ExchangeExportToCsvAccountsCtrl from '../account/export-as-csv/account-export-as-csv.controller';
 import ExchangeExportAsPstCtrl from '../account/export-as-pst/account-export-as-pst.controller';
@@ -63,7 +58,6 @@ import ExchangeDomainSpfAutoconfigCtrl from '../domain/spf-autoconfig/domain-spf
 import ExchangeDomainDkimAutoconfigCtrl from '../domain/dkim-autoconfig/domain-dkim-autoconfig.controller';
 import ExchangeUpdateDomainCtrl from '../domain/update/domain-update.controller';
 import ExchangeDeleteSharedAccountCtrl from '../shared-account/delete/shared-account-delete.controller';
-import ExchangeTabSharedAccountsCtrl from '../shared-account/shared-account.controller';
 import ExchangeUpdateSharedAccountCtrl from '../shared-account/update/shared-account-update.controller';
 import ExchangeAddPublicFolderCtrl from '../shared/add/shared-add.controller';
 import ExchangeRemovePublicFolderPermissionCtrl from '../shared/permission/remove/shared-permission-remove.controller';
@@ -101,9 +95,6 @@ angular
   )
   .controller('ExchangeGroupAccountsCtrl', ExchangeGroupAccountsCtrl)
   .controller('ExchangeAddGroupCtrl', ExchangeAddGroupCtrl)
-  .controller('ExchangeAddGroupAliasCtrl', ExchangeAddGroupAliasCtrl)
-  .controller('ExchangeTabGroupAliasCtrl', ExchangeTabGroupAliasCtrl)
-  .controller('ExchangeRemoveGroupAliasCtrl', ExchangeRemoveGroupAliasCtrl)
   .controller(
     'ExchangeMailingListDelegationCtrl',
     ExchangeMailingListDelegationCtrl,
@@ -140,8 +131,6 @@ angular
     ExchangeSharedAccountDelegationCtrl,
   )
   .controller('exchangeAccountCtlr', exchangeAccountCtlr)
-  .controller('ExchangeAddAccountAliasCtrl', ExchangeAddAccountAliasCtrl)
-  .controller('ExchangeRemoveAliasCtrl', ExchangeRemoveAliasCtrl)
   .controller('ExchangeAccountDelegationCtrl', ExchangeAccountDelegationCtrl)
   .controller(
     'ExchangeExportToCsvAccountsCtrl',
@@ -187,7 +176,6 @@ angular
     'ExchangeDeleteSharedAccountCtrl',
     ExchangeDeleteSharedAccountCtrl,
   )
-  .controller('ExchangeTabSharedAccountsCtrl', ExchangeTabSharedAccountsCtrl)
   .controller(
     'ExchangeUpdateSharedAccountCtrl',
     ExchangeUpdateSharedAccountCtrl,
diff --git a/packages/manager/modules/exchange/src/dashboard/translations/Messages_de_DE.json b/packages/manager/modules/exchange/src/dashboard/translations/Messages_de_DE.json
index eb8fd20eb190..4bc0d4ce2670 100644
--- a/packages/manager/modules/exchange/src/dashboard/translations/Messages_de_DE.json
+++ b/packages/manager/modules/exchange/src/dashboard/translations/Messages_de_DE.json
@@ -233,8 +233,8 @@
   "exchange_tab_ALIAS_add_alias_step2_account_label": "Dazugehöriger Account",
   "exchange_tab_ALIAS_add_alias_valid_smtp": "Achtung, einige Sonderzeichen können nicht in einem Alias-Namen verwendet werden, zum Beispiel + ? / () [] ;",
   "exchange_tab_ALIAS_add_alias_valid_x500": "Bitte beachten Sie: Das Sonderzeichen „@“ ist für eine X500-Adresse unzulässig.",
-  "exchange_tab_ALIAS_add_alias_success_message": "Alias wird hinzugefügt.",
-  "exchange_tab_ALIAS_add_alias_error_message": "Bei der Erstellung Ihres Alias ist ein Fehler aufgetreten.",
+  "exchange_tab_ALIAS_add_alias_success_message": "Der Alias wird hinzugefügt.",
+  "exchange_tab_ALIAS_add_alias_error_message": "Bei der Erstellung Ihres Alias ist ein Fehler aufgetreten. {{ error }}",
   "exchange_tab_ALIAS_add_no_domains": "Sie haben noch keine Domain hinzugefügt oder diese wurde noch nicht validiert. <br/>Sie müssen zuerst eine Domain hinzufügen und deren Validierung abwarten, um einen Alias für Ihren Exchange Account erstellen zu können.",
   "exchange_tab_ALIAS_domain_loading_failure": "Beim Laden Ihrer Domains ist ein Fehler aufgetreten.",
   "exchange_tab_ALIAS_add_alias_limit_tooltip": "Sie haben das Limit von {0} Alias pro Exchange Account erreicht.",
diff --git a/packages/manager/modules/exchange/src/dashboard/translations/Messages_en_GB.json b/packages/manager/modules/exchange/src/dashboard/translations/Messages_en_GB.json
index 16be2962747e..c232292dcbfb 100644
--- a/packages/manager/modules/exchange/src/dashboard/translations/Messages_en_GB.json
+++ b/packages/manager/modules/exchange/src/dashboard/translations/Messages_en_GB.json
@@ -234,7 +234,7 @@
   "exchange_tab_ALIAS_add_alias_valid_smtp": "Important: Some special symbols are not accepted in alias names, for example: + ? / () [] ;",
   "exchange_tab_ALIAS_add_alias_valid_x500": "Please note that the special character '@' is not accepted for an X500 address",
   "exchange_tab_ALIAS_add_alias_success_message": "The alias will be added.",
-  "exchange_tab_ALIAS_add_alias_error_message": "An error has occurred creating your alias.",
+  "exchange_tab_ALIAS_add_alias_error_message": "An error has occurred creating your alias {{ error }}",
   "exchange_tab_ALIAS_add_no_domains": "You haven't added a domain yet, or it still hasn't been validated. <br/>You must enter a domain and wait for it to be validated before you can create an Exchange account.",
   "exchange_tab_ALIAS_domain_loading_failure": "An error has occurred when loading your domains.",
   "exchange_tab_ALIAS_add_alias_limit_tooltip": "You have reached the limit of {0} aliases per Exchange account.",
diff --git a/packages/manager/modules/exchange/src/dashboard/translations/Messages_es_ES.json b/packages/manager/modules/exchange/src/dashboard/translations/Messages_es_ES.json
index 038199ce04bc..c931ef07f19e 100644
--- a/packages/manager/modules/exchange/src/dashboard/translations/Messages_es_ES.json
+++ b/packages/manager/modules/exchange/src/dashboard/translations/Messages_es_ES.json
@@ -233,8 +233,8 @@
   "exchange_tab_ALIAS_add_alias_step2_account_label": "Cuenta asociada",
   "exchange_tab_ALIAS_add_alias_valid_smtp": "Atención, algunos caracteres especiales no están permitidos en el nombre de un alias, por ejemplo + ? / () [] ;",
   "exchange_tab_ALIAS_add_alias_valid_x500": "Atención, el carácter especial «@» no es compatible con las direcciones X500.",
-  "exchange_tab_ALIAS_add_alias_success_message": "Va a añadirse el alias.",
-  "exchange_tab_ALIAS_add_alias_error_message": "Se ha producido un error al crear el alias.",
+  "exchange_tab_ALIAS_add_alias_success_message": "Se va a añadir el alias.",
+  "exchange_tab_ALIAS_add_alias_error_message": "Se ha producido un error al crear el alias. {{ error }}",
   "exchange_tab_ALIAS_add_no_domains": "Aún no ha añadido un dominio o este todavía no ha sido validado. <br/>Para crear un alias para su cuenta Exchange, es necesario añadir primero un dominio y esperar a que sea validado.",
   "exchange_tab_ALIAS_domain_loading_failure": "Se ha producido un error al cargar los dominios.",
   "exchange_tab_ALIAS_add_alias_limit_tooltip": "Ha alcanzado el límite de {0} alias por cuenta Exchange.",
diff --git a/packages/manager/modules/exchange/src/dashboard/translations/Messages_fr_CA.json b/packages/manager/modules/exchange/src/dashboard/translations/Messages_fr_CA.json
index b4dc41d78695..585329a32152 100644
--- a/packages/manager/modules/exchange/src/dashboard/translations/Messages_fr_CA.json
+++ b/packages/manager/modules/exchange/src/dashboard/translations/Messages_fr_CA.json
@@ -233,8 +233,8 @@
   "exchange_tab_ALIAS_add_alias_step2_account_label": "Compte attaché",
   "exchange_tab_ALIAS_add_alias_valid_smtp": "Attention, certains caractères spéciaux ne sont pas acceptés dans le nom d'un alias, par exemple + ? / () [] ;",
   "exchange_tab_ALIAS_add_alias_valid_x500": "Attention, le caractère spécial « @ » n'est pas accepté dans le cadre d'une adresse X500",
-  "exchange_tab_ALIAS_add_alias_success_message": "L’alias va être ajouté.",
-  "exchange_tab_ALIAS_add_alias_error_message": "Une erreur est survenue lors de la création de votre alias.",
+  "exchange_tab_ALIAS_add_alias_success_message": "L'alias va être ajouté.",
+  "exchange_tab_ALIAS_add_alias_error_message": "Une erreur est survenue lors de la création de votre alias. {{ error }}",
   "exchange_tab_ALIAS_add_no_domains": "Vous n'avez pas encore ajouté de domaine ou il n'a pas encore été validé. <br/>Vous devez d'abord ajouter un domaine et attendre qu'il soit validé pour créer un alias à votre compte Exchange.",
   "exchange_tab_ALIAS_domain_loading_failure": "Une erreur est survenue lors du chargement de vos domaines.",
   "exchange_tab_ALIAS_add_alias_limit_tooltip": "Vous avez atteint la limite de {0} alias par compte Exchange.",
diff --git a/packages/manager/modules/exchange/src/dashboard/translations/Messages_fr_FR.json b/packages/manager/modules/exchange/src/dashboard/translations/Messages_fr_FR.json
index b4dc41d78695..585329a32152 100644
--- a/packages/manager/modules/exchange/src/dashboard/translations/Messages_fr_FR.json
+++ b/packages/manager/modules/exchange/src/dashboard/translations/Messages_fr_FR.json
@@ -233,8 +233,8 @@
   "exchange_tab_ALIAS_add_alias_step2_account_label": "Compte attaché",
   "exchange_tab_ALIAS_add_alias_valid_smtp": "Attention, certains caractères spéciaux ne sont pas acceptés dans le nom d'un alias, par exemple + ? / () [] ;",
   "exchange_tab_ALIAS_add_alias_valid_x500": "Attention, le caractère spécial « @ » n'est pas accepté dans le cadre d'une adresse X500",
-  "exchange_tab_ALIAS_add_alias_success_message": "L’alias va être ajouté.",
-  "exchange_tab_ALIAS_add_alias_error_message": "Une erreur est survenue lors de la création de votre alias.",
+  "exchange_tab_ALIAS_add_alias_success_message": "L'alias va être ajouté.",
+  "exchange_tab_ALIAS_add_alias_error_message": "Une erreur est survenue lors de la création de votre alias. {{ error }}",
   "exchange_tab_ALIAS_add_no_domains": "Vous n'avez pas encore ajouté de domaine ou il n'a pas encore été validé. <br/>Vous devez d'abord ajouter un domaine et attendre qu'il soit validé pour créer un alias à votre compte Exchange.",
   "exchange_tab_ALIAS_domain_loading_failure": "Une erreur est survenue lors du chargement de vos domaines.",
   "exchange_tab_ALIAS_add_alias_limit_tooltip": "Vous avez atteint la limite de {0} alias par compte Exchange.",
diff --git a/packages/manager/modules/exchange/src/dashboard/translations/Messages_it_IT.json b/packages/manager/modules/exchange/src/dashboard/translations/Messages_it_IT.json
index 7afa62427c0f..ca833f074068 100644
--- a/packages/manager/modules/exchange/src/dashboard/translations/Messages_it_IT.json
+++ b/packages/manager/modules/exchange/src/dashboard/translations/Messages_it_IT.json
@@ -233,8 +233,8 @@
   "exchange_tab_ALIAS_add_alias_step2_account_label": "Account associato",
   "exchange_tab_ALIAS_add_alias_valid_smtp": "Attenzione, alcuni caratteri speciali non sono accettati nel nome di un alias, come ad esempio + ? / () [] ;",
   "exchange_tab_ALIAS_add_alias_valid_x500": "Attenzione: il carattere speciale \"@\" non è accettato per gli indirizzi X500",
-  "exchange_tab_ALIAS_add_alias_success_message": "L'alias sta per essere aggiunto",
-  "exchange_tab_ALIAS_add_alias_error_message": "Si è verificato un errore nella creazione del tuo alias.",
+  "exchange_tab_ALIAS_add_alias_success_message": "L'alias verrà aggiunto.",
+  "exchange_tab_ALIAS_add_alias_error_message": "Si è verificato un errore durante la creazione dell'alias: {{ error }}",
   "exchange_tab_ALIAS_add_no_domains": "Non hai ancora aggiunto un dominio o non è ancora stato validato.  <br/>Aggiungi un dominio e aspetta che venga validato prima di creare un alias per il tuo account Exchange.",
   "exchange_tab_ALIAS_domain_loading_failure": "Si è verificato un errore nel caricamento dei tuoi domini",
   "exchange_tab_ALIAS_add_alias_limit_tooltip": "Hai raggiunto il limite di {0} alias per account Exchange.",
diff --git a/packages/manager/modules/exchange/src/dashboard/translations/Messages_pl_PL.json b/packages/manager/modules/exchange/src/dashboard/translations/Messages_pl_PL.json
index bd371c3e456b..d5506cfe147b 100644
--- a/packages/manager/modules/exchange/src/dashboard/translations/Messages_pl_PL.json
+++ b/packages/manager/modules/exchange/src/dashboard/translations/Messages_pl_PL.json
@@ -234,7 +234,7 @@
   "exchange_tab_ALIAS_add_alias_valid_smtp": "Uwaga, niektóre znaki specjalne nie są dozwolone w nazwie aliasu, na przykład + ? / () [] ;",
   "exchange_tab_ALIAS_add_alias_valid_x500": "Uwaga: znak „@” nie jest akceptowany w adresie X500",
   "exchange_tab_ALIAS_add_alias_success_message": "Alias zostanie dodany.",
-  "exchange_tab_ALIAS_add_alias_error_message": "Wystąpił błąd podczas tworzenia aliasu.",
+  "exchange_tab_ALIAS_add_alias_error_message": "Wystąpił błąd podczas tworzenia aliasu. {{error}}",
   "exchange_tab_ALIAS_add_no_domains": "Nie dodałeś jeszcze domeny lub domena nie została jeszcze zatwierdzona. <br/> Najpierw dodaj domenę i poczekaj na jej zatwierdzenie, aby utworzyć alias dla konta Exchange.",
   "exchange_tab_ALIAS_domain_loading_failure": "Wystąpił błąd podczas wyświetlania domen.",
   "exchange_tab_ALIAS_add_alias_limit_tooltip": "Osiągnąłeś limit {0} aliasów przewidziany dla konta Exchange.",
diff --git a/packages/manager/modules/exchange/src/dashboard/translations/Messages_pt_PT.json b/packages/manager/modules/exchange/src/dashboard/translations/Messages_pt_PT.json
index 520b8af8723c..434080320337 100644
--- a/packages/manager/modules/exchange/src/dashboard/translations/Messages_pt_PT.json
+++ b/packages/manager/modules/exchange/src/dashboard/translations/Messages_pt_PT.json
@@ -234,7 +234,7 @@
   "exchange_tab_ALIAS_add_alias_valid_smtp": "Atenção, certos caracteres especiais não são aceites no nome de um alias, por exemplo + ? / () [] ;",
   "exchange_tab_ALIAS_add_alias_valid_x500": "Atenção: o caráter especial \"@\" não é aceite no âmbito de um endereço X500",
   "exchange_tab_ALIAS_add_alias_success_message": "O alias vai ser adicionado.",
-  "exchange_tab_ALIAS_add_alias_error_message": "Ocorreu um erro aquando da criação do seu alias.",
+  "exchange_tab_ALIAS_add_alias_error_message": "Ocorreu um erro aquando da criação do seu alias. {{ error }}",
   "exchange_tab_ALIAS_add_no_domains": "Ainda não adicionou um domínio ou o mesmo ainda não foi validado. <br/>Deve de seguida adicionar um domínio e aguardar que o mesmo esteja válido para que possa criar um alias na sua conta Exchange.",
   "exchange_tab_ALIAS_domain_loading_failure": "Ocorreu um erro aquando do carregamento dos seus domínios.",
   "exchange_tab_ALIAS_add_alias_limit_tooltip": "Já atingiu o limite de {0} alias por cada conta Exchange.",
diff --git a/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.controller.js b/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.controller.js
deleted file mode 100644
index 38fad4cf5562..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.controller.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import has from 'lodash/has';
-import head from 'lodash/head';
-import includes from 'lodash/includes';
-import isEmpty from 'lodash/isEmpty';
-import isString from 'lodash/isString';
-
-export default class ExchangeAddGroupAliasCtrl {
-  /* @ngInject */
-  constructor($scope, wucExchange, navigation, messaging, $translate) {
-    this.services = {
-      $scope,
-      wucExchange,
-      navigation,
-      messaging,
-      $translate,
-    };
-
-    this.$routerParams = wucExchange.getParams();
-    this.selectedMailingList = navigation.currentActionData;
-    this.availableDomains = null;
-    this.model = {};
-
-    $scope.addGroupAlias = () => this.addGroupAlias();
-    $scope.aliasIsValid = () => this.aliasIsValid();
-    $scope.loadDomainData = () => this.loadDomainData();
-  }
-
-  loadDomainData() {
-    this.services.wucExchange
-      .getNewAliasOptions(
-        this.$routerParams.organization,
-        this.$routerParams.productId,
-        this.selectedMailingList.mailingListName,
-        'MAILING_LIST',
-      )
-      .then((data) => {
-        if (isEmpty(data.availableDomains)) {
-          this.services.messaging.writeError(
-            this.services.$translate.instant(
-              'exchange_tab_ALIAS_add_no_domains',
-            ),
-          );
-          this.services.navigation.resetAction();
-        } else {
-          this.availableDomains = data.availableDomains;
-          this.takenEmails = data.takenEmails;
-          this.model.domain = head(data.availableDomains);
-        }
-      })
-      .catch((err) => {
-        this.services.messaging.writeError(
-          this.services.$translate.instant(
-            'exchange_tab_ALIAS_domain_loading_failure',
-          ),
-          err.data,
-        );
-        this.services.navigation.resetAction();
-      });
-  }
-
-  checkTakenEmails() {
-    this.takenEmailError = false;
-    const modelIsWellFormed =
-      !isEmpty(this.model) &&
-      isString(this.model.alias) &&
-      has(this.model, 'domain.name');
-
-    if (modelIsWellFormed) {
-      const emailIsAlreadyUsed =
-        !isEmpty(this.takenEmails) &&
-        includes(
-          this.takenEmails,
-          `${this.model.alias.toLowerCase()}@${this.model.domain.name}`,
-        );
-
-      if (emailIsAlreadyUsed) {
-        this.takenEmailError = true;
-      }
-    }
-  }
-
-  addGroupAlias() {
-    this.services.wucExchange
-      .addGroupAlias(
-        this.$routerParams.organization,
-        this.$routerParams.productId,
-        this.selectedMailingList.mailingListName,
-        this.model,
-      )
-      .then((data) => {
-        this.services.messaging.writeSuccess(
-          this.services.$translate.instant(
-            'exchange_tab_ALIAS_add_alias_success_message',
-          ),
-          data,
-        );
-      })
-      .catch((err) => {
-        this.services.messaging.writeError(
-          this.services.$translate.instant(
-            'exchange_tab_ALIAS_add_alias_error_message',
-          ),
-          err,
-        );
-      })
-      .finally(() => {
-        this.services.navigation.resetAction();
-      });
-  }
-
-  aliasIsValid() {
-    if (isEmpty(this.model)) {
-      return false;
-    }
-
-    const aliasIsValid =
-      !isEmpty(this.model.alias) &&
-      isString(this.model.alias) &&
-      this.model.alias.length <= 64;
-    const hasDomain = !isEmpty(this.model.domain);
-
-    return aliasIsValid && hasDomain && !this.takenEmailError;
-  }
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.html b/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.html
deleted file mode 100644
index c69e367d067c..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<div data-ng-controller="ExchangeAddGroupAliasCtrl as ctrl">
-    <div
-        data-wizard
-        data-wizard-bread-crumb
-        data-wizard-on-cancel="resetAction"
-        data-wizard-on-finish="addGroupAlias"
-        data-wizard-title="'exchange_tab_GROUPS_add_alias_title' | translate"
-    >
-        <div
-            data-wizard-step
-            data-wizard-step-on-load="loadDomainData"
-            data-wizard-step-valid="aliasIsValid()"
-        >
-            <oui-spinner data-ng-if="!ctrl.availableDomains"></oui-spinner>
-
-            <div data-ng-if="ctrl.availableDomains">
-                <p
-                    data-ng-bind-html="'exchange_tab_GROUPS_add_alias_intro' | translate:{ t0: ctrl.selectedMailingList.mailingListDisplayName }"
-                ></p>
-
-                <form name="ctrl.exchangeAddGroupAliasForm">
-                    <div
-                        class="form-group"
-                        data-ng-class="{'has-error': ctrl.exchangeAddGroupAliasForm.aliasInput.$dirty && (ctrl.exchangeAddGroupAliasForm.aliasInput.$invalid || ctrl.takenEmailError)}"
-                    >
-                        <div class="input-group">
-                            <input
-                                type="text"
-                                class="form-control"
-                                maxlength="256"
-                                name="aliasInput"
-                                placeholder="{{'exchange_tab_GROUPS_add_alias_placeholder' | translate}}"
-                                required
-                                data-ng-change="ctrl.checkTakenEmails()"
-                                data-ng-model="ctrl.model.alias"
-                                data-ng-pattern="/^[-_a-zA-Z0-9]+((\.|\+)[-_a-z0-9]+)*$/"
-                            />
-                            <span class="input-group-addon">@</span>
-                            <select
-                                class="form-control"
-                                data-ng-change="ctrl.checkTakenEmails()"
-                                data-ng-model="ctrl.model.domain"
-                                data-ng-options="domain.displayName for domain in ctrl.availableDomains | orderBy:'formattedName'"
-                            >
-                            </select>
-                        </div>
-                        <small
-                            class="help-block"
-                            data-translate="exchange_tab_GROUPS_add_alias_max_error"
-                            data-ng-if="ctrl.exchangeAddGroupAliasForm.aliasInput.$error.maxlength"
-                        ></small>
-                        <small
-                            class="help-block"
-                            data-translate="exchange_tab_ALIAS_taken_error_message"
-                            data-ng-if="ctrl.takenEmailError"
-                        ></small>
-                    </div>
-                </form>
-
-                <div
-                    class="alert alert-info"
-                    role="alert"
-                    data-translate="exchange_tab_GROUPS_add_alias_valid"
-                ></div>
-            </div>
-        </div>
-
-        <div data-wizard-step>
-            <p data-translate="exchange_tab_GROUPS_add_alias_step2_intro"></p>
-            <dl class="dl-horizontal dl-lg">
-                <dt
-                    data-translate="exchange_tab_GROUPS_add_alias_step2_alias_label"
-                ></dt>
-                <dd
-                    class="word-break"
-                    data-ng-bind-template="{{ctrl.model.alias}}@{{ctrl.model.domain.displayName}}"
-                ></dd>
-
-                <dt
-                    data-translate="exchange_tab_GROUPS_add_alias_step2_account_label"
-                ></dt>
-                <dd
-                    class="word-break"
-                    data-ng-bind="ctrl.selectedMailingList.mailingListDisplayName | wucSliceContent: 150"
-                ></dd>
-            </dl>
-        </div>
-    </div>
-</div>
diff --git a/packages/manager/modules/exchange/src/group/alias/alias.module.js b/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.module.js
similarity index 75%
rename from packages/manager/modules/exchange/src/group/alias/alias.module.js
rename to packages/manager/modules/exchange/src/group/alias/add/group-alias-add.module.js
index a0c9e27b7c50..3df47885542d 100644
--- a/packages/manager/modules/exchange/src/group/alias/alias.module.js
+++ b/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.module.js
@@ -3,9 +3,9 @@ import 'angular-translate';
 import '@ovh-ux/ui-kit';
 import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
 
-import routing from './alias.routing';
+import routing from './group-alias-add.routing';
 
-const moduleName = 'ovhManagerExchangeDashboardGroupAlias';
+const moduleName = 'ovhManagerExchangeDashboardGroupAliasAdd';
 
 angular
   .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
diff --git a/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.routing.js b/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.routing.js
new file mode 100644
index 000000000000..bc71b9ebb223
--- /dev/null
+++ b/packages/manager/modules/exchange/src/group/alias/add/group-alias-add.routing.js
@@ -0,0 +1,15 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('exchange.dashboard.group.mailing-list.alias.add', {
+    url: '/add',
+    views: {
+      modal: {
+        component: 'exchangeAliasAdd',
+      },
+    },
+    layout: 'modal',
+    resolve: {
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('exchange_account_alias'),
+    },
+  });
+};
diff --git a/packages/manager/modules/exchange/src/group/alias/alias.routing.js b/packages/manager/modules/exchange/src/group/alias/alias.routing.js
deleted file mode 100644
index 84801b12cbaf..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/alias.routing.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import template from './group-alias.html';
-
-export default /* @ngInject */ ($stateProvider) => {
-  $stateProvider.state('exchange.dashboard.group.mailing-list.alias', {
-    url: '/alias',
-    controller: 'ExchangeTabGroupAliasCtrl',
-    controllerAs: 'ctrl',
-    template,
-    params: {
-      mailingList: {},
-    },
-    resolve: {
-      mailingList: /* @ngInject */ ($transition$) =>
-        $transition$.params().mailingList,
-      breadcrumb: /* @ngInject */ ($translate) =>
-        $translate.instant('exchange_group_alias'),
-    },
-  });
-};
diff --git a/packages/manager/modules/exchange/src/group/alias/group-alias.controller.js b/packages/manager/modules/exchange/src/group/alias/group-alias.controller.js
deleted file mode 100644
index 696854ed11b7..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/group-alias.controller.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import has from 'lodash/has';
-
-export default class ExchangeTabGroupAliasCtrl {
-  /* @ngInject */
-  constructor(
-    $scope,
-    wucExchange,
-    goToGroup,
-    mailingList,
-    navigation,
-    messaging,
-    $translate,
-    exchangeStates,
-  ) {
-    this.services = {
-      $scope,
-      wucExchange,
-      navigation,
-      messaging,
-      $translate,
-      exchangeStates,
-    };
-
-    this.$routerParams = wucExchange.getParams();
-    this.aliasMaxLimit = this.services.wucExchange.aliasMaxLimit;
-    this.aliasesParams = {};
-    this.goToGroup = goToGroup;
-    this.mailingList = mailingList;
-
-    $scope.$on(this.services.wucExchange.events.groupsChanged, () =>
-      this.refreshList(),
-    );
-    $scope.getAliases = (pageSize, offset) => this.getAliases(pageSize, offset);
-    $scope.getAliaseObjects = () => this.getAliaseObjects();
-  }
-
-  getAliases({ pageSize, offset }) {
-    this.aliasesParams.pageSize = pageSize;
-    this.aliasesParams.offset = offset;
-
-    return this.services.wucExchange
-      .getGroupAliasList(
-        this.$routerParams.organization,
-        this.$routerParams.productId,
-        this.mailingList.mailingListAddress,
-        pageSize,
-        offset - 1,
-      )
-      .then((data) => {
-        this.aliases = data.list.results;
-        this.aliasesParams.results = {
-          data: data.list.results,
-          meta: {
-            totalCount: data.count,
-          },
-        };
-        return this.aliasesParams.results;
-      })
-      .catch((err) =>
-        this.services.messaging.writeError(
-          this.services.$translate.instant('exchange_tab_ALIAS_error_message'),
-          err,
-        ),
-      );
-  }
-
-  refreshList() {
-    this.services.wucExchange
-      .getGroupAliasList(
-        this.$routerParams.organization,
-        this.$routerParams.productId,
-        this.mailingList.mailingListAddress,
-        this.aliasesParams.pageSize,
-        this.aliasesParams.offset - 1,
-      )
-      .then((data) => {
-        this.aliasesParams.results.meta.totalCount = data.count;
-        for (let i = 0; i < data.list.results.length; i += 1) {
-          this.aliases.splice(i, 1, data.list.results[i]);
-        }
-        for (
-          let i = data.list.results.length;
-          i < this.aliases.length;
-          i += 1
-        ) {
-          this.aliases.splice(i, 1);
-        }
-      })
-      .catch((err) =>
-        this.services.messaging.writeError(
-          this.services.$translate.instant('exchange_tab_ALIAS_error_message'),
-          err,
-        ),
-      );
-  }
-
-  deleteGroupAlias(alias) {
-    if (!alias.taskPendingId) {
-      this.services.navigation.setAction(
-        'exchange/group/alias/remove/group-alias-remove',
-        {
-          selectedGroup: this.mailingList,
-          alias,
-        },
-      );
-    }
-  }
-
-  addGroupAlias() {
-    if (
-      this.mailingList &&
-      this.mailingList.aliases <= this.aliasMaxLimit &&
-      this.services.exchangeStates.constructor.isOk(this.mailingList)
-    ) {
-      this.services.navigation.setAction(
-        'exchange/group/alias/add/group-alias-add',
-        this.mailingList,
-      );
-    }
-  }
-
-  getAddAliasTooltip() {
-    if (
-      has(this.mailingList, 'aliases') &&
-      this.mailingList.aliases >= this.aliasMaxLimit
-    ) {
-      return this.services.$translate.instant(
-        'exchange_tab_ALIAS_add_alias_limit_tooltip',
-      );
-    }
-
-    return null;
-  }
-
-  getAliaseObjects() {
-    return this.aliases;
-  }
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/group-alias.html b/packages/manager/modules/exchange/src/group/alias/group-alias.html
deleted file mode 100644
index 46e86071193e..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/group-alias.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="row">
-    <div class="col-md-9">
-        <oui-back-button data-on-click="ctrl.goToGroup()">
-            <span data-translate="common_back"></span>
-        </oui-back-button>
-        <h2
-            data-ng-bind-html="'exchange_tab_ALIAS_GROUP_intro' | translate:{ t0: ctrl.services.navigation.selectedGroup.mailingListDisplayName }"
-        ></h2>
-
-        <div
-            class="alert alert-info"
-            role="alert"
-            data-translate="exchange_tab_ALIAS_GROUP_table_empty"
-            data-ng-if="ctrl.aliases && ctrl.aliases.list.results.length === 0"
-        ></div>
-
-        <oui-datagrid data-rows-loader="ctrl.getAliases($config)">
-            <oui-datagrid-column
-                data-title="'exchange_tab_ALIAS_header' | translate"
-                data-property="displayName"
-            ></oui-datagrid-column>
-            <oui-datagrid-column
-                data-title="'exchange_tab_ACCOUNTS_table_status' | translate"
-            >
-                <span
-                    class="label label-info"
-                    data-translate="exchange_tab_ALIAS_state_TASK_ON_DOING"
-                    data-ng-if="$row.taskPendingId"
-                    data-oui-tooltip="{{'exchange_tab_ALIAS_state_TASK_ON_DOING_tooltip' | translate}}"
-                ></span>
-            </oui-datagrid-column>
-            <oui-action-menu data-compact data-placement="end">
-                <oui-action-menu-item
-                    data-on-click="ctrl.deleteGroupAlias($row)"
-                    ><span
-                        data-translate="exchange_tab_ALIAS_delete_tooltip"
-                    ></span
-                ></oui-action-menu-item>
-            </oui-action-menu>
-        </oui-datagrid>
-    </div>
-
-    <div class="col-md-3 mt-5 mt-lg-0">
-        <span data-oui-tooltip="{{ctrl.getAddAliasTooltip()}}">
-            <button
-                class="btn btn-block btn-default"
-                type="button"
-                data-translate="exchange_tab_ALIAS_add_button"
-                data-ng-click="ctrl.addGroupAlias()"
-                data-ng-disabled="ctrl.services.navigation.selectedGroup.aliases >= ctrl.aliasMaxLimit || ctrl.services.navigation.selectedGroup.state !== 'OK'"
-            ></button>
-        </span>
-    </div>
-</div>
diff --git a/packages/manager/modules/exchange/src/group/alias/group-alias.module.js b/packages/manager/modules/exchange/src/group/alias/group-alias.module.js
new file mode 100644
index 000000000000..6979d42c42b4
--- /dev/null
+++ b/packages/manager/modules/exchange/src/group/alias/group-alias.module.js
@@ -0,0 +1,23 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import routing from './group-alias.routing';
+import aliasAddModule from './add/group-alias-add.module';
+import aliasRemoveModule from './remove/group-alias-remove.module';
+
+const moduleName = 'ovhManagerExchangeDashboardGroupAlias';
+
+angular
+  .module(moduleName, [
+    ngTranslateAsyncLoader,
+    'oui',
+    'pascalprecht.translate',
+    aliasAddModule,
+    aliasRemoveModule,
+  ])
+  .config(routing)
+  .run(/* @ngTranslationsInject:json ./translations */);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/group/alias/group-alias.routing.js b/packages/manager/modules/exchange/src/group/alias/group-alias.routing.js
new file mode 100644
index 000000000000..60a5e5099d47
--- /dev/null
+++ b/packages/manager/modules/exchange/src/group/alias/group-alias.routing.js
@@ -0,0 +1,18 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('exchange.dashboard.group.mailing-list.alias', {
+    url: '/alias',
+    component: 'exchangeAlias',
+    resolve: {
+      aliasType: /* @ngInject */ () => 'group',
+      goBack: /* @ngInject */ ($state) => () => $state.go('^'),
+      goToAliasAdd: /* @ngInject */ ($state) => () =>
+        $state.go('exchange.dashboard.group.mailing-list.alias.add'),
+      goToAliasRemove: /* @ngInject */ ($state) => (alias) =>
+        $state.go('exchange.dashboard.group.mailing-list.alias.remove', {
+          alias,
+        }),
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('exchange_account_alias'),
+    },
+  });
+};
diff --git a/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.controller.js b/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.controller.js
deleted file mode 100644
index f3758bfd253e..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.controller.js
+++ /dev/null
@@ -1,50 +0,0 @@
-export default class ExchangeRemoveGroupAliasCtrl {
-  /* @ngInject */
-  constructor($scope, wucExchange, navigation, $translate, messaging) {
-    this.services = {
-      $scope,
-      wucExchange,
-      navigation,
-      $translate,
-      messaging,
-    };
-
-    this.$routerParams = wucExchange.getParams();
-  }
-
-  $onInit() {
-    this.selectedGroup = this.services.navigation.currentActionData.selectedGroup;
-    this.alias = this.services.navigation.currentActionData.alias;
-
-    this.services.$scope.submit = () => this.submit();
-  }
-
-  submit() {
-    this.services.wucExchange
-      .deleteGroupAlias(
-        this.$routerParams.organization,
-        this.$routerParams.productId,
-        this.selectedGroup.mailingListAddress,
-        this.alias.alias,
-      )
-      .then((success) => {
-        this.services.messaging.writeSuccess(
-          this.services.$translate.instant(
-            'exchange_tab_ALIAS_delete_success_message',
-          ),
-          success,
-        );
-      })
-      .catch((err) => {
-        this.services.messaging.writeError(
-          this.services.$translate.instant(
-            'exchange_tab_ALIAS_delete_error_message',
-          ),
-          err,
-        );
-      })
-      .finally(() => {
-        this.services.navigation.resetAction();
-      });
-  }
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.html b/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.html
deleted file mode 100644
index ba89af79693d..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div data-ng-controller="ExchangeRemoveGroupAliasCtrl as ctrl">
-    <div
-        data-wizard
-        data-wizard-on-cancel="resetAction"
-        data-wizard-on-finish="submit"
-        data-wizard-title="'exchange_tab_ALIAS_remove_alias_title' | translate"
-    >
-        <div data-wizard-step>
-            <p data-translate="exchange_tab_ALIAS_remove_alias_intro"></p>
-            <dl class="dl-horizontal dl-lg">
-                <dt data-translate="exchange_tab_ALIAS_remove_alias_label"></dt>
-                <dd
-                    class="word-break"
-                    data-ng-bind="ctrl.alias.displayName | wucSliceContent: 150"
-                ></dd>
-
-                <dt
-                    data-translate="exchange_tab_GROUPS_add_alias_step2_account_label"
-                ></dt>
-                <dd
-                    class="word-break"
-                    data-ng-bind="ctrl.selectedGroup.mailingListDisplayName | wucSliceContent: 150"
-                ></dd>
-            </dl>
-        </div>
-    </div>
-</div>
diff --git a/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.module.js b/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.module.js
new file mode 100644
index 000000000000..8dc8c3da7fc3
--- /dev/null
+++ b/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.module.js
@@ -0,0 +1,15 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import routing from './group-alias-remove.routing';
+
+const moduleName = 'ovhManagerExchangeDashboardGroupAliasRemove';
+
+angular
+  .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
+  .config(routing)
+  .run(/* @ngTranslationsInject:json ./translations */);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.routing.js b/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.routing.js
new file mode 100644
index 000000000000..c214f1734b20
--- /dev/null
+++ b/packages/manager/modules/exchange/src/group/alias/remove/group-alias-remove.routing.js
@@ -0,0 +1,15 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('exchange.dashboard.group.mailing-list.alias.remove', {
+    url: '/remove?alias',
+    views: {
+      modal: {
+        component: 'exchangeAliasRemove',
+      },
+    },
+    layout: 'modal',
+    resolve: {
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('exchange_account_alias'),
+    },
+  });
+};
diff --git a/packages/manager/modules/exchange/src/group/alias/translations/Messages_de_DE.json b/packages/manager/modules/exchange/src/group/alias/translations/Messages_de_DE.json
deleted file mode 100644
index ba05b0cffcc0..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/translations/Messages_de_DE.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exchange_group_alias": "Liste der Alias"
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/translations/Messages_en_GB.json b/packages/manager/modules/exchange/src/group/alias/translations/Messages_en_GB.json
deleted file mode 100644
index 16618b535bd5..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/translations/Messages_en_GB.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exchange_group_alias": "List of aliases"
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/translations/Messages_es_ES.json b/packages/manager/modules/exchange/src/group/alias/translations/Messages_es_ES.json
deleted file mode 100644
index 5ee942885e85..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/translations/Messages_es_ES.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exchange_group_alias": "Lista de alias"
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/translations/Messages_fr_CA.json b/packages/manager/modules/exchange/src/group/alias/translations/Messages_fr_CA.json
deleted file mode 100644
index 596bcd1f2436..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/translations/Messages_fr_CA.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exchange_group_alias": "Liste des alias"
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/translations/Messages_fr_FR.json b/packages/manager/modules/exchange/src/group/alias/translations/Messages_fr_FR.json
deleted file mode 100644
index 596bcd1f2436..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/translations/Messages_fr_FR.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exchange_group_alias": "Liste des alias"
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/translations/Messages_it_IT.json b/packages/manager/modules/exchange/src/group/alias/translations/Messages_it_IT.json
deleted file mode 100644
index d214d95dcd72..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/translations/Messages_it_IT.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exchange_group_alias": "Elenco degli alias"
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/translations/Messages_pl_PL.json b/packages/manager/modules/exchange/src/group/alias/translations/Messages_pl_PL.json
deleted file mode 100644
index 6086909b038b..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/translations/Messages_pl_PL.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exchange_group_alias": "Lista aliasów"
-}
diff --git a/packages/manager/modules/exchange/src/group/alias/translations/Messages_pt_PT.json b/packages/manager/modules/exchange/src/group/alias/translations/Messages_pt_PT.json
deleted file mode 100644
index 6af3e962b87f..000000000000
--- a/packages/manager/modules/exchange/src/group/alias/translations/Messages_pt_PT.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "exchange_group_alias": "Lista dos alias"
-}
diff --git a/packages/manager/modules/exchange/src/group/group.controller.js b/packages/manager/modules/exchange/src/group/group.controller.js
index e4a5d7061880..e8ed988712f2 100644
--- a/packages/manager/modules/exchange/src/group/group.controller.js
+++ b/packages/manager/modules/exchange/src/group/group.controller.js
@@ -70,14 +70,7 @@ export default class ExchangeTabGroupsCtrl {
   }
 
   displayAliasesByGroup(ml) {
-    this.search = null;
     this.goToAlias(ml);
-    this.services.navigation.selectedGroup = ml;
-    this.services.$scope.$broadcast(
-      'paginationServerSide.loadPage',
-      1,
-      'groupAliasTable',
-    );
   }
 
   getLoading() {
diff --git a/packages/manager/modules/exchange/src/group/group.html b/packages/manager/modules/exchange/src/group/group.html
index 096480010fef..f51d9b297c1b 100644
--- a/packages/manager/modules/exchange/src/group/group.html
+++ b/packages/manager/modules/exchange/src/group/group.html
@@ -236,6 +236,14 @@
                                             data-translate="exchange_tab_GROUPS_menu_delegation"
                                         ></span>
                                     </oui-action-menu-item>
+                                    <oui-action-menu-item
+                                        data-on-click="ctrl.displayAliasesByGroup(ml)"
+                                        data-disabled="!ctrl.services.exchangeStates.constructor.isOk(ml)"
+                                    >
+                                        <span
+                                            data-translate="exchange_tab_ACCOUNTS_menu_alias"
+                                        ></span>
+                                    </oui-action-menu-item>
                                     <oui-action-menu-item
                                         data-on-click="ctrl.deleteGroup(ml)"
                                         data-disabled="!ctrl.services.exchangeStates.constructor.isOk(ml)"
diff --git a/packages/manager/modules/exchange/src/group/group.module.js b/packages/manager/modules/exchange/src/group/group.module.js
index 876331853ff5..407ff54fd19d 100644
--- a/packages/manager/modules/exchange/src/group/group.module.js
+++ b/packages/manager/modules/exchange/src/group/group.module.js
@@ -7,7 +7,7 @@ import routing from './group.routing';
 
 import manager from './manager/manager.module';
 import member from './member/member.module';
-import alias from './alias/alias.module';
+import alias from './alias/group-alias.module';
 
 const moduleName = 'ovhManagerExchangeDashboardGroup';
 
diff --git a/packages/manager/modules/exchange/src/group/group.routing.js b/packages/manager/modules/exchange/src/group/group.routing.js
index 2293ebc1e8ed..b33ef211fa4d 100644
--- a/packages/manager/modules/exchange/src/group/group.routing.js
+++ b/packages/manager/modules/exchange/src/group/group.routing.js
@@ -10,22 +10,19 @@ export default /* @ngInject */ ($stateProvider) => {
       goToAlias: /* @ngInject */ ($state, $transition$) => (mailingList) =>
         $state.go('exchange.dashboard.group.mailing-list.alias', {
           ...$transition$.params(),
-          mailingList,
-          address: mailingList.mailingListAddress,
+          group: mailingList.mailingListAddress,
         }),
       goToGroup: /* @ngInject */ ($state, $transition$) => () =>
         $state.go('exchange.dashboard.group', $transition$.params()),
       goToManager: /* @ngInject */ ($state, $transition$) => (mailingList) =>
         $state.go('exchange.dashboard.group.mailing-list.manager', {
           ...$transition$.params(),
-          mailingList,
-          address: mailingList.mailingListAddress,
+          group: mailingList.mailingListAddress,
         }),
       goToMembers: /* @ngInject */ ($state, $transition$) => (mailingList) =>
         $state.go('exchange.dashboard.group.mailing-list.member', {
           ...$transition$.params(),
-          mailingList,
-          address: mailingList.mailingListAddress,
+          group: mailingList.mailingListAddress,
         }),
       breadcrumb: /* @ngInject */ ($translate) =>
         $translate.instant('exchange_group'),
@@ -33,12 +30,11 @@ export default /* @ngInject */ ($stateProvider) => {
   });
 
   $stateProvider.state('exchange.dashboard.group.mailing-list', {
-    url: '/:address',
+    url: '/:group',
     redirectTo: 'exchange.dashboard.group',
     template: '<div ui-view></div>',
     resolve: {
-      address: /* @ngInject */ ($transition$) => $transition$.params().address,
-      breadcrumb: /* @ngInject */ (address) => address,
+      breadcrumb: /* @ngInject */ ($transition$) => $transition$.params().group,
     },
   });
 };
diff --git a/packages/manager/modules/exchange/src/group/manager/group-manager.controller.js b/packages/manager/modules/exchange/src/group/manager/group-manager.controller.js
index 6211dc0611be..8dfa24a6e0c0 100644
--- a/packages/manager/modules/exchange/src/group/manager/group-manager.controller.js
+++ b/packages/manager/modules/exchange/src/group/manager/group-manager.controller.js
@@ -4,7 +4,6 @@ export default class ExchangeTabManagersByGroupsCtrl {
     $scope,
     wucExchange,
     navigation,
-    mailingList,
     messaging,
     $translate,
     goToGroup,
@@ -22,7 +21,6 @@ export default class ExchangeTabManagersByGroupsCtrl {
     this.$routerParams = wucExchange.getParams();
     this.groupParams = {};
     this.goToGroup = goToGroup;
-    this.mailingList = mailingList;
 
     $scope.$on(wucExchange.events.accountsChanged, () => this.refreshList());
     $scope.getManagersList = () => this.managersList;
@@ -39,7 +37,7 @@ export default class ExchangeTabManagersByGroupsCtrl {
       .retrievingManagersByGroup(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.mailingList.mailingListName,
+        this.$routerParams.group,
         pageSize,
         offset - 1,
       )
@@ -67,7 +65,7 @@ export default class ExchangeTabManagersByGroupsCtrl {
       .retrievingManagersByGroup(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.mailingList.mailingListName,
+        this.$routerParams.group,
         this.groupParams.pageSize,
         this.groupParams.offset - 1,
       )
@@ -97,7 +95,6 @@ export default class ExchangeTabManagersByGroupsCtrl {
     this.services.navigation.setAction(
       'exchange/group/manager/remove/group-manager-remove',
       {
-        group: this.mailingList,
         manager,
       },
     );
diff --git a/packages/manager/modules/exchange/src/group/manager/group-manager.html b/packages/manager/modules/exchange/src/group/manager/group-manager.html
index 3a935c5d713b..b774e732f70d 100644
--- a/packages/manager/modules/exchange/src/group/manager/group-manager.html
+++ b/packages/manager/modules/exchange/src/group/manager/group-manager.html
@@ -1,7 +1,5 @@
 <div>
-    <oui-back-button data-on-click="ctrl.goToGroup()">
-        <span data-translate="common_back"></span>
-    </oui-back-button>
+    <oui-back-button data-on-click="ctrl.goToGroup()"></oui-back-button>
     <h2
         data-ng-bind-html="'exchange_GROUPS_manager_intro' | translate:{ t0: ctrl.services.navigation.selectedGroup.mailingListDisplayName }"
     ></h2>
diff --git a/packages/manager/modules/exchange/src/group/manager/manager.routing.js b/packages/manager/modules/exchange/src/group/manager/manager.routing.js
index 0337b9e8db13..c4f2b94885b4 100644
--- a/packages/manager/modules/exchange/src/group/manager/manager.routing.js
+++ b/packages/manager/modules/exchange/src/group/manager/manager.routing.js
@@ -6,12 +6,7 @@ export default /* @ngInject */ ($stateProvider) => {
     controller: 'ExchangeTabManagersByGroupsCtrl',
     controllerAs: 'ctrl',
     template,
-    params: {
-      mailingList: {},
-    },
     resolve: {
-      mailingList: /* @ngInject */ ($transition$) =>
-        $transition$.params().mailingList,
       breadcrumb: /* @ngInject */ ($translate) =>
         $translate.instant('exchange_group_manager'),
     },
diff --git a/packages/manager/modules/exchange/src/group/manager/remove/group-manager-remove.controller.js b/packages/manager/modules/exchange/src/group/manager/remove/group-manager-remove.controller.js
index 8a2e3df2f7aa..0d05e6adb49e 100644
--- a/packages/manager/modules/exchange/src/group/manager/remove/group-manager-remove.controller.js
+++ b/packages/manager/modules/exchange/src/group/manager/remove/group-manager-remove.controller.js
@@ -10,7 +10,6 @@ export default class ExchangeRemoveManagerCtrl {
     };
 
     this.$routerParams = wucExchange.getParams();
-    this.group = navigation.currentActionData.group;
     this.manager = navigation.currentActionData.manager;
 
     $scope.submit = () => this.submit();
@@ -25,7 +24,7 @@ export default class ExchangeRemoveManagerCtrl {
       .removeManager(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.group.mailingListName,
+        this.$routerParams.group,
         this.manager.id,
       )
       .then((success) => {
@@ -34,7 +33,7 @@ export default class ExchangeRemoveManagerCtrl {
             'exchange_GROUPS_remove_manager_success_message',
             {
               t0: this.manager.primaryEmailAddress,
-              t1: this.group.mailingListDisplayName,
+              t1: this.$routerParams.group,
             },
           ),
           success,
@@ -46,7 +45,7 @@ export default class ExchangeRemoveManagerCtrl {
             'exchange_GROUPS_remove_manager_error_message',
             {
               t0: this.manager.primaryEmailAddress,
-              t1: this.group.mailingListDisplayName,
+              t1: this.$routerParams.group,
             },
           ),
           failure,
diff --git a/packages/manager/modules/exchange/src/group/manager/remove/group-manager-remove.html b/packages/manager/modules/exchange/src/group/manager/remove/group-manager-remove.html
index 2633680cabae..71f4b3f991d8 100644
--- a/packages/manager/modules/exchange/src/group/manager/remove/group-manager-remove.html
+++ b/packages/manager/modules/exchange/src/group/manager/remove/group-manager-remove.html
@@ -14,7 +14,7 @@
                 ></dt>
                 <dd
                     class="word-break"
-                    data-ng-bind="ctrl.group.mailingListDisplayName | wucSliceContent: 150"
+                    data-ng-bind="ctrl.$routerParams.group | wucSliceContent: 150"
                 ></dd>
 
                 <dt
diff --git a/packages/manager/modules/exchange/src/group/member/group-member.controller.js b/packages/manager/modules/exchange/src/group/member/group-member.controller.js
index 14204438857d..1b494245dace 100644
--- a/packages/manager/modules/exchange/src/group/member/group-member.controller.js
+++ b/packages/manager/modules/exchange/src/group/member/group-member.controller.js
@@ -4,7 +4,6 @@ export default class ExchangeTabMembersByGroupsCtrl {
     $scope,
     wucExchange,
     $timeout,
-    mailingList,
     messaging,
     navigation,
     $translate,
@@ -24,7 +23,6 @@ export default class ExchangeTabMembersByGroupsCtrl {
     this.$routerParams = wucExchange.getParams();
     this.groupParams = {};
     this.goToGroup = goToGroup;
-    this.mailingList = mailingList;
 
     $scope.$on(wucExchange.events.accountsChanged, () => this.refreshList());
     $scope.getMembersList = () => this.membersList;
@@ -41,7 +39,7 @@ export default class ExchangeTabMembersByGroupsCtrl {
       .retrievingMembersByGroup(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.mailingList.mailingListName,
+        this.$routerParams.group,
         pageSize,
         offset - 1,
       )
@@ -69,7 +67,7 @@ export default class ExchangeTabMembersByGroupsCtrl {
       .retrievingMembersByGroup(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.mailingList.mailingListName,
+        this.$routerParams.group,
         this.groupParams.pageSize,
         this.groupParams.offset - 1,
       )
@@ -99,7 +97,6 @@ export default class ExchangeTabMembersByGroupsCtrl {
     this.services.navigation.setAction(
       'exchange/group/member/remove/group-member-remove',
       {
-        group: this.mailingList,
         member,
       },
     );
diff --git a/packages/manager/modules/exchange/src/group/member/group-member.html b/packages/manager/modules/exchange/src/group/member/group-member.html
index efbdb045a5cd..e4837d08aba3 100644
--- a/packages/manager/modules/exchange/src/group/member/group-member.html
+++ b/packages/manager/modules/exchange/src/group/member/group-member.html
@@ -1,7 +1,5 @@
 <div>
-    <oui-back-button data-on-click="ctrl.goToGroup()">
-        <span data-translate="common_back"></span>
-    </oui-back-button>
+    <oui-back-button data-on-click="ctrl.goToGroup()"></oui-back-button>
     <h2
         data-ng-bind-html="'exchange_GROUPS_member_intro' | translate:{ t0: ctrl.services.navigation.selectedGroup.mailingListDisplayName }"
     ></h2>
diff --git a/packages/manager/modules/exchange/src/group/member/member.routing.js b/packages/manager/modules/exchange/src/group/member/member.routing.js
index 5e576beeb627..4219217a2edc 100644
--- a/packages/manager/modules/exchange/src/group/member/member.routing.js
+++ b/packages/manager/modules/exchange/src/group/member/member.routing.js
@@ -6,12 +6,7 @@ export default /* @ngInject */ ($stateProvider) => {
     controller: 'ExchangeTabMembersByGroupsCtrl',
     controllerAs: 'ctrl',
     template,
-    params: {
-      mailingList: {},
-    },
     resolve: {
-      mailingList: /* @ngInject */ ($transition$) =>
-        $transition$.params().mailingList,
       breadcrumb: /* @ngInject */ ($translate) =>
         $translate.instant('exchange_group_member'),
     },
diff --git a/packages/manager/modules/exchange/src/group/member/remove/group-member-remove.controller.js b/packages/manager/modules/exchange/src/group/member/remove/group-member-remove.controller.js
index f4d30e7fdddc..17c07425ac8a 100644
--- a/packages/manager/modules/exchange/src/group/member/remove/group-member-remove.controller.js
+++ b/packages/manager/modules/exchange/src/group/member/remove/group-member-remove.controller.js
@@ -11,7 +11,6 @@ export default class ExchangeRemoveMemberCtrl {
 
     this.$routerParams = wucExchange.getParams();
 
-    this.group = navigation.currentActionData.group;
     this.member = navigation.currentActionData.member;
 
     $scope.submit = () => this.submit();
@@ -26,7 +25,7 @@ export default class ExchangeRemoveMemberCtrl {
       .removeMember(
         this.$routerParams.organization,
         this.$routerParams.productId,
-        this.group.mailingListName,
+        this.$routerParams.group,
         this.member.id,
         this.member.type,
       )
@@ -36,7 +35,7 @@ export default class ExchangeRemoveMemberCtrl {
             'exchange_GROUPS_remove_member_success_message',
             {
               t0: this.member.primaryEmailAddress,
-              t1: this.group.mailingListDisplayName,
+              t1: this.$routerParams.group,
             },
           ),
           success,
@@ -48,7 +47,7 @@ export default class ExchangeRemoveMemberCtrl {
             'exchange_GROUPS_remove_member_error_message',
             {
               t0: this.member.primaryEmailAddress,
-              t1: this.group.mailingListDisplayName,
+              t1: this.$routerParams.group,
             },
           ),
           failure,
diff --git a/packages/manager/modules/exchange/src/group/member/remove/group-member-remove.html b/packages/manager/modules/exchange/src/group/member/remove/group-member-remove.html
index 3738256c1b23..7e4fb91f4d87 100644
--- a/packages/manager/modules/exchange/src/group/member/remove/group-member-remove.html
+++ b/packages/manager/modules/exchange/src/group/member/remove/group-member-remove.html
@@ -14,7 +14,7 @@
                 ></dt>
                 <dd
                     class="word-break"
-                    data-ng-bind="ctrl.group.mailingListDisplayName | wucSliceContent: 150"
+                    data-ng-bind="ctrl.$routerParams.group | wucSliceContent: 150"
                 ></dd>
 
                 <dt
diff --git a/packages/manager/modules/exchange/src/shared-account/alias/add/shared-account-alias-add.module.js b/packages/manager/modules/exchange/src/shared-account/alias/add/shared-account-alias-add.module.js
new file mode 100644
index 000000000000..9873e5544af9
--- /dev/null
+++ b/packages/manager/modules/exchange/src/shared-account/alias/add/shared-account-alias-add.module.js
@@ -0,0 +1,15 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import routing from './shared-account-alias-add.routing';
+
+const moduleName = 'ovhManagerExchangeDashboardSharedAccountAliasAdd';
+
+angular
+  .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
+  .config(routing)
+  .run(/* @ngTranslationsInject:json ./translations */);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/shared-account/alias/add/shared-account-alias-add.routing.js b/packages/manager/modules/exchange/src/shared-account/alias/add/shared-account-alias-add.routing.js
new file mode 100644
index 000000000000..db3dda6ab41a
--- /dev/null
+++ b/packages/manager/modules/exchange/src/shared-account/alias/add/shared-account-alias-add.routing.js
@@ -0,0 +1,15 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('exchange.dashboard.shared-account.shared.alias.add', {
+    url: '/add',
+    views: {
+      modal: {
+        component: 'exchangeAliasAdd',
+      },
+    },
+    layout: 'modal',
+    resolve: {
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('exchange_account_alias'),
+    },
+  });
+};
diff --git a/packages/manager/modules/exchange/src/shared-account/alias/remove/shared-account-alias-remove.module.js b/packages/manager/modules/exchange/src/shared-account/alias/remove/shared-account-alias-remove.module.js
new file mode 100644
index 000000000000..499837269900
--- /dev/null
+++ b/packages/manager/modules/exchange/src/shared-account/alias/remove/shared-account-alias-remove.module.js
@@ -0,0 +1,15 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import routing from './shared-account-alias-remove.routing';
+
+const moduleName = 'ovhManagerExchangeDashboardSharedAccountAliasRemove';
+
+angular
+  .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
+  .config(routing)
+  .run(/* @ngTranslationsInject:json ./translations */);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/shared-account/alias/remove/shared-account-alias-remove.routing.js b/packages/manager/modules/exchange/src/shared-account/alias/remove/shared-account-alias-remove.routing.js
new file mode 100644
index 000000000000..32796c61a9e1
--- /dev/null
+++ b/packages/manager/modules/exchange/src/shared-account/alias/remove/shared-account-alias-remove.routing.js
@@ -0,0 +1,18 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state(
+    'exchange.dashboard.shared-account.shared.alias.remove',
+    {
+      url: '/remove?alias',
+      views: {
+        modal: {
+          component: 'exchangeAliasRemove',
+        },
+      },
+      layout: 'modal',
+      resolve: {
+        breadcrumb: /* @ngInject */ ($translate) =>
+          $translate.instant('exchange_account_alias'),
+      },
+    },
+  );
+};
diff --git a/packages/manager/modules/exchange/src/shared-account/alias/shared-account-alias.module.js b/packages/manager/modules/exchange/src/shared-account/alias/shared-account-alias.module.js
new file mode 100644
index 000000000000..a0203961540b
--- /dev/null
+++ b/packages/manager/modules/exchange/src/shared-account/alias/shared-account-alias.module.js
@@ -0,0 +1,22 @@
+import angular from 'angular';
+import 'angular-translate';
+import '@ovh-ux/ui-kit';
+import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
+
+import routing from './shared-account-alias.routing';
+import aliasAddModule from './add/shared-account-alias-add.module';
+import aliasRemoveModule from './remove/shared-account-alias-remove.module';
+
+const moduleName = 'ovhManagerExchangeDashboardSharedAccountAlias';
+
+angular
+  .module(moduleName, [
+    ngTranslateAsyncLoader,
+    'oui',
+    'pascalprecht.translate',
+    aliasAddModule,
+    aliasRemoveModule,
+  ])
+  .config(routing);
+
+export default moduleName;
diff --git a/packages/manager/modules/exchange/src/shared-account/alias/shared-account-alias.routing.js b/packages/manager/modules/exchange/src/shared-account/alias/shared-account-alias.routing.js
new file mode 100644
index 000000000000..991b997017dd
--- /dev/null
+++ b/packages/manager/modules/exchange/src/shared-account/alias/shared-account-alias.routing.js
@@ -0,0 +1,18 @@
+export default /* @ngInject */ ($stateProvider) => {
+  $stateProvider.state('exchange.dashboard.shared-account.shared.alias', {
+    url: '/alias',
+    component: 'exchangeAlias',
+    resolve: {
+      aliasType: /* @ngInject */ () => 'shared',
+      goBack: /* @ngInject */ ($state) => () => $state.go('^'),
+      goToAliasAdd: /* @ngInject */ ($state) => () =>
+        $state.go('exchange.dashboard.shared-account.shared.alias.add'),
+      goToAliasRemove: /* @ngInject */ ($state) => (alias) =>
+        $state.go('exchange.dashboard.shared-account.shared.alias.remove', {
+          alias,
+        }),
+      breadcrumb: /* @ngInject */ ($translate) =>
+        $translate.instant('exchange_account_alias'),
+    },
+  });
+};
diff --git a/packages/manager/modules/exchange/src/shared-account/shared-account.component.js b/packages/manager/modules/exchange/src/shared-account/shared-account.component.js
new file mode 100644
index 000000000000..570638cc6460
--- /dev/null
+++ b/packages/manager/modules/exchange/src/shared-account/shared-account.component.js
@@ -0,0 +1,12 @@
+import controller from './shared-account.controller';
+import template from './shared-account.html';
+
+export default {
+  bindings: {
+    productId: '<',
+    organization: '<',
+    goToAliasManagement: '<',
+  },
+  controller,
+  template,
+};
diff --git a/packages/manager/modules/exchange/src/shared-account/shared-account.controller.js b/packages/manager/modules/exchange/src/shared-account/shared-account.controller.js
index 8ed8c9354fd0..49018b6a7920 100644
--- a/packages/manager/modules/exchange/src/shared-account/shared-account.controller.js
+++ b/packages/manager/modules/exchange/src/shared-account/shared-account.controller.js
@@ -227,4 +227,8 @@ export default class ExchangeTabSharedAccountsCtrl {
       );
     }
   }
+
+  displayAliasManagementView(account) {
+    this.goToAliasManagement(account);
+  }
 }
diff --git a/packages/manager/modules/exchange/src/shared-account/shared-account.html b/packages/manager/modules/exchange/src/shared-account/shared-account.html
index 8914d79c6cf0..b71bea146967 100644
--- a/packages/manager/modules/exchange/src/shared-account/shared-account.html
+++ b/packages/manager/modules/exchange/src/shared-account/shared-account.html
@@ -1,243 +1,262 @@
-<div class="row" data-ng-if="ctrl.showAccounts">
-    <div class="col-md-9">
-        <div
-            data-ng-if="!loading && canDisplayQuota"
-            data-ng-bind-html="'exchange_SHARED_ACCOUNTS_quota_recap' | translation: { t0: ctrl.quotaLimit, t1: quotaRemaining, t2: quoteRemainingPercent }"
-        ></div>
+<div ui-view>
+    <div class="row" data-ng-if="$ctrl.showAccounts">
+        <div class="col-md-9">
+            <div
+                data-ng-if="!loading && canDisplayQuota"
+                data-ng-bind-html="'exchange_SHARED_ACCOUNTS_quota_recap' | translation: { t0: $ctrl.quotaLimit, t1: quotaRemaining, t2: quoteRemainingPercent }"
+            ></div>
 
-        <p
-            class="alert alert-info"
-            role="alert"
-            data-ng-if="ctrl.accounts.list.messages.length > 0 && !ctrl.loading"
-        >
-            <strong data-translate="exchange_tab_ACCOUNTS_warning"></strong>
-            <span data-translate="exchange_tab_ACCOUNTS_partial"></span>
-        </p>
+            <p
+                class="alert alert-info"
+                role="alert"
+                data-ng-if="$ctrl.accounts.list.messages.length > 0 && !$ctrl.loading"
+            >
+                <strong data-translate="exchange_tab_ACCOUNTS_warning"></strong>
+                <span data-translate="exchange_tab_ACCOUNTS_partial"></span>
+            </p>
 
-        <form class="mb-3 form-inline d-md-flex justify-content-md-end">
-            <div class="form-group">
-                <label
-                    class="sr-only"
-                    for="groupSearch"
-                    data-ng-bind="::'common_search' | translate"
-                ></label>
-                <div class="input-group">
-                    <input
-                        type="text"
-                        class="form-control"
-                        id="groupSearch"
-                        maxlength="256"
-                        placeholder="{{'exchange_tab_ACCOUNTS_table_email' | translate}}"
-                        data-ng-change="ctrl.onSearch()"
-                        data-ng-disabled="ctrl.loading"
-                        data-ng-model="ctrl.searchValue"
-                    />
-                    <div class="input-group-btn" data-ng-if="ctrl.searchValue">
-                        <button
-                            class="btn btn-default"
-                            type="button"
-                            aria-label="{{'common_cancel' | translate}}"
-                            data-ng-click="ctrl.resetSearch()"
-                            data-ng-disabled="ctrl.loading"
+            <form class="mb-3 form-inline d-md-flex justify-content-md-end">
+                <div class="form-group">
+                    <label
+                        class="sr-only"
+                        for="groupSearch"
+                        data-ng-bind="::'common_search' | translate"
+                    ></label>
+                    <div class="input-group">
+                        <input
+                            type="text"
+                            class="form-control"
+                            id="groupSearch"
+                            maxlength="256"
+                            placeholder="{{'exchange_tab_ACCOUNTS_table_email' | translate}}"
+                            data-ng-change="$ctrl.onSearch()"
+                            data-ng-disabled="$ctrl.loading"
+                            data-ng-model="$ctrl.searchValue"
+                        />
+                        <div
+                            class="input-group-btn"
+                            data-ng-if="$ctrl.searchValue"
                         >
-                            <span class="fa fa-times" aria-hidden="true"></span>
-                        </button>
+                            <button
+                                class="btn btn-default"
+                                type="button"
+                                aria-label="{{'common_cancel' | translate}}"
+                                data-ng-click="$ctrl.resetSearch()"
+                                data-ng-disabled="$ctrl.loading"
+                            >
+                                <span
+                                    class="fa fa-times"
+                                    aria-hidden="true"
+                                ></span>
+                            </button>
+                        </div>
+                        <span
+                            class="input-group-addon"
+                            data-ng-if="!$ctrl.searchValue"
+                        >
+                            <span
+                                class="fa fa-search"
+                                aria-hidden="true"
+                            ></span>
+                        </span>
                     </div>
-                    <span
-                        class="input-group-addon"
-                        data-ng-if="!ctrl.searchValue"
-                    >
-                        <span class="fa fa-search" aria-hidden="true"></span>
-                    </span>
                 </div>
-            </div>
-        </form>
-
-        <div class="table-responsive">
-            <table class="table table-hover">
-                <thead>
-                    <tr>
-                        <th
-                            scope="col"
-                            data-translate="exchange_tab_ACCOUNTS_table_email"
-                        ></th>
-                        <th
-                            class="text-center"
-                            scope="col"
-                            data-translate="exchange_tab_ACCOUNTS_table_size"
-                        ></th>
-                        <th
-                            class="text-center min-width"
-                            scope="col"
-                            data-translate="exchange_tab_ACCOUNTS_table_status"
-                        ></th>
-                        <th class="min-width" scope="col"></th>
-                    </tr>
-                </thead>
+            </form>
 
-                <tbody data-ng-if="ctrl.loading">
-                    <tr>
-                        <td class="text-center" colspan="4">
-                            <oui-spinner></oui-spinner>
-                        </td>
-                    </tr>
-                </tbody>
+            <div class="table-responsive">
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th
+                                scope="col"
+                                data-translate="exchange_tab_ACCOUNTS_table_email"
+                            ></th>
+                            <th
+                                class="text-center"
+                                scope="col"
+                                data-translate="exchange_tab_ACCOUNTS_table_size"
+                            ></th>
+                            <th
+                                class="text-center min-width"
+                                scope="col"
+                                data-translate="exchange_tab_ACCOUNTS_table_status"
+                            ></th>
+                            <th class="min-width" scope="col"></th>
+                        </tr>
+                    </thead>
 
-                <tbody
-                    data-ng-if="ctrl.accounts.list.results.length === 0 && ctrl.accounts.list.messages.length === 0 && !ctrl.loading && ctrl.search.value == null"
-                >
-                    <tr>
-                        <td
-                            class="text-center"
-                            colspan="4"
-                            data-translate="exchange_tab_ACCOUNTS_table_empty"
-                        ></td>
-                    </tr>
-                </tbody>
+                    <tbody data-ng-if="$ctrl.loading">
+                        <tr>
+                            <td class="text-center" colspan="4">
+                                <oui-spinner></oui-spinner>
+                            </td>
+                        </tr>
+                    </tbody>
 
-                <tbody
-                    data-ng-if="ctrl.accounts.list.results.length === 0 && ctrl.accounts.list.messages.length === 0 && !ctrl.loading && ctrl.search.value != null"
-                >
-                    <tr>
-                        <td
-                            class="text-center"
-                            colspan="4"
-                            data-translate="exchange_tab_ACCOUNTS_table_empty_search"
-                        ></td>
-                    </tr>
-                </tbody>
+                    <tbody
+                        data-ng-if="$ctrl.accounts.list.results.length === 0 && $ctrl.accounts.list.messages.length === 0 && !$ctrl.loading && $ctrl.search.value == null"
+                    >
+                        <tr>
+                            <td
+                                class="text-center"
+                                colspan="4"
+                                data-translate="exchange_tab_ACCOUNTS_table_empty"
+                            ></td>
+                        </tr>
+                    </tbody>
 
-                <tbody data-ng-if="!ctrl.loading">
-                    <tr
-                        data-ng-repeat="account in ctrl.accounts.list.results | orderBy:'primaryEmailAddress':false track by $index"
+                    <tbody
+                        data-ng-if="$ctrl.accounts.list.results.length === 0 && $ctrl.accounts.list.messages.length === 0 && !$ctrl.loading && $ctrl.search.value != null"
                     >
-                        <th
-                            class="word-break"
-                            scope="row"
-                            data-ng-bind="account.primaryEmailDisplayName"
-                        ></th>
-                        <td
-                            class="text-center"
-                            data-ng-bind="ctrl.services.ExchangeSharedAccounts.getFormattedQuota(account.quota)"
-                        ></td>
-                        <td class="text-center">
-                            <span
-                                class="oui-badge oui-badge_warning"
-                                data-ng-if="account.state === ctrl.stateTaskError"
-                                data-oui-tooltip="{{:: 'exchange_tab_ACCOUNTS_state_TASK_ON_ERROR' | translate}}"
-                            ></span>
-                            <span
-                                class="oui-badge oui-badge_warning"
-                                data-ng-if="account.state === ctrl.stateTaskDoing"
-                                data-oui-tooltip="{{:: 'exchange_tab_ACCOUNTS_state_TASK_ON_DOING' | translate}}"
-                            ></span>
-                            <span
-                                class="oui-badge oui-badge_success"
-                                data-ng-if="account.state == ctrl.stateOk"
-                                data-translate="exchange_tab_ACCOUNTS_state_OK"
-                            ></span>
-                            <span
-                                class="oui-badge oui-badge_info"
-                                data-ng-if="account.state === ctrl.stateCreating"
-                                data-translate="exchange_tab_ACCOUNTS_state_CREATING"
-                            ></span>
-                            <span
-                                class="oui-badge oui-badge_info"
-                                data-ng-if="account.state === ctrl.stateDeleting"
-                                data-translate="exchange_tab_ACCOUNTS_state_DELETING"
-                            ></span>
-                            <span
-                                class="oui-badge oui-badge_info"
-                                data-ng-if="account.info === ctrl.stateSuspended"
-                                data-translate="exchange_tab_ACCOUNTS_state_SUSPENDED"
-                            ></span>
-                            <span
-                                class="oui-badge oui-badge_info"
-                                data-ng-if="account.state === ctrl.stateSuspending"
-                                data-translate="exchange_tab_ACCOUNTS_state_SUSPENDING"
-                            ></span>
-                            <span
-                                class="oui-badge oui-badge_info"
-                                data-ng-if="account.state === ctrl.stateReopening"
-                                data-translate="exchange_tab_ACCOUNTS_state_REOPENING"
-                            ></span>
-                        </td>
+                        <tr>
+                            <td
+                                class="text-center"
+                                colspan="4"
+                                data-translate="exchange_tab_ACCOUNTS_table_empty_search"
+                            ></td>
+                        </tr>
+                    </tbody>
 
-                        <td class="text-center text-nowrap">
-                            <oui-action-menu
-                                data-compact
-                                data-disabled="!ctrl.isConfigurable(account)"
-                                data-placement="end"
-                            >
-                                <oui-action-menu-item
-                                    data-on-click="ctrl.editAccount(account)"
-                                    data-disabled="!ctrl.isEditable(account)"
-                                >
-                                    <span
-                                        data-translate="exchange_tab_ACCOUNTS_edit_account_tooltip"
-                                    ></span>
-                                </oui-action-menu-item>
-                                <oui-action-menu-item
-                                    data-on-click="ctrl.delegationSettings(account)"
-                                    data-disabled="ctrl.isDisabled(account)"
-                                >
-                                    <span
-                                        data-translate="exchange_tab_ACCOUNTS_popover_delegation"
-                                    ></span>
-                                </oui-action-menu-item>
-                                <oui-action-menu-item
-                                    data-on-click="ctrl.deleteAccount(account)"
-                                    data-disabled="ctrl.isDisabled(account)"
+                    <tbody data-ng-if="!$ctrl.loading">
+                        <tr
+                            data-ng-repeat="account in $ctrl.accounts.list.results | orderBy:'primaryEmailAddress':false track by $index"
+                        >
+                            <th
+                                class="word-break"
+                                scope="row"
+                                data-ng-bind="account.primaryEmailDisplayName"
+                            ></th>
+                            <td
+                                class="text-center"
+                                data-ng-bind="$ctrl.services.ExchangeSharedAccounts.getFormattedQuota(account.quota)"
+                            ></td>
+                            <td class="text-center">
+                                <span
+                                    class="oui-badge oui-badge_warning"
+                                    data-ng-if="account.state === $ctrl.stateTaskError"
+                                    data-oui-tooltip="{{:: 'exchange_tab_ACCOUNTS_state_TASK_ON_ERROR' | translate}}"
+                                ></span>
+                                <span
+                                    class="oui-badge oui-badge_warning"
+                                    data-ng-if="account.state === $ctrl.stateTaskDoing"
+                                    data-oui-tooltip="{{:: 'exchange_tab_ACCOUNTS_state_TASK_ON_DOING' | translate}}"
+                                ></span>
+                                <span
+                                    class="oui-badge oui-badge_success"
+                                    data-ng-if="account.state == $ctrl.stateOk"
+                                    data-translate="exchange_tab_ACCOUNTS_state_OK"
+                                ></span>
+                                <span
+                                    class="oui-badge oui-badge_info"
+                                    data-ng-if="account.state === $ctrl.stateCreating"
+                                    data-translate="exchange_tab_ACCOUNTS_state_CREATING"
+                                ></span>
+                                <span
+                                    class="oui-badge oui-badge_info"
+                                    data-ng-if="account.state === $ctrl.stateDeleting"
+                                    data-translate="exchange_tab_ACCOUNTS_state_DELETING"
+                                ></span>
+                                <span
+                                    class="oui-badge oui-badge_info"
+                                    data-ng-if="account.info === $ctrl.stateSuspended"
+                                    data-translate="exchange_tab_ACCOUNTS_state_SUSPENDED"
+                                ></span>
+                                <span
+                                    class="oui-badge oui-badge_info"
+                                    data-ng-if="account.state === $ctrl.stateSuspending"
+                                    data-translate="exchange_tab_ACCOUNTS_state_SUSPENDING"
+                                ></span>
+                                <span
+                                    class="oui-badge oui-badge_info"
+                                    data-ng-if="account.state === $ctrl.stateReopening"
+                                    data-translate="exchange_tab_ACCOUNTS_state_REOPENING"
+                                ></span>
+                            </td>
+
+                            <td class="text-center text-nowrap">
+                                <oui-action-menu
+                                    data-compact
+                                    data-disabled="!$ctrl.isConfigurable(account)"
+                                    data-placement="end"
                                 >
-                                    <span
-                                        data-translate="exchange_tab_ACCOUNTS_popover_delete"
-                                    ></span>
-                                </oui-action-menu-item>
-                            </oui-action-menu>
-                        </td>
-                    </tr>
+                                    <oui-action-menu-item
+                                        data-on-click="$ctrl.editAccount(account)"
+                                        data-disabled="!$ctrl.isEditable(account)"
+                                    >
+                                        <span
+                                            data-translate="exchange_tab_ACCOUNTS_edit_account_tooltip"
+                                        ></span>
+                                    </oui-action-menu-item>
+                                    <oui-action-menu-item
+                                        data-on-click="$ctrl.delegationSettings(account)"
+                                        data-disabled="$ctrl.isDisabled(account)"
+                                    >
+                                        <span
+                                            data-translate="exchange_tab_ACCOUNTS_popover_delegation"
+                                        ></span>
+                                    </oui-action-menu-item>
+                                    <oui-action-menu-item
+                                        data-on-click="$ctrl.displayAliasManagementView(account)"
+                                        data-disabled="!$ctrl.services.exchangeStates.constructor.isOk(account)"
+                                    >
+                                        <span
+                                            data-translate="exchange_tab_ACCOUNTS_menu_alias"
+                                        ></span>
+                                    </oui-action-menu-item>
+                                    <oui-action-menu-item
+                                        data-on-click="$ctrl.deleteAccount(account)"
+                                        data-disabled="$ctrl.isDisabled(account)"
+                                    >
+                                        <span
+                                            data-translate="exchange_tab_ACCOUNTS_popover_delete"
+                                        ></span>
+                                    </oui-action-menu-item>
+                                </oui-action-menu>
+                            </td>
+                        </tr>
 
-                    <tr
-                        data-ng-repeat="account in ctrl.accounts.list.messages | orderBy:'id':false track by $index"
-                    >
-                        <td colspan="4">
-                            <span
-                                class="fa fa-exclamation-triangle mr-2"
-                                aria-hidden="true"
-                            ></span>
-                            <span
-                                data-ng-bind="account.primaryEmailAddress"
-                                data-oui-tooltip="{{:: 'exchange_tab_ACCOUNTS_partial_account' | translate}}"
-                            ></span>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
+                        <tr
+                            data-ng-repeat="account in $ctrl.accounts.list.messages | orderBy:'id':false track by $index"
+                        >
+                            <td colspan="4">
+                                <span
+                                    class="fa fa-exclamation-triangle mr-2"
+                                    aria-hidden="true"
+                                ></span>
+                                <span
+                                    data-ng-bind="account.primaryEmailAddress"
+                                    data-oui-tooltip="{{:: 'exchange_tab_ACCOUNTS_partial_account' | translate}}"
+                                ></span>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
 
-        <div
-            class="clearfix"
-            data-pagination-server-side="accountsTable"
-            data-pagination-server-side-function="retrievingAccounts"
-            data-pagination-server-side-paginated-stuff="getAccounts()"
-            data-pagination-server-side-table-loading="getLoading()"
-        ></div>
-    </div>
+            <div
+                class="clearfix"
+                data-pagination-server-side="accountsTable"
+                data-pagination-server-side-function="retrievingAccounts"
+                data-pagination-server-side-paginated-stuff="getAccounts()"
+                data-pagination-server-side-table-loading="getLoading()"
+            ></div>
+        </div>
 
-    <div class="col-md-3 mt-5 mt-lg-0">
-        <button
-            class="oui-button oui-button_secondary w-100"
-            type="button"
-            data-translate="exchange_SHARED_ACCOUNTS_add_button_label"
-            data-ng-click="ctrl.newSharedAccount()"
-            data-ng-if="ctrl.isSharedAccountAdjustable()"
-        ></button>
-        <button
-            class="oui-button oui-button_secondary w-100 mt-2"
-            type="button"
-            data-ng-click="ctrl.services.navigation.setAction('exchange/account/export-as-csv/account-export-as-csv', { search : ctrl.searchValue, total : ctrl.accounts.list.results.length, exchange : ctrl.exchange, csvExportType: 'shared' })"
-            data-ng-disabled="ctrl.mailingLists.list.results.count === 0"
-            data-translate="exchange_SHARED_ACCOUNTS_export_csv"
-        ></button>
+        <div class="col-md-3 mt-5 mt-lg-0">
+            <button
+                class="oui-button oui-button_secondary w-100"
+                type="button"
+                data-translate="exchange_SHARED_ACCOUNTS_add_button_label"
+                data-ng-click="$ctrl.newSharedAccount()"
+                data-ng-if="$ctrl.isSharedAccountAdjustable()"
+            ></button>
+            <button
+                class="oui-button oui-button_secondary w-100 mt-2"
+                type="button"
+                data-ng-click="$ctrl.services.navigation.setAction('exchange/account/export-as-csv/account-export-as-csv', { search : $ctrl.searchValue, total : $ctrl.accounts.list.results.length, exchange : $ctrl.exchange, csvExportType: 'shared' })"
+                data-ng-disabled="$ctrl.mailingLists.list.results.count === 0"
+                data-translate="exchange_SHARED_ACCOUNTS_export_csv"
+            ></button>
+        </div>
     </div>
 </div>
diff --git a/packages/manager/modules/exchange/src/shared-account/shared-account.module.js b/packages/manager/modules/exchange/src/shared-account/shared-account.module.js
index d08823eb15a9..4f6a2e360709 100644
--- a/packages/manager/modules/exchange/src/shared-account/shared-account.module.js
+++ b/packages/manager/modules/exchange/src/shared-account/shared-account.module.js
@@ -4,11 +4,19 @@ import '@ovh-ux/ui-kit';
 import ngTranslateAsyncLoader from '@ovh-ux/ng-translate-async-loader';
 
 import routing from './shared-account.routing';
+import component from './shared-account.component';
+import alias from './alias/shared-account-alias.module';
 
 const moduleName = 'ovhManagerExchangeDashboardSharedAccount';
 
 angular
-  .module(moduleName, [ngTranslateAsyncLoader, 'oui', 'pascalprecht.translate'])
+  .module(moduleName, [
+    ngTranslateAsyncLoader,
+    'oui',
+    'pascalprecht.translate',
+    alias,
+  ])
+  .component('exchangeSharedAccountHome', component)
   .config(routing)
   .run(/* @ngTranslationsInject:json ./translations */);
 
diff --git a/packages/manager/modules/exchange/src/shared-account/shared-account.routing.js b/packages/manager/modules/exchange/src/shared-account/shared-account.routing.js
index 57afaef90c56..9028e4f8af7c 100644
--- a/packages/manager/modules/exchange/src/shared-account/shared-account.routing.js
+++ b/packages/manager/modules/exchange/src/shared-account/shared-account.routing.js
@@ -1,14 +1,28 @@
-import template from './shared-account.html';
-
 export default /* @ngInject */ ($stateProvider) => {
   $stateProvider.state('exchange.dashboard.shared-account', {
     url: '/shared-account',
-    controller: 'ExchangeTabSharedAccountsCtrl',
-    controllerAs: 'ctrl',
-    template,
+    component: 'exchangeSharedAccountHome',
     resolve: {
+      goToAliasManagement: /* @ngInject */ ($state, $transition$) => (
+        account,
+      ) =>
+        $state.go('exchange.dashboard.shared-account.shared.alias', {
+          ...$transition$.params(),
+          account,
+          shared: account.primaryEmailAddress,
+        }),
       breadcrumb: /* @ngInject */ ($translate) =>
         $translate.instant('exchange_dashboard_shared_account'),
     },
   });
+
+  $stateProvider.state('exchange.dashboard.shared-account.shared', {
+    url: '/:shared',
+    template: '<div ui-view></div>',
+    redirectTo: 'exchange.dashboard.shared-account',
+    resolve: {
+      shared: /* @ngInject */ ($transition$) => $transition$.params().shared,
+      breadcrumb: /* @ngInject */ (shared) => shared,
+    },
+  });
 };
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/overTheBox-details.constant.js b/packages/manager/modules/overthebox/src/overthebox/details/overTheBox-details.constant.js
index 50e009d89274..7a55e5772ebb 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/overTheBox-details.constant.js
+++ b/packages/manager/modules/overthebox/src/overthebox/details/overTheBox-details.constant.js
@@ -74,4 +74,6 @@ export default {
     unknown: 'unknown',
   },
   pattern: /[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}/,
+  deprecated: '_deprecated',
+  version: 'v',
 };
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/overTheBox-details.controller.js b/packages/manager/modules/overthebox/src/overthebox/details/overTheBox-details.controller.js
index 5d65bccda27d..52aff02fcf75 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/overTheBox-details.controller.js
+++ b/packages/manager/modules/overthebox/src/overthebox/details/overTheBox-details.controller.js
@@ -384,6 +384,27 @@ export default class OverTheBoxDetailsCtrl {
       });
   }
 
+  /**
+   * Translate channel with deprecated translation managed
+   * @param {*} channel channel to be translate
+   * @returns translated channel
+   */
+  translateReleaseChannel(channel) {
+    if (channel.includes(this.OVERTHEBOX_DETAILS.deprecated)) {
+      // Remove deprecated part
+      const version = channel.split(this.OVERTHEBOX_DETAILS.deprecated)[0];
+      return this.$translate.instant('overTheBox_release_channel_deprecated', {
+        version,
+      });
+    }
+    if (channel.includes(this.OVERTHEBOX_DETAILS.version)) {
+      return this.$translate.instant('overTheBox_release_channel', {
+        version: channel,
+      });
+    }
+    return this.$translate.instant(`overTheBox_release_channel_${channel}`);
+  }
+
   /**
    * Get available release channels
    * @returns {Promise}
@@ -397,23 +418,10 @@ export default class OverTheBoxDetailsCtrl {
       .$promise.then((channels) => {
         this.releaseChannels = channels.map((channel) => ({
           name: channel,
-          label: this.$translate.instant(
-            `overTheBox_release_channel_${channel.replace('.', '_')}`,
-          ),
+          label: this.translateReleaseChannel(channel),
         }));
 
-        const result = this.releaseChannels.find(
-          (channel) => this.releaseChannel === channel.name,
-        );
-
-        if (result) {
-          this.releaseChannel = this.$translate.instant(
-            `overTheBox_release_channel_${this.releaseChannel.replace(
-              '.',
-              '_',
-            )}`,
-          );
-        }
+        this.releaseChannel = this.translateReleaseChannel(this.releaseChannel);
       });
   }
 
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_de_DE.json b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_de_DE.json
index f451e33944d7..af234e6767ab 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_de_DE.json
+++ b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_de_DE.json
@@ -98,5 +98,7 @@
   "overTheBox_cancel": "Abbrechen",
   "overTheBox_confirm_unlink_device": "Dieses Gerät kann keine Verbindung mehr mit diesem Dienst herstellen, sind Sie sicher?",
   "overTheBox_unlink_device_error": "Das Gerät konnte nicht getrennt werden: {{errorMessage}}",
-  "overTheBox_unlink_device_success": "Die Zuordnung des Geräts wurde erfolgreich aufgehoben."
+  "overTheBox_unlink_device_success": "Die Zuordnung des Geräts wurde erfolgreich aufgehoben.",
+  "overTheBox_release_channel_deprecated": "Veraltete Version {{version}}",
+  "overTheBox_release_channel": "Version {{version}}"
 }
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_en_GB.json b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_en_GB.json
index b893f6381a89..75101e76eddc 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_en_GB.json
+++ b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_en_GB.json
@@ -98,5 +98,7 @@
   "overTheBox_cancel": "Cancel",
   "overTheBox_confirm_unlink_device": "This device will no longer be able to connect to this service, are you sure?",
   "overTheBox_unlink_device_error": "Unable to unlink the device: {{errorMessage}}",
-  "overTheBox_unlink_device_success": "Your device has been successfully detached."
+  "overTheBox_unlink_device_success": "Your device has been successfully detached.",
+  "overTheBox_release_channel_deprecated": "Deprecated version {{version}}",
+  "overTheBox_release_channel": "Version {{version}}"
 }
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_es_ES.json b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_es_ES.json
index ad330b057fb0..a17a06925e94 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_es_ES.json
+++ b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_es_ES.json
@@ -98,5 +98,7 @@
   "overTheBox_cancel": "Cancelar",
   "overTheBox_confirm_unlink_device": "Este dispositivo ya no podrá conectarse a este servicio, ¿está seguro?",
   "overTheBox_unlink_device_error": "No se pudo desasociar el dispositivo: {{errorMessage}}",
-  "overTheBox_unlink_device_success": "El dispositivo se ha desvinculado correctamente."
+  "overTheBox_unlink_device_success": "El dispositivo se ha desvinculado correctamente.",
+  "overTheBox_release_channel_deprecated": "Versión obsoleta {{version}}",
+  "overTheBox_release_channel": "Versión {{version}}"
 }
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_fr_CA.json b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_fr_CA.json
index 517eb08a589c..a6342e3e0f7e 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_fr_CA.json
+++ b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_fr_CA.json
@@ -73,9 +73,7 @@
   "overTheBox_change_release_channel_error": "Nous n'avons pas pu effectuer le changement de la version : {{errorMessage}}",
   "overTheBox_release_channel_stable": "Version stable avec mise à jour automatique",
   "overTheBox_release_channel_beta": "Version beta avec mise à jour automatique",
-  "overTheBox_release_channel_v0_8": "Version v0.8",
-  "overTheBox_release_channel_v0_9": "Version v0.9",
-  "overTheBox_release_channel_v1_0": "Version v1.0",
+  "overTheBox_release_channel": "Version {{version}}",
   "overTheBox_version_system": "Version du système d'exploitation",
   "overTheBox_last_seen": "Dernière connexion du périphérique",
   "overTheBox_last_seen_few_seconds": "Il y a quelques secondes",
@@ -98,5 +96,6 @@
   "overTheBox_confirm_unlink_device": "Ce périphérique ne pourra plus se connecter ce service, en êtes-vous sûr?",
   "overTheBox_unlink_device_error": "Nous n'avons pas pu dissocier le périphérique : {{errorMessage}}",
   "overTheBox_unlink_device_success": "Votre périphérique a été dissocié avec succès.",
-  "overTheBox_change_offer": "Changer d'offre"
+  "overTheBox_change_offer": "Changer d'offre",
+  "overTheBox_release_channel_deprecated": "Version dépréciée {{version}}"
 }
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_fr_FR.json b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_fr_FR.json
index 517eb08a589c..a6342e3e0f7e 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_fr_FR.json
+++ b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_fr_FR.json
@@ -73,9 +73,7 @@
   "overTheBox_change_release_channel_error": "Nous n'avons pas pu effectuer le changement de la version : {{errorMessage}}",
   "overTheBox_release_channel_stable": "Version stable avec mise à jour automatique",
   "overTheBox_release_channel_beta": "Version beta avec mise à jour automatique",
-  "overTheBox_release_channel_v0_8": "Version v0.8",
-  "overTheBox_release_channel_v0_9": "Version v0.9",
-  "overTheBox_release_channel_v1_0": "Version v1.0",
+  "overTheBox_release_channel": "Version {{version}}",
   "overTheBox_version_system": "Version du système d'exploitation",
   "overTheBox_last_seen": "Dernière connexion du périphérique",
   "overTheBox_last_seen_few_seconds": "Il y a quelques secondes",
@@ -98,5 +96,6 @@
   "overTheBox_confirm_unlink_device": "Ce périphérique ne pourra plus se connecter ce service, en êtes-vous sûr?",
   "overTheBox_unlink_device_error": "Nous n'avons pas pu dissocier le périphérique : {{errorMessage}}",
   "overTheBox_unlink_device_success": "Votre périphérique a été dissocié avec succès.",
-  "overTheBox_change_offer": "Changer d'offre"
+  "overTheBox_change_offer": "Changer d'offre",
+  "overTheBox_release_channel_deprecated": "Version dépréciée {{version}}"
 }
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_it_IT.json b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_it_IT.json
index d81d5d7aedc4..4c6c9f3abf8e 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_it_IT.json
+++ b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_it_IT.json
@@ -98,5 +98,7 @@
   "overTheBox_cancel": "Annullare",
   "overTheBox_confirm_unlink_device": "Il dispositivo non sarà in grado di connettersi al servizio?",
   "overTheBox_unlink_device_error": "Impossibile dissociare la periferica: {{errorMessage}}",
-  "overTheBox_unlink_device_success": "Il dispositivo è stato scollegato correttamente."
+  "overTheBox_unlink_device_success": "Il dispositivo è stato scollegato correttamente.",
+  "overTheBox_release_channel_deprecated": "Versione deprezzata {{version}}",
+  "overTheBox_release_channel": "Versione {{version}}"
 }
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_pl_PL.json b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_pl_PL.json
index 87d274c45b89..9cb426001806 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_pl_PL.json
+++ b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_pl_PL.json
@@ -98,5 +98,7 @@
   "overTheBox_cancel": "Anuluj",
   "overTheBox_confirm_unlink_device": "To urządzenie nie będzie już mogło łączyć się z tą usługą, czy na pewno?",
   "overTheBox_unlink_device_error": "Nie można odłączyć urządzenia: {{errorMessage}}",
-  "overTheBox_unlink_device_success": "Urządzenie zostało pomyślnie odłączone."
+  "overTheBox_unlink_device_success": "Urządzenie zostało pomyślnie odłączone.",
+  "overTheBox_release_channel_deprecated": "Wersja przestarzała {{version}}",
+  "overTheBox_release_channel": "Wersja {{version}}"
 }
diff --git a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_pt_PT.json b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_pt_PT.json
index 5984743d9dff..58462bb35e43 100644
--- a/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_pt_PT.json
+++ b/packages/manager/modules/overthebox/src/overthebox/details/translations/Messages_pt_PT.json
@@ -98,5 +98,7 @@
   "overTheBox_cancel": "Anular",
   "overTheBox_confirm_unlink_device": "Este dispositivo já não conseguirá estabelecer ligação, tem a certeza?",
   "overTheBox_unlink_device_error": "Não foi possível desassociar o dispositivo: {{errorMessage}}",
-  "overTheBox_unlink_device_success": "O dispositivo foi dissociado com sucesso."
+  "overTheBox_unlink_device_success": "O dispositivo foi dissociado com sucesso.",
+  "overTheBox_release_channel_deprecated": "Versão com imparidade {{version}}",
+  "overTheBox_release_channel": "Versão {{version}}"
 }
diff --git a/packages/manager/modules/web-universe-components/src/exchange/exchange.service.js b/packages/manager/modules/web-universe-components/src/exchange/exchange.service.js
index 1076107794e3..e82617ee62c1 100644
--- a/packages/manager/modules/web-universe-components/src/exchange/exchange.service.js
+++ b/packages/manager/modules/web-universe-components/src/exchange/exchange.service.js
@@ -799,20 +799,34 @@ export default class Exchange {
   getAliases(
     organizationName,
     exchangeService,
-    account,
-    count = 10,
+    email,
+    aliasType,
     offset = 0,
+    pageSize = 25,
+    sort = { name: 'alias', dir: 'asc' },
+    filters = null,
   ) {
-    return this.services.OvhHttp.get(
-      `/sws/exchange/${organizationName}/${exchangeService}/accounts/${account}/alias`,
-      {
-        rootPath: '2api',
-        params: {
-          count,
-          offset,
-        },
+    let res = this.services
+      .iceberg(
+        `/email/exchange/${organizationName}/service/${exchangeService}/${aliasType}/${email}/alias`,
+      )
+      .query()
+      .expand('CachedObjectList-Pages')
+      .limit(pageSize)
+      .offset(offset)
+      .sort(sort.name, sort.dir);
+    if (filters !== null) {
+      filters.forEach((item) => {
+        res = res.addFilter(item.name, item.operator, item.value);
+      });
+    }
+    return res.execute(null, true).$promise.then((response) => ({
+      data: response.data,
+      meta: {
+        totalCount:
+          parseInt(response.headers['x-pagination-elements'], 10) || 0,
       },
-    );
+    }));
   }
 
   /**
@@ -841,49 +855,26 @@ export default class Exchange {
   /**
    * Add an account alias
    */
-  addAlias(organization, serviceName, account, alias) {
-    return this.services.OvhHttp.post(
-      '/email/exchange/{organization}/service/{exchange}/account/{account}/alias',
-      {
-        rootPath: 'apiv6',
-        urlParams: {
-          organization,
-          exchange: serviceName,
-          account,
-        },
-        data: {
+  addAlias(organization, productId, email, aliasType, alias) {
+    return this.services.$http
+      .post(
+        `/email/exchange/${organization}/service/${productId}/${aliasType}/${email}/alias`,
+        {
           alias,
         },
-      },
-    ).then((data) => {
-      this.resetAccounts();
-      this.resetTasks();
-
-      return data;
-    });
+      )
+      .then((data) => data);
   }
 
   /**
    * Delete an account alias
    */
-  deleteAlias(organization, productId, account, alias) {
-    return this.services.OvhHttp.delete(
-      '/email/exchange/{organization}/service/{exchange}/account/{account}/alias/{alias}',
-      {
-        rootPath: 'apiv6',
-        urlParams: {
-          organization,
-          exchange: productId,
-          account,
-          alias,
-        },
-      },
-    ).then((data) => {
-      this.resetAccounts();
-      this.resetTasks();
-
-      return data;
-    });
+  deleteAlias(organization, productId, email, aliasType, alias) {
+    return this.services.$http
+      .delete(
+        `/email/exchange/${organization}/service/${productId}/${aliasType}/${email}/alias/${alias}`,
+      )
+      .then((data) => data);
   }
 
   getGroupManagerList(organization, serviceName, groupName, count, offset) {