From 22586d4d464bd865f981a2be28ac32a6cb1d0b66 Mon Sep 17 00:00:00 2001
From: HejdaJakub <kuba.hejda97@gmail.com>
Date: Tue, 7 Mar 2023 08:49:07 +0100
Subject: [PATCH] fix: fixed some bugs after rebase

* Fixed bootstrap5 migration after rebase (ml, mr, pl, pr, font-weight -> ms, me, ps, pe, fw)
* Fixed broken facility allowed users and facility tasks results after rebase
* Fixed style for spinner in dialog to be compatible with new Angular 15
---
 apps/admin-gui/src/_styles.scss               | 20 ++---------
 .../admin-attributes.component.html           |  6 ++--
 .../admin-consent-hubs.component.html         |  2 +-
 .../admin-owners/admin-owners.component.html  |  4 +--
 .../admin-services.component.html             |  4 +--
 .../service-destinations.component.html       |  6 ++--
 ...service-required-attributes.component.html |  4 +--
 ...facility-configuration-page.component.html | 24 ++++++-------
 .../facility-allowed-groups.component.html    |  2 +-
 .../facility-allowed-users.component.html     |  6 ++--
 .../facility-hosts-detail.component.html      |  4 +--
 .../facility-hosts.component.html             |  4 +--
 .../facility-resources.component.html         |  6 ++--
 .../facility-security-teams.component.html    |  4 +--
 .../facility-service-status.component.html    |  8 ++---
 .../facility-task-results.component.html      |  2 +-
 .../facility-task-results.component.ts        |  2 +-
 ...ility-services-destinations.component.html |  8 ++---
 .../facility-settings-owners.component.html   |  4 +--
 .../facility-select-page.component.html       |  6 ++--
 .../resource-assigned-members.component.html  |  2 +-
 .../resource-assigned-services.component.html |  4 +--
 .../resource-groups.component.html            |  2 +-
 .../resource-tags.component.html              |  6 ++--
 .../add-owner-dialog.component.html           |  4 +--
 ...reate-service-member-dialog.component.html | 20 ++++++-----
 .../delete-owner-dialog.component.html        |  6 ++--
 .../add-ban-dialog.component.html             |  6 ++--
 ...dd-edit-notification-dialog.component.html | 20 +++++------
 .../add-ext-source-dialog.component.html      |  4 +--
 .../add-facility-owner-dialog.component.html  |  4 +--
 ...hierarchical-include-dialog.component.html |  2 +-
 .../add-group-manager-dialog.component.html   |  8 ++---
 .../add-group-resource-dialog.component.html  | 10 +++---
 .../add-group-to-registration.component.html  |  4 +--
 .../add-host-dialog.component.html            |  4 +--
 .../add-manager-dialog.component.html         | 10 +++---
 .../add-member-dialog.component.html          |  8 ++---
 .../add-member-group-dialog.component.html    |  4 +--
 ...d-member-to-resource-dialog.component.html | 19 +++++-----
 ...-required-attributes-dialog.component.html |  4 +--
 ...urce-tag-to-resource-dialog.component.html |  4 +--
 .../add-role-dialog.component.html            |  4 +--
 ...services-destination-dialog.component.html | 20 ++++-------
 .../add-user-ext-source-dialog.component.html |  9 ++---
 ...tion-form-copy-items-dialog.component.html |  4 +--
 ...re-send-notification-dialog.component.html |  4 +--
 .../application-reject-dialog.component.html  |  4 +--
 ...-list-columns-change-dialog.component.html |  4 +--
 ...gn-group-to-resource-dialog.component.html |  8 ++---
 ...-service-to-resource-dialog.component.html |  4 +--
 .../attribute-import-dialog.component.html    |  4 +--
 .../bulk-invite-members-dialog.component.html |  6 ++--
 .../connect-identity-dialog.component.html    | 13 +++----
 .../copy-members-dialog-component.html        |  4 +--
 ...attribute-definition-dialog.component.html | 14 +++-----
 .../create-attribute-dialog.component.html    |  6 ++--
 .../create-edit-service-dialog.component.html | 36 +++++++------------
 .../create-facility-dialog.component.html     | 16 +++------
 .../create-group-dialog.component.html        |  4 +--
 .../create-relation-dialog.component.html     |  4 +--
 .../create-resource-dialog.component.html     |  4 +--
 .../create-resource-tag-dialog.component.html |  9 ++---
 ...ate-sponsored-member-dialog.component.html | 12 +++----
 .../create-vo-dialog.component.html           |  4 +--
 ...attribute-definition-dialog.component.html |  6 ++--
 .../delete-attribute-dialog.component.html    |  6 ++--
 .../delete-notification-dialog.component.html |  6 ++--
 .../delete-resource-tag-dialog.component.html |  6 ++--
 ...elete-service-from-facility.component.html |  6 ++--
 .../delete-task-dialog.component.html         |  6 ++--
 .../delete-task-result-dialog.component.html  |  6 ++--
 ...ation-form-item-data-dialog.component.html |  7 ++--
 ...attribute-definition-dialog.component.html | 12 ++++---
 .../edit-email-footer-dialog.component.html   |  4 +--
 ...edit-member-sponsors-dialog.component.html |  4 +--
 ...te-sponsored-members-dialog.component.html | 10 +++---
 .../invite-member-dialog.component.html       |  4 +--
 .../move-group-dialog.component.html          |  4 +--
 ...fications-copy-mails-dialog.component.html |  4 +--
 ...ssword-reset-request-dialog.component.html |  6 ++--
 .../remove-destination-dialog.component.html  |  6 ++--
 .../remove-ext-source-dialog.component.html   |  6 ++--
 ...emove-facility-owner-dialog.component.html |  6 ++--
 ...-group-from-resource-dialog.component.html |  6 ++--
 ...remove-group-manager-dialog.component.html |  6 ++--
 ...emove-group-resource-dialog.component.html |  6 ++--
 .../remove-host-dialog.component.html         |  6 ++--
 .../remove-manager-dialog.component.html      |  6 ++--
 .../remove-member-group-dialog.component.html |  6 ++--
 .../remove-members-dialog.component.html      |  6 ++--
 .../remove-relation-dialog.component.html     |  6 ++--
 ...-required-attributes-dialog.component.html |  6 ++--
 ...ervice-from-resource-dialog.component.html |  6 ++--
 ...nsor-existing-member-dialog.component.html |  8 ++---
 ...ate-application-form-dialog.component.html |  4 +--
 .../update-ban-dialog.component.html          |  2 +-
 .../identity-detail.component.html            |  6 ++--
 .../managers-page.component.html              |  4 ---
 .../one-entity-attribute-page.component.html  |  6 ++--
 .../roles-list/roles-page.component.html      |  6 ++--
 .../set-login-dialog.component.html           |  4 +--
 .../two-entity-attribute-page.component.html  |  8 ++---
 .../user-identities.component.html            |  4 +--
 ...r-settings-associated-users.component.html |  4 +--
 ...rvice-identity-certificates.component.html |  2 +-
 ...settings-service-identities.component.html |  4 +--
 .../application-detail.component.html         |  2 +-
 ...lication-form-manage-groups.component.html |  4 +--
 .../group-applications.component.html         |  4 +--
 .../group-members.component.html              | 12 +++----
 .../group-resources.component.html            |  4 +--
 .../group-settings-extsources.component.html  |  4 +--
 ...roup-settings-notifications.component.html |  6 ++--
 .../group-settings-relations.component.html   |  4 +--
 .../group-subgroups.component.html            |  8 ++---
 .../member-applications.component.html        |  4 +--
 .../member-groups.component.html              |  4 +--
 .../member-resources.component.html           |  2 +-
 .../vo-applications.component.html            |  6 ++--
 .../vo-members/vo-members.component.html      |  8 ++---
 .../vo-resources-preview.component.html       |  2 +-
 .../vo-resources-tags.component.html          |  4 +--
 .../vo-settings-extsources.component.html     |  4 +--
 ...-member-organization-dialog.component.html |  2 +-
 ...ttings-member-organizations.component.html |  4 +--
 .../vo-settings-notifications.component.html  |  6 ++--
 ...vo-settings-service-members.component.html |  4 +--
 ...-settings-sponsored-members.component.html |  4 +--
 .../vo-select-page.component.html             |  6 ++--
 apps/consolidator/src/_styles.scss            | 18 +---------
 apps/linker/src/_styles.scss                  | 18 +---------
 .../send-message-dialog.component.html        |  4 +--
 .../show-result/show-result.component.html    |  6 ++--
 apps/password-reset/src/_styles.scss          | 18 +---------
 apps/publications/src/_styles.scss            | 18 +---------
 .../add-thanks/add-thanks.component.html      |  4 +--
 .../add-authors-dialog.component.html         |  6 ++--
 .../add-thanks-dialog.component.html          |  4 +--
 .../remove-category-dialog.component.html     |  6 ++--
 .../remove-publication-dialog.component.html  |  4 +--
 .../update-rank-dialog.component.html         |  4 +--
 .../all-publications-page.component.html      |  4 +--
 .../author-detail.component.html              |  6 ++--
 .../authors-page/authors-page.component.html  |  2 +-
 .../categories-page.component.html            |  4 +--
 .../my-publications-page.component.html       |  4 +--
 apps/user-profile/src/_styles.scss            | 18 +---------
 ...tivate-local-account-dialog.component.html |  2 +-
 .../add-auth-text-dialog.component.html       |  2 +-
 .../remove-alt-password-dialog.component.html |  6 ++--
 .../groups-page/groups-page.component.html    |  4 +--
 .../identities-page.component.html            |  4 +--
 .../privacy-page/privacy-page.component.html  |  2 +-
 ...tings-alternative-passwords.component.html |  4 +--
 .../application-state-selector.component.html |  2 +-
 .../refresh-button.component.html             |  2 +-
 .../bug-report-dialog.component.html          |  4 +--
 ...p-resource-assigment-dialog.component.html |  8 ++---
 ...change-member-status-dialog.component.html | 12 +++----
 .../change-password-dialog.component.html     |  7 ++--
 .../delete-entity-dialog.component.html       | 12 +++----
 ...ty-resource-group-vo-dialog.component.html |  4 +--
 .../group-sync-detail-dialog.component.html   |  6 ++--
 .../member-tree-view-dialog.component.html    | 20 +++++------
 .../remove-string-value-dialog.component.html |  6 ++--
 ...move-user-ext-source-dialog.component.html |  6 ++--
 ...l-confirmation-items-dialog.component.html |  8 ++---
 .../loading-dialog.component.html             |  2 +-
 169 files changed, 475 insertions(+), 619 deletions(-)

