diff --git a/frontend/app/templates/components/encryptable/form.hbs b/frontend/app/templates/components/encryptable/form.hbs
index d8fecb68e..a4899b3fe 100644
--- a/frontend/app/templates/components/encryptable/form.hbs
+++ b/frontend/app/templates/components/encryptable/form.hbs
@@ -124,10 +124,10 @@
                          alt="delete attribute field">
                   </button>
                   {{#if (eq attribute "password")}}
-                    <PasswordStrengthMeter class="col-12 col-lg-9 px-0 mb-2 mb-md-0 ml-3"
+                    <PasswordStrengthMeter class="col-12 col-lg-9 px-0 mb-2 mb-md-0 ms-3"
                                            @password={{this.changeset.cleartextPassword}}/>
                     <div></div>
-                    <button class="btn btn-secondary btn-block col-lg-7 mb-md-4 ml-3 mt-2" type="button" {{on "click"
+                    <button class="btn btn-secondary btn-block col-lg-7 mb-md-4 ms-3 mt-2" type="button" {{on "click"
                                                                                                 this.setRandomPassword}}>
                       {{t "encryptable/credentials.edit.random_password"}}
                     </button>
@@ -136,7 +136,7 @@
               {{/each}}
             </div>
             {{#if (gt this.inactiveFields.length 0)}}
-              <div class="ml-3 mb-2 mt-3">{{t "additionalField"}}</div>
+              <div class="ms-3 mb-2 mt-3">{{t "additionalField"}}</div>
               <div id="encryptable-form-additional-field" class="d-flex flex-row">
                 <PowerSelect
                   id="add-field-dropdown"
@@ -147,7 +147,7 @@
                   @onChange={{fn (mut this.selectedAttribute)}} as |attribute|>
                   {{t attribute}}
                 </PowerSelect>
-                <button class="btn btn-success d-inline-block p-1 ml-4 add-field" type="button" {{on "click" (action "addField")}} >
+                <button class="btn btn-success d-inline-block p-1 ms-4 add-field" type="button" {{on "click" (action "addField")}} >
                   <img id="add-field-button" class="d-inline" src="/assets/images/plus-white.svg"
                        alt="add attribute field">
                 </button>
diff --git a/frontend/app/templates/components/encryptable/row.hbs b/frontend/app/templates/components/encryptable/row.hbs
index 6e6c816d9..d9135f29d 100644
--- a/frontend/app/templates/components/encryptable/row.hbs
+++ b/frontend/app/templates/components/encryptable/row.hbs
@@ -24,7 +24,7 @@
         {{@encryptable.sender_name}} / {{moment-format @encryptable.createdAt "DD.MM.YYYY hh:mm"}}
       </div>
 
-      <div class="ml-auto col-md-auto d-none d-md-block">
+      <div class="ms-auto col-md-auto d-none d-md-block">
         <a class="mx-1 text-decoration-none" role="button" href={{this.downloadLink}}>
           <img class="icon-medium-button d-inline" src="/assets/images/file_download.svg" alt="download file">
           <BsTooltip @title={{t "download_file"}} @delayShow="1000" />
@@ -60,49 +60,49 @@
       {{else}}
         {{#if (and (lte this.getAttributesAmount 2) (gt this.getAttributesAmount 0))}}
           {{#if (is-included @encryptable.usedEncryptedDataAttrs "username")}}
-            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block ml-0 mr-md-2 ml-md-5 mr-lg-2 ml-lg-5 mr-xl-2 ml-xl-2">
+            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block ms-0 me-md-2 ms-md-5 me-lg-2 ms-lg-5 me-xl-2 ms-xl-2">
               <Encryptable::AttributeField @attribute="username" @row={{true}} @encryptable={{@encryptable}}
                                            @visibleByDefault={{false}}/>
             </div>
           {{/if}}
           {{#if (is-included @encryptable.usedEncryptedDataAttrs "password")}}
-            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block mr-0 ml-0 mr-md-2 ml-md-5 mr-lg-2 ml-lg-5 mr-xl-2 ml-xl-2">
+            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block me-0 ms-0 me-md-2 ms-md-5 me-lg-2 ms-lg-5 me-xl-2 ms-xl-2">
               <Encryptable::AttributeField @attribute="password" @row={{true}} @encryptable={{@encryptable}}
                                            @visibleByDefault={{false}}/>
             </div>
           {{/if}}
           {{#if (is-included @encryptable.usedEncryptedDataAttrs "email")}}
-            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block mr-0 ml-0 mr-md-2 ml-md-5 mr-lg-2 ml-lg-5 mr-xl-2 ml-xl-2">
+            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block me-0 ms-0 me-md-2 ms-md-5 me-lg-2 ms-lg-5 me-xl-2 ms-xl-2">
               <Encryptable::AttributeField @attribute="email" @row={{true}} @encryptable={{@encryptable}}
                                            @visibleByDefault={{false}}/>
             </div>
           {{/if}}
           {{#if (is-included @encryptable.usedEncryptedDataAttrs "token")}}
-            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block mr-0 ml-0 mr-md-2 ml-md-5 mr-lg-2 ml-lg-5 mr-xl-2 ml-xl-2">
+            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block me-0 ms-0 me-md-2 ms-md-5 me-lg-2 ms-lg-5 me-xl-2 ms-xl-2">
               <Encryptable::AttributeField @attribute="token" @row={{true}} @encryptable={{@encryptable}}
                                            @visibleByDefault={{false}}/>
             </div>
           {{/if}}
           {{#if (is-included @encryptable.usedEncryptedDataAttrs "pin")}}
-            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block mr-0 ml-0 mr-md-2 ml-md-5 mr-lg-2 ml-lg-5 mr-xl-2 ml-xl-2">
+            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block me-0 ms-0 me-md-2 me-md-5 me-lg-2 ms-lg-5 me-xl-2 ms-xl-2">
               <Encryptable::AttributeField @attribute="pin" @row={{true}} @encryptable={{@encryptable}}
                                            @visibleByDefault={{false}}/>
             </div>
           {{/if}}
           {{#if (is-included @encryptable.usedEncryptedDataAttrs "custom_attr")}}
-            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block mr-0 ml-0 mr-md-2 ml-md-5 mr-lg-2 ml-lg-5 mr-xl-2 ml-xl-2">
+            <div class="encryptable-container d-none d-md-block d-lg-block d-xl-block me-0 ms-0 me-md-2 ms-md-5 me-lg-2 ms-lg-5 me-xl-2 ms-xl-2">
               <Encryptable::AttributeField @attribute="customAttr" @row={{true}} @encryptable={{@encryptable}}
                                            @visibleByDefault={{false}}/>
             </div>
           {{/if}}
         {{else}}
-          <LinkTo class="col-6 underline-hover break-words account-link mt-2 mb-2 ml-2 p-0 d-none d-md-block d-lg-block d-xl-block" @route="encryptables.show"
+          <LinkTo class="col-6 underline-hover break-words account-link mt-2 mb-2 ms-2 p-0 d-none d-md-block d-lg-block d-xl-block" @route="encryptables.show"
                   @model={{@encryptable.id}}>
             {{t "encryptable/credentials.row.clickToSeeAttrs"}}
           </LinkTo>
         {{/if}}
       {{/if}}
-      <div class="col-md-auto d-none d-md-none d-lg-none d-xl-block encryptable-row-icons ml-auto">
+      <div class="col-md-auto d-none d-md-none d-lg-none d-xl-block encryptable-row-icons ms-auto">
         {{#unless this.isTransferredCredentials }}
           <span class="mx-1" role="button" {{on "click" this.toggleEncryptableEdit}}>
             <img class="icon-medium-button d-inline" src="/assets/images/edit.svg" alt="edit">
diff --git a/frontend/app/templates/components/side-nav-bar.hbs b/frontend/app/templates/components/side-nav-bar.hbs
index 94e7ef809..f37c5a3b7 100644
--- a/frontend/app/templates/components/side-nav-bar.hbs
+++ b/frontend/app/templates/components/side-nav-bar.hbs
@@ -28,7 +28,7 @@
                 <a {{on "click" (fn this.setSelectedTeam team)}} role="button" id="side-bar-team-{{team.id}}" class="list-group-item list-group-item-action d-flex justify-content-between align-items-baseline {{if (eq team this.navService.selectedTeam) "bg-blue-three" "bg-blue-one"}}">
                   <div class="d-flex justify-content-between">
                     {{#if team.isPersonalTeam}}
-                      <img class="icon icon-button lh-1 mr-2" src="/assets/images/{{if (eq team this.navService.selectedTeam) "member-white.svg" "member.svg"}}" alt="">
+                      <img class="icon icon-button lh-1 me-2" src="/assets/images/{{if (eq team this.navService.selectedTeam) "member-white.svg" "member.svg"}}" alt="">
                     {{else}}
                       {{#if team.private}}
                         <img class="icon icon-button me-2 " src="/assets/images/{{if (eq team this.navService.selectedTeam) "encrypted_small-white.svg" "encrypted_small.svg"}}" alt="">