diff --git a/apps/admin-gui/src/_styles.scss b/apps/admin-gui/src/_styles.scss
index cba96a90c..5965728e4 100644
--- a/apps/admin-gui/src/_styles.scss
+++ b/apps/admin-gui/src/_styles.scss
@@ -843,7 +843,7 @@ textarea.cdk-textarea-autosize-measuring {
   flex-direction: column;
   margin-left: 2rem;
   margin-bottom: 2rem;
-  //d-flex flex-column ml-5 pb-4
+  //d-flex flex-column ms-5 pb-4
 }
 
 .page-subtitle {
@@ -1435,28 +1435,12 @@ td.mat-mdc-cell {
   bottom: 0;
   right: 0;
   background: rgba(0, 0, 0, 0.15);
-  z-index: 1;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-// TODO: check this style after the migration to Angular 15
-// make the whole dialog grey (including padding space) while the spinner is active
-mat-dialog-container:has(#loading-dialog-spinner) {
-  box-shadow: 0 0 0 24px rgba(0, 0, 0, 0.15) inset;
-  padding-bottom: 0;
-  .position-relative {
-    padding-bottom: 24px;
-  }
-  .spinner-container {
-    margin-bottom: 24px;
-  }
-  .mat-dialog-actions {
-    padding-bottom: 16px;
-  }
-}
-
 #preloader {
   position: fixed;
   top: 0;
diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-attributes/admin-attributes.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-attributes/admin-attributes.component.html
index ae1d38c6c..be7338437 100644
--- a/apps/admin-gui/src/app/admin/pages/admin-page/admin-attributes/admin-attributes.component.html
+++ b/apps/admin-gui/src/app/admin/pages/admin-page/admin-attributes/admin-attributes.component.html
@@ -4,7 +4,7 @@ <h1 class="page-subtitle">{{'ADMIN.ATTRIBUTES.TITLE' | translate}}</h1>
   <button
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onCreate()"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     color="accent"
     data-cy="new-attr-definition-button"
     mat-flat-button>
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{'ADMIN.ATTRIBUTES.TITLE' | translate}}</h1>
   <button
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onImport()"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     color="accent"
     mat-flat-button>
     {{'ADMIN.ATTRIBUTES.IMPORT' | translate}}
@@ -23,7 +23,7 @@ <h1 class="page-subtitle">{{'ADMIN.ATTRIBUTES.TITLE' | translate}}</h1>
     (click)="onDelete()"
     color="warn"
     [disabled]="selected.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     data-cy="delete-attr-definition-button"
     mat-flat-button>
     {{'ADMIN.ATTRIBUTES.DELETE' | translate}}
diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-consent-hubs/admin-consent-hubs.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-consent-hubs/admin-consent-hubs.component.html
index 9ae484e24..4add4e16f 100644
--- a/apps/admin-gui/src/app/admin/pages/admin-page/admin-consent-hubs/admin-consent-hubs.component.html
+++ b/apps/admin-gui/src/app/admin/pages/admin-page/admin-consent-hubs/admin-consent-hubs.component.html
@@ -12,7 +12,7 @@ <h1 class="page-subtitle">{{'ADMIN.CONSENT_HUBS.TITLE' | translate}}</h1>
       (click)="evaluateConsents()"
       [disabled]="!globalForceConsents || selection.selected.length === 0"
       color="accent"
-      class="action-button mr-2"
+      class="action-button me-2"
       mat-flat-button>
       {{'ADMIN.CONSENT_HUBS.EVALUATE_CONSENTS' | translate}}
     </button>
diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-owners/admin-owners.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-owners/admin-owners.component.html
index c9210abd4..e81c0db5e 100644
--- a/apps/admin-gui/src/app/admin/pages/admin-page/admin-owners/admin-owners.component.html
+++ b/apps/admin-gui/src/app/admin/pages/admin-page/admin-owners/admin-owners.component.html
@@ -5,14 +5,14 @@ <h1 class="page-subtitle">{{'ADMIN.OWNERS.TITLE' | translate}}</h1>
     *ngIf="addAuth"
     (click)="addOwner()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{'ADMIN.OWNERS.ADD' | translate}}
   </button>
 
   <button
     (click)="removeOwner()"
-    class="mr-2"
+    class="me-2"
     color="warn"
     *ngIf="removeAuth"
     [disabled]="!selected.selected.length"
diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/admin-services.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/admin-services.component.html
index f27d9cfb2..fba7ec13f 100644
--- a/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/admin-services.component.html
+++ b/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/admin-services.component.html
@@ -5,7 +5,7 @@ <h1 class="page-subtitle">{{'ADMIN.SERVICES.TITLE' | translate}}</h1>
     *ngIf="authResolver.isPerunAdmin()"
     (click)="createService()"
     color="accent"
-    class="action-button mr-2"
+    class="action-button me-2"
     data-cy="service-create-button"
     mat-flat-button>
     {{'ADMIN.SERVICES.CREATE' | translate}}
@@ -14,7 +14,7 @@ <h1 class="page-subtitle">{{'ADMIN.SERVICES.TITLE' | translate}}</h1>
     *ngIf="authResolver.isPerunAdmin()"
     (click)="deleteService()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     data-cy="service-delete-button"
     mat-flat-button>
diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-destinations/service-destinations.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-destinations/service-destinations.component.html
index b72636716..e432ae0db 100644
--- a/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-destinations/service-destinations.component.html
+++ b/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-destinations/service-destinations.component.html
@@ -6,7 +6,7 @@ <h1 class="page-subtitle">{{ 'SERVICE_DETAIL.DESTINATIONS.TITLE' | translate}}</
     (click)="onRemove()"
     color="warn"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.DESTINATIONS.REMOVE' | translate}}
   </button>
@@ -14,7 +14,7 @@ <h1 class="page-subtitle">{{ 'SERVICE_DETAIL.DESTINATIONS.TITLE' | translate}}</
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onAllow()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="accent"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.DESTINATIONS.ALLOW' | translate}}
@@ -23,7 +23,7 @@ <h1 class="page-subtitle">{{ 'SERVICE_DETAIL.DESTINATIONS.TITLE' | translate}}</
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onBlock()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.DESTINATIONS.BLOCK' | translate}}
diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-required-attributes/service-required-attributes.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-required-attributes/service-required-attributes.component.html
index 9df52be77..abc690d7d 100644
--- a/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-required-attributes/service-required-attributes.component.html
+++ b/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-required-attributes/service-required-attributes.component.html
@@ -5,7 +5,7 @@ <h1 class="page-subtitle">{{ 'SERVICE_DETAIL.REQUIRED_ATTRIBUTES.TITLE' | transl
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onAdd()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.REQUIRED_ATTRIBUTES.ADD' | translate}}
   </button>
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{ 'SERVICE_DETAIL.REQUIRED_ATTRIBUTES.TITLE' | transl
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onRemove()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.REQUIRED_ATTRIBUTES.REMOVE' | translate}}
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-configuration-page/facility-configuration-page.component.html b/apps/admin-gui/src/app/facilities/pages/facility-configuration-page/facility-configuration-page.component.html
index 74da39f60..770dd23fc 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-configuration-page/facility-configuration-page.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-configuration-page/facility-configuration-page.component.html
@@ -66,7 +66,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.SERVICE_CONFIG' | translate}
         <div class="filters">
           <button
             (click)="onRemoveAttributes()"
-            class="mr-2"
+            class="me-2"
             color="warn"
             [disabled]="attSelection.selected.length === 0"
             mat-flat-button>
@@ -74,7 +74,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.SERVICE_CONFIG' | translate}
           </button>
           <button
             (click)="onSaveAttributes()"
-            class="mr-2"
+            class="me-2"
             color="accent"
             [disabled]="attSelection.selected.length === 0"
             mat-flat-button>
@@ -140,7 +140,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.SERVICE_CONFIG' | translate}
           <mat-expansion-panel [disabled]="owners.length === 0">
             <mat-expansion-panel-header [class.cursor-default]="owners.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-owner-grey"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-owner-grey"></mat-icon>
                 {{'FACILITY_CONFIGURATION.OWNERS' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -159,7 +159,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.OWNERS' | translate}}</h1>
           <mat-expansion-panel [disabled]="hosts.length === 0">
             <mat-expansion-panel-header [class.cursor-default]="hosts.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-hosts"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-hosts"></mat-icon>
                 {{'FACILITY_CONFIGURATION.HOSTS' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -179,7 +179,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.HOSTS' | translate}}</h1>
           <mat-expansion-panel [disabled]="selection.selected.length === 0">
             <mat-expansion-panel-header [class.cursor-default]="selection.selected.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-service"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-service"></mat-icon>
                 {{'FACILITY_CONFIGURATION.SERVICES' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -195,7 +195,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.SERVICES' | translate}}</h1>
             [disabled]="selection.selected.length === 0">
             <mat-expansion-panel-header [class.cursor-default]="selection.selected.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-hosts"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-hosts"></mat-icon>
                 {{'FACILITY_CONFIGURATION.SERVICE_CONFIG' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -212,7 +212,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.ATTS' | translate}}</h1>
             <mat-expansion-panel-header
               [class.cursor-default]="selection.selected.length === 0 && destinations.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-service_destination"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-service_destination"></mat-icon>
                 {{'FACILITY_CONFIGURATION.DESTINATION_CONFIG' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -232,7 +232,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.DESTINATION' | translate}}</
           <mat-expansion-panel>
             <mat-expansion-panel-header>
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-manager"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-manager"></mat-icon>
                 {{'FACILITY_CONFIGURATION.MANAGERS' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -257,15 +257,15 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.DESTINATION' | translate}}</
     <button
       *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
       (click)="back()"
-      class="ml-auto mr-2"
+      class="ms-auto me-2"
       mat-flat-button>
       {{'FACILITY_CONFIGURATION.BACK' | translate}}
     </button>
     <button
       *ngIf="stepper !== undefined && stepper.selectedIndex !== stepper.steps.length - 1"
       (click)="next()"
-      [class.mr-2]="stepper !== undefined && stepper.selectedIndex !== 0"
-      [class.ml-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
+      [class.me-2]="stepper !== undefined && stepper.selectedIndex !== 0"
+      [class.ms-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
       color="accent"
       mat-flat-button>
       {{'FACILITY_CONFIGURATION.NEXT' | translate}}
@@ -273,7 +273,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.DESTINATION' | translate}}</
     <button
       *ngIf="stepper !== undefined && stepper.selectedIndex === stepper.steps.length -1"
       (click)="onFinish()"
-      class="mr-2"
+      class="me-2"
       color="accent"
       mat-flat-button>
       {{'FACILITY_CONFIGURATION.FINISH' | translate}}
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-groups/facility-allowed-groups.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-groups/facility-allowed-groups.component.html
index 1e5c6a63b..6be5f35a5 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-groups/facility-allowed-groups.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-groups/facility-allowed-groups.component.html
@@ -1,7 +1,7 @@
 <div>
   <h1 class="page-subtitle">{{'MENU_ITEMS.FACILITY.ALLOWED_GROUPS' | translate}}</h1>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
-  <mat-form-field class="mr-2">
+  <mat-form-field class="me-2">
     <mat-label>{{'FACILITY_DETAIL.ALLOWED_GROUPS.SHOW_VOS_GROUPS' | translate}}</mat-label>
     <mat-select (selectionChange)="showGroup()" [(value)]="selected">
       <mat-option value="all">{{'FACILITY_DETAIL.ALLOWED_GROUPS.ALL' | translate}}</mat-option>
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-users/facility-allowed-users.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-users/facility-allowed-users.component.html
index 39fec3b33..5b150d134 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-users/facility-allowed-users.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-allowed-users/facility-allowed-users.component.html
@@ -76,10 +76,10 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.ALLOWED_USERS.TITLE' | translate}}<
       [onlyAllowed]="allowed"
       [facilityId]="facility.id"
       [searchString]="filterValue"
-      [resourceId]="selectedResource.id === -1 ? null : selectedResource.id"
-      [serviceId]="selectedService.id === -1 ? null : selectedService.id"
+      [resourceId]="selectedResource?.id"
+      [serviceId]="selectedService?.id"
       [tableId]="tableId"
-      [voId]="selectedVo.id === -1 ? null : selectedVo.id"
+      [voId]="selectedVo?.id"
       [consentStatuses]="selectedConsentStatuses"
       [includeConsents]="globalForceConsents && facilityForceConsents"
       [updateTable]="update">
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts-detail/facility-hosts-detail.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts-detail/facility-hosts-detail.component.html
index d4f76e624..b2716c1c2 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts-detail/facility-hosts-detail.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts-detail/facility-hosts-detail.component.html
@@ -3,12 +3,12 @@ <h1 class="page-subtitle">
     {{'FACILITY_DETAIL.HOSTS.HOSTS_DETAIL.TITLE' | translate}} {{host.hostname}}
   </h1>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
-  <button (click)="addAttribute()" class="mr-2" color="accent" mat-flat-button>
+  <button (click)="addAttribute()" class="me-2" color="accent" mat-flat-button>
     {{'FACILITY_DETAIL.HOSTS.HOSTS_DETAIL.ADD' | translate}}
   </button>
   <button
     (click)="onSave()"
-    class="mr-2"
+    class="me-2"
     color="accent"
     [disabled]="selected.selected.length === 0"
     mat-flat-button>
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts.component.html
index 9f0d60acc..f9211a5f2 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts.component.html
@@ -5,7 +5,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.HOSTS.TITLE' | translate}}</h1>
     *ngIf="addAuth"
     (click)="addHost()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{'FACILITY_DETAIL.HOSTS.ADD' | translate}}
   </button>
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.HOSTS.TITLE' | translate}}</h1>
     *ngIf="removeAuth"
     (click)="removeHost()"
     [disabled]="selected.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{'FACILITY_DETAIL.HOSTS.REMOVE' | translate}}
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-resources/facility-resources.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-resources/facility-resources.component.html
index 8ff249c15..2eb9b054d 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-resources/facility-resources.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-resources/facility-resources.component.html
@@ -7,7 +7,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.RESOURCES.TITLE' | translate}}</h1>
       mat-flat-button
       color="accent"
       data-cy="create-resource-button"
-      class="mr-2 action-button"
+      class="me-2 action-button"
       (click)="createResource()">
       {{'FACILITY_DETAIL.RESOURCES.CREATE' | translate}}
     </button>
@@ -15,7 +15,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.RESOURCES.TITLE' | translate}}</h1>
       *ngIf="removeAuth"
       mat-flat-button
       color="warn"
-      class="mr-2"
+      class="me-2"
       data-cy="delete-resource-button"
       [disabled]="selected.selected.length === 0"
       (click)="removeResource()">
@@ -25,7 +25,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.RESOURCES.TITLE' | translate}}</h1>
       [services]="services"
       (serviceSelected)="serviceSelected($event)"
       [service]="selectedService"
-      class="search-select mr-2">
+      class="search-select me-2">
     </perun-web-apps-service-search-select>
     <perun-web-apps-immediate-filter
       [placeholder]="'SHARED_LIB.PERUN.COMPONENTS.RESOURCES_LIST.TABLE_SEARCH'"
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-security-teams/facility-security-teams.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-security-teams/facility-security-teams.component.html
index 3f3c1683a..a1aaad426 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-security-teams/facility-security-teams.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-security-teams/facility-security-teams.component.html
@@ -5,7 +5,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SECURITY_TEAMS.TITLE' | translate}}
   <!--    *ngIf="!loading && addAuth"-->
   <!--    mat-flat-button -->
   <!--    color="accent" -->
-  <!--    class="mr-2"-->
+  <!--    class="me-2"-->
   <!--    (click)="addSecurityTeam()">-->
   <!--    {{'FACILITY_DETAIL.SECURITY_TEAMS.ADD'| translate}}-->
   <!--  </button>-->
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SECURITY_TEAMS.TITLE' | translate}}
   <!--    *ngIf="!loading && removeAuth"-->
   <!--    mat-flat-button -->
   <!--    color="warn" -->
-  <!--    class="mr-2"  -->
+  <!--    class="me-2"  -->
   <!--    [disabled]="selected.selected.length === 0" (click)="removeSecurityTeam()">-->
   <!--    {{'FACILITY_DETAIL.SECURITY_TEAMS.REMOVE'| translate}}-->
   <!--  </button>-->
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-service-status.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-service-status.component.html
index 0c01575fe..a01d75ed0 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-service-status.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-service-status.component.html
@@ -5,7 +5,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SERVICES_STATUS.TITLE' | translate}
     *ngIf="propagationAuth"
     (click)="forcePropagation()"
     [disabled]="selected.selected.length === 0 || loading"
-    class="mr-2"
+    class="me-2"
     color="accent"
     mat-flat-button>
     {{'FACILITY_DETAIL.SERVICES_STATUS.FORCE_PROPAGATION' | translate}}
@@ -14,7 +14,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SERVICES_STATUS.TITLE' | translate}
     *ngIf="allowAuth"
     (click)="allow()"
     [disabled]="selected.selected.length === 0 || this.disableAllowButton || loading"
-    class="mr-2"
+    class="me-2"
     color="accent"
     mat-flat-button>
     {{'FACILITY_DETAIL.SERVICES_STATUS.ALLOW' | translate}}
@@ -22,7 +22,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SERVICES_STATUS.TITLE' | translate}
   <button
     *ngIf="blockAuth"
     (click)="block()"
-    class="mr-2"
+    class="me-2"
     color="warn"
     [disabled]="selected.selected.length === 0 || this.disableBlockButton || loading"
     mat-flat-button>
@@ -34,7 +34,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SERVICES_STATUS.TITLE' | translate}
     [disabled]="disableRemoveButton || loading"
     [matMenuTriggerFor]="menu"
     [matTooltipDisabled]="!disableRemoveButton"
-    class="mr-2 dropdown-toggle"
+    class="me-2 dropdown-toggle"
     color="warn"
     matTooltip="{{'DIALOGS.REMOVE_SERVICE_FROM_FACILITY.CHECKBOXES_DISABLED' | translate}}">
     {{'FACILITY_DETAIL.SERVICES_STATUS.REMOVE' | translate}}
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-task-results/facility-task-results.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-task-results/facility-task-results.component.html
index 9080cf49f..c4ad2f279 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-task-results/facility-task-results.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-task-results/facility-task-results.component.html
@@ -7,7 +7,7 @@ <h1 class="page-subtitle">
   (click)="removeTaskResult()"
   *ngIf="removeAuth"
   [disabled]="selection.selected.length === 0"
-  class="mr-2"
+  class="me-2"
   color="warn"
   mat-flat-button>
   {{'FACILITY_DETAIL.TASK_RESULTS.REMOVE' | translate}}
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-task-results/facility-task-results.component.ts b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-task-results/facility-task-results.component.ts
index 4a4735124..4d1b79bf3 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-task-results/facility-task-results.component.ts
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-service-status/facility-task-results/facility-task-results.component.ts
@@ -21,7 +21,7 @@ export class FacilityTaskResultsComponent implements OnInit {
   taskId: number;
   task: Task = { id: 0 };
   facility: Facility;
-  taskResults: TaskResult[];
+  taskResults: TaskResult[] = [];
 
   tableId = TABLE_TASK_RESULTS;
   displayedColumns = [
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-services-destinations/facility-services-destinations.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-services-destinations/facility-services-destinations.component.html
index 0d6724a4a..7307f4e06 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-services-destinations/facility-services-destinations.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-services-destinations/facility-services-destinations.component.html
@@ -8,14 +8,14 @@ <h1 class="page-subtitle">{{title | translate}}</h1>
     *ngIf="addAuth"
     (click)="addDestination()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{'FACILITY_DETAIL.SERVICES_DESTINATIONS.ADD' | translate}}
   </button>
   <button
     *ngIf="removeAuth"
     (click)="removeDestination()"
-    class="mr-2"
+    class="me-2"
     color="warn"
     [disabled]="selected.selected.length === 0"
     mat-flat-button>
@@ -24,7 +24,7 @@ <h1 class="page-subtitle">{{title | translate}}</h1>
   <button
     *ngIf="allowAuth"
     (click)="onAllow()"
-    class="mr-2"
+    class="me-2"
     [disabled]="selected.selected.length === 0 || allSelectedAllowed()"
     mat-stroked-button>
     <mat-icon> check_circle_outline </mat-icon>
@@ -33,7 +33,7 @@ <h1 class="page-subtitle">{{title | translate}}</h1>
   <button
     *ngIf="blockAuth"
     (click)="onBlock()"
-    class="mr-2"
+    class="me-2"
     [disabled]="selected.selected.length === 0 || allSelectedBlocked()"
     mat-stroked-button>
     <mat-icon> block </mat-icon>
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-settings/facility-settings-owners/facility-settings-owners.component.html b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-settings/facility-settings-owners/facility-settings-owners.component.html
index b7cc65596..234957066 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-settings/facility-settings-owners/facility-settings-owners.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-detail-page/facility-settings/facility-settings-owners/facility-settings-owners.component.html
@@ -3,7 +3,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SETTINGS.OWNERS.TITLE' | translate}
 <button
   *ngIf="addAuth"
   (click)="onCreate()"
-  class="mr-2 action-button"
+  class="me-2 action-button"
   color="accent"
   mat-flat-button>
   {{'FACILITY_DETAIL.SETTINGS.OWNERS.ADD' | translate}}
@@ -12,7 +12,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SETTINGS.OWNERS.TITLE' | translate}
   *ngIf="removeAuth"
   (click)="onRemove()"
   [disabled]="selection.selected.length === 0"
-  class="mr-2"
+  class="me-2"
   color="warn"
   mat-flat-button>
   {{'FACILITY_DETAIL.SETTINGS.OWNERS.DELETE' | translate}}
diff --git a/apps/admin-gui/src/app/facilities/pages/facility-select-page/facility-select-page.component.html b/apps/admin-gui/src/app/facilities/pages/facility-select-page/facility-select-page.component.html
index 26f49ea2e..b93e8ebc2 100644
--- a/apps/admin-gui/src/app/facilities/pages/facility-select-page/facility-select-page.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/facility-select-page/facility-select-page.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid pl-xl-5 pr-xl-5 facility-theme">
+<div class="container-fluid ps-xl-5 pe-xl-5 facility-theme">
   <perun-web-apps-back-button> </perun-web-apps-back-button>
 
   <h1 class="page-title d-flex">
@@ -12,7 +12,7 @@ <h1 class="page-title d-flex">
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
   <button
     mat-flat-button
-    class="action-button mr-2"
+    class="action-button me-2"
     (click)="onCreate()"
     data-cy="new-facility-button"
     color="accent">
@@ -20,7 +20,7 @@ <h1 class="page-title d-flex">
   </button>
   <button
     mat-flat-button
-    class="mr-2"
+    class="me-2"
     data-cy="delete-facility-button"
     [disabled]="selection.selected.length === 0"
     (click)="onDelete()"
diff --git a/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-assigned-members/resource-assigned-members.component.html b/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-assigned-members/resource-assigned-members.component.html
index fd1308d1b..793b00cd6 100644
--- a/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-assigned-members/resource-assigned-members.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-assigned-members/resource-assigned-members.component.html
@@ -1,7 +1,7 @@
 <h1 class="page-subtitle">{{'RESOURCE_DETAIL.ASSIGNED_MEMBERS.TITLE' | translate}}</h1>
 <perun-web-apps-refresh-button (refresh)="refreshTable()"> </perun-web-apps-refresh-button>
 
-<mat-form-field class="mr-2 fix-select" *ngIf="includeConsents">
+<mat-form-field class="me-2 fix-select" *ngIf="includeConsents">
   <mat-label>{{'RESOURCE_DETAIL.ASSIGNED_MEMBERS.FILTER_CONSENT_STATUS' | translate}}</mat-label>
   <mat-select (closed)="changeConsentStatuses()" [formControl]="consentStatuses" multiple>
     <mat-select-trigger>
diff --git a/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-assigned-services/resource-assigned-services.component.html b/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-assigned-services/resource-assigned-services.component.html
index 8b613404c..ffbe2b68d 100644
--- a/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-assigned-services/resource-assigned-services.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-assigned-services/resource-assigned-services.component.html
@@ -3,14 +3,14 @@ <h1 class="page-subtitle">{{'RESOURCE_DETAIL.ASSIGNED_SERVICES.TITLE' | translat
 <button
   (click)="addService()"
   *ngIf="assignServiceAuth"
-  class="action-button mr-2"
+  class="action-button me-2"
   color="accent"
   mat-flat-button>
   {{'RESOURCE_DETAIL.ASSIGNED_SERVICES.ADD_SERVICE' | translate}}
 </button>
 <button
   [disabled]="selected.selected.length === 0"
-  class="mr-2"
+  class="me-2"
   color="warn"
   (click)="removeServices()"
   *ngIf="removeServiceAuth"
diff --git a/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-groups/resource-groups.component.html b/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-groups/resource-groups.component.html
index 062ae6ca8..3008c76bc 100644
--- a/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-groups/resource-groups.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-groups/resource-groups.component.html
@@ -12,7 +12,7 @@ <h1 class="page-subtitle">{{'RESOURCE_DETAIL.ASSIGNED_GROUPS.TITLE' | translate}
 <button
   (click)="removeGroups()"
   [disabled]="selected.selected.length === 0 || !canRemoveGroups()"
-  class="ml-2 mr-2"
+  class="ms-2 me-2"
   color="warn"
   mat-flat-button
   data-cy="remove-group-button">
diff --git a/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-tags/resource-tags.component.html b/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-tags/resource-tags.component.html
index d319bc75c..5fd669193 100644
--- a/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-tags/resource-tags.component.html
+++ b/apps/admin-gui/src/app/facilities/pages/resource-detail-page/resource-tags/resource-tags.component.html
@@ -3,7 +3,7 @@ <h1 class="page-subtitle">{{'RESOURCE_DETAIL.TAGS.TITLE' | translate}}</h1>
 <button
   *ngIf="createAuth"
   (click)="create()"
-  class="mr-2 action-button"
+  class="me-2 action-button"
   color="accent"
   mat-flat-button>
   {{'VO_DETAIL.RESOURCES.TAGS.CREATE_BUTTON' | translate}}
@@ -12,7 +12,7 @@ <h1 class="page-subtitle">{{'RESOURCE_DETAIL.TAGS.TITLE' | translate}}</h1>
 <button
   *ngIf="addAuth"
   (click)="addTag()"
-  class="mr-2 action-button"
+  class="me-2 action-button"
   color="accent"
   mat-flat-button>
   {{'RESOURCE_DETAIL.TAGS.ADD_BUTTON' | translate}}
@@ -21,7 +21,7 @@ <h1 class="page-subtitle">{{'RESOURCE_DETAIL.TAGS.TITLE' | translate}}</h1>
 <button
   *ngIf="removeAuth"
   (click)="removeTags()"
-  class="mr-2"
+  class="me-2"
   color="warn"
   [disabled]="selection.selected.length === 0"
   mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/add-owner-dialog/add-owner-dialog.component.html b/apps/admin-gui/src/app/shared/components/add-owner-dialog/add-owner-dialog.component.html
index 47fafa3ec..73cfd9152 100644
--- a/apps/admin-gui/src/app/shared/components/add-owner-dialog/add-owner-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/add-owner-dialog/add-owner-dialog.component.html
@@ -31,7 +31,7 @@ <h1 mat-dialog-title>{{"DIALOGS.ADD_OWNER.TITLE" | translate}}</h1>
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_OWNER.CANCEL' | translate}}
       </button>
       <div
@@ -40,7 +40,7 @@ <h1 mat-dialog-title>{{"DIALOGS.ADD_OWNER.TITLE" | translate}}</h1>
         matTooltipPosition="above">
         <button
           (click)="onSubmit()"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           [disabled]="nameCtrl.invalid || contactCtrl.invalid"
           mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/create-service-member-dialog/create-service-member-dialog.component.html b/apps/admin-gui/src/app/shared/components/create-service-member-dialog/create-service-member-dialog.component.html
index 734208121..154f13498 100644
--- a/apps/admin-gui/src/app/shared/components/create-service-member-dialog/create-service-member-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/create-service-member-dialog/create-service-member-dialog.component.html
@@ -90,7 +90,7 @@ <h6>{{'DIALOGS.CREATE_SERVICE_MEMBER.ASSOCIATED_USERS' | translate}}</h6>
                   <button
                     (click)="removeUser(member)"
                     [disabled]="assignedMembers.length === 1"
-                    class="ml-1"
+                    class="ms-1"
                     color="warn"
                     mat-icon-button>
                     <mat-icon class="margin-bottom">close</mat-icon>
@@ -101,8 +101,10 @@ <h6>{{'DIALOGS.CREATE_SERVICE_MEMBER.ASSOCIATED_USERS' | translate}}</h6>
           </mat-list>
 
           <h6 class="mt-3">{{'DIALOGS.CREATE_SERVICE_MEMBER.SEARCH_INFO' | translate}}</h6>
-          <mat-form-field class="mr-2 w-50">
-            <mat-label>{{'DIALOGS.CREATE_SERVICE_MEMBER.SEARCH_PLACEHOLDER' | translate}}</mat-label>
+          <mat-form-field class="me-2 w-50">
+            <mat-label
+              >{{'DIALOGS.CREATE_SERVICE_MEMBER.SEARCH_PLACEHOLDER' | translate}}</mat-label
+            >
             <input
               [formControl]="searchCtrl"
               autocomplete="false"
@@ -112,7 +114,7 @@ <h6 class="mt-3">{{'DIALOGS.CREATE_SERVICE_MEMBER.SEARCH_INFO' | translate}}</h6
           <button
             (click)="onSearchByString()"
             [disabled]="loading || searchCtrl.value.length === 0"
-            class="mr-2"
+            class="me-2"
             color="primary"
             mat-flat-button>
             <mat-icon>search</mat-icon>
@@ -157,7 +159,7 @@ <h6 class="mt-3">{{'DIALOGS.CREATE_SERVICE_MEMBER.SEARCH_INFO' | translate}}</h6
       <button
         (click)="stepperPrevious()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
-        class="ml-auto"
+        class="ms-auto"
         mat-flat-button>
         {{'DIALOGS.CREATE_SERVICE_MEMBER.BACK' | translate}}
       </button>
@@ -167,8 +169,8 @@ <h6 class="mt-3">{{'DIALOGS.CREATE_SERVICE_MEMBER.SEARCH_INFO' | translate}}</h6
         <button
           (click)="stepperNext()"
           *ngIf="stepper !== undefined && stepper.selectedIndex !== stepper._steps.length - 1"
-          [class.ml-2]="stepper !== undefined && stepper.selectedIndex !== 0"
-          [class.ml-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
+          [class.ms-2]="stepper !== undefined && stepper.selectedIndex !== 0"
+          [class.ms-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
           [disabled]="getStepperNextConditions()"
           color="accent"
           mat-flat-button>
@@ -179,7 +181,7 @@ <h6 class="mt-3">{{'DIALOGS.CREATE_SERVICE_MEMBER.SEARCH_INFO' | translate}}</h6
         (click)="onCreate(false)"
         *ngIf="stepper !== undefined && stepper.selectedIndex === stepper._steps.length -1"
         [disabled]="firstFormGroup.invalid || (secondFormGroup.get('namespaceCtrl').value !== 'Not selected' && secondFormGroup.invalid)"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{"DIALOGS.CREATE_SERVICE_MEMBER.CREATE" | translate}}
@@ -188,7 +190,7 @@ <h6 class="mt-3">{{'DIALOGS.CREATE_SERVICE_MEMBER.SEARCH_INFO' | translate}}</h6
         (click)="onCreate(true)"
         *ngIf="(findSponsorsAuth && voSponsors.length !== 0 && setSponsorshipAuth) && stepper !== undefined && stepper.selectedIndex === stepper._steps.length -1"
         [disabled]="firstFormGroup.invalid || (secondFormGroup.get('namespaceCtrl').value !== 'Not selected' && secondFormGroup.invalid)"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{"DIALOGS.CREATE_SERVICE_MEMBER.CREATE_AND_SPONSOR" | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/delete-owner-dialog/delete-owner-dialog.component.html b/apps/admin-gui/src/app/shared/components/delete-owner-dialog/delete-owner-dialog.component.html
index b8b53780e..797602112 100644
--- a/apps/admin-gui/src/app/shared/components/delete-owner-dialog/delete-owner-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/delete-owner-dialog/delete-owner-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_OWNER.TITLE' | translate}}</h1>
         {{'DIALOGS.DELETE_OWNER.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.DELETE_OWNER.ASK' | translate}}
       </div>
 
@@ -24,10 +24,10 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_OWNER.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.DELETE_OWNER.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.DELETE_OWNER.DELETE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-ban-dialog/add-ban-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-ban-dialog/add-ban-dialog.component.html
index 149cf82a6..cc2711c53 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-ban-dialog/add-ban-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-ban-dialog/add-ban-dialog.component.html
@@ -21,13 +21,13 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_BAN.TITLE' | translate}}</h1>
       </mat-stepper>
     </div>
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto mr-2" (click)="cancel.emit()">
+      <button mat-flat-button class="ms-auto me-2" (click)="cancel.emit()">
         {{'DIALOGS.ADD_BAN.CANCEL' | translate}}
       </button>
       <button
         *ngIf="stepper.selectedIndex !== stepper?._steps?.length - 1"
         mat-flat-button
-        class="mr-2"
+        class="me-2"
         color="accent"
         (click)="stepper.next()"
         [disabled]="disabled">
@@ -36,7 +36,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_BAN.TITLE' | translate}}</h1>
       <button
         *ngIf="stepper.selectedIndex === stepper?._steps?.length - 1"
         mat-flat-button
-        class="mr-2"
+        class="me-2"
         (click)="stepper.previous()">
         {{'DIALOGS.ADD_BAN.BACK' | translate}}
       </button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-edit-notification-dialog/add-edit-notification-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-edit-notification-dialog/add-edit-notification-dialog.component.html
index 1bdc52364..bd1072326 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-edit-notification-dialog/add-edit-notification-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-edit-notification-dialog/add-edit-notification-dialog.component.html
@@ -20,7 +20,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
       <mat-tab-group color="primary" mat-stretch-tabs="false">
         <mat-tab label="{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.BASIC_SETTINGS' | translate}}">
           <div class="mt-3 d-flex">
-            <span class="w-25 m-auto font-weight-bold"
+            <span class="w-25 m-auto fw-bold"
               >{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.EMAIL_TYPE' | translate}} :</span
             >
             <div class="w-75">
@@ -68,7 +68,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
             </div>
           </div>
           <div class="d-flex">
-            <span class="w-25 font-weight-bold"
+            <span class="w-25 fw-bold"
               >{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.APPLICATION_TYPE' | translate}} :</span
             >
             <div class="w-75">
@@ -98,7 +98,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
             </div>
           </div>
           <div class="d-flex">
-            <span class="w-25 font-weight-bold"
+            <span class="w-25 fw-bold"
               >{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.SENDING_ENABLED' | translate}} :</span
             >
             <div class="w-75">
@@ -130,7 +130,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
                   </span>
                 </ng-template>
                 <div class="d-flex w-100">
-                  <div class="pr-2 w-100">
+                  <div class="pe-2 w-100">
                     <div class="pt-2">
                       <button
                         class="right-button"
@@ -139,7 +139,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
                         {{showTags ? ('DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.HIDE_TAGS' | translate) :
                         ('DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.SHOW_TAGS' | translate)}}
                       </button>
-                      <span class="font-weight-bold pr-2">
+                      <span class="fw-bold pe-2">
                         {{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.SUBJECT' | translate}}:
                       </span>
                       <mat-form-field class="w-100">
@@ -157,7 +157,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
                         </div>
                       </mat-form-field>
                     </div>
-                    <div class="font-weight-bold">
+                    <div class="fw-bold">
                       {{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TEXT' | translate}}:
                     </div>
 
@@ -181,7 +181,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
                     </mat-form-field>
                   </div>
 
-                  <mat-divider *ngIf="showTags" class="ml-3 mr-3" vertical="true"></mat-divider>
+                  <mat-divider *ngIf="showTags" class="ms-3 me-3" vertical="true"></mat-divider>
 
                   <div [@tagsOpenClose]="showTags ? 'open' : 'closed'">
                     <app-tag-bar (addedTag)="addTag(Input, Textarea, lang, $event, format)">
@@ -196,13 +196,13 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
     </div>
 
     <div class="d-flex mt-auto" mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.CANCEL_BUTTON' | translate}}
       </button>
       <button
         (click)="create()"
         *ngIf="data.createMailNotification"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="invalidNotification"
         mat-flat-button>
@@ -215,7 +215,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_ADD_EDIT_MAIL.TITLE_EDIT' | transl
         <button
           (click)="save()"
           *ngIf="!data.createMailNotification"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           [disabled]="!editAuth"
           mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-ext-source-dialog/add-ext-source-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-ext-source-dialog/add-ext-source-dialog.component.html
index 9702c74b8..c590e1e8e 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-ext-source-dialog/add-ext-source-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-ext-source-dialog/add-ext-source-dialog.component.html
@@ -22,13 +22,13 @@ <h1 class="page-subtitle">{{'DIALOGS.ADD_EXT_SOURCES.TITLE' | translate}}</h1>
   </div>
 
   <div mat-dialog-actions>
-    <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+    <button (click)="onCancel()" class="ms-auto" mat-flat-button>
       {{'DIALOGS.ADD_EXT_SOURCES.CANCEL' | translate}}
     </button>
 
     <button
       (click)="onAdd()"
-      class="ml-2"
+      class="ms-2"
       color="accent"
       [disabled]="selection.selected.length === 0 || loading"
       mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-facility-owner-dialog/add-facility-owner-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-facility-owner-dialog/add-facility-owner-dialog.component.html
index d37d456e9..7b978ced5 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-facility-owner-dialog/add-facility-owner-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-facility-owner-dialog/add-facility-owner-dialog.component.html
@@ -21,14 +21,14 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_OWNERS.TITLE' | translate}}</h1>
       </div>
 
       <div mat-dialog-actions>
-        <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+        <button (click)="onCancel()" class="ms-auto" mat-flat-button>
           {{'DIALOGS.ADD_OWNERS.CANCEL' | translate}}
         </button>
 
         <button
           (click)="onAdd()"
           [disabled]="selection.selected.length === 0 || loading"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           mat-flat-button>
           {{'DIALOGS.ADD_OWNERS.ADD' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-group-hierarchical-include-dialog/add-group-hierarchical-include-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-group-hierarchical-include-dialog/add-group-hierarchical-include-dialog.component.html
index 7bf523965..7a4d940d7 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-group-hierarchical-include-dialog/add-group-hierarchical-include-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-group-hierarchical-include-dialog/add-group-hierarchical-include-dialog.component.html
@@ -28,7 +28,7 @@ <h1 mat-dialog-title>
     </ng-template>
   </div>
   <div mat-dialog-actions>
-    <button [disabled]="loading" (click)="close()" mat-flat-button class="ml-auto">
+    <button [disabled]="loading" (click)="close()" mat-flat-button class="ms-auto">
       {{'DIALOGS.ADD_GROUPS_HIERARCHICAL_INCLUSION.CANCEL' | translate}}
     </button>
     <button
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-group-manager-dialog/add-group-manager-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-group-manager-dialog/add-group-manager-dialog.component.html
index ac2fe4527..291d77f02 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-group-manager-dialog/add-group-manager-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-group-manager-dialog/add-group-manager-dialog.component.html
@@ -3,7 +3,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_GROUPS.TITLE' | translate}}</h1>
 
   <div mat-dialog-content>
     <div class="inline-dialog-items">
-      <mat-form-field class="mr-2">
+      <mat-form-field class="me-2">
         <mat-label>{{'SHARED.COMPONENTS.MANAGERS_PAGE.SELECT_ROLE' | translate}}</mat-label>
         <mat-select [(value)]="selectedRole">
           <mat-option *ngFor="let role of availableRoles" [value]="role.roleName">
@@ -12,7 +12,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_GROUPS.TITLE' | translate}}</h1>
         </mat-select>
       </mat-form-field>
 
-      <mat-form-field class="mr-2 w-75">
+      <mat-form-field class="me-2 w-75">
         <mat-label>{{'DIALOGS.ADD_GROUPS.SELECT_VO' | translate}}</mat-label>
         <input
           [formControl]="myControl"
@@ -54,12 +54,12 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_GROUPS.TITLE' | translate}}</h1>
   </div>
 
   <div mat-dialog-actions>
-    <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+    <button (click)="onCancel()" class="ms-auto" mat-flat-button>
       {{'DIALOGS.ADD_MANAGERS.CANCEL' | translate}}
     </button>
     <button
       (click)="onSubmit()"
-      class="ml-2"
+      class="ms-2"
       color="accent"
       [disabled]="selection.selected.length === 0 || loading"
       mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-group-resource-dialog/add-group-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-group-resource-dialog/add-group-resource-dialog.component.html
index d1cde2c98..1f3dcb1fc 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-group-resource-dialog/add-group-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-group-resource-dialog/add-group-resource-dialog.component.html
@@ -74,17 +74,17 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_GROUP_RESOURCES.TITLE'| translate}}</h1>
       <button
         (click)="stepperPrevious()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
-        class="ml-auto"
+        class="ms-auto"
         mat-flat-button>
         {{'DIALOGS.ADD_GROUP_RESOURCES.BACK' | translate}}
       </button>
       <button
         (click)="stepperNext()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== stepper._steps.length - 1"
-        [class.ml-2]="stepper !== undefined && stepper.selectedIndex !== 0"
-        [class.ml-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
+        [class.ms-2]="stepper !== undefined && stepper.selectedIndex !== 0"
+        [class.ms-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
         [disabled]="selection.selected.length === 0 || (list !== undefined && !list.addAuth)"
-        class="ml-auto"
+        class="ms-auto"
         color="accent"
         mat-flat-button
         type="button">
@@ -95,7 +95,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_GROUP_RESOURCES.TITLE'| translate}}</h1>
         matTooltip="{{'DIALOGS.ADD_GROUP_RESOURCES.ADD_PERMISSION_TOOLTIP' | translate}}">
         <button
           (click)="onSubmit()"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           *ngIf="stepper !== undefined && stepper.selectedIndex === stepper._steps.length -1"
           [disabled]="selection.selected.length === 0 || loading"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-group-to-registration/add-group-to-registration.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-group-to-registration/add-group-to-registration.component.html
index ca9b0a6f8..072686a4f 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-group-to-registration/add-group-to-registration.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-group-to-registration/add-group-to-registration.component.html
@@ -20,12 +20,12 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_GROUP_TO_REGISTRATION.TITLE' | translate}}</
       </perun-web-apps-groups-list>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_GROUP_TO_REGISTRATION.CANCEL_BUTTON' | translate}}
       </button>
       <button
         (click)="onAdd()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="selection.selected.length === 0 || loading"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-host-dialog/add-host-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-host-dialog/add-host-dialog.component.html
index 9ef69f590..144bb52b0 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-host-dialog/add-host-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-host-dialog/add-host-dialog.component.html
@@ -30,12 +30,12 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_HOST.TITLE' | translate}}</h1>
       >
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_HOST.CANCEL' | translate}}
       </button>
       <button
         (click)="onAdd()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="hostsCtrl.invalid || loading"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-manager-dialog/add-manager-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-manager-dialog/add-manager-dialog.component.html
index 60dcdf9c0..2fce266c9 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-manager-dialog/add-manager-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-manager-dialog/add-manager-dialog.component.html
@@ -3,7 +3,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MANAGERS.TITLE' | translate}}</h1>
 
   <div mat-dialog-content>
     <div class="inline-dialog-items">
-      <mat-form-field class="mr-2">
+      <mat-form-field class="me-2">
         <mat-label>{{'SHARED.COMPONENTS.MANAGERS_PAGE.SELECT_ROLE' | translate}}</mat-label>
         <mat-select [(value)]="selectedRole">
           <mat-option *ngFor="let role of availableRoles" [value]="role.roleName">
@@ -12,7 +12,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MANAGERS.TITLE' | translate}}</h1>
         </mat-select>
       </mat-form-field>
 
-      <mat-form-field class="mr-2 w-100">
+      <mat-form-field class="me-2 w-100">
         <mat-label>{{'DIALOGS.ADD_MANAGERS.DESCRIPTION' | translate}}</mat-label>
         <input
           matInput
@@ -28,7 +28,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MANAGERS.TITLE' | translate}}</h1>
     </div>
     <button
       (click)="onSearchByString()"
-      class="ml-auto"
+      class="ms-auto"
       color="accent"
       data-cy="search-manager-button"
       [disabled]="loading"
@@ -52,12 +52,12 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MANAGERS.TITLE' | translate}}</h1>
   </div>
 
   <div mat-dialog-actions>
-    <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+    <button (click)="onCancel()" class="ms-auto" mat-flat-button>
       {{'DIALOGS.ADD_MANAGERS.CANCEL' | translate}}
     </button>
     <button
       (click)="onSubmit()"
-      class="ml-2"
+      class="ms-2"
       color="accent"
       data-cy="add-manager-button-dialog"
       [disabled]="selection.selected.length === 0 || selectedRole === undefined || loading"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-member-dialog/add-member-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-member-dialog/add-member-dialog.component.html
index 236993188..296cb5234 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-member-dialog/add-member-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-member-dialog/add-member-dialog.component.html
@@ -29,7 +29,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MEMBERS.TITLE' | translate}}</h1>
         </div>
       </div>
       <div mat-dialog-actions>
-        <button mat-flat-button class="ml-auto" (click)="cancel.emit(false)">
+        <button mat-flat-button class="ms-auto" (click)="cancel.emit(false)">
           {{'DIALOGS.ADD_MEMBERS.CANCEL' | translate}}
         </button>
         <span
@@ -40,7 +40,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MEMBERS.TITLE' | translate}}</h1>
             *ngIf="inviteAuth"
             [disabled]="selection.selected.length === 0 || !inviteAuth || !showInvite"
             [matMenuTriggerFor]="menu"
-            class="ml-2 dropdown-toggle"
+            class="ms-2 dropdown-toggle"
             color="accent"
             mat-flat-button>
             {{'DIALOGS.ADD_MEMBERS.INVITE' | translate}}
@@ -59,7 +59,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MEMBERS.TITLE' | translate}}</h1>
           [matTooltipDisabled]="selection.selected.length === 0 || addAuth">
           <button
             mat-flat-button
-            class="ml-2"
+            class="ms-2"
             color="accent"
             data-cy="add-button"
             (click)="add.emit()"
@@ -101,7 +101,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MEMBERS.TITLE' | translate}}</h1>
         </table>
       </div>
       <div mat-dialog-actions *ngIf="!loading">
-        <button mat-flat-button class="ml-auto" (click)="cancel.emit(true)">
+        <button mat-flat-button class="ms-auto" (click)="cancel.emit(true)">
           {{'DIALOGS.ADD_MEMBERS.CLOSE' | translate}}
         </button>
       </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-member-group-dialog/add-member-group-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-member-group-dialog/add-member-group-dialog.component.html
index 0e7a6e292..218867e96 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-member-group-dialog/add-member-group-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-member-group-dialog/add-member-group-dialog.component.html
@@ -21,13 +21,13 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MEMBER_GROUP.TITLE' | translate}}</h1>
       </perun-web-apps-groups-list>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_MEMBER_GROUP.CANCEL' | translate}}
       </button>
       <button
         [disabled]="selection.selected.length === 0"
         (click)="onAdd()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.ADD_MEMBER_GROUP.ADD' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-member-to-resource-dialog/add-member-to-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-member-to-resource-dialog/add-member-to-resource-dialog.component.html
index 796871286..95ce565cf 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-member-to-resource-dialog/add-member-to-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-member-to-resource-dialog/add-member-to-resource-dialog.component.html
@@ -34,17 +34,14 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MEMBER_TO_RESOURCE.TITLE' | translate}}</h1>
           </div>
           <div>
             <span
-              class="font-weight-bold"
+              class="fw-bold"
               >{{ 'DIALOGS.ADD_MEMBER_TO_RESOURCE.DESCRIPTION' | translate}}</span
             >
-            <div class="ml-5">{{description}}</div>
+            <div class="ms-5">{{description}}</div>
           </div>
           <div>
-            <span
-              class="font-weight-bold"
-              >{{ 'DIALOGS.ADD_MEMBER_TO_RESOURCE.SERVICES' | translate}}</span
-            >
-            <div *ngFor="let service of services" class="ml-5">{{service.name}}</div>
+            <span class="fw-bold">{{ 'DIALOGS.ADD_MEMBER_TO_RESOURCE.SERVICES' | translate}}</span>
+            <div *ngFor="let service of services" class="ms-5">{{service.name}}</div>
           </div>
         </mat-step>
         <mat-step>
@@ -80,15 +77,15 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MEMBER_TO_RESOURCE.TITLE' | translate}}</h1>
       <button
         (click)="stepperPrevious()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
-        class="ml-auto"
+        class="ms-auto"
         mat-flat-button>
         {{'DIALOGS.ADD_MEMBER_TO_RESOURCE.BACK' | translate}}
       </button>
       <button
         (click)="stepperNext(); loadGroups()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== stepper._steps.length - 1"
-        [class.ml-2]="stepper !== undefined && stepper.selectedIndex !== 0"
-        [class.ml-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
+        [class.ms-2]="stepper !== undefined && stepper.selectedIndex !== 0"
+        [class.ms-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
         [disabled]="selectedResource === null || processing || loading"
         color="accent"
         mat-flat-button>
@@ -98,7 +95,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_MEMBER_TO_RESOURCE.TITLE' | translate}}</h1>
         (click)="onFinish()"
         *ngIf="stepper !== undefined && stepper.selectedIndex === stepper._steps.length -1"
         [disabled]="selectedGroups.selected.length === 0 || processing"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.ADD_MEMBER_TO_RESOURCE.SUBMIT' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-required-attributes-dialog/add-required-attributes-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-required-attributes-dialog/add-required-attributes-dialog.component.html
index b189d7e4e..38c232492 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-required-attributes-dialog/add-required-attributes-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-required-attributes-dialog/add-required-attributes-dialog.component.html
@@ -24,12 +24,12 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_REQUIRED_ATTRIBUTES.TITLE' | translate}}</h1
       </app-attr-def-list>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_REQUIRED_ATTRIBUTES.CANCEL' | translate}}
       </button>
       <button
         (click)="onAdd()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="selection.selected.length === 0"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-resource-tag-to-resource-dialog/add-resource-tag-to-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-resource-tag-to-resource-dialog/add-resource-tag-to-resource-dialog.component.html
index 3071ae9b7..b4fae2017 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-resource-tag-to-resource-dialog/add-resource-tag-to-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-resource-tag-to-resource-dialog/add-resource-tag-to-resource-dialog.component.html
@@ -19,12 +19,12 @@ <h1 mat-dialog-title>{{'RESOURCE_DETAIL.TAGS.ADD_TAGS' | translate}}</h1>
   </div>
 
   <div mat-dialog-actions>
-    <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+    <button (click)="onCancel()" class="ms-auto" mat-flat-button>
       {{'RESOURCE_DETAIL.TAGS.CANCEL' | translate}}
     </button>
     <button
       (click)="onSubmit(selection.selected)"
-      class="ml-2"
+      class="ms-2"
       color="accent"
       [disabled]="loading || resourceTags.length === 0"
       mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-role-dialog/add-role-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-role-dialog/add-role-dialog.component.html
index 2506dee67..e19b0ea11 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-role-dialog/add-role-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-role-dialog/add-role-dialog.component.html
@@ -48,14 +48,14 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_ROLE.TITLE' | translate}}</h1>
       </perun-web-apps-resources-list>
     </div>
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_ROLE.CANCEL' | translate}}
       </button>
       <button
         (click)="addRole()"
         [disabled]="selectedRule === null || ((selectedRule.primaryObject === 'Facility' && selectedFacilities.isEmpty())
         || (selectedRule.primaryObject && selectedRule.primaryObject !== 'Facility' && selected.isEmpty()))"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.ADD_ROLE.ADD' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-services-destination-dialog/add-services-destination-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-services-destination-dialog/add-services-destination-dialog.component.html
index 2a416d3d3..8b54287cc 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-services-destination-dialog/add-services-destination-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-services-destination-dialog/add-services-destination-dialog.component.html
@@ -8,9 +8,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_SERVICE_DESTINATION.TITLE' | translate}}</h1
       <div class="font-italic">{{'DIALOGS.ADD_SERVICE_DESTINATION.DESCRIPTION' | translate}}</div>
       <mat-form-field>
         <mat-label>{{'DIALOGS.ADD_SERVICE_DESTINATION.SERVICE' | translate}}</mat-label>
-        <mat-select
-          [formControl]="serviceControl"
-          required>
+        <mat-select [formControl]="serviceControl" required>
           <mat-option
             *ngIf="services.length !== 0"
             value="all"
@@ -29,9 +27,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_SERVICE_DESTINATION.TITLE' | translate}}</h1
           {{'DIALOGS.ADD_SERVICE_DESTINATION.CHOOSE_SERVICE' | translate}}
         </mat-error>
       </mat-form-field>
-      <mat-checkbox
-        (change)="getServices()"
-        [(ngModel)]="servicesOnFacility">
+      <mat-checkbox (change)="getServices()" [(ngModel)]="servicesOnFacility">
         {{'DIALOGS.ADD_SERVICE_DESTINATION.IS_SERVICES_ONLY_ON_FACILITY' | translate}}
       </mat-checkbox>
       <mat-form-field>
@@ -47,10 +43,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_SERVICE_DESTINATION.TITLE' | translate}}</h1
 
       <mat-form-field *ngIf="!(selectedType === 'host' && useFacilityHost)" class="w-100">
         <mat-label>{{getTypeForView(selectedType)}}</mat-label>
-        <input
-          [formControl]="destinationControl"
-          matInput
-          required />
+        <input [formControl]="destinationControl" matInput required />
         <mat-error
           *ngIf="selectedType === 'host' && !useFacilityHost && destinationControl.hasError('required')">
           {{'DIALOGS.ADD_SERVICE_DESTINATION.REQUIRED_FIELD' | translate}}
@@ -66,8 +59,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_SERVICE_DESTINATION.TITLE' | translate}}</h1
 
       <mat-form-field>
         <mat-label>{{'DIALOGS.ADD_SERVICE_DESTINATION.PROPAGATION' | translate}}</mat-label>
-        <mat-select
-          [(ngModel)]="selectedPropagation">
+        <mat-select [(ngModel)]="selectedPropagation">
           <mat-option *ngFor="let propagation of propagations" [value]="propagation">
             {{propagation}}
           </mat-option>
@@ -78,13 +70,13 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_SERVICE_DESTINATION.TITLE' | translate}}</h1
       </div>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_SERVICE_DESTINATION.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
         [disabled]="loading || invalidDestination() || serviceControl.invalid || serviceControl.value === 'noService'"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.ADD_SERVICE_DESTINATION.ADD' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/add-user-ext-source-dialog/add-user-ext-source-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/add-user-ext-source-dialog/add-user-ext-source-dialog.component.html
index e58dde9e8..8e07ae84c 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/add-user-ext-source-dialog/add-user-ext-source-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/add-user-ext-source-dialog/add-user-ext-source-dialog.component.html
@@ -7,10 +7,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_USER_EXT_SOURCE.TITLE'|translate}}</h1>
     <div class="dialog-container user-theme" mat-dialog-content>
       <mat-form-field class="center-self w-100">
         <mat-label>{{'DIALOGS.ADD_USER_EXT_SOURCE.LOGIN' | translate}}</mat-label>
-        <input
-          [formControl]="loginControl"
-          matInput
-          required />
+        <input [formControl]="loginControl" matInput required />
         <mat-error>
           {{'DIALOGS.ADD_USER_EXT_SOURCE.EMPTY_LOGIN' | translate}}
         </mat-error>
@@ -34,13 +31,13 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_USER_EXT_SOURCE.TITLE'|translate}}</h1>
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_USER_EXT_SOURCE.CANCEL'|translate}}
       </button>
       <button
         (click)="onAdd()"
         [disabled]="loginControl.invalid || extSourcesControl.invalid || loading"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.ADD_USER_EXT_SOURCE.ADD'|translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/application-form-copy-items-dialog/application-form-copy-items-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/application-form-copy-items-dialog/application-form-copy-items-dialog.component.html
index bac2fc14e..71e0e39a4 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/application-form-copy-items-dialog/application-form-copy-items-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/application-form-copy-items-dialog/application-form-copy-items-dialog.component.html
@@ -27,12 +27,12 @@ <h1 mat-dialog-title>{{'DIALOGS.APPLICATION_FORM_COPY_ITEMS.TITLE' | translate}}
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.APPLICATION_FORM_COPY_ITEMS.CANCEL_BUTTON' | translate}}
       </button>
       <button
         (click)="submit()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="(!selectedVo && !selectedGroup) || loading"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/application-re-send-notification-dialog/application-re-send-notification-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/application-re-send-notification-dialog/application-re-send-notification-dialog.component.html
index 9cc1c0536..63cf844ee 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/application-re-send-notification-dialog/application-re-send-notification-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/application-re-send-notification-dialog/application-re-send-notification-dialog.component.html
@@ -48,10 +48,10 @@ <h1 mat-dialog-title>{{'DIALOGS.RE_SEND_NOTIFICATION.TITLE' | translate}}</h1>
       </div>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.RE_SEND_NOTIFICATION.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="accent" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="accent" mat-flat-button>
         {{'DIALOGS.RE_SEND_NOTIFICATION.SEND' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/application-reject-dialog/application-reject-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/application-reject-dialog/application-reject-dialog.component.html
index f97488bff..aa60fee96 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/application-reject-dialog/application-reject-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/application-reject-dialog/application-reject-dialog.component.html
@@ -12,10 +12,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REJECT_APPLICATION.TITLE' | translate}}</h1>
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REJECT_APPLICATION.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REJECT_APPLICATION.SUBMIT' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/applications-list-columns-change-dialog/applications-list-columns-change-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/applications-list-columns-change-dialog/applications-list-columns-change-dialog.component.html
index f865f9f7b..455410637 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/applications-list-columns-change-dialog/applications-list-columns-change-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/applications-list-columns-change-dialog/applications-list-columns-change-dialog.component.html
@@ -29,10 +29,10 @@ <h1 mat-dialog-title>{{'DIALOGS.APPLICATIONS_LIST_COLUMNS_CHANGE.TITLE' | transl
       <button (click)="cancel()" mat-flat-button>
         {{'DIALOGS.APPLICATIONS_LIST_COLUMNS_CHANGE.CANCEL' | translate}}
       </button>
-      <button (click)="default()" class="ml-auto" mat-flat-button>
+      <button (click)="default()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.APPLICATIONS_LIST_COLUMNS_CHANGE.DEFAULT' | translate}}
       </button>
-      <button (click)="confirm()" [disabled]="loading" class="ml-2" color="accent" mat-flat-button>
+      <button (click)="confirm()" [disabled]="loading" class="ms-2" color="accent" mat-flat-button>
         {{'DIALOGS.APPLICATIONS_LIST_COLUMNS_CHANGE.CONFIRM' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/assign-group-to-resource-dialog/assign-group-to-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/assign-group-to-resource-dialog/assign-group-to-resource-dialog.component.html
index 29f1c30e1..befe4654f 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/assign-group-to-resource-dialog/assign-group-to-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/assign-group-to-resource-dialog/assign-group-to-resource-dialog.component.html
@@ -73,15 +73,15 @@ <h1 mat-dialog-title>{{'DIALOGS.ASSIGN_GROUP_TO_RESOURCE.TITLE' | translate}}</h
       <button
         (click)="stepperPrevious()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
-        class="ml-auto"
+        class="ms-auto"
         mat-flat-button>
         {{'DIALOGS.ASSIGN_GROUP_TO_RESOURCE.BACK' | translate}}
       </button>
       <button
         (click)="stepperNext()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== stepper._steps.length - 1"
-        [class.ml-2]="stepper !== undefined && stepper.selectedIndex !== 0"
-        [class.ml-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
+        [class.ms-2]="stepper !== undefined && stepper.selectedIndex !== 0"
+        [class.ms-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
         [disabled]="selection.selected.length === 0 || !canAddGroups()"
         color="accent"
         mat-flat-button
@@ -92,7 +92,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ASSIGN_GROUP_TO_RESOURCE.TITLE' | translate}}</h
       <button
         (click)="onAdd()"
         *ngIf="stepper !== undefined && stepper.selectedIndex === stepper._steps.length -1"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button
         type="button"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/assign-service-to-resource-dialog/assign-service-to-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/assign-service-to-resource-dialog/assign-service-to-resource-dialog.component.html
index 432d94ff8..1daab1eab 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/assign-service-to-resource-dialog/assign-service-to-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/assign-service-to-resource-dialog/assign-service-to-resource-dialog.component.html
@@ -48,12 +48,12 @@ <h1 mat-dialog-title>{{'DIALOGS.ASSIGN_SERVICE_TO_RESOURCE.TITLE' | translate}}<
       </mat-tab-group>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ASSIGN_SERVICE_TO_RESOURCE.CANCEL_BUTTON' | translate}}
       </button>
       <button
         (click)="onAdd()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="(selection.selected.length === 0 && selectedPackage.id === -1) || loading"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/attribute-import-dialog/attribute-import-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/attribute-import-dialog/attribute-import-dialog.component.html
index 191fa33eb..43d030dc5 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/attribute-import-dialog/attribute-import-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/attribute-import-dialog/attribute-import-dialog.component.html
@@ -16,13 +16,13 @@ <h1 mat-dialog-title>
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <button (click)="dialogRef.close()" class="ml-auto" mat-flat-button>
+      <button (click)="dialogRef.close()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.IMPORT_ATTRIBUTE.CANCEL' | translate}}
       </button>
       <button
         (click)="create()"
         [disabled]="value.trim().length === 0 || loading"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.IMPORT_ATTRIBUTE.CREATE' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/bulk-invite-members-dialog/bulk-invite-members-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/bulk-invite-members-dialog/bulk-invite-members-dialog.component.html
index 95c95a6c4..451d0f04f 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/bulk-invite-members-dialog/bulk-invite-members-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/bulk-invite-members-dialog/bulk-invite-members-dialog.component.html
@@ -55,13 +55,13 @@ <h1 mat-dialog-title>{{'DIALOGS.BULK_INVITE_MEMBERS.TITLE' | translate}}</h1>
       </perun-web-apps-alert>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.BULK_INVITE_MEMBERS.CANCEL' | translate}}
       </button>
       <button
         *ngIf="state === 'input'"
         (click)="onSubmit()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="loading || invitedMembers.invalid"
         mat-flat-button>
@@ -71,7 +71,7 @@ <h1 mat-dialog-title>{{'DIALOGS.BULK_INVITE_MEMBERS.TITLE' | translate}}</h1>
         *ngIf="state === 'results'"
         [disabled]="!resultData"
         (click)="downloadCsv()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.BULK_INVITE_MEMBERS.DOWNLOAD_CSV' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/connect-identity-dialog/connect-identity-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/connect-identity-dialog/connect-identity-dialog.component.html
index 99de24c89..c231f01d5 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/connect-identity-dialog/connect-identity-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/connect-identity-dialog/connect-identity-dialog.component.html
@@ -6,12 +6,9 @@
     <div (keyup)="onKeyInput($event)" class="{{theme}}">
       <h1 mat-dialog-title>{{'DIALOGS.CONNECT_IDENTITY.TITLE_'+target | translate}}</h1>
       <div class="dialog-container" mat-dialog-content>
-        <mat-form-field class="mr-2 search-field no-border-mat-input">
+        <mat-form-field class="me-2 search-field no-border-mat-input">
           <mat-label>{{'DIALOGS.CONNECT_IDENTITY.SEARCH' | translate}}</mat-label>
-          <input
-            matInput
-            autocomplete="false"
-            [formControl]="searchCtrl" />
+          <input matInput autocomplete="false" [formControl]="searchCtrl" />
           <mat-error>
             {{'DIALOGS.CONNECT_IDENTITY.EMPTY_SEARCH_MESSAGE' | translate}}
           </mat-error>
@@ -19,7 +16,7 @@ <h1 mat-dialog-title>{{'DIALOGS.CONNECT_IDENTITY.TITLE_'+target | translate}}</h
         <button
           (click)="onSearchByString()"
           [disabled]="loading"
-          class="mr-2 search-btn"
+          class="me-2 search-btn"
           color="primary"
           mat-flat-button>
           <mat-icon>search</mat-icon>
@@ -43,11 +40,11 @@ <h1 mat-dialog-title>{{'DIALOGS.CONNECT_IDENTITY.TITLE_'+target | translate}}</h
         </perun-web-apps-alert>
       </div>
       <div mat-dialog-actions>
-        <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+        <button (click)="onCancel()" class="ms-auto" mat-flat-button>
           {{'DIALOGS.CONNECT_IDENTITY.CANCEL' | translate}}
         </button>
         <button
-          class="ml-2"
+          class="ms-2"
           (click)="onAdd()"
           [disabled]="selection.selected.length === 0"
           color="accent"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/copy-members-dialog/copy-members-dialog-component.html b/apps/admin-gui/src/app/shared/components/dialogs/copy-members-dialog/copy-members-dialog-component.html
index ac94f9a60..a22d07fb4 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/copy-members-dialog/copy-members-dialog-component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/copy-members-dialog/copy-members-dialog-component.html
@@ -36,13 +36,13 @@ <h5 class="mt-4">{{'DIALOGS.COPY_MEMBERS.SELECT_GROUPS' | translate}}</h5>
       </perun-web-apps-groups-list>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.COPY_MEMBERS.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
         [disabled]="loading || selection.isEmpty()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.COPY_MEMBERS.COPY' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-definition-dialog/create-attribute-definition-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-definition-dialog/create-attribute-definition-dialog.component.html
index 42857fbce..7d6ea9e6d 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-definition-dialog/create-attribute-definition-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-definition-dialog/create-attribute-definition-dialog.component.html
@@ -43,10 +43,7 @@ <h1 mat-dialog-title>{{'DIALOGS.CREATE_ATTRIBUTE_DEFINITION.TITLE' | translate}}
         </mat-form-field>
         <mat-form-field>
           <mat-label>{{'DIALOGS.CREATE_ATTRIBUTE_DEFINITION.ENTITY' | translate}}</mat-label>
-          <mat-select
-            formControlName="entity"
-            data-cy="attribute-entity-input"
-            required>
+          <mat-select formControlName="entity" data-cy="attribute-entity-input" required>
             <mat-option *ngFor="let entity of entities" [value]="entity">{{entity}}</mat-option>
           </mat-select>
           <mat-error *ngIf="attributeControl.hasError('required', 'entity')">
@@ -69,10 +66,7 @@ <h1 mat-dialog-title>{{'DIALOGS.CREATE_ATTRIBUTE_DEFINITION.TITLE' | translate}}
         </mat-form-field>
         <mat-form-field>
           <mat-label>{{'DIALOGS.CREATE_ATTRIBUTE_DEFINITION.VALUE_TYPE' | translate}}</mat-label>
-          <mat-select
-            formControlName="valueType"
-            data-cy="attribute-value-type-input"
-            required>
+          <mat-select formControlName="valueType" data-cy="attribute-value-type-input" required>
             <mat-option *ngFor="let valType of valueTypes" [value]="valType">
               {{valType | attributeTypeClean}}
             </mat-option>
@@ -95,11 +89,11 @@ <h1 mat-dialog-title>{{'DIALOGS.CREATE_ATTRIBUTE_DEFINITION.TITLE' | translate}}
       </perun-web-apps-attribute-rights-tab-group>
     </div>
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.CREATE_ATTRIBUTE_DEFINITION.CANCEL' | translate}}
       </button>
       <button
-        class="ml-2"
+        class="ms-2"
         color="accent"
         (click)="submit()"
         [disabled]="loading || attributeControl.invalid"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-dialog/create-attribute-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-dialog/create-attribute-dialog.component.html
index b089ce48d..1fdc3720e 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-dialog/create-attribute-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-attribute-dialog/create-attribute-dialog.component.html
@@ -6,7 +6,7 @@ <h1 class="page-subtitle">{{'DIALOGS.CREATE_ATTRIBUTE.SET_NEW' | translate}}</h1
       [placeholder]="'SHARED_LIB.PERUN.COMPONENTS.ATTRIBUTES_LIST.FILTER'"
       data-cy="filter-attributes"
       class="font-size-1rem"></perun-web-apps-immediate-filter>
-    <perun-web-apps-alert *ngIf="showError" class="ml-3 font-size-1rem" alert_type="error">
+    <perun-web-apps-alert *ngIf="showError" class="ms-3 font-size-1rem" alert_type="error">
       {{'DIALOGS.CREATE_ATTRIBUTE.ERROR_EMPTY_VALUE' | translate}}
     </perun-web-apps-alert>
   </div>
@@ -28,14 +28,14 @@ <h1 class="page-subtitle">{{'DIALOGS.CREATE_ATTRIBUTE.SET_NEW' | translate}}</h1
     </div>
   </div>
   <div mat-dialog-actions>
-    <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+    <button (click)="onCancel()" class="ms-auto" mat-flat-button>
       {{'DIALOGS.CREATE_ATTRIBUTE.CANCEL' | translate}}
     </button>
 
     <button
       (click)="onSave()"
       [disabled]="selected.selected.length === 0"
-      class="ml-2"
+      class="ms-2"
       color="accent"
       data-cy="save-selected-attributes"
       mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-edit-service-dialog/create-edit-service-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-edit-service-dialog/create-edit-service-dialog.component.html
index 5d3fcd2a5..69b69bba2 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-edit-service-dialog/create-edit-service-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-edit-service-dialog/create-edit-service-dialog.component.html
@@ -19,47 +19,35 @@ <h1 mat-dialog-title>{{title}}</h1>
 
       <mat-form-field>
         <mat-label>{{'DIALOGS.CREATE_EDIT_SERVICE.DESCRIPTION' | translate}}</mat-label>
-        <input
-          [(ngModel)]="description"
-          matInput
-          data-cy="service-description-input"/>
+        <input [(ngModel)]="description" matInput data-cy="service-description-input" />
       </mat-form-field>
 
       <mat-form-field>
         <mat-label>{{'DIALOGS.CREATE_EDIT_SERVICE.DELAY' | translate}}</mat-label>
-        <input
-          matInput
-          [formControl]="delayControl"
-          required />
+        <input matInput [formControl]="delayControl" required />
         <mat-error>{{'DIALOGS.CREATE_EDIT_SERVICE.INVALID_DELAY' | translate}}</mat-error>
       </mat-form-field>
 
       <mat-form-field>
         <mat-label>{{'DIALOGS.CREATE_EDIT_SERVICE.RECURRENCE' | translate}}</mat-label>
-        <input
-          matInput
-          [formControl]="recurrenceControl"
-          required />
+        <input matInput [formControl]="recurrenceControl" required />
         <mat-error>{{'DIALOGS.CREATE_EDIT_SERVICE.INVALID_RECURRENCE' | translate}}</mat-error>
       </mat-form-field>
 
       <mat-form-field>
         <mat-label>{{'DIALOGS.CREATE_EDIT_SERVICE.PATH' | translate}}</mat-label>
-        <input
-          matInput
-          [formControl]="pathControl"
-          required />
+        <input matInput [formControl]="pathControl" required />
         <mat-error>{{'DIALOGS.CREATE_EDIT_SERVICE.REQUIRE_PATH' | translate}}</mat-error>
       </mat-form-field>
 
-    <div>
-      {{'DIALOGS.CREATE_EDIT_SERVICE.STATUS' | translate}}
-      <mat-checkbox
-        class="ms-3"
-        [(ngModel)]="status"
-        >{{'DIALOGS.CREATE_EDIT_SERVICE.STATUS_HINT' | translate}}</mat-checkbox
-      >
-    </div>
+      <div>
+        {{'DIALOGS.CREATE_EDIT_SERVICE.STATUS' | translate}}
+        <mat-checkbox
+          class="ms-3"
+          [(ngModel)]="status"
+          >{{'DIALOGS.CREATE_EDIT_SERVICE.STATUS_HINT' | translate}}</mat-checkbox
+        >
+      </div>
 
       <span class="d-flex align-elements"
         >{{'DIALOGS.CREATE_EDIT_SERVICE.EXPIRED_MEMBERS' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-facility-dialog/create-facility-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-facility-dialog/create-facility-dialog.component.html
index 35662c8c6..abc677068 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-facility-dialog/create-facility-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-facility-dialog/create-facility-dialog.component.html
@@ -7,24 +7,16 @@ <h1 mat-dialog-title>{{'DIALOGS.CREATE_FACILITY.TITLE' | translate}}</h1>
     <div class="dialog-container" mat-dialog-content>
       <mat-form-field>
         <mat-label>{{'DIALOGS.CREATE_FACILITY.NAME' | translate}}</mat-label>
-        <input
-          matInput
-          required
-          data-cy="facility-name-input"
-          [formControl]="nameControl" />
+        <input matInput required data-cy="facility-name-input" [formControl]="nameControl" />
         <mat-error>{{"DIALOGS.CREATE_FACILITY.REQUIRE_NAME" | translate}}</mat-error>
       </mat-form-field>
       <mat-form-field>
         <mat-label>{{'DIALOGS.CREATE_FACILITY.DESCRIPTION' | translate}}</mat-label>
-        <input
-          matInput
-          data-cy="facility-description-input"
-          [formControl]="descControl" />
+        <input matInput data-cy="facility-description-input" [formControl]="descControl" />
       </mat-form-field>
       <mat-form-field>
         <mat-label>{{'DIALOGS.CREATE_FACILITY.AS_COPY' | translate}}</mat-label>
-        <mat-select
-          disableOptionCentering="true">
+        <mat-select disableOptionCentering="true">
           <mat-option (click)="srcFacility = null">
             {{'DIALOGS.CREATE_FACILITY.NO_COPY' | translate}}
           </mat-option>
@@ -41,7 +33,7 @@ <h1 mat-dialog-title>{{'DIALOGS.CREATE_FACILITY.TITLE' | translate}}</h1>
       </perun-web-apps-alert>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{"DIALOGS.CREATE_FACILITY.CANCEL" | translate}}
       </button>
       <button
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-group-dialog/create-group-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-group-dialog/create-group-dialog.component.html
index f2bf309db..7d44561f6 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-group-dialog/create-group-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-group-dialog/create-group-dialog.component.html
@@ -33,13 +33,13 @@ <h1 mat-dialog-title>{{title}}</h1>
       </perun-web-apps-group-search-select>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.CREATE_GROUP.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
         [disabled]="nameControl.invalid || descriptionControl.invalid || (asSubgroup && selectedParent === null) || loading"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         data-cy="create-group-button-dialog"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-relation-dialog/create-relation-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-relation-dialog/create-relation-dialog.component.html
index 3c3e66c02..a9162498c 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-relation-dialog/create-relation-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-relation-dialog/create-relation-dialog.component.html
@@ -33,12 +33,12 @@ <h1 mat-dialog-title>{{"DIALOGS.CREATE_RELATION.TITLE" | translate}}</h1>
       </div>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.CREATE_RELATION.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="loading || initLoading || selection.selected.length === 0"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-resource-dialog/create-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-resource-dialog/create-resource-dialog.component.html
index 66a1f4f25..992ede6ca 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-resource-dialog/create-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-resource-dialog/create-resource-dialog.component.html
@@ -27,12 +27,12 @@
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.CREATE_RESOURCE.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
-        class="ml-2"
+        class="ms-2"
         data-cy="create-resource-dialog-button"
         [disabled]="nameCtrl.invalid || descriptionCtrl.invalid || selectedVo === null || loading"
         color="accent"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-resource-tag-dialog/create-resource-tag-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-resource-tag-dialog/create-resource-tag-dialog.component.html
index 81fe75748..a137615c8 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-resource-tag-dialog/create-resource-tag-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-resource-tag-dialog/create-resource-tag-dialog.component.html
@@ -7,18 +7,15 @@ <h1 mat-dialog-title>{{'DIALOGS.CREATE_RESOURCE_TAG.TITLE' | translate}}</h1>
     <div class="dialog-container" mat-dialog-content>
       <mat-form-field>
         <mat-label>{{'DIALOGS.CREATE_RESOURCE_TAG.NAME' | translate}}</mat-label>
-        <input
-          matInput
-          [(ngModel)]="name"
-          required />
+        <input matInput [(ngModel)]="name" required />
         <mat-error>{{'DIALOGS.CREATE_RESOURCE_TAG.EMPTY_NAME' | translate}}</mat-error>
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.CREATE_RESOURCE_TAG.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="accent" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="accent" mat-flat-button>
         {{'DIALOGS.CREATE_RESOURCE_TAG.CREATE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-sponsored-member-dialog/create-sponsored-member-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-sponsored-member-dialog/create-sponsored-member-dialog.component.html
index 8152e4c7a..d017f911c 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-sponsored-member-dialog/create-sponsored-member-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-sponsored-member-dialog/create-sponsored-member-dialog.component.html
@@ -159,7 +159,7 @@ <h6 class="mt-4">{{'DIALOGS.CREATE_SPONSORED_MEMBER.EXPIRATION' | translate}}</h
 
     <div *ngIf="successfullyCreated" class="dialog-container" mat-dialog-content>
       <div class="bigger-font mb-2">
-        <mat-icon class="mr-2 mb-2">done</mat-icon>
+        <mat-icon class="me-2 mb-2">done</mat-icon>
         {{'DIALOGS.CREATE_SPONSORED_MEMBER.USER' | translate}}
         <i>{{this.createdMember.user | userFullName}}</i>
         {{'DIALOGS.CREATE_SPONSORED_MEMBER.WAS_CREATED' | translate}}
@@ -181,7 +181,7 @@ <h6 class="mt-4">{{'DIALOGS.CREATE_SPONSORED_MEMBER.EXPIRATION' | translate}}</h
     </div>
 
     <div *ngIf="successfullyCreated" mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button data-cy="ok-button">
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button data-cy="ok-button">
         {{'DIALOGS.CREATE_SPONSORED_MEMBER.OK' | translate}}
       </button>
     </div>
@@ -193,7 +193,7 @@ <h6 class="mt-4">{{'DIALOGS.CREATE_SPONSORED_MEMBER.EXPIRATION' | translate}}</h
       <button
         (click)="stepperPrevious()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
-        class="ml-auto"
+        class="ms-auto"
         mat-flat-button>
         {{'DIALOGS.CREATE_SPONSORED_MEMBER.BACK' | translate}}
       </button>
@@ -201,8 +201,8 @@ <h6 class="mt-4">{{'DIALOGS.CREATE_SPONSORED_MEMBER.EXPIRATION' | translate}}</h
         data-cy="next-button"
         (click)="stepperNext()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== stepper._steps.length - 1"
-        [class.ml-2]="stepper !== undefined && stepper.selectedIndex !== 0"
-        [class.ml-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
+        [class.ms-2]="stepper !== undefined && stepper.selectedIndex !== 0"
+        [class.ms-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
         [disabled]="getStepperNextConditions()"
         color="accent"
         mat-flat-button
@@ -214,7 +214,7 @@ <h6 class="mt-4">{{'DIALOGS.CREATE_SPONSORED_MEMBER.EXPIRATION' | translate}}</h
         (click)="onConfirm()"
         *ngIf="stepper !== undefined && stepper.selectedIndex === stepper._steps.length -1"
         [disabled]="!submitAllowed"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button
         type="button">
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/create-vo-dialog/create-vo-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/create-vo-dialog/create-vo-dialog.component.html
index 480440252..b5a9e23ac 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/create-vo-dialog/create-vo-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/create-vo-dialog/create-vo-dialog.component.html
@@ -21,7 +21,7 @@ <h1 mat-dialog-title>{{"DIALOGS.CREATE_VO.TITLE" | translate}}</h1>
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.CREATE_VO.CANCEL' | translate}}
       </button>
       <div
@@ -30,7 +30,7 @@ <h1 mat-dialog-title>{{"DIALOGS.CREATE_VO.TITLE" | translate}}</h1>
         matTooltipPosition="above">
         <button
           (click)="onSubmit()"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           data-cy="create-vo-button"
           [disabled]="shortNameCtrl.invalid || fullNameCtrl.invalid"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-attribute-definition-dialog/delete-attribute-definition-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/delete-attribute-definition-dialog/delete-attribute-definition-dialog.component.html
index 2bc7cb28e..081f34ec7 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-attribute-definition-dialog/delete-attribute-definition-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-attribute-definition-dialog/delete-attribute-definition-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_ATTRIBUTE_DEFINITION.TITLE' | translate}}
         {{'DIALOGS.DELETE_ATTRIBUTE_DEFINITION.TEXT_LINE1' | translate}}
       </div>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.DELETE_ATTRIBUTE_DEFINITION.TEXT_LINE2' | translate}}
       </div>
 
@@ -28,13 +28,13 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_ATTRIBUTE_DEFINITION.TITLE' | translate}}
       </perun-web-apps-alert>
     </div>
     <div class="mt-3" mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.DELETE_ATTRIBUTE_DEFINITION.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
         [disabled]="loading"
-        class="ml-2"
+        class="ms-2"
         color="warn"
         mat-flat-button
         data-cy="confirm-delete-attr-definition-button">
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-attribute-dialog/delete-attribute-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/delete-attribute-dialog/delete-attribute-dialog.component.html
index c593e467c..6b0a98563 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-attribute-dialog/delete-attribute-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-attribute-dialog/delete-attribute-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_ATTRIBUTES.TITLE' | translate}}</h1>
         {{'DIALOGS.DELETE_ATTRIBUTES.DESCRIPTION' | translate}}
       </div>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.DELETE_ATTRIBUTES.ASK' | translate}}
       </div>
 
@@ -24,12 +24,12 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_ATTRIBUTES.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.DELETE_ATTRIBUTES.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
-        class="ml-2"
+        class="ms-2"
         color="warn"
         data-cy="delete-attributes"
         [disabled]="loading"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-notification-dialog/delete-notification-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/delete-notification-dialog/delete-notification-dialog.component.html
index a034826f0..6164e5033 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-notification-dialog/delete-notification-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-notification-dialog/delete-notification-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.APPLICATION_FORM_DELETE_MAIL.TITLE' | translate}
         {{'DIALOGS.APPLICATION_FORM_DELETE_MAIL.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.APPLICATION_FORM_DELETE_MAIL.CONFIRMATION' | translate}}
       </div>
 
@@ -24,10 +24,10 @@ <h1 mat-dialog-title>{{'DIALOGS.APPLICATION_FORM_DELETE_MAIL.TITLE' | translate}
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.APPLICATION_FORM_DELETE_MAIL.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.APPLICATION_FORM_DELETE_MAIL.SUBMIT' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-resource-tag-dialog/delete-resource-tag-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/delete-resource-tag-dialog/delete-resource-tag-dialog.component.html
index 70f62b136..737acae5a 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-resource-tag-dialog/delete-resource-tag-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-resource-tag-dialog/delete-resource-tag-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_RESOURCE_TAG.TITLE' | translate}}</h1>
         {{'DIALOGS.DELETE_RESOURCE_TAG.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.DELETE_RESOURCE_TAG.ASK' | translate}}
       </div>
 
@@ -24,10 +24,10 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_RESOURCE_TAG.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.DELETE_RESOURCE_TAG.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.DELETE_RESOURCE_TAG.SUBMIT' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-service-from-facility/delete-service-from-facility.component.html b/apps/admin-gui/src/app/shared/components/dialogs/delete-service-from-facility/delete-service-from-facility.component.html
index dd74e934a..44ea4c92a 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-service-from-facility/delete-service-from-facility.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-service-from-facility/delete-service-from-facility.component.html
@@ -43,7 +43,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_SERVICE_FROM_FACILITY.TITLE' | translate}
         </mat-checkbox>
       </div>
       <p>{{'DIALOGS.REMOVE_SERVICE_FROM_FACILITY.DESCRIPTION' | translate}}</p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_SERVICE_FROM_FACILITY.ASK' | translate}}
       </div>
       <perun-web-apps-resources-list
@@ -56,12 +56,12 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_SERVICE_FROM_FACILITY.TITLE' | translate}
       </perun-web-apps-resources-list>
     </div>
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_SERVICE_FROM_FACILITY.CANCEL' | translate}}
       </button>
       <button
         (click)="remove()"
-        class="ml-2"
+        class="ms-2"
         color="warn"
         [disabled]="loading || selected.selected.length === 0"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-task-dialog/delete-task-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/delete-task-dialog/delete-task-dialog.component.html
index 2e3163884..88c0dacb4 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-task-dialog/delete-task-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-task-dialog/delete-task-dialog.component.html
@@ -5,15 +5,15 @@
   <div *perunWebAppsLoader="loading; indicator: spinner">
     <h1 mat-dialog-title>{{'DIALOGS.DELETE_TASK.TITLE' | translate}}</h1>
     <div mat-dialog-content>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.DELETE_TASK.DESCRIPTION' | translate}}
       </div>
     </div>
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.DELETE_TASK.CANCEL' | translate}}
       </button>
-      <button (click)="remove()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="remove()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.DELETE_TASK.DELETE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/delete-task-result-dialog/delete-task-result-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/delete-task-result-dialog/delete-task-result-dialog.component.html
index 286d017f7..294f5f67e 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/delete-task-result-dialog/delete-task-result-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/delete-task-result-dialog/delete-task-result-dialog.component.html
@@ -6,7 +6,7 @@
     <h1 mat-dialog-title>{{'DIALOGS.DELETE_TASK_RESULT.TITLE' | translate}}</h1>
     <div mat-dialog-content>
       <p>{{'DIALOGS.DELETE_TASK_RESULT.DESCRIPTION' | translate}}</p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.DELETE_TASK_RESULT.ASK' | translate}}
       </div>
       <table [dataSource]="dataSource" class="w-100" mat-table>
@@ -35,10 +35,10 @@ <h1 mat-dialog-title>{{'DIALOGS.DELETE_TASK_RESULT.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.DELETE_TASK_RESULT.CANCEL' | translate}}
       </button>
-      <button (click)="onDelete()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onDelete()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.DELETE_TASK_RESULT.REMOVE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-data-dialog/edit-application-form-item-data-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-data-dialog/edit-application-form-item-data-dialog.component.html
index 1b7738405..b5f757880 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-data-dialog/edit-application-form-item-data-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/edit-application-form-item-data-dialog/edit-application-form-item-data-dialog.component.html
@@ -20,18 +20,19 @@ <h1 mat-dialog-title>
         <mat-label>{{itemName}}</mat-label>
         <input [formControl]="inputControl" matInput required type="text" />
         <mat-error *ngIf="inputControl.invalid">
-          {{'DIALOGS.EDIT_APPLICATION_FORM_ITEM_DATA.EMPTY_INPUT' | translate}}</mat-error>
+          {{'DIALOGS.EDIT_APPLICATION_FORM_ITEM_DATA.EMPTY_INPUT' | translate}}</mat-error
+        >
       </mat-form-field>
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.EDIT_APPLICATION_FORM_ITEM_DATA.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
         [disabled]="loading || (inputControl !== null && inputControl.invalid) || (emailControl !== null && emailControl.invalid)"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.EDIT_APPLICATION_FORM_ITEM_DATA.SUBMIT' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/edit-attribute-definition-dialog/edit-attribute-definition-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/edit-attribute-definition-dialog/edit-attribute-definition-dialog.component.html
index b01086507..96036a0b1 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/edit-attribute-definition-dialog/edit-attribute-definition-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/edit-attribute-definition-dialog/edit-attribute-definition-dialog.component.html
@@ -17,7 +17,11 @@ <h1 mat-dialog-title>{{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.TITLE' | translate}}</
 
           <mat-form-field>
             <mat-label>{{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.DESCRIPTION' | translate}}</mat-label>
-            <textarea matInput formControlName="description" cdkTextareaAutosize required></textarea>
+            <textarea
+              matInput
+              formControlName="description"
+              cdkTextareaAutosize
+              required></textarea>
             <mat-error *ngIf="attributeControl.hasError('required', 'description')">
               {{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.ERROR_FIELD_EMPTY' | translate}}
             </mat-error>
@@ -73,14 +77,14 @@ <h1 mat-dialog-title>{{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.TITLE' | translate}}</
         <button *ngIf="attDef?.entity === 'entityless'" (click)="switchShowKeys()" mat-flat-button>
           {{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.SHOW_KEYS' | translate}}
         </button>
-        <button (click)="onCopy()" class="ml-auto" mat-flat-button>
+        <button (click)="onCopy()" class="ms-auto" mat-flat-button>
           {{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.COPY_FOR_IMPORT' | translate}}
         </button>
-        <button (click)="onCancel()" class="ml-2" mat-flat-button>
+        <button (click)="onCancel()" class="ms-2" mat-flat-button>
           {{'DIALOGS.EDIT_ATTRIBUTE_DEFINITION.CANCEL' | translate}}
         </button>
         <button
-          class="ml-2"
+          class="ms-2"
           color="accent"
           mat-flat-button
           (click)="onSubmit()"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/edit-email-footer-dialog/edit-email-footer-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/edit-email-footer-dialog/edit-email-footer-dialog.component.html
index ed99082e4..aa591ad81 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/edit-email-footer-dialog/edit-email-footer-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/edit-email-footer-dialog/edit-email-footer-dialog.component.html
@@ -30,7 +30,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_EDIT_FOOTER.TITLE' | translate}}</
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.NOTIFICATIONS_EDIT_FOOTER.CANCEL_BUTTON' | translate}}
       </button>
       <div
@@ -40,7 +40,7 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_EDIT_FOOTER.TITLE' | translate}}</
         <button
           (click)="submit()"
           [disabled]="loading || !plainEdithAuth"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           mat-flat-button>
           {{'DIALOGS.NOTIFICATIONS_EDIT_FOOTER.SUBMIT_BUTTON' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/edit-member-sponsors-dialog/edit-member-sponsors-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/edit-member-sponsors-dialog/edit-member-sponsors-dialog.component.html
index ea4f4656e..3695de360 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/edit-member-sponsors-dialog/edit-member-sponsors-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/edit-member-sponsors-dialog/edit-member-sponsors-dialog.component.html
@@ -66,13 +66,13 @@ <h1 mat-dialog-title>{{'DIALOGS.EDIT_MEMBER_SPONSORS.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.EDIT_MEMBER_SPONSORS.CANCEL' | translate}}
       </button>
       <button
         data-cy="unsponsor-confirm-button"
         (click)="onSubmit()"
-        class="ml-2"
+        class="ms-2"
         color="warn"
         [disabled]="loading || sponsorsToRemove.size === 0"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/generate-sponsored-members-dialog/generate-sponsored-members-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/generate-sponsored-members-dialog/generate-sponsored-members-dialog.component.html
index 0e307e5fa..6ede157b8 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/generate-sponsored-members-dialog/generate-sponsored-members-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/generate-sponsored-members-dialog/generate-sponsored-members-dialog.component.html
@@ -34,7 +34,7 @@ <h5 class="mt-2">{{'DIALOGS.GENERATE_SPONSORED_MEMBERS.USERS_INFO' | translate}}
               </mat-error>
             </mat-form-field>
             <div>{{'DIALOGS.GENERATE_SPONSORED_MEMBERS.HINT'| translate}}</div>
-            <div class="font-weight-bold">
+            <div class="fw-bold">
               {{this.getSelectedNamespaceRules().csvGenHeaderDescription}}
             </div>
             <mat-form-field class="pt-2">
@@ -143,7 +143,7 @@ <h5 class="mb-4">{{'DIALOGS.GENERATE_SPONSORED_MEMBERS.EXPIRATION' | translate}}
       <button
         (click)="stepperPrevious()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
-        class="ml-auto"
+        class="ms-auto"
         mat-flat-button>
         {{'DIALOGS.GENERATE_SPONSORED_MEMBERS.BACK' | translate}}
       </button>
@@ -151,8 +151,8 @@ <h5 class="mb-4">{{'DIALOGS.GENERATE_SPONSORED_MEMBERS.EXPIRATION' | translate}}
         data-cy="next-button"
         (click)="stepperNext()"
         *ngIf="stepper !== undefined && stepper.selectedIndex !== stepper._steps.length - 1"
-        [class.ml-2]="stepper !== undefined && stepper.selectedIndex !== 0"
-        [class.ml-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
+        [class.ms-2]="stepper !== undefined && stepper.selectedIndex !== 0"
+        [class.ms-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
         [disabled]="getStepperNextConditions()"
         color="accent"
         mat-flat-button>
@@ -175,7 +175,7 @@ <h5 class="mb-4">{{'DIALOGS.GENERATE_SPONSORED_MEMBERS.EXPIRATION' | translate}}
       <button
         [matMenuTriggerFor]="menu"
         color="accent"
-        class="ml-auto dropdown-toggle"
+        class="ms-auto dropdown-toggle"
         mat-flat-button>
         {{'DIALOGS.GENERATE_SPONSORED_MEMBERS.DOWNLOAD' | translate}}
       </button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/invite-member-dialog/invite-member-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/invite-member-dialog/invite-member-dialog.component.html
index 600d24858..f1627b81b 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/invite-member-dialog/invite-member-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/invite-member-dialog/invite-member-dialog.component.html
@@ -41,12 +41,12 @@ <h1 mat-dialog-title>{{'DIALOGS.INVITE_MEMBER.TITLE' | translate}}</h1>
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.INVITE_MEMBER.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="emailForm.invalid || name.invalid || loading"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/move-group-dialog/move-group-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/move-group-dialog/move-group-dialog.component.html
index c619262d0..14657c7c6 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/move-group-dialog/move-group-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/move-group-dialog/move-group-dialog.component.html
@@ -46,7 +46,7 @@ <h1 mat-dialog-title>{{'DIALOGS.MOVE_GROUP.TITLE' | translate}}{{this.data.group
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <button (click)="close()" class="ml-auto" mat-flat-button>
+      <button (click)="close()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.MOVE_GROUP.CANCEL' | translate}}
       </button>
       <span
@@ -56,7 +56,7 @@ <h1 mat-dialog-title>{{'DIALOGS.MOVE_GROUP.TITLE' | translate}}{{this.data.group
         <button
           (click)="confirm()"
           [disabled]="((otherGroupsCtrl.invalid || selectedGroup === null) && moveOption !== 'toRoot') || loading"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           mat-flat-button>
           {{'DIALOGS.MOVE_GROUP.CONFIRM' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/notifications-copy-mails-dialog/notifications-copy-mails-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/notifications-copy-mails-dialog/notifications-copy-mails-dialog.component.html
index 6f11c46dd..300cd1ad9 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/notifications-copy-mails-dialog/notifications-copy-mails-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/notifications-copy-mails-dialog/notifications-copy-mails-dialog.component.html
@@ -27,12 +27,12 @@ <h1 mat-dialog-title>{{'DIALOGS.NOTIFICATIONS_COPY_MAILS.TITLE' | translate}}</h
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.NOTIFICATIONS_COPY_MAILS.CANCEL_BUTTON' | translate}}
       </button>
       <button
         (click)="submit()"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="selectedVo === null || selectedGroup === null || loading"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/password-reset-request-dialog/password-reset-request-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/password-reset-request-dialog/password-reset-request-dialog.component.html
index cdd2649d5..a285bfbaa 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/password-reset-request-dialog/password-reset-request-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/password-reset-request-dialog/password-reset-request-dialog.component.html
@@ -33,19 +33,19 @@ <h1 mat-dialog-title>{{'DIALOGS.PASSWORD_RESET_REQUEST.TITLE'|translate}}</h1>
       </mat-form-field>
 
       <div class="row">
-        <p class="column-size ml-3">{{'DIALOGS.PASSWORD_RESET_REQUEST.LOGIN'|translate}}</p>
+        <p class="column-size ms-3">{{'DIALOGS.PASSWORD_RESET_REQUEST.LOGIN'|translate}}</p>
         <p>{{selectedLogin.value}}</p>
       </div>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.PASSWORD_RESET_REQUEST.CANCEL'|translate}}
       </button>
       <button
         data-cy="reset-passwd-confirm-button"
         (click)="onSubmit()"
         [disabled]="loading"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.PASSWORD_RESET_REQUEST.SEND'|translate}}
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-destination-dialog/remove-destination-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-destination-dialog/remove-destination-dialog.component.html
index 0bf0e4d38..e013adb42 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-destination-dialog/remove-destination-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-destination-dialog/remove-destination-dialog.component.html
@@ -10,7 +10,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_DESTINATIONS.TITLE' | translate}}</h1>
         >{{'DIALOGS.REMOVE_DESTINATIONS.WARNING' | translate}}</perun-web-apps-alert
       >
       <p>{{'DIALOGS.REMOVE_DESTINATIONS.DESCRIPTION' | translate}}</p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_DESTINATIONS.ASK' | translate}}
       </div>
       <app-perun-web-apps-destination-list
@@ -19,10 +19,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_DESTINATIONS.TITLE' | translate}}</h1>
       </app-perun-web-apps-destination-list>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_DESTINATIONS.CANCEL' | translate}}
       </button>
-      <button (click)="onConfirm()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onConfirm()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_DESTINATIONS.CONFIRM' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-ext-source-dialog/remove-ext-source-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-ext-source-dialog/remove-ext-source-dialog.component.html
index 6df70e710..dd6aaa71f 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-ext-source-dialog/remove-ext-source-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-ext-source-dialog/remove-ext-source-dialog.component.html
@@ -10,7 +10,7 @@ <h1 class="page-subtitle">{{'DIALOGS.REMOVE_EXT_SOURCES.TITLE' | translate}}</h1
       <p>
         {{'DIALOGS.REMOVE_EXT_SOURCES.DESCRIPTION' | translate}}
       </p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_EXT_SOURCES.ASK' | translate}}
       </div>
 
@@ -29,11 +29,11 @@ <h1 class="page-subtitle">{{'DIALOGS.REMOVE_EXT_SOURCES.TITLE' | translate}}</h1
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_EXT_SOURCES.CANCEL' | translate}}
       </button>
 
-      <button (click)="onRemove()" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onRemove()" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_EXT_SOURCES.REMOVE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-facility-owner-dialog/remove-facility-owner-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-facility-owner-dialog/remove-facility-owner-dialog.component.html
index 528e095af..a31a74d28 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-facility-owner-dialog/remove-facility-owner-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-facility-owner-dialog/remove-facility-owner-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_OWNERS.TITLE' | translate}}</h1>
         {{'DIALOGS.REMOVE_OWNERS.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_OWNERS.ASK' | translate}}
       </div>
 
@@ -25,10 +25,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_OWNERS.TITLE' | translate}}</h1>
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_OWNERS.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_OWNERS.DELETE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-group-from-resource-dialog/remove-group-from-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-group-from-resource-dialog/remove-group-from-resource-dialog.component.html
index 2a5f3fee4..28cb67a29 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-group-from-resource-dialog/remove-group-from-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-group-from-resource-dialog/remove-group-from-resource-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_GROUP_FROM_RESOURCE.TITLE' | translate}}<
         {{'DIALOGS.REMOVE_GROUP_FROM_RESOURCE.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_GROUP_FROM_RESOURCE.ASK' | translate}}
       </div>
 
@@ -24,13 +24,13 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_GROUP_FROM_RESOURCE.TITLE' | translate}}<
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_GROUP_FROM_RESOURCE.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
         [disabled]="loading"
-        class="ml-2"
+        class="ms-2"
         color="warn"
         mat-flat-button
         data-cy="delete-button">
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-group-manager-dialog/remove-group-manager-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-group-manager-dialog/remove-group-manager-dialog.component.html
index 7a4b56eb6..84ec87897 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-group-manager-dialog/remove-group-manager-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-group-manager-dialog/remove-group-manager-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_GROUPS.TITLE' | translate}}</h1>
         {{'DIALOGS.REMOVE_GROUPS.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_GROUPS.ASK' | translate}}
       </div>
 
@@ -24,10 +24,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_GROUPS.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_GROUPS.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_GROUPS.DELETE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-group-resource-dialog/remove-group-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-group-resource-dialog/remove-group-resource-dialog.component.html
index bb23d14e3..ebb35b0fb 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-group-resource-dialog/remove-group-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-group-resource-dialog/remove-group-resource-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_RESOURCES.TITLE' | translate}}</h1>
         {{'DIALOGS.REMOVE_RESOURCES.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_RESOURCES.ASK' | translate}}
       </div>
 
@@ -24,10 +24,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_RESOURCES.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_RESOURCES.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_RESOURCES.DELETE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-host-dialog/remove-host-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-host-dialog/remove-host-dialog.component.html
index 17497e4fa..988402c69 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-host-dialog/remove-host-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-host-dialog/remove-host-dialog.component.html
@@ -6,7 +6,7 @@
     <h1 mat-dialog-title>{{'DIALOGS.REMOVE_HOST.TITLE' | translate}}</h1>
     <div mat-dialog-content>
       <p>{{'DIALOGS.REMOVE_HOST.DESCRIPTION' | translate}}</p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_HOST.ASK' | translate}}
       </div>
       <table [dataSource]="dataSource" class="w-100" mat-table>
@@ -19,10 +19,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_HOST.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_HOST.CANCEL' | translate}}
       </button>
-      <button (click)="onConfirm()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onConfirm()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_HOST.CONFIRM' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-manager-dialog/remove-manager-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-manager-dialog/remove-manager-dialog.component.html
index c6f77b47d..98f0f86f5 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-manager-dialog/remove-manager-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-manager-dialog/remove-manager-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_MANAGERS.TITLE' | translate}}</h1>
         {{'DIALOGS.REMOVE_MANAGERS.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_MANAGERS.ASK' | translate}}
       </div>
 
@@ -27,12 +27,12 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_MANAGERS.TITLE' | translate}}</h1>
       </perun-web-apps-alert>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_MANAGERS.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
-        class="ml-2"
+        class="ms-2"
         color="warn"
         data-cy="remove-manager-button-dialog"
         [disabled]="loading"
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-member-group-dialog/remove-member-group-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-member-group-dialog/remove-member-group-dialog.component.html
index 31a818237..303e84e71 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-member-group-dialog/remove-member-group-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-member-group-dialog/remove-member-group-dialog.component.html
@@ -6,7 +6,7 @@
     <h1 mat-dialog-title>{{'DIALOGS.REMOVE_MEMBER_GROUP.TITLE' | translate}}</h1>
     <div class="dialog-container" mat-dialog-content>
       <p>{{'DIALOGS.REMOVE_MEMBER_GROUP.DESCRIPTION' | translate}}</p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_MEMBER_GROUP.ASK' | translate}}
       </div>
       <table [dataSource]="dataSource" class="w-100" mat-table>
@@ -19,10 +19,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_MEMBER_GROUP.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_MEMBER_GROUP.CANCEL' | translate}}
       </button>
-      <button (click)="onRemove()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onRemove()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_MEMBER_GROUP.REMOVE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-members-dialog/remove-members-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-members-dialog/remove-members-dialog.component.html
index f80bf8f51..ea5572442 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-members-dialog/remove-members-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-members-dialog/remove-members-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_MEMBERS.TITLE' | translate}}</h1>
         {{(!!data.groupId ? 'DIALOGS.REMOVE_MEMBERS.DESCRIPTION_GROUP' : 'DIALOGS.REMOVE_MEMBERS.DESCRIPTION') | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_MEMBERS.ASK' | translate}}
       </div>
 
@@ -28,12 +28,12 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_MEMBERS.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_MEMBERS.CANCEL' | translate}}
       </button>
       <button
         (click)="onSubmit()"
-        class="ml-2"
+        class="ms-2"
         color="warn"
         data-cy="remove-members-dialog"
         mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-relation-dialog/remove-relation-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-relation-dialog/remove-relation-dialog.component.html
index d0d2e0edd..60511e902 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-relation-dialog/remove-relation-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-relation-dialog/remove-relation-dialog.component.html
@@ -8,7 +8,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_RELATION.TITLE' | translate}}</h1>
       <p>
         {{'DIALOGS.REMOVE_RELATION.DESCRIPTION' | translate}}
       </p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_RELATION.ASK' | translate}}
       </div>
       <table [dataSource]="dataSource" class="w-100" mat-table>
@@ -22,10 +22,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_RELATION.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_RELATION.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_RELATION.DELETE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-required-attributes-dialog/remove-required-attributes-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-required-attributes-dialog/remove-required-attributes-dialog.component.html
index 1a76f7926..0b03a75d5 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-required-attributes-dialog/remove-required-attributes-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-required-attributes-dialog/remove-required-attributes-dialog.component.html
@@ -6,7 +6,7 @@
     <h1 mat-dialog-title>{{'DIALOGS.REMOVE_REQUIRED_ATTRIBUTES.TITLE' | translate}}</h1>
     <div mat-dialog-content>
       <p>{{'DIALOGS.REMOVE_REQUIRED_ATTRIBUTES.DESCRIPTION' | translate}}</p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_REQUIRED_ATTRIBUTES.ASK' | translate}}
       </div>
       <table [dataSource]="dataSource" class="w-100" mat-table>
@@ -19,10 +19,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_REQUIRED_ATTRIBUTES.TITLE' | translate}}<
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_REQUIRED_ATTRIBUTES.CANCEL' | translate}}
       </button>
-      <button (click)="onConfirm()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onConfirm()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_REQUIRED_ATTRIBUTES.REMOVE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/remove-service-from-resource-dialog/remove-service-from-resource-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/remove-service-from-resource-dialog/remove-service-from-resource-dialog.component.html
index 47b8dbc97..c424be480 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/remove-service-from-resource-dialog/remove-service-from-resource-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/remove-service-from-resource-dialog/remove-service-from-resource-dialog.component.html
@@ -8,7 +8,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_SERVICE_FROM_RESOURCE.TITLE' | translate}
       <p>
         {{'DIALOGS.REMOVE_SERVICE_FROM_RESOURCE.DESCRIPTION' | translate}}
       </p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_SERVICE_FROM_RESOURCE.ASK' | translate}}
       </div>
       <table [dataSource]="dataSource" class="w-100" mat-table>
@@ -22,10 +22,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_SERVICE_FROM_RESOURCE.TITLE' | translate}
       </table>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.REMOVE_SERVICE_FROM_RESOURCE.CANCEL' | translate}}
       </button>
-      <button (click)="onSubmit()" [disabled]="loading" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" [disabled]="loading" class="ms-2" color="warn" mat-flat-button>
         {{'DIALOGS.REMOVE_SERVICE_FROM_RESOURCE.DELETE' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/sponsor-existing-member-dialog/sponsor-existing-member-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/sponsor-existing-member-dialog/sponsor-existing-member-dialog.component.html
index 866e5a961..3ea91f157 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/sponsor-existing-member-dialog/sponsor-existing-member-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/sponsor-existing-member-dialog/sponsor-existing-member-dialog.component.html
@@ -1,7 +1,7 @@
 <div class="{{theme}}">
   <h1 mat-dialog-title>{{'DIALOGS.SPONSOR_EXISTING_MEMBER.TITLE' | translate}}</h1>
   <div mat-dialog-content>
-    <mat-form-field class="mr-2 search-field adjust-width" *ngIf="!serviceMemberId">
+    <mat-form-field class="me-2 search-field adjust-width" *ngIf="!serviceMemberId">
       <mat-label>{{'DIALOGS.SPONSOR_EXISTING_MEMBER.DESCRIPTION' | translate}}</mat-label>
       <input
         data-cy="sponsor-search-input"
@@ -18,7 +18,7 @@ <h1 mat-dialog-title>{{'DIALOGS.SPONSOR_EXISTING_MEMBER.TITLE' | translate}}</h1
       *ngIf="!serviceMemberId"
       data-cy="sponsor-search-button"
       (click)="onSearchByString()"
-      class="ml-auto"
+      class="ms-auto"
       color="accent"
       [disabled]="loading"
       mat-flat-button>
@@ -61,13 +61,13 @@ <h6>{{'DIALOGS.SPONSOR_EXISTING_MEMBER.EXPIRATION' | translate}}</h6>
   </div>
 
   <div mat-dialog-actions>
-    <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+    <button (click)="onCancel()" class="ms-auto" mat-flat-button>
       {{'DIALOGS.SPONSOR_EXISTING_MEMBER.CANCEL' | translate}}
     </button>
     <button
       data-cy="sponsor-member-button"
       (click)="onSubmit()"
-      class="ml-2"
+      class="ms-2"
       color="accent"
       [disabled]="loading || selection.selected.length === 0 || (sponsorType === 'other' && !selectedSponsor)"
       mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/update-application-form-dialog/update-application-form-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/update-application-form-dialog/update-application-form-dialog.component.html
index 0ce7dad52..ff83f27a1 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/update-application-form-dialog/update-application-form-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/update-application-form-dialog/update-application-form-dialog.component.html
@@ -55,10 +55,10 @@ <h1 mat-dialog-title>{{'DIALOGS.UPDATE_APPLICATION_FORM.TITLE' | translate}}</h1
       </div>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.UPDATE_APPLICATION_FORM.CANCEL_BUTTON' | translate}}
       </button>
-      <button (click)="submit()" [disabled]="loading" class="ml-2" color="accent" mat-flat-button>
+      <button (click)="submit()" [disabled]="loading" class="ms-2" color="accent" mat-flat-button>
         {{'DIALOGS.UPDATE_APPLICATION_FORM.SUBMIT_BUTTON' | translate}}
       </button>
     </div>
diff --git a/apps/admin-gui/src/app/shared/components/dialogs/update-ban-dialog/update-ban-dialog.component.html b/apps/admin-gui/src/app/shared/components/dialogs/update-ban-dialog/update-ban-dialog.component.html
index 5fa2c3114..1d83044f4 100644
--- a/apps/admin-gui/src/app/shared/components/dialogs/update-ban-dialog/update-ban-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/dialogs/update-ban-dialog/update-ban-dialog.component.html
@@ -9,7 +9,7 @@ <h1 mat-dialog-title>{{'DIALOGS.UPDATE_BAN.TITLE' | translate}}</h1>
       </perun-web-apps-ban-specification>
     </div>
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto mr-2" (click)="cancel.emit()">
+      <button mat-flat-button class="ms-auto me-2" (click)="cancel.emit()">
         {{'DIALOGS.UPDATE_BAN.CANCEL' | translate}}
       </button>
       <button mat-flat-button color="accent" (click)="updateBan()">
diff --git a/apps/admin-gui/src/app/shared/components/identity-detail/identity-detail.component.html b/apps/admin-gui/src/app/shared/components/identity-detail/identity-detail.component.html
index 40102b8db..fd5aa017f 100644
--- a/apps/admin-gui/src/app/shared/components/identity-detail/identity-detail.component.html
+++ b/apps/admin-gui/src/app/shared/components/identity-detail/identity-detail.component.html
@@ -18,19 +18,19 @@ <h1 class="page-subtitle">
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
   <button
     (click)="onSave()"
-    class="mr-2"
+    class="me-2"
     color="accent"
     [disabled]="selection.selected.length === 0"
     mat-flat-button>
     {{ 'SHARED.IDENTITY_DETAIL.SAVE' | translate}}
   </button>
-  <button (click)="onAdd()" class="mr-2" color="accent" mat-flat-button>
+  <button (click)="onAdd()" class="me-2" color="accent" mat-flat-button>
     {{ 'SHARED.IDENTITY_DETAIL.ADD' | translate}}
   </button>
   <button
     (click)="onRemove()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{ 'SHARED.IDENTITY_DETAIL.REMOVE' | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/managers-page/managers-page.component.html b/apps/admin-gui/src/app/shared/components/managers-page/managers-page.component.html
index c91afbecd..5960d6f86 100644
--- a/apps/admin-gui/src/app/shared/components/managers-page/managers-page.component.html
+++ b/apps/admin-gui/src/app/shared/components/managers-page/managers-page.component.html
@@ -44,8 +44,6 @@ <h1 class="page-subtitle">
         </mat-select>
       </mat-form-field>
 
-      <mat-spinner *ngIf="loading" class="ms-auto me-auto"></mat-spinner>
-
       <ng-template #spinner>
         <perun-web-apps-loading-table></perun-web-apps-loading-table>
       </ng-template>
@@ -101,8 +99,6 @@ <h1 class="page-subtitle">
         </mat-select>
       </mat-form-field>
 
-      <mat-spinner *ngIf="loading" class="ms-auto me-auto"></mat-spinner>
-
       <ng-template #spinner>
         <perun-web-apps-loading-table></perun-web-apps-loading-table>
       </ng-template>
diff --git a/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.html b/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.html
index 8e55e4c77..6f73866d1 100644
--- a/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.html
+++ b/apps/admin-gui/src/app/shared/components/one-entity-attribute-page/one-entity-attribute-page.component.html
@@ -1,7 +1,7 @@
 <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
 <button
   (click)="onCreate()"
-  class="mr-2 action-button"
+  class="me-2 action-button"
   color="accent"
   data-cy="add-attributes"
   mat-flat-button>
@@ -10,7 +10,7 @@
 
 <button
   (click)="onSave()"
-  class="mr-2"
+  class="me-2"
   color="accent"
   [disabled]="selection.selected.length === 0"
   mat-flat-button>
@@ -20,7 +20,7 @@
 <button
   (click)="onDelete()"
   [disabled]="selection.selected.length === 0"
-  class="mr-2"
+  class="me-2"
   color="warn"
   data-cy="remove-attributes"
   mat-flat-button>
diff --git a/apps/admin-gui/src/app/shared/components/roles-list/roles-page.component.html b/apps/admin-gui/src/app/shared/components/roles-list/roles-page.component.html
index c7f876b10..70f038f73 100644
--- a/apps/admin-gui/src/app/shared/components/roles-list/roles-page.component.html
+++ b/apps/admin-gui/src/app/shared/components/roles-list/roles-page.component.html
@@ -2,11 +2,11 @@
   *ngIf="assignableRules.length !== 0 && editable"
   mat-flat-button
   color="accent"
-  class="mb-3 mr-2 mt-2"
+  class="mb-3 me-2 mt-2"
   (click)="addRole()">
   {{'ROLES.ADD'| translate}}
 </button>
-<mat-spinner *ngIf="outerLoading" class="ml-auto mr-auto"></mat-spinner>
+<mat-spinner *ngIf="outerLoading" class="ms-auto me-auto"></mat-spinner>
 <mat-accordion *ngIf="!outerLoading && roles.size > 0">
   <mat-expansion-panel
     *ngFor="let role of allRules"
@@ -15,7 +15,7 @@
     #panel>
     <mat-expansion-panel-header>
       <mat-panel-title>
-        <mat-icon class="mr-2" mat-card-avatar svgIcon="perun-user-dark"></mat-icon>
+        <mat-icon class="me-2" mat-card-avatar svgIcon="perun-user-dark"></mat-icon>
         <p class="mt-auto mb-auto">{{role | displayedRole}}</p>
       </mat-panel-title>
     </mat-expansion-panel-header>
diff --git a/apps/admin-gui/src/app/shared/components/set-login-dialog/set-login-dialog.component.html b/apps/admin-gui/src/app/shared/components/set-login-dialog/set-login-dialog.component.html
index de9828b21..2b7b6b509 100644
--- a/apps/admin-gui/src/app/shared/components/set-login-dialog/set-login-dialog.component.html
+++ b/apps/admin-gui/src/app/shared/components/set-login-dialog/set-login-dialog.component.html
@@ -11,13 +11,13 @@ <h1 mat-dialog-title>{{'DIALOGS.SET_LOGIN.TITLE' | translate}}</h1>
       </app-login-password-form-with-generate-option>
     </div>
     <div mat-dialog-actions>
-      <button (click)="onCancel()" mat-flat-button class="ml-auto">
+      <button (click)="onCancel()" mat-flat-button class="ms-auto">
         {{'DIALOGS.SET_LOGIN.CANCEL' | translate}}
       </button>
       <button
         (click)="onSetLogin()"
         [disabled]="(formGroup.get('namespaceCtrl').value === 'Not selected' || formGroup.invalid || formGroup.pending) || processing"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{"DIALOGS.SET_LOGIN.SET_LOGIN" | translate}}
diff --git a/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.html b/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.html
index a191cd224..6d9816ab2 100644
--- a/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.html
+++ b/apps/admin-gui/src/app/shared/components/two-entity-attribute-page/two-entity-attribute-page.component.html
@@ -1,5 +1,5 @@
 <div class="mt-3">
-  <mat-spinner class="ml-auto mr-auto" *ngIf="loading"></mat-spinner>
+  <mat-spinner class="ms-auto me-auto" *ngIf="loading"></mat-spinner>
   <perun-web-apps-alert
     *ngIf="entityValues.length === 0 && !loading"
     alert_type="warn"
@@ -46,7 +46,7 @@
 
     <button
       (click)="onAdd(specificSecondEntity.id)"
-      class="mr-2 action-button"
+      class="me-2 action-button"
       color="accent"
       mat-flat-button>
       {{'MEMBER_DETAIL.SETTINGS.ATTRIBUTES.CREATE' | translate}}
@@ -54,7 +54,7 @@
 
     <button
       (click)="onSave(specificSecondEntity.id)"
-      class="mr-2"
+      class="me-2"
       color="accent"
       [disabled]="selection.selected.length === 0"
       mat-flat-button>
@@ -65,7 +65,7 @@
       (click)="onDelete(specificSecondEntity.id)"
       color="warn"
       [disabled]="selection.selected.length === 0"
-      class="mr-2"
+      class="me-2"
       mat-flat-button>
       {{'MEMBER_DETAIL.SETTINGS.ATTRIBUTES.DELETE' | translate}}
     </button>
diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-identities/user-identities.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-identities/user-identities.component.html
index 000513c62..44095ba2f 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-identities/user-identities.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-identities/user-identities.component.html
@@ -3,7 +3,7 @@ <h1 class="page-subtitle">{{'USER_DETAIL.IDENTITIES.TITLE'|translate}}</h1>
 <button
   *ngIf="authResolver.isPerunAdmin()"
   (click)="addIdentity()"
-  class="mr-2 action-button"
+  class="me-2 action-button"
   color="accent"
   mat-flat-button>
   {{'USER_DETAIL.IDENTITIES.ADD'|translate}}
@@ -12,7 +12,7 @@ <h1 class="page-subtitle">{{'USER_DETAIL.IDENTITIES.TITLE'|translate}}</h1>
   *ngIf="authResolver.isPerunAdmin()"
   (click)="removeIdentity()"
   [disabled]="selection.selected.length === 0"
-  class="mr-2"
+  class="me-2"
   color="warn"
   mat-flat-button>
   {{'USER_DETAIL.IDENTITIES.REMOVE'|translate}}
diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-associated-users/user-settings-associated-users.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-associated-users/user-settings-associated-users.component.html
index 7dd8fcd1b..ddebdf918 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-associated-users/user-settings-associated-users.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-associated-users/user-settings-associated-users.component.html
@@ -1,14 +1,14 @@
 <div>
   <h1 class="page-subtitle">{{'USER_DETAIL.SETTINGS.ASSOCIATED_USERS.TITLE' | translate}}</h1>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
-  <button (click)="onAdd()" class="mr-2 action-button" color="accent" mat-flat-button>
+  <button (click)="onAdd()" class="me-2 action-button" color="accent" mat-flat-button>
     {{'USER_DETAIL.SETTINGS.ASSOCIATED_USERS.ADD' | translate}}
   </button>
   <button
     (click)="onRemove()"
     [disabled]="selection.selected.length === 0"
     color="warn"
-    class="mr-2"
+    class="me-2"
     mat-flat-button>
     {{'USER_DETAIL.SETTINGS.ASSOCIATED_USERS.REMOVE' | translate}}
   </button>
diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-authentication/service-identity-certificates/service-identity-certificates.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-authentication/service-identity-certificates/service-identity-certificates.component.html
index 399863383..4d9a4633f 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-authentication/service-identity-certificates/service-identity-certificates.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/service-identity-authentication/service-identity-certificates/service-identity-certificates.component.html
@@ -2,7 +2,7 @@ <h1 class="page-title">{{'USER_DETAIL.SETTINGS.CERTIFICATES.TITLE' | translate}}
 <perun-web-apps-refresh-button (refresh)="refresh()" class="mt-2"></perun-web-apps-refresh-button>
 <button
   (click)="save()"
-  class="mr-2 mt-2"
+  class="me-2 mt-2"
   color="accent"
   [disabled]="selection.selected.length === 0"
   mat-flat-button>
diff --git a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/user-settings-service-identities.component.html b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/user-settings-service-identities.component.html
index 2c65bb2a1..b841abf04 100644
--- a/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/user-settings-service-identities.component.html
+++ b/apps/admin-gui/src/app/users/pages/user-detail-page/user-settings/user-settings-service-identities/user-settings-service-identities.component.html
@@ -4,7 +4,7 @@ <h1 class="page-subtitle">{{'USER_DETAIL.SETTINGS.SERVICE_IDENTITIES.TITLE' | tr
   *ngIf="addIdentity"
   (click)="onAdd()"
   color="accent"
-  class="mr-2 action-button"
+  class="me-2 action-button"
   mat-flat-button>
   {{'USER_DETAIL.SETTINGS.SERVICE_IDENTITIES.CREATE' | translate}}
 </button>
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{'USER_DETAIL.SETTINGS.SERVICE_IDENTITIES.TITLE' | tr
   (click)="onRemove()"
   [disabled]="selection.selected.length === 0"
   color="warn"
-  class="mr-2"
+  class="me-2"
   mat-flat-button>
   {{'USER_DETAIL.SETTINGS.SERVICE_IDENTITIES.DELETE' | translate}}
 </button>
diff --git a/apps/admin-gui/src/app/vos/components/application-detail/application-detail.component.html b/apps/admin-gui/src/app/vos/components/application-detail/application-detail.component.html
index b0646a47c..965082b92 100644
--- a/apps/admin-gui/src/app/vos/components/application-detail/application-detail.component.html
+++ b/apps/admin-gui/src/app/vos/components/application-detail/application-detail.component.html
@@ -110,7 +110,7 @@ <h2 class="page-subtitle">
   <div
     *ngIf="this.application.state !== 'APPROVED' && this.application.state !== 'REJECTED' && this.application.autoApproveError"
     class="card p-3 mt-2">
-    <h5 class="font-weight-bold">
+    <h5 class="fw-bold">
       <i class="material-icons orange">warning</i>
       {{'VO_DETAIL.APPLICATION.APPLICATION_DETAIL.AUTO_APPROVE_FAILURE' | translate}}:
     </h5>
diff --git a/apps/admin-gui/src/app/vos/components/application-form-manage-groups/application-form-manage-groups.component.html b/apps/admin-gui/src/app/vos/components/application-form-manage-groups/application-form-manage-groups.component.html
index fbf773812..77f170718 100644
--- a/apps/admin-gui/src/app/vos/components/application-form-manage-groups/application-form-manage-groups.component.html
+++ b/apps/admin-gui/src/app/vos/components/application-form-manage-groups/application-form-manage-groups.component.html
@@ -7,7 +7,7 @@ <h1 class="page-subtitle">
 </perun-web-apps-alert>
 
 <perun-web-apps-refresh-button (refresh)="loadGroups()"></perun-web-apps-refresh-button>
-<button (click)="onAddGroup()" *ngIf="addAuth" class="mr-2" color="accent" mat-flat-button>
+<button (click)="onAddGroup()" *ngIf="addAuth" class="me-2" color="accent" mat-flat-button>
   {{'VO_DETAIL.SETTINGS.APPLICATION_FORM.MANAGE_GROUPS_PAGE.ADD' | translate}}
 </button>
 <span
@@ -18,7 +18,7 @@ <h1 class="page-subtitle">
     (click)="removeGroup()"
     color="warn"
     [disabled]="selected.selected.length === 0 || !auth.removeAuth"
-    class="mr-2"
+    class="me-2"
     mat-flat-button>
     {{'VO_DETAIL.SETTINGS.APPLICATION_FORM.MANAGE_GROUPS_PAGE.REMOVE' | translate}}
   </button>
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-applications/group-applications.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-applications/group-applications.component.html
index 8abb71cb2..5fc9352c8 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-applications/group-applications.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-applications/group-applications.component.html
@@ -1,10 +1,10 @@
 <h1 class="page-subtitle">{{'VO_DETAIL.APPLICATION.TITLE' | translate}}</h1>
 <div>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
-  <button (click)="this.showDetails(true)" *ngIf="!showAllDetails" class="mr-2" mat-stroked-button>
+  <button (click)="this.showDetails(true)" *ngIf="!showAllDetails" class="me-2" mat-stroked-button>
     {{'VO_DETAIL.APPLICATION.SHOW_ALL_DETAILS' | translate}}
   </button>
-  <button (click)="this.showDetails(false)" *ngIf="showAllDetails" class="mr-2" mat-stroked-button>
+  <button (click)="this.showDetails(false)" *ngIf="showAllDetails" class="me-2" mat-stroked-button>
     {{'VO_DETAIL.APPLICATION.SHOW_LESS_DETAILS' | translate}}
   </button>
   <perun-web-apps-application-state-selector (stateChanged)="currentStates = $event">
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.html
index bf90c497c..3ce949161 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-members/group-members.component.html
@@ -12,7 +12,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.MEMBERS.TITLE' | translate}}</h1>
       (click)="onAddMember()"
       *ngIf="addAuth"
       [disabled]="(group | groupMembersActionButtonDisabled: 'add')"
-      class="mr-2 action-button"
+      class="me-2 action-button"
       color="accent"
       data-cy="add-members"
       mat-flat-button>
@@ -27,7 +27,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.MEMBERS.TITLE' | translate}}</h1>
       *ngIf="inviteAuth"
       [disabled]="(group | groupMembersActionButtonDisabled)"
       [matMenuTriggerFor]="menu"
-      class="mr-2 dropdown-toggle"
+      class="me-2 dropdown-toggle"
       color="accent"
       mat-flat-button>
       {{'GROUP_DETAIL.MEMBERS.INVITE' | translate}}
@@ -59,7 +59,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.MEMBERS.TITLE' | translate}}</h1>
       (click)="onCopyMembers()"
       *ngIf="copyAuth"
       [disabled]="copyDisabled"
-      class="mr-2"
+      class="me-2"
       color="accent"
       mat-flat-button>
       {{'GROUP_DETAIL.MEMBERS.COPY_MEMBERS' | translate}}
@@ -73,14 +73,14 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.MEMBERS.TITLE' | translate}}</h1>
       (click)="onRemoveMembers()"
       *ngIf="removeAuth"
       [disabled]="selection.isEmpty() || (group | groupMembersActionButtonDisabled)"
-      class="mr-2"
+      class="me-2"
       color="warn"
       data-cy="remove-members"
       mat-flat-button>
       {{'GROUP_DETAIL.MEMBERS.REMOVE_MEMBERS' | translate}}
     </button>
   </span>
-  <mat-form-field class="mr-2 fix-select">
+  <mat-form-field class="me-2 fix-select">
     <mat-label>{{'GROUP_DETAIL.MEMBERS.FILTER_STATUS' | translate}}</mat-label>
     <mat-select (closed)="changeVoStatuses()" [formControl]="statuses" multiple>
       <mat-select-trigger>
@@ -94,7 +94,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.MEMBERS.TITLE' | translate}}</h1>
       >
     </mat-select>
   </mat-form-field>
-  <mat-form-field class="mr-2 fix-select">
+  <mat-form-field class="me-2 fix-select">
     <mat-label>{{'GROUP_DETAIL.MEMBERS.FILTER_GROUP_STATUS' | translate}}</mat-label>
     <mat-select (closed)="changeGroupStatuses()" [formControl]="groupStatuses" multiple>
       <mat-select-trigger>
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-resources/group-resources.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-resources/group-resources.component.html
index bd1ddc509..3ed0fe8df 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-resources/group-resources.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-resources/group-resources.component.html
@@ -5,7 +5,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.RESOURCES.TITLE' | translate}}</h1>
     *ngIf="addAuth"
     (click)="addResource()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{'GROUP_DETAIL.RESOURCES.ADD' | translate}}
   </button>
@@ -16,7 +16,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.RESOURCES.TITLE' | translate}}</h1>
       (click)="removeResource()"
       color="warn"
       [disabled]="selected.selected.length === 0 || (list !== undefined && !list.removeAuth)"
-      class="mr-2"
+      class="me-2"
       mat-flat-button>
       {{'GROUP_DETAIL.RESOURCES.DELETE' | translate}}
     </button>
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-extsources/group-settings-extsources.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-extsources/group-settings-extsources.component.html
index d5b56ba92..6ca6333eb 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-extsources/group-settings-extsources.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-extsources/group-settings-extsources.component.html
@@ -4,7 +4,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.SETTINGS.EXT_SOURCES.TITLE' | translat
   <button
     *ngIf="addAuth"
     (click)="onAdd()"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     color="accent"
     mat-flat-button>
     {{'GROUP_DETAIL.SETTINGS.EXT_SOURCES.ADD' | translate}}
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.SETTINGS.EXT_SOURCES.TITLE' | translat
     *ngIf="removeAuth"
     (click)="onRemove()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{'GROUP_DETAIL.SETTINGS.EXT_SOURCES.REMOVE' | translate}}
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html
index 464ec7cba..585e5511f 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-notifications/group-settings-notifications.component.html
@@ -8,7 +8,7 @@ <h1 class="page-subtitle">
       *ngIf="addAuth"
       (click)="add()"
       color="accent"
-      class="mr-2 action-button"
+      class="me-2 action-button"
       mat-flat-button>
       {{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.ADD' | translate}}
     </button>
@@ -18,12 +18,12 @@ <h1 class="page-subtitle">
       (click)="remove()"
       color="warn"
       [disabled]="selection.selected.length === 0"
-      class="mr-2"
+      class="me-2"
       mat-flat-button>
       {{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.REMOVE' | translate}}
     </button>
 
-    <button (click)="changeEmailFooter()" class="mr-2 action-button" mat-stroked-button>
+    <button (click)="changeEmailFooter()" class="me-2 action-button" mat-stroked-button>
       <i class="material-icons">email</i>
       {{'GROUP_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
     </button>
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-relations/group-settings-relations.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-relations/group-settings-relations.component.html
index c15973119..efe4e3e32 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-relations/group-settings-relations.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-settings/group-settings-relations/group-settings-relations.component.html
@@ -3,7 +3,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.SETTINGS.RELATIONS.TITLE' | translate}
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
   <button
     (click)="onCreate()"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     color="accent"
     [disabled]="reverse"
     mat-flat-button>
@@ -15,7 +15,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.SETTINGS.RELATIONS.TITLE' | translate}
     [matTooltipDisabled]="selection.selected.length === 0 || auth.removeAuth">
     <button
       [disabled]="selection.selected.length === 0 || !auth.removeAuth || reverse"
-      class="mr-2"
+      class="me-2"
       color="warn"
       (click)="onDelete()"
       mat-flat-button>
diff --git a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-subgroups/group-subgroups.component.html b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-subgroups/group-subgroups.component.html
index d9fe713b1..dd0c2dc9b 100644
--- a/apps/admin-gui/src/app/vos/pages/group-detail-page/group-subgroups/group-subgroups.component.html
+++ b/apps/admin-gui/src/app/vos/pages/group-detail-page/group-subgroups/group-subgroups.component.html
@@ -29,9 +29,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.SUBGROUPS.TITLE' | translate}}</h1>
     (filter)="applyFilter($event)"
     [placeholder]="'GROUP_DETAIL.SUBGROUPS.FILTER'">
   </perun-web-apps-debounce-filter>
-  <label
-    class="slide-label"
-    (click)="labelToggle()">
+  <label class="slide-label" (click)="labelToggle()">
     {{'GROUP_DETAIL.SUBGROUPS.TREE_VIEW' | translate}}
   </label>
   <mat-slide-toggle
@@ -41,9 +39,7 @@ <h1 class="page-subtitle">{{'GROUP_DETAIL.SUBGROUPS.TITLE' | translate}}</h1>
     class="me-1"
     color="primary"
     labelPosition="before"></mat-slide-toggle>
-  <label
-    class="slide-label"
-    (click)="labelToggle()">
+  <label class="slide-label" (click)="labelToggle()">
     {{'GROUP_DETAIL.SUBGROUPS.LIST_VIEW' | translate}}
   </label>
   <ng-template #spinner>
diff --git a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-applications/member-applications.component.html b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-applications/member-applications.component.html
index 9959b8ef5..48940f4b6 100644
--- a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-applications/member-applications.component.html
+++ b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-applications/member-applications.component.html
@@ -1,10 +1,10 @@
 <h1 class="page-subtitle">{{'MEMBER_DETAIL.APPLICATIONS.TITLE' | translate}}</h1>
 <div>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
-  <button (click)="showDetails()" *ngIf="!showAllDetails" class="mr-2" mat-stroked-button>
+  <button (click)="showDetails()" *ngIf="!showAllDetails" class="me-2" mat-stroked-button>
     {{'MEMBER_DETAIL.APPLICATIONS.SHOW_ALL_DETAILS' | translate}}
   </button>
-  <button (click)="showDetails()" *ngIf="showAllDetails" class="mr-2" mat-stroked-button>
+  <button (click)="showDetails()" *ngIf="showAllDetails" class="me-2" mat-stroked-button>
     {{'MEMBER_DETAIL.APPLICATIONS.SHOW_LESS_DETAILS' | translate}}
   </button>
   <perun-web-apps-debounce-filter
diff --git a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.html b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.html
index 84333b620..b438ea9b6 100644
--- a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.html
+++ b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-groups/member-groups.component.html
@@ -4,7 +4,7 @@ <h1 class="page-subtitle">{{'MEMBER_DETAIL.GROUPS.TITLE' | translate}}</h1>
   *ngIf="addAuth"
   (click)="addGroup()"
   color="accent"
-  class="mr-2 action-button"
+  class="me-2 action-button"
   mat-flat-button>
   {{'MEMBER_DETAIL.GROUPS.ADD' | translate}}
 </button>
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{'MEMBER_DETAIL.GROUPS.TITLE' | translate}}</h1>
   [matTooltipDisabled]="auth.removeAuth"
   matTooltip="{{'MEMBER_DETAIL.GROUPS.REMOVE_PERMISSION_HINT' | translate}}">
   <button
-    class="mr-2"
+    class="me-2"
     color="warn"
     (click)="removeGroup()"
     [disabled]="selection.selected.length === 0 || !auth.removeAuth"
diff --git a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-resources/member-resources.component.html b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-resources/member-resources.component.html
index 864eb9202..a206de759 100644
--- a/apps/admin-gui/src/app/vos/pages/member-detail-page/member-resources/member-resources.component.html
+++ b/apps/admin-gui/src/app/vos/pages/member-detail-page/member-resources/member-resources.component.html
@@ -6,7 +6,7 @@ <h1 class="page-subtitle">{{ 'MEMBER_DETAIL.RESOURCES.TITLE' | translate}}</h1>
     (click)="addResource()"
     class="action-button"
     color="accent"
-    class="mr-2"
+    class="me-2"
     mat-flat-button>
     {{ 'MEMBER_DETAIL.RESOURCES.ADD' | translate}}
   </button>
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-applications/vo-applications.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-applications/vo-applications.component.html
index 94deb5b4e..d3042799e 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-applications/vo-applications.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-applications/vo-applications.component.html
@@ -1,10 +1,10 @@
 <h1 class="page-subtitle">{{'VO_DETAIL.APPLICATION.TITLE' | translate}}</h1>
 <div>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
-  <button mat-stroked-button *ngIf="!showAllDetails" class="mr-2" (click)="this.showDetails(true)">
+  <button mat-stroked-button *ngIf="!showAllDetails" class="me-2" (click)="this.showDetails(true)">
     {{'VO_DETAIL.APPLICATION.SHOW_ALL_DETAILS' | translate}}
   </button>
-  <button mat-stroked-button *ngIf="showAllDetails" class="mr-2" (click)="this.showDetails(false)">
+  <button mat-stroked-button *ngIf="showAllDetails" class="me-2" (click)="this.showDetails(false)">
     {{'VO_DETAIL.APPLICATION.SHOW_LESS_DETAILS' | translate}}
   </button>
   <perun-web-apps-application-state-selector (stateChanged)="currentStates = $event">
@@ -29,7 +29,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.APPLICATION.TITLE' | translate}}</h1>
       <button
         mat-stroked-button
         *ngIf="columnsAuth"
-        class="ml-2"
+        class="ms-2"
         [disabled]="showAllDetails"
         (click)="this.setColumns()">
         {{'VO_DETAIL.APPLICATION.SET_COLUMN_SETTINGS' | translate}}
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.html
index c7c157b01..dee152297 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-members/vo-members.component.html
@@ -10,7 +10,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.MEMBERS.TITLE' | translate}}</h1>
         [disabled]="blockManualMemberAdding"
         (click)="onAddMember()"
         color="accent"
-        class="mr-2 action-button"
+        class="me-2 action-button"
         data-cy="add-members"
         mat-flat-button>
         {{'VO_DETAIL.MEMBERS.ADD_MEMBER' | translate}}
@@ -20,7 +20,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.MEMBERS.TITLE' | translate}}</h1>
       *ngIf="inviteAuth"
       [disabled]="blockManualMemberAdding"
       [matMenuTriggerFor]="menu"
-      class="mr-2 dropdown-toggle"
+      class="me-2 dropdown-toggle"
       color="accent"
       mat-flat-button>
       {{'VO_DETAIL.MEMBERS.INVITE' | translate}}
@@ -39,12 +39,12 @@ <h1 class="page-subtitle">{{'VO_DETAIL.MEMBERS.TITLE' | translate}}</h1>
       color="warn"
       [disabled]="selection.isEmpty()"
       data-cy="remove-members"
-      class="mr-2"
+      class="me-2"
       mat-flat-button>
       {{'VO_DETAIL.MEMBERS.REMOVE_MEMBERS' | translate}}
     </button>
 
-    <mat-form-field class="mr-2 fix-select">
+    <mat-form-field class="me-2 fix-select">
       <mat-label>{{'VO_DETAIL.MEMBERS.FILTER_STATUS' | translate}}</mat-label>
       <mat-select (closed)="changeStatuses()" [formControl]="statuses" multiple>
         <mat-select-trigger>
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-resources/vo-resources-preview/vo-resources-preview.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-resources/vo-resources-preview/vo-resources-preview.component.html
index 562ba8aae..d0803571e 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-resources/vo-resources-preview/vo-resources-preview.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-resources/vo-resources-preview/vo-resources-preview.component.html
@@ -3,7 +3,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.RESOURCES.LIST.TITLE' | translate}}</h1>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
   <button
     *ngIf="removeAuth"
-    class="mr-2"
+    class="me-2"
     color="warn"
     (click)="deleteSelectedResources()"
     [disabled]="selected.selected.length === 0"
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-resources/vo-resources-tags/vo-resources-tags.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-resources/vo-resources-tags/vo-resources-tags.component.html
index 62c1421d6..d5b475111 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-resources/vo-resources-tags/vo-resources-tags.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-resources/vo-resources-tags/vo-resources-tags.component.html
@@ -3,7 +3,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.RESOURCES.TAGS.TITLE' | translate}}</h1>
 <button
   *ngIf="createAuth"
   (click)="create()"
-  class="mr-2 action-button"
+  class="me-2 action-button"
   color="accent"
   mat-flat-button>
   {{'VO_DETAIL.RESOURCES.TAGS.CREATE_BUTTON' | translate}}
@@ -12,7 +12,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.RESOURCES.TAGS.TITLE' | translate}}</h1>
 <button
   *ngIf="deleteAuth"
   (click)="deleteTag()"
-  class="mr-2"
+  class="me-2"
   color="warn"
   [disabled]="selection.selected.length === 0"
   mat-flat-button>
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-extsources/vo-settings-extsources.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-extsources/vo-settings-extsources.component.html
index af8d429c9..4af6a9c8f 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-extsources/vo-settings-extsources.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-extsources/vo-settings-extsources.component.html
@@ -4,7 +4,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.SETTINGS.EXT_SOURCES.TITLE' | translate}}
   <button
     *ngIf="addAuth"
     (click)="onAdd()"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     color="accent"
     mat-flat-button>
     {{'VO_DETAIL.SETTINGS.EXT_SOURCES.ADD' | translate}}
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.SETTINGS.EXT_SOURCES.TITLE' | translate}}
     *ngIf="removeAuth"
     (click)="onRemove()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{'VO_DETAIL.SETTINGS.EXT_SOURCES.REMOVE' | translate}}
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-member-organizations/add-member-organization-dialog/add-member-organization-dialog.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-member-organizations/add-member-organization-dialog/add-member-organization-dialog.component.html
index ccae6fbc1..c41648fc4 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-member-organizations/add-member-organization-dialog/add-member-organization-dialog.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-member-organizations/add-member-organization-dialog/add-member-organization-dialog.component.html
@@ -52,7 +52,7 @@ <h1 mat-dialog-title>
       <button (click)="close()" mat-flat-button>
         {{'VO_DETAIL.SETTINGS.MEMBER_ORGANIZATIONS.ADD_MEMBER_ORGANIZATION.CANCEL' | translate}}
       </button>
-      <div class="ml-auto">
+      <div class="ms-auto">
         <button
           *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
           (click)="stepperPrevious()"
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-member-organizations/vo-settings-member-organizations.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-member-organizations/vo-settings-member-organizations.component.html
index 493ebd88d..33d3fb0af 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-member-organizations/vo-settings-member-organizations.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-member-organizations/vo-settings-member-organizations.component.html
@@ -4,7 +4,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.SETTINGS.MEMBER_ORGANIZATIONS.TITLE' | tr
   *ngIf="auth"
   (click)="addMemberOrganization()"
   mat-flat-button
-  class="mr-2 action-button"
+  class="me-2 action-button"
   color="accent">
   {{'VO_DETAIL.SETTINGS.MEMBER_ORGANIZATIONS.ADD' | translate}}
 </button>
@@ -14,7 +14,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.SETTINGS.MEMBER_ORGANIZATIONS.TITLE' | tr
   [disabled]="voSelection.selected.length === 0"
   mat-flat-button
   color="warn"
-  class="mr-2">
+  class="me-2">
   {{'VO_DETAIL.SETTINGS.MEMBER_ORGANIZATIONS.REMOVE' | translate}}
 </button>
 <perun-web-apps-immediate-filter
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html
index dbee225b7..b3f3ca0b9 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-notifications/vo-settings-notifications.component.html
@@ -4,7 +4,7 @@ <h1 class="page-subtitle">
 
 <div class="w-100 d-flex">
   <perun-web-apps-refresh-button (click)="refresh()"></perun-web-apps-refresh-button>
-  <button (click)="add()" *ngIf="addAuth" class="mr-2 action-button" color="accent" mat-flat-button>
+  <button (click)="add()" *ngIf="addAuth" class="me-2 action-button" color="accent" mat-flat-button>
     {{'VO_DETAIL.SETTINGS.NOTIFICATIONS.ADD' | translate}}
   </button>
 
@@ -13,12 +13,12 @@ <h1 class="page-subtitle">
     (click)="remove()"
     color="warn"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     mat-flat-button>
     {{'VO_DETAIL.SETTINGS.NOTIFICATIONS.REMOVE' | translate}}
   </button>
 
-  <button (click)="changeEmailFooter()" class="mr-2 action-button" mat-stroked-button>
+  <button (click)="changeEmailFooter()" class="me-2 action-button" mat-stroked-button>
     <i class="material-icons">email</i>
     {{'VO_DETAIL.SETTINGS.NOTIFICATIONS.EMAIL_FOOTER' | translate}}
   </button>
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-service-members/vo-settings-service-members.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-service-members/vo-settings-service-members.component.html
index 442174f8c..c32d8cc96 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-service-members/vo-settings-service-members.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-service-members/vo-settings-service-members.component.html
@@ -1,13 +1,13 @@
 <h1 class="page-subtitle">{{'VO_DETAIL.SETTINGS.SERVICE_MEMBERS.TITLE' | translate}}</h1>
 <perun-web-apps-refresh-button (refresh)="refresh()"></perun-web-apps-refresh-button>
-<button (click)="createServiceMember()" class="mr-2 action-button" color="accent" mat-flat-button>
+<button (click)="createServiceMember()" class="me-2 action-button" color="accent" mat-flat-button>
   {{'VO_DETAIL.SETTINGS.SERVICE_MEMBERS.CREATE' | translate}}
 </button>
 <button
   (click)="onRemoveMembers()"
   *ngIf="removeAuth"
   [disabled]="selection.isEmpty()"
-  class="mr-2"
+  class="me-2"
   color="warn"
   mat-flat-button>
   {{'VO_DETAIL.SETTINGS.SERVICE_MEMBERS.DELETE' | translate}}
diff --git a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-sponsored-members/vo-settings-sponsored-members.component.html b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-sponsored-members/vo-settings-sponsored-members.component.html
index c74a0a16f..9e036f1b5 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-sponsored-members/vo-settings-sponsored-members.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-detail-page/vo-settings/vo-settings-sponsored-members/vo-settings-sponsored-members.component.html
@@ -10,7 +10,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.SETTINGS.SPONSORED_MEMBERS.TITLE' | trans
       *ngIf="createAuth || generateAuth"
       [disabled]="findSponsorsAuth && voSponsors.length === 0"
       [matMenuTriggerFor]="menu"
-      class="mr-2 dropdown-toggle"
+      class="me-2 dropdown-toggle"
       color="accent"
       mat-flat-button>
       {{'VO_DETAIL.SETTINGS.SPONSORED_MEMBERS.CREATE' | translate}}
@@ -39,7 +39,7 @@ <h1 class="page-subtitle">{{'VO_DETAIL.SETTINGS.SPONSORED_MEMBERS.TITLE' | trans
     *ngIf="setSponsorshipAuth"
     (click)="onSponsorExistingMember()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{'VO_DETAIL.SETTINGS.SPONSORED_MEMBERS.SPONSOR_EXISTING' | translate}}
   </button>
diff --git a/apps/admin-gui/src/app/vos/pages/vo-select-page/vo-select-page.component.html b/apps/admin-gui/src/app/vos/pages/vo-select-page/vo-select-page.component.html
index 0e42eb31b..99c0bf8da 100644
--- a/apps/admin-gui/src/app/vos/pages/vo-select-page/vo-select-page.component.html
+++ b/apps/admin-gui/src/app/vos/pages/vo-select-page/vo-select-page.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid pl-xl-5 pr-xl-5 vo-theme">
+<div class="container-fluid ps-xl-5 pe-xl-5 vo-theme">
   <perun-web-apps-back-button> </perun-web-apps-back-button>
 
   <h1 class="page-title d-flex">
@@ -11,7 +11,7 @@ <h1 class="page-title d-flex">
   <button
     (click)="onCreateVo()"
     *ngIf="createAuth"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     data-cy="new-vo-button"
     color="accent"
     mat-flat-button>
@@ -21,7 +21,7 @@ <h1 class="page-title d-flex">
     (click)="onRemoveVo()"
     *ngIf="deleteAuth"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{'VO_MANAGEMENT.REMOVE_VO' | translate}}
diff --git a/apps/consolidator/src/_styles.scss b/apps/consolidator/src/_styles.scss
index 30707caf8..8f1124a21 100644
--- a/apps/consolidator/src/_styles.scss
+++ b/apps/consolidator/src/_styles.scss
@@ -145,28 +145,12 @@ button:focus {
   bottom: 0;
   right: 0;
   background: rgba(0, 0, 0, 0.15);
-  z-index: 1;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-// TODO: check this style after the migration to Angular 15
-// make the whole dialog grey (including padding space) while the spinner is active
-mat-dialog-container:has(#loading-dialog-spinner) {
-  box-shadow: 0 0 0 24px rgba(0, 0, 0, 0.15) inset;
-  padding-bottom: 0;
-  .position-relative {
-    padding-bottom: 24px;
-  }
-  .spinner-container {
-    margin-bottom: 24px;
-  }
-  .mat-dialog-actions {
-    padding-bottom: 16px;
-  }
-}
-
 #preloader {
   position: fixed;
   top: 0;
diff --git a/apps/linker/src/_styles.scss b/apps/linker/src/_styles.scss
index 321d1b25b..7a0b66363 100644
--- a/apps/linker/src/_styles.scss
+++ b/apps/linker/src/_styles.scss
@@ -117,28 +117,12 @@ $perun-theme: mat.define-light-theme(
   bottom: 0;
   right: 0;
   background: rgba(0, 0, 0, 0.15);
-  z-index: 1;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-// TODO: check this style after the migration to Angular 15
-// make the whole dialog grey (including padding space) while the spinner is active
-mat-dialog-container:has(#loading-dialog-spinner) {
-  box-shadow: 0 0 0 24px rgba(0, 0, 0, 0.15) inset;
-  padding-bottom: 0;
-  .position-relative {
-    padding-bottom: 24px;
-  }
-  .spinner-container {
-    margin-bottom: 24px;
-  }
-  .mat-dialog-actions {
-    padding-bottom: 16px;
-  }
-}
-
 #preloader {
   position: fixed;
   top: 0;
diff --git a/apps/linker/src/app/components/send-message-dialog/send-message-dialog.component.html b/apps/linker/src/app/components/send-message-dialog/send-message-dialog.component.html
index 6cc502cbd..d95855098 100644
--- a/apps/linker/src/app/components/send-message-dialog/send-message-dialog.component.html
+++ b/apps/linker/src/app/components/send-message-dialog/send-message-dialog.component.html
@@ -21,11 +21,11 @@ <h1 class="page-subtitle">
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'SHARED_LIB.CONSOLIDATOR.SEND_MESSAGE_TO_SUPPORT_DIALOG.CANCEL' | translate}}
       </button>
 
-      <button (click)="onSend()" class="ml-2" color="accent" mat-flat-button>
+      <button (click)="onSend()" class="ms-2" color="accent" mat-flat-button>
         {{'SHARED_LIB.CONSOLIDATOR.SEND_MESSAGE_TO_SUPPORT_DIALOG.SUBMIT' | translate}}
       </button>
     </div>
diff --git a/apps/linker/src/app/components/show-result/show-result.component.html b/apps/linker/src/app/components/show-result/show-result.component.html
index 94faceac2..25b1b3e0b 100644
--- a/apps/linker/src/app/components/show-result/show-result.component.html
+++ b/apps/linker/src/app/components/show-result/show-result.component.html
@@ -1,7 +1,7 @@
 <div class="position-relative">
   <perun-web-apps-consolidation-result [result]="linkerResult">
     <div class="d-flex mt-5">
-      <button mat-flat-button class="ml-auto" (click)="closeWindow()">
+      <button mat-flat-button class="ms-auto" (click)="closeWindow()">
         {{'SHOW_RESULT.CLOSE_WINDOW_BUTTON' | translate}}
       </button>
       <button
@@ -10,7 +10,7 @@
                 linkerResult === 'IDENTITY_UNKNOWN' ||
                 linkerResult === 'IDENTITY_LINKED'"
         color="accent"
-        class="ml-2"
+        class="ms-2"
         (click)="loginAgain()">
         {{'SHOW_RESULT.LOG_OTHER_BUTTON' | translate}}
       </button>
@@ -18,7 +18,7 @@
         mat-flat-button
         *ngIf="linkerResult === 'IDENTITY_REGISTERED_ALREADY'"
         color="accent"
-        class="ml-2"
+        class="ms-2"
         (click)="sendMessageToSupport()">
         {{'SHOW_RESULT.CONTACT_SUPPORT_BUTTON' | translate}}
       </button>
diff --git a/apps/password-reset/src/_styles.scss b/apps/password-reset/src/_styles.scss
index 4f5a8b402..9ecedd567 100644
--- a/apps/password-reset/src/_styles.scss
+++ b/apps/password-reset/src/_styles.scss
@@ -118,28 +118,12 @@ mat-icon {
   bottom: 0;
   right: 0;
   background: rgba(0, 0, 0, 0.15);
-  z-index: 1;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-// TODO: check this style after the migration to Angular 15
-// make the whole dialog grey (including padding space) while the spinner is active
-mat-dialog-container:has(#loading-dialog-spinner) {
-  box-shadow: 0 0 0 24px rgba(0, 0, 0, 0.15) inset;
-  padding-bottom: 0;
-  .position-relative {
-    padding-bottom: 24px;
-  }
-  .spinner-container {
-    margin-bottom: 24px;
-  }
-  .mat-dialog-actions {
-    padding-bottom: 16px;
-  }
-}
-
 /*************************************
 ******** Customization of MDC ********
 *************************************/
diff --git a/apps/publications/src/_styles.scss b/apps/publications/src/_styles.scss
index 01b9a4659..b5b029489 100644
--- a/apps/publications/src/_styles.scss
+++ b/apps/publications/src/_styles.scss
@@ -371,28 +371,12 @@ mat-icon {
   bottom: 0;
   right: 0;
   background: rgba(0, 0, 0, 0.15);
-  z-index: 1;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-// TODO: check this style after the migration to Angular 15
-// make the whole dialog grey (including padding space) while the spinner is active
-mat-dialog-container:has(#loading-dialog-spinner) {
-  box-shadow: 0 0 0 24px rgba(0, 0, 0, 0.15) inset;
-  padding-bottom: 0;
-  .position-relative {
-    padding-bottom: 24px;
-  }
-  .spinner-container {
-    margin-bottom: 24px;
-  }
-  .mat-dialog-actions {
-    padding-bottom: 16px;
-  }
-}
-
 /*************************************
 ******** Customization of MDC ********
 *************************************/
diff --git a/apps/publications/src/app/components/add-thanks/add-thanks.component.html b/apps/publications/src/app/components/add-thanks/add-thanks.component.html
index c57097061..1958fdedc 100644
--- a/apps/publications/src/app/components/add-thanks/add-thanks.component.html
+++ b/apps/publications/src/app/components/add-thanks/add-thanks.component.html
@@ -3,7 +3,7 @@
     *ngIf="!publication.locked && !similarityCheck"
     mat-flat-button
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     (click)="onAddThanks()">
     {{'PUBLICATION_DETAIL.ADD' | translate}}
   </button>
@@ -11,7 +11,7 @@
     *ngIf="!publication.locked && !similarityCheck"
     mat-flat-button
     color="warn"
-    class="mr-2"
+    class="me-2"
     [disabled]="selection.selected.length === 0"
     (click)="onRemoveThanks()">
     {{'PUBLICATION_DETAIL.REMOVE' | translate}}
diff --git a/apps/publications/src/app/dialogs/add-authors-dialog/add-authors-dialog.component.html b/apps/publications/src/app/dialogs/add-authors-dialog/add-authors-dialog.component.html
index c64cc8e0a..f4700a219 100644
--- a/apps/publications/src/app/dialogs/add-authors-dialog/add-authors-dialog.component.html
+++ b/apps/publications/src/app/dialogs/add-authors-dialog/add-authors-dialog.component.html
@@ -19,7 +19,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_AUTHORS.TITLE' | translate}}</h1>
       <button
         mat-flat-button
         color="accent"
-        class="mr-2"
+        class="me-2"
         [disabled]="searchLoading || searchControl.value.trim() === ''"
         (click)="onSearchByString()">
         <mat-icon iconPositionEnd>search</mat-icon>
@@ -43,13 +43,13 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_AUTHORS.TITLE' | translate}}</h1>
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.ADD_AUTHORS.CANCEL' | translate}}
       </button>
       <button
         (click)="onAdd()"
         [disabled]="selection.selected.length === 0 || loading"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.ADD_AUTHORS.ADD' | translate}}
diff --git a/apps/publications/src/app/dialogs/add-thanks-dialog/add-thanks-dialog.component.html b/apps/publications/src/app/dialogs/add-thanks-dialog/add-thanks-dialog.component.html
index dc3f79d73..11a2003d6 100644
--- a/apps/publications/src/app/dialogs/add-thanks-dialog/add-thanks-dialog.component.html
+++ b/apps/publications/src/app/dialogs/add-thanks-dialog/add-thanks-dialog.component.html
@@ -18,12 +18,12 @@ <h1 mat-dialog-title>{{"DIALOGS.ADD_THANKS.TITLE" | translate}}</h1>
       </perun-web-apps-owners-list>
     </div>
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto" (click)="onCancel()">
+      <button mat-flat-button class="ms-auto" (click)="onCancel()">
         {{'DIALOGS.ADD_THANKS.CANCEL' | translate}}
       </button>
       <button
         mat-flat-button
-        class="ml-2"
+        class="ms-2"
         color="accent"
         [disabled]="selected.selected.length === 0 || loading"
         (click)="onSubmit()">
diff --git a/apps/publications/src/app/dialogs/remove-category-dialog/remove-category-dialog.component.html b/apps/publications/src/app/dialogs/remove-category-dialog/remove-category-dialog.component.html
index 1a8d95b3e..253233eae 100644
--- a/apps/publications/src/app/dialogs/remove-category-dialog/remove-category-dialog.component.html
+++ b/apps/publications/src/app/dialogs/remove-category-dialog/remove-category-dialog.component.html
@@ -10,7 +10,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_CATEGORY.TITLE' | translate}}</h1>
         {{'DIALOGS.REMOVE_CATEGORY.DESCRIPTION' | translate}}
       </p>
 
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_CATEGORY.ASK' | translate}}
       </div>
 
@@ -25,10 +25,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_CATEGORY.TITLE' | translate}}</h1>
       </table>
     </div>
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto" (click)="onCancel()">
+      <button mat-flat-button class="ms-auto" (click)="onCancel()">
         {{'DIALOGS.REMOVE_CATEGORY.CANCEL' | translate}}
       </button>
-      <button mat-flat-button class="ml-2" color="warn" [disabled]="loading" (click)="onSubmit()">
+      <button mat-flat-button class="ms-2" color="warn" [disabled]="loading" (click)="onSubmit()">
         {{'DIALOGS.REMOVE_CATEGORY.DELETE' | translate}}
       </button>
     </div>
diff --git a/apps/publications/src/app/dialogs/remove-publication-dialog/remove-publication-dialog.component.html b/apps/publications/src/app/dialogs/remove-publication-dialog/remove-publication-dialog.component.html
index aa74d1832..caa6903f4 100644
--- a/apps/publications/src/app/dialogs/remove-publication-dialog/remove-publication-dialog.component.html
+++ b/apps/publications/src/app/dialogs/remove-publication-dialog/remove-publication-dialog.component.html
@@ -13,10 +13,10 @@ <h1 mat-dialog-title>{{"DIALOGS.REMOVE_PUBLICATION.TITLE" | translate}}</h1>
       </perun-web-apps-publications-list>
     </div>
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto" (click)="cancel()">
+      <button mat-flat-button class="ms-auto" (click)="cancel()">
         {{'DIALOGS.REMOVE_PUBLICATION.CANCEL' | translate}}
       </button>
-      <button mat-flat-button color="warn" class="ml-2" [disabled]="loading" (click)="remove()">
+      <button mat-flat-button color="warn" class="ms-2" [disabled]="loading" (click)="remove()">
         {{'DIALOGS.REMOVE_PUBLICATION.REMOVE' | translate}}
       </button>
     </div>
diff --git a/apps/publications/src/app/dialogs/update-rank-dialog/update-rank-dialog.component.html b/apps/publications/src/app/dialogs/update-rank-dialog/update-rank-dialog.component.html
index a874655c6..d38272434 100644
--- a/apps/publications/src/app/dialogs/update-rank-dialog/update-rank-dialog.component.html
+++ b/apps/publications/src/app/dialogs/update-rank-dialog/update-rank-dialog.component.html
@@ -15,7 +15,7 @@ <h1 mat-dialog-title>{{"DIALOGS.UPDATE_RANK.TITLE" | translate}}{{categoryName}}
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto" (click)="onCancel()">
+      <button mat-flat-button class="ms-auto" (click)="onCancel()">
         {{'DIALOGS.UPDATE_RANK.CANCEL' | translate}}
       </button>
       <div
@@ -24,7 +24,7 @@ <h1 mat-dialog-title>{{"DIALOGS.UPDATE_RANK.TITLE" | translate}}{{categoryName}}
         [matTooltipDisabled]="rankCtrl.valid">
         <button
           mat-flat-button
-          class="ml-2"
+          class="ms-2"
           color="accent"
           [disabled]="rankCtrl.invalid || loading"
           (click)="onSubmit()">
diff --git a/apps/publications/src/app/pages/all-publications-page/all-publications-page.component.html b/apps/publications/src/app/pages/all-publications-page/all-publications-page.component.html
index 20bc8b7e0..bd28cf6d0 100644
--- a/apps/publications/src/app/pages/all-publications-page/all-publications-page.component.html
+++ b/apps/publications/src/app/pages/all-publications-page/all-publications-page.component.html
@@ -1,14 +1,14 @@
 <div class="user-theme">
   <h1 class="page-subtitle d-flex">
     <mat-icon class="publications-icon" svgIcon="publications"></mat-icon>
-    <span class="ml-3 mt-1">{{'ALL_PUBLICATIONS.TITLE' | translate}}</span>
+    <span class="ms-3 mt-1">{{'ALL_PUBLICATIONS.TITLE' | translate}}</span>
   </h1>
   <div class="mt-4">
     <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
     <button
       mat-flat-button
       color="warn"
-      class="mr-2"
+      class="me-2"
       [disabled]="selected.selected.length === 0"
       (click)="removePublication()">
       {{'ALL_PUBLICATIONS.REMOVE' | translate}}
diff --git a/apps/publications/src/app/pages/author-detail/author-detail.component.html b/apps/publications/src/app/pages/author-detail/author-detail.component.html
index ca03e2318..246465c1c 100644
--- a/apps/publications/src/app/pages/author-detail/author-detail.component.html
+++ b/apps/publications/src/app/pages/author-detail/author-detail.component.html
@@ -1,7 +1,7 @@
 <div class="user-theme">
   <h1 class="page-subtitle d-flex">
     <mat-icon class="title-icon">assignment_ind</mat-icon>
-    <span class="ml-3 mt-1">{{'AUTHORS_PAGE.TITLE' | translate}}</span>
+    <span class="ms-3 mt-1">{{'AUTHORS_PAGE.TITLE' | translate}}</span>
   </h1>
   <div *ngIf="!initLoading">
     <h5>{{ author | userFullName }}{{'AUTHOR_DETAIL.TITLE' | translate}}</h5>
@@ -10,7 +10,7 @@ <h5>{{ author | userFullName }}{{'AUTHOR_DETAIL.TITLE' | translate}}</h5>
       <button
         mat-flat-button
         color="warn"
-        class="mr-2"
+        class="me-2"
         [disabled]="selected.selected.length === 0"
         (click)="removePublication()">
         {{'AUTHOR_DETAIL.REMOVE' | translate}}
@@ -31,5 +31,5 @@ <h5>{{ author | userFullName }}{{'AUTHOR_DETAIL.TITLE' | translate}}</h5>
         [routerPath]="'/authors/'+author.id+'/publication'"></perun-web-apps-publications-list>
     </div>
   </div>
-  <mat-spinner class="ml-auto mr-auto" *ngIf="initLoading"></mat-spinner>
+  <mat-spinner class="ms-auto me-auto" *ngIf="initLoading"></mat-spinner>
 </div>
diff --git a/apps/publications/src/app/pages/authors-page/authors-page.component.html b/apps/publications/src/app/pages/authors-page/authors-page.component.html
index a106cb3c5..f0ebc2b8a 100644
--- a/apps/publications/src/app/pages/authors-page/authors-page.component.html
+++ b/apps/publications/src/app/pages/authors-page/authors-page.component.html
@@ -1,7 +1,7 @@
 <div class="user-theme">
   <h1 class="page-subtitle d-flex">
     <mat-icon class="title-icon">assignment_ind</mat-icon>
-    <span class="ml-3 mt-1">{{'AUTHORS_PAGE.TITLE' | translate}}</span>
+    <span class="ms-3 mt-1">{{'AUTHORS_PAGE.TITLE' | translate}}</span>
   </h1>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
   <perun-web-apps-debounce-filter
diff --git a/apps/publications/src/app/pages/categories-page/categories-page.component.html b/apps/publications/src/app/pages/categories-page/categories-page.component.html
index 0ce702616..1156aea02 100644
--- a/apps/publications/src/app/pages/categories-page/categories-page.component.html
+++ b/apps/publications/src/app/pages/categories-page/categories-page.component.html
@@ -6,14 +6,14 @@ <h1 class="page-subtitle">{{'CATEGORIES_PAGE.TITLE' | translate}}</h1>
     mat-flat-button
     color="accent"
     (click)="addCategory()"
-    class="mr-2 action-button">
+    class="me-2 action-button">
     {{'CATEGORIES_PAGE.CREATE' | translate}}
   </button>
 
   <button
     mat-flat-button
     color="warn"
-    class="mr-2"
+    class="me-2"
     *ngIf="removeAuth"
     [disabled]="!selected.selected.length"
     (click)="removeCategory()">
diff --git a/apps/publications/src/app/pages/my-publications-page/my-publications-page.component.html b/apps/publications/src/app/pages/my-publications-page/my-publications-page.component.html
index 90fb859e0..61850cae3 100644
--- a/apps/publications/src/app/pages/my-publications-page/my-publications-page.component.html
+++ b/apps/publications/src/app/pages/my-publications-page/my-publications-page.component.html
@@ -1,14 +1,14 @@
 <div class="user-theme">
   <h1 class="page-subtitle d-flex">
     <mat-icon class="title-icon">local_library</mat-icon>
-    <span class="ml-3 mt-1">{{'MY_PUBLICATIONS.TITLE' | translate}}</span>
+    <span class="ms-3 mt-1">{{'MY_PUBLICATIONS.TITLE' | translate}}</span>
   </h1>
   <div class="mt-4">
     <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
     <button
       mat-flat-button
       color="warn"
-      class="mr-2"
+      class="me-2"
       [disabled]="selected.selected.length === 0"
       (click)="removePublication()">
       {{'MY_PUBLICATIONS.REMOVE' | translate}}
diff --git a/apps/user-profile/src/_styles.scss b/apps/user-profile/src/_styles.scss
index d63068123..8bfb92bf5 100644
--- a/apps/user-profile/src/_styles.scss
+++ b/apps/user-profile/src/_styles.scss
@@ -163,28 +163,12 @@ td.mat-mdc-cell {
   bottom: 0;
   right: 0;
   background: rgba(0, 0, 0, 0.15);
-  z-index: 1;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-// TODO: check this style after the migration to Angular 15
-// make the whole dialog grey (including padding space) while the spinner is active
-mat-dialog-container:has(#loading-dialog-spinner) {
-  box-shadow: 0 0 0 24px rgba(0, 0, 0, 0.15) inset;
-  padding-bottom: 0;
-  .position-relative {
-    padding-bottom: 24px;
-  }
-  .spinner-container {
-    margin-bottom: 24px;
-  }
-  .mat-dialog-actions {
-    padding-bottom: 16px;
-  }
-}
-
 #preloader {
   position: fixed;
   top: 0;
diff --git a/apps/user-profile/src/app/components/dialogs/activate-local-account-dialog/activate-local-account-dialog.component.html b/apps/user-profile/src/app/components/dialogs/activate-local-account-dialog/activate-local-account-dialog.component.html
index b82ef047b..ef1323b6c 100644
--- a/apps/user-profile/src/app/components/dialogs/activate-local-account-dialog/activate-local-account-dialog.component.html
+++ b/apps/user-profile/src/app/components/dialogs/activate-local-account-dialog/activate-local-account-dialog.component.html
@@ -12,7 +12,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ACTIVATE_LOCAL_ACCOUNT.TITLE'|customTranslate |
       </perun-web-apps-password-form>
     </div>
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto mr-2" (click)="cancel()">
+      <button mat-flat-button class="ms-auto me-2" (click)="cancel()">
         {{'DIALOGS.ACTIVATE_LOCAL_ACCOUNT.CANCEL'|customTranslate | translate}}
       </button>
       <button
diff --git a/apps/user-profile/src/app/components/dialogs/add-auth-text-dialog/add-auth-text-dialog.component.html b/apps/user-profile/src/app/components/dialogs/add-auth-text-dialog/add-auth-text-dialog.component.html
index f90201388..58eeabe85 100644
--- a/apps/user-profile/src/app/components/dialogs/add-auth-text-dialog/add-auth-text-dialog.component.html
+++ b/apps/user-profile/src/app/components/dialogs/add-auth-text-dialog/add-auth-text-dialog.component.html
@@ -15,7 +15,7 @@ <h1 mat-dialog-title>{{'DIALOGS.ADD_AUTH_TEXT.TITLE' | translate}}</h1>
     </perun-web-apps-alert>
   </div>
   <div matDialogActions>
-    <button (click)="cancel()" class="ml-auto mr-2" mat-flat-button>
+    <button (click)="cancel()" class="ms-auto me-2" mat-flat-button>
       {{'DIALOGS.ADD_AUTH_TEXT.CANCEL' | translate}}
     </button>
     <button [disabled]="securityText.trim() === ''" (click)="add()" color="accent" mat-flat-button>
diff --git a/apps/user-profile/src/app/components/dialogs/remove-alt-password-dialog/remove-alt-password-dialog.component.html b/apps/user-profile/src/app/components/dialogs/remove-alt-password-dialog/remove-alt-password-dialog.component.html
index 02bfae35e..d3634a96a 100644
--- a/apps/user-profile/src/app/components/dialogs/remove-alt-password-dialog/remove-alt-password-dialog.component.html
+++ b/apps/user-profile/src/app/components/dialogs/remove-alt-password-dialog/remove-alt-password-dialog.component.html
@@ -8,7 +8,7 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_ALT_PASSWORD.TITLE' | customTranslate | t
       <p>
         {{'DIALOGS.REMOVE_ALT_PASSWORD.DESCRIPTION' | customTranslate | translate}}
       </p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_ALT_PASSWORD.ASK' | customTranslate | translate}}
       </div>
       <table mat-table [dataSource]="dataSource" class="w-100">
@@ -23,10 +23,10 @@ <h1 mat-dialog-title>{{'DIALOGS.REMOVE_ALT_PASSWORD.TITLE' | customTranslate | t
     </div>
 
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto" (click)="onCancel()">
+      <button mat-flat-button class="ms-auto" (click)="onCancel()">
         {{'DIALOGS.REMOVE_ALT_PASSWORD.CANCEL' | customTranslate | translate}}
       </button>
-      <button mat-flat-button class="ml-2" color="warn" (click)="onSubmit()">
+      <button mat-flat-button class="ms-2" color="warn" (click)="onSubmit()">
         {{'DIALOGS.REMOVE_ALT_PASSWORD.REMOVE' | customTranslate | translate}}
       </button>
     </div>
diff --git a/apps/user-profile/src/app/pages/groups-page/groups-page.component.html b/apps/user-profile/src/app/pages/groups-page/groups-page.component.html
index 7202c3484..d9c4a34d3 100644
--- a/apps/user-profile/src/app/pages/groups-page/groups-page.component.html
+++ b/apps/user-profile/src/app/pages/groups-page/groups-page.component.html
@@ -1,6 +1,6 @@
 <h1 class="page-title pt-2">{{'GROUPS.TITLE' | customTranslate | translate}}</h1>
 <div class="user-theme">
-  <mat-form-field class="mr-2 w-75" *ngIf="!initialLoading">
+  <mat-form-field class="me-2 w-75" *ngIf="!initialLoading">
     <mat-label>{{'GROUPS.SELECT_VO' | translate}}</mat-label>
     <input
       type="text"
@@ -20,7 +20,7 @@ <h1 class="page-title pt-2">{{'GROUPS.TITLE' | customTranslate | translate}}</h1
     </mat-autocomplete>
   </mat-form-field>
 
-  <mat-spinner *ngIf="initialLoading" class="mr-auto ml-auto"></mat-spinner>
+  <mat-spinner *ngIf="initialLoading" class="me-auto ms-auto"></mat-spinner>
 
   <perun-web-apps-alert
     alert_type="warn"
diff --git a/apps/user-profile/src/app/pages/identities-page/identities-page.component.html b/apps/user-profile/src/app/pages/identities-page/identities-page.component.html
index 46cc34479..21fe75ec9 100644
--- a/apps/user-profile/src/app/pages/identities-page/identities-page.component.html
+++ b/apps/user-profile/src/app/pages/identities-page/identities-page.component.html
@@ -6,7 +6,7 @@ <h1 class="page-title">{{'IDENTITIES.IDP' | customTranslate | translate}}</h1>
   <button
     (click)="removeIdentity(idpSelection)"
     [disabled]="idpSelection.selected.length === 0 || loading"
-    class="ml-2"
+    class="ms-2"
     color="warn"
     mat-flat-button>
     {{'IDENTITIES.REMOVE' | customTranslate | translate}}
@@ -29,7 +29,7 @@ <h1 class="page-title mt-5">{{'IDENTITIES.CERT' | customTranslate | translate}}<
     <button
       (click)="removeIdentity(certSelection)"
       [disabled]="certSelection.selected.length === 0 || loading"
-      class="ml-2"
+      class="ms-2"
       color="warn"
       mat-flat-button>
       {{'IDENTITIES.REMOVE' | customTranslate | translate}}
diff --git a/apps/user-profile/src/app/pages/privacy-page/privacy-page.component.html b/apps/user-profile/src/app/pages/privacy-page/privacy-page.component.html
index 768233696..130342ad2 100644
--- a/apps/user-profile/src/app/pages/privacy-page/privacy-page.component.html
+++ b/apps/user-profile/src/app/pages/privacy-page/privacy-page.component.html
@@ -3,7 +3,7 @@ <h1 class="page-title mt-2">{{'PRIVACY.TITLE' | customTranslate | translate}}</h
   <perun-web-apps-immediate-filter
     [placeholder]="'SERVICES.FILTER' | customTranslate | translate"
     (filter)="applyFilter($event)"></perun-web-apps-immediate-filter>
-  <mat-spinner class="ml-auto mr-auto" *ngIf="outerLoading"></mat-spinner>
+  <mat-spinner class="ms-auto me-auto" *ngIf="outerLoading"></mat-spinner>
   <mat-accordion *ngIf="!outerLoading">
     <mat-expansion-panel (opened)="getUserData()">
       <mat-expansion-panel-header>
diff --git a/apps/user-profile/src/app/pages/settings-page/settings-alternative-passwords/settings-alternative-passwords.component.html b/apps/user-profile/src/app/pages/settings-page/settings-alternative-passwords/settings-alternative-passwords.component.html
index f4fab1709..a3fdb08eb 100644
--- a/apps/user-profile/src/app/pages/settings-page/settings-alternative-passwords/settings-alternative-passwords.component.html
+++ b/apps/user-profile/src/app/pages/settings-page/settings-alternative-passwords/settings-alternative-passwords.component.html
@@ -1,4 +1,4 @@
-<div class="ml-3">
+<div class="ms-3">
   <h1 class="page-title">{{'ALT_PASSWORDS.TITLE_GENERATE'|customTranslate | translate}}</h1>
   <mat-form-field class="input-width">
     <mat-label>{{'ALT_PASSWORDS.INPUT_PLACEHOLDER'|customTranslate | translate}}</mat-label>
@@ -9,7 +9,7 @@ <h1 class="page-title">{{'ALT_PASSWORDS.TITLE_GENERATE'|customTranslate | transl
     mat-flat-button
     [disabled]="!altPasswordCtrl.valid || alreadyContainsValue(altPasswordCtrl.value)"
     color="accent"
-    class="ml-2"
+    class="ms-2"
     (click)="createPassword()">
     {{'ALT_PASSWORDS.GENERATE'|customTranslate | translate}}
   </button>
diff --git a/libs/perun/components/src/lib/application-state-selector/application-state-selector.component.html b/libs/perun/components/src/lib/application-state-selector/application-state-selector.component.html
index af3055c3b..3e7d5312d 100644
--- a/libs/perun/components/src/lib/application-state-selector/application-state-selector.component.html
+++ b/libs/perun/components/src/lib/application-state-selector/application-state-selector.component.html
@@ -1,4 +1,4 @@
-<mat-form-field class="input-width-250 mr-2">
+<mat-form-field class="input-width-250 me-2">
   <mat-label>{{'APPLICATIONS_LIST.STATE' | translate}}</mat-label>
   <mat-select (selectionChange)="select()" [(value)]="state" disableOptionCentering>
     <mat-option value="all">{{'VO_DETAIL.APPLICATION.SELECTION_ALL' | translate}}</mat-option>
diff --git a/libs/perun/components/src/lib/refresh-button/refresh-button.component.html b/libs/perun/components/src/lib/refresh-button/refresh-button.component.html
index 55f8076fd..d11ad6fc6 100644
--- a/libs/perun/components/src/lib/refresh-button/refresh-button.component.html
+++ b/libs/perun/components/src/lib/refresh-button/refresh-button.component.html
@@ -6,7 +6,7 @@
   data-cy="refresh-button"
   matTooltip="{{'SHARED_LIB.PERUN.REFRESH_BUTTON' | translate}}">
   <mat-icon
-    class="ml-auto perun-icon d-inline-flex align-items-center"
+    class="ms-auto perun-icon d-inline-flex align-items-center"
     svgIcon="{{!disabled ? 'perun-refresh-enabled': 'perun-refresh-disabled'}}">
   </mat-icon>
 </button>
diff --git a/libs/perun/dialogs/src/lib/bug-report-dialog/bug-report-dialog.component.html b/libs/perun/dialogs/src/lib/bug-report-dialog/bug-report-dialog.component.html
index 03f53e201..6f711e0d0 100644
--- a/libs/perun/dialogs/src/lib/bug-report-dialog/bug-report-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/bug-report-dialog/bug-report-dialog.component.html
@@ -30,14 +30,14 @@ <h1 mat-dialog-title>{{'SHARED_LIB.PERUN.COMPONENTS.BUG_REPORT.TITLE' | translat
     </div>
 
     <div mat-dialog-actions>
-      <div class="ml-auto">
+      <div class="ms-auto">
         <button (click)="dialogRef.close()" mat-button>
           {{'SHARED_LIB.PERUN.COMPONENTS.BUG_REPORT.CANCEL' | translate}}
         </button>
         <button
           (click)="sendBugReport()"
           [disabled]="message === '' || subject === '' || loading"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           mat-flat-button>
           {{'SHARED_LIB.PERUN.COMPONENTS.BUG_REPORT.SEND' | translate}}
diff --git a/libs/perun/dialogs/src/lib/change-group-resource-assigment-dialog/change-group-resource-assigment-dialog.component.html b/libs/perun/dialogs/src/lib/change-group-resource-assigment-dialog/change-group-resource-assigment-dialog.component.html
index 3fc66abb7..bc4d0c299 100644
--- a/libs/perun/dialogs/src/lib/change-group-resource-assigment-dialog/change-group-resource-assigment-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/change-group-resource-assigment-dialog/change-group-resource-assigment-dialog.component.html
@@ -12,7 +12,7 @@ <h1 mat-dialog-title>
         <span class="text-muted id-font">#{{resource.id}}</span>
       </p>
       <p>
-        <strong class="mr-2">
+        <strong class="me-2">
           {{'SHARED_LIB.PERUN.COMPONENTS.CHANGE_GROUP_RESOURCE_ASSIGMENT_DIALOG.CURRENT' | translate}}
           :
         </strong>
@@ -20,7 +20,7 @@ <h1 mat-dialog-title>
       </p>
 
       <p>
-        <strong class="mr-2">
+        <strong class="me-2">
           {{'SHARED_LIB.PERUN.COMPONENTS.CHANGE_GROUP_RESOURCE_ASSIGMENT_DIALOG.NEW' | translate}}
           :
         </strong>
@@ -38,7 +38,7 @@ <h1 mat-dialog-title>
         class="d-flex flex-column mt-3"
         *ngIf="status === 'INACTIVE' || status ==='FAILED'"
         [(ngModel)]="asyncValidation">
-        <span class="font-weight-bold">
+        <span class="fw-bold">
           {{'SHARED_LIB.PERUN.COMPONENTS.CHANGE_GROUP_RESOURCE_ASSIGMENT_DIALOG.VALIDATE' | translate}}
           :
         </span>
@@ -62,7 +62,7 @@ <h1 mat-dialog-title>
       </span>
     </div>
     <div mat-dialog-actions>
-      <button class="ml-auto mr-2" mat-flat-button (click)="onCancel()">
+      <button class="ms-auto me-2" mat-flat-button (click)="onCancel()">
         {{'SHARED_LIB.PERUN.COMPONENTS.CHANGE_GROUP_RESOURCE_ASSIGMENT_DIALOG.CANCEL' | translate}}
       </button>
       <button
diff --git a/libs/perun/dialogs/src/lib/change-member-status-dialog/change-member-status-dialog.component.html b/libs/perun/dialogs/src/lib/change-member-status-dialog/change-member-status-dialog.component.html
index e1fd77c4d..e9d3f2093 100644
--- a/libs/perun/dialogs/src/lib/change-member-status-dialog/change-member-status-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/change-member-status-dialog/change-member-status-dialog.component.html
@@ -5,14 +5,14 @@
   <div *perunWebAppsLoader="loading; indicator: spinner">
     <h1 mat-dialog-title>{{'DIALOGS.CHANGE_STATUS.TITLE' | translate}}</h1>
     <div class="dialog-container" mat-dialog-content>
-      <div class="font-weight-bold pb-1">
+      <div class="fw-bold pb-1">
         {{'DIALOGS.CHANGE_STATUS.CURRENT_STATUS' | translate}} {{actualStatus | memberStatus}}
       </div>
       <div class="text-muted pb-3">{{description}}</div>
 
-      <div *ngIf="allStatuses.length>1" class="font-weight-bold pb-1">
+      <div *ngIf="allStatuses.length>1" class="fw-bold pb-1">
         {{'DIALOGS.CHANGE_STATUS.NEW_STATUS' | translate}}
-        <mat-form-field class="mr-2 mt-2">
+        <mat-form-field class="me-2 mt-2">
           <mat-label>{{'DIALOGS.CHANGE_STATUS.SELECT_STATUS' | translate}}</mat-label>
           <mat-select (selectionChange)="changeStatus($event)">
             <mat-option
@@ -23,7 +23,7 @@ <h1 mat-dialog-title>{{'DIALOGS.CHANGE_STATUS.TITLE' | translate}}</h1>
           </mat-select>
         </mat-form-field>
       </div>
-      <div *ngIf="allStatuses.length === 1" class="font-weight-bold pb-1">
+      <div *ngIf="allStatuses.length === 1" class="fw-bold pb-1">
         {{'DIALOGS.CHANGE_STATUS.NEW_STATUS' | translate}}
         {{allStatuses[0] | memberStatus}}
       </div>
@@ -32,13 +32,13 @@ <h1 mat-dialog-title>{{'DIALOGS.CHANGE_STATUS.TITLE' | translate}}</h1>
       </div>
     </div>
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{cancelOrBackButton}}
       </button>
       <button
         (click)="submit()"
         [disabled]="loading || !selectedStatus"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{submitButtonText}}
diff --git a/libs/perun/dialogs/src/lib/change-password-dialog/change-password-dialog.component.html b/libs/perun/dialogs/src/lib/change-password-dialog/change-password-dialog.component.html
index dea30e9af..547d74195 100644
--- a/libs/perun/dialogs/src/lib/change-password-dialog/change-password-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/change-password-dialog/change-password-dialog.component.html
@@ -21,8 +21,7 @@ <h1 mat-dialog-title>
             <mat-icon matSuffix (click)="showOldPassword = !showOldPassword">
               {{showOldPassword ? "visibility_off": "visibility"}}
             </mat-icon>
-            <mat-error
-              *ngIf="oldPwd.hasError('required')">
+            <mat-error *ngIf="oldPwd.hasError('required')">
               {{'SHARED_LIB.PERUN.COMPONENTS.CHANGE_PASSWORD_DIALOG.FIELD_EMPTY' | translate}}</mat-error
             >
           </mat-form-field>
@@ -34,14 +33,14 @@ <h1 mat-dialog-title>
     </div>
 
     <div mat-dialog-actions>
-      <div class="ml-auto">
+      <div class="ms-auto">
         <button (click)="close()" mat-button>
           {{'SHARED_LIB.PERUN.COMPONENTS.CHANGE_PASSWORD_DIALOG.CANCEL' | translate}}
         </button>
         <button
           (click)="changePassword()"
           [disabled]="formGroup.invalid || formGroup.pending || loading"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           mat-flat-button>
           {{'SHARED_LIB.PERUN.COMPONENTS.CHANGE_PASSWORD_DIALOG.CHANGE' | translate}}
diff --git a/libs/perun/dialogs/src/lib/delete-entity-dialog/delete-entity-dialog.component.html b/libs/perun/dialogs/src/lib/delete-entity-dialog/delete-entity-dialog.component.html
index a4162d5e1..d1bef3825 100644
--- a/libs/perun/dialogs/src/lib/delete-entity-dialog/delete-entity-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/delete-entity-dialog/delete-entity-dialog.component.html
@@ -13,7 +13,7 @@ <h1 mat-dialog-title>
           {{'DIALOGS.DELETE_ENTITY.BASIC' | translate: {action: this.anonymize | deleteDialogType} }}
           {{'DIALOGS.DELETE_ENTITY.ONLY' | translate}}
           {{entityType}}
-          <span class="font-weight-bold">{{'DIALOGS.DELETE_ENTITY.OR' | translate}}</span>
+          <span class="fw-bold">{{'DIALOGS.DELETE_ENTITY.OR' | translate}}</span>
           {{entityType}}
           {{'DIALOGS.DELETE_ENTITY.RELATIONS' | translate}}?
         </div>
@@ -35,12 +35,12 @@ <h1 mat-dialog-title>
         </table>
       </div>
       <div mat-dialog-actions>
-        <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+        <button (click)="onCancel()" class="ms-auto" mat-flat-button>
           {{'DIALOGS.DELETE_ENTITY.CANCEL' | translate}}
         </button>
         <button
           (click)="onDelete()"
-          class="ml-2"
+          class="ms-2"
           data-cy="delete-button-dialog"
           color="warn"
           mat-flat-button>
@@ -49,7 +49,7 @@ <h1 mat-dialog-title>
         <button
           *ngIf="!disableForce"
           (click)="force = true"
-          class="ml-2"
+          class="ms-2"
           data-cy="force-delete"
           color="warn"
           mat-flat-button>
@@ -103,13 +103,13 @@ <h1 mat-dialog-title>
         </mat-form-field>
       </div>
       <div mat-dialog-actions>
-        <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+        <button (click)="onCancel()" class="ms-auto" mat-flat-button>
           {{'DIALOGS.DELETE_ENTITY.CANCEL' | translate}}
         </button>
         <button
           (click)="onDelete()"
           [disabled]="deleteControl.invalid"
-          class="ml-2"
+          class="ms-2"
           data-cy="force-delete-button"
           color="warn"
           mat-flat-button>
diff --git a/libs/perun/dialogs/src/lib/edit-facility-resource-group-vo-dialog/edit-facility-resource-group-vo-dialog.component.html b/libs/perun/dialogs/src/lib/edit-facility-resource-group-vo-dialog/edit-facility-resource-group-vo-dialog.component.html
index b3982a83a..c3b3286f1 100644
--- a/libs/perun/dialogs/src/lib/edit-facility-resource-group-vo-dialog/edit-facility-resource-group-vo-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/edit-facility-resource-group-vo-dialog/edit-facility-resource-group-vo-dialog.component.html
@@ -40,13 +40,13 @@ <h1 *ngIf="dialogType === 3" mat-dialog-title>
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="cancel()" class="ml-auto" mat-flat-button>
+      <button (click)="cancel()" class="ms-auto" mat-flat-button>
         {{'DIALOGS.EDIT_FACILITY_RESOURCE_GROUP_VO.CANCEL_BUTTON' | translate}}
       </button>
       <button
         (click)="submit()"
         [disabled]="loading || nameCtrl.invalid || descriptionCtrl.invalid"
-        class="ml-2"
+        class="ms-2"
         color="accent"
         mat-flat-button>
         {{'DIALOGS.EDIT_FACILITY_RESOURCE_GROUP_VO.SUBMIT_BUTTON' | translate}}
diff --git a/libs/perun/dialogs/src/lib/group-sync-detail-dialog/group-sync-detail-dialog.component.html b/libs/perun/dialogs/src/lib/group-sync-detail-dialog/group-sync-detail-dialog.component.html
index 9d85907ab..d43b64561 100644
--- a/libs/perun/dialogs/src/lib/group-sync-detail-dialog/group-sync-detail-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/group-sync-detail-dialog/group-sync-detail-dialog.component.html
@@ -30,15 +30,15 @@ <h1 mat-dialog-title>{{'DIALOGS.GROUP_SYNC_DETAIL.TITLE' | translate}}</h1>
       </mat-form-field>
     </div>
     <div mat-dialog-actions>
-      <div class="ml-auto">
-        <button (click)="onCancel()" class="ml-2" mat-flat-button>
+      <div class="ms-auto">
+        <button (click)="onCancel()" class="ms-2" mat-flat-button>
           {{'DIALOGS.GROUP_SYNC_DETAIL.CANCEL' | translate}}
         </button>
         <button
           (click)="onForce()"
           *ngIf="type === 'BASIC' || type === 'STRUCTURED'"
           [disabled]="loading"
-          class="ml-2"
+          class="ms-2"
           color="accent"
           mat-flat-button>
           {{'DIALOGS.GROUP_SYNC_DETAIL.FORCE' | translate}}
diff --git a/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.html b/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.html
index 2eceefdf1..b8015cbb7 100644
--- a/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/member-tree-view-dialog/member-tree-view-dialog.component.html
@@ -6,10 +6,10 @@
     <h1 mat-dialog-title>
       {{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.TITLE' | translate:{ 'name': userName} }}
     </h1>
-    <div *ngIf="dataSource" mat-dialog-content class="mr-0">
+    <div *ngIf="dataSource" mat-dialog-content class="me-0">
       <p>{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.INFO' | translate}}</p>
 
-      <mat-form-field class="filter-field ml-2">
+      <mat-form-field class="filter-field ms-2">
         <mat-label>
           {{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.FILTER' | translate}}
         </mat-label>
@@ -37,16 +37,16 @@ <h1 mat-dialog-title>
                 <span>{{node.name | parseGroupName}}</span>
                 <span
                   *ngIf="node.direct"
-                  class="text-muted ml-2"
+                  class="text-muted ms-2"
                   >{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.DIRECT' | translate}}</span
                 >
                 <span
                   *ngIf="node.include"
-                  class="text-muted ml-2"
+                  class="text-muted ms-2"
                   >{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.INCLUDE' | translate}}</span
                 >
               </div>
-              <span class="text-muted ml-3">{{node.description}}</span>
+              <span class="text-muted ms-3">{{node.description}}</span>
             </div>
           </li>
         </mat-tree-node>
@@ -55,7 +55,7 @@ <h1 mat-dialog-title>
           <li>
             <div class="mat-tree-node">
               <button mat-icon-button matTreeNodeToggle [attr.aria-label]="'Toggle ' + node.name">
-                <mat-icon class="mr-3">
+                <mat-icon class="me-3">
                   {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
                 </mat-icon>
               </button>
@@ -68,16 +68,16 @@ <h1 mat-dialog-title>
                   <span>{{node.name | parseGroupName}}</span>
                   <span
                     *ngIf="node.direct"
-                    class="text-muted ml-2"
+                    class="text-muted ms-2"
                     >{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.DIRECT' | translate}}</span
                   >
                   <span
                     *ngIf="node.include"
-                    class="text-muted ml-2"
+                    class="text-muted ms-2"
                     >{{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.INCLUDE' | translate}}</span
                   >
                 </div>
-                <span class="text-muted ml-3">{{node.description}}</span>
+                <span class="text-muted ms-3">{{node.description}}</span>
               </div>
             </div>
             <ul [class.example-tree-invisible]="!treeControl.isExpanded(node)">
@@ -88,7 +88,7 @@ <h1 mat-dialog-title>
       </mat-tree>
     </div>
     <div mat-dialog-actions>
-      <div class="ml-auto">
+      <div class="ms-auto">
         <button (click)="onCancel()" mat-flat-button>
           {{'SHARED_LIB.PERUN.COMPONENTS.MEMBER_TREEVIEW_DIALOG.CLOSE' | translate}}
         </button>
diff --git a/libs/perun/dialogs/src/lib/remove-string-value-dialog/remove-string-value-dialog.component.html b/libs/perun/dialogs/src/lib/remove-string-value-dialog/remove-string-value-dialog.component.html
index c49f48919..4c1f3761e 100644
--- a/libs/perun/dialogs/src/lib/remove-string-value-dialog/remove-string-value-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/remove-string-value-dialog/remove-string-value-dialog.component.html
@@ -8,7 +8,7 @@ <h1 mat-dialog-title>{{title}}</h1>
       <p>
         {{description}}
       </p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'DIALOGS.REMOVE_STRING_VALUE.ASK' | customTranslate | translate}}
       </div>
       <table *ngIf="dataSource.data.length" [dataSource]="dataSource" class="w-100" mat-table>
@@ -23,10 +23,10 @@ <h1 mat-dialog-title>{{title}}</h1>
     </div>
 
     <div mat-dialog-actions>
-      <button mat-flat-button class="ml-auto" (click)="onCancel()">
+      <button mat-flat-button class="ms-auto" (click)="onCancel()">
         {{'DIALOGS.REMOVE_STRING_VALUE.CANCEL' | customTranslate | translate}}
       </button>
-      <button mat-flat-button class="ml-2" color="warn" (click)="onSubmit()">
+      <button mat-flat-button class="ms-2" color="warn" (click)="onSubmit()">
         {{'DIALOGS.REMOVE_STRING_VALUE.REMOVE' | customTranslate | translate}}
       </button>
     </div>
diff --git a/libs/perun/dialogs/src/lib/remove-user-ext-source-dialog/remove-user-ext-source-dialog.component.html b/libs/perun/dialogs/src/lib/remove-user-ext-source-dialog/remove-user-ext-source-dialog.component.html
index d128874a6..987b1f262 100644
--- a/libs/perun/dialogs/src/lib/remove-user-ext-source-dialog/remove-user-ext-source-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/remove-user-ext-source-dialog/remove-user-ext-source-dialog.component.html
@@ -10,7 +10,7 @@ <h1 mat-dialog-title>
       <p>
         {{'SHARED_LIB.PERUN.COMPONENTS.REMOVE_USER_EXT_SOURCE.DESCRIPTION' | customTranslate | translate}}
       </p>
-      <div class="font-weight-bold">
+      <div class="fw-bold">
         {{'SHARED_LIB.PERUN.COMPONENTS.REMOVE_USER_EXT_SOURCE.ASK' | customTranslate | translate}}
       </div>
       <table [dataSource]="dataSource" class="w-100" mat-table>
@@ -27,10 +27,10 @@ <h1 mat-dialog-title>
     </div>
 
     <div mat-dialog-actions>
-      <button (click)="onCancel()" class="ml-auto" mat-flat-button>
+      <button (click)="onCancel()" class="ms-auto" mat-flat-button>
         {{'SHARED_LIB.PERUN.COMPONENTS.REMOVE_USER_EXT_SOURCE.CANCEL' | customTranslate | translate}}
       </button>
-      <button (click)="onSubmit()" class="ml-2" color="warn" mat-flat-button>
+      <button (click)="onSubmit()" class="ms-2" color="warn" mat-flat-button>
         {{'SHARED_LIB.PERUN.COMPONENTS.REMOVE_USER_EXT_SOURCE.REMOVE' | customTranslate | translate}}
       </button>
     </div>
diff --git a/libs/perun/dialogs/src/lib/universal-confirmation-items-dialog/universal-confirmation-items-dialog.component.html b/libs/perun/dialogs/src/lib/universal-confirmation-items-dialog/universal-confirmation-items-dialog.component.html
index 3b3f41093..ed527b045 100644
--- a/libs/perun/dialogs/src/lib/universal-confirmation-items-dialog/universal-confirmation-items-dialog.component.html
+++ b/libs/perun/dialogs/src/lib/universal-confirmation-items-dialog/universal-confirmation-items-dialog.component.html
@@ -5,7 +5,7 @@ <h1 mat-dialog-title>{{this.data.title | translate}}</h1>
       {{this.data.description | translate}}
     </p>
 
-    <div class="font-weight-bold" *ngIf="data.showAsk">
+    <div class="fw-bold" *ngIf="data.showAsk">
       {{'SHARED_LIB.PERUN.COMPONENTS.UNIVERSAL_REMOVE_ITEMS_DIALOG.ASK' | translate}}
     </div>
 
@@ -23,12 +23,12 @@ <h1 mat-dialog-title>{{this.data.title | translate}}</h1>
     </perun-web-apps-alert>
   </div>
   <div mat-dialog-actions>
-    <button mat-flat-button class="ml-auto" (click)="onCancel()">
+    <button mat-flat-button class="ms-auto" (click)="onCancel()">
       {{'SHARED_LIB.PERUN.COMPONENTS.UNIVERSAL_REMOVE_ITEMS_DIALOG.CANCEL_BUTTON' | translate}}
     </button>
     <button
       mat-flat-button
-      class="ml-2"
+      class="ms-2"
       color="warn"
       (click)="onSubmit()"
       *ngIf="data.type === 'remove'">
@@ -36,7 +36,7 @@ <h1 mat-dialog-title>{{this.data.title | translate}}</h1>
     </button>
     <button
       mat-flat-button
-      class="ml-2"
+      class="ms-2"
       color="accent"
       (click)="onSubmit()"
       *ngIf="data.type === 'confirmation'">
diff --git a/libs/ui/loaders/src/lib/loading-dialog/loading-dialog.component.html b/libs/ui/loaders/src/lib/loading-dialog/loading-dialog.component.html
index 7a3f4a82d..181ee574f 100644
--- a/libs/ui/loaders/src/lib/loading-dialog/loading-dialog.component.html
+++ b/libs/ui/loaders/src/lib/loading-dialog/loading-dialog.component.html
@@ -1,3 +1,3 @@
-<div id="loading-dialog-spinner" class="spinner-container">
+<div class="spinner-container">
   <mat-spinner></mat-spinner>
 </div>