diff --git a/administrator/templates/atum/scss/template-rtl.scss b/administrator/templates/atum/scss/template-rtl.scss
index 0920831428c02..845d8f8e9c2c5 100644
--- a/administrator/templates/atum/scss/template-rtl.scss
+++ b/administrator/templates/atum/scss/template-rtl.scss
@@ -1,4 +1,5 @@
 @import "template";
+@import "vendor/bootstrap/bootstrap-rtl";
 
 // Global
 dl,
@@ -7,10 +8,6 @@ ul {
   padding-right: 0;
 }
 
-.close {
-  float: left;
-}
-
 .dropdown-menu-end {
 
   &::after {
@@ -106,26 +103,6 @@ ul {
   }
 }
 
-.ms-auto {
-  margin-right: auto !important;
-  margin-left: 0 !important;
-}
-
-.me-auto {
-  margin-right: 0 !important;
-  margin-left: auto !important;
-}
-
-.ms-2 {
-  margin-right: .5rem;
-  margin-left: 0 !important;
-}
-
-.me-2 {
-  margin-right: 0 !important;
-  margin-left: .5rem;
-}
-
 .field-calendar {
   float: none;
 }
@@ -138,15 +115,6 @@ ul {
   float: none;
 }
 
-// Bootstrap overrides
-.text-start {
-  text-align: right !important;
-}
-
-.text-end {
-  text-align: left !important;
-}
-
 // System panel
 .menu-quicktask,
 .menu-badge {
@@ -211,9 +179,3 @@ ul {
 .btn-group > .btn-group:not(:first-child) {
   @include border-end-radius(0);
 }
-
-.modal-header {
-  .btn-close {
-    margin: -.5rem auto -.5rem -.5rem;
-  }
-}
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_bootstrap-rtl.scss b/administrator/templates/atum/scss/vendor/bootstrap/_bootstrap-rtl.scss
new file mode 100644
index 0000000000000..574d3b71d019a
--- /dev/null
+++ b/administrator/templates/atum/scss/vendor/bootstrap/_bootstrap-rtl.scss
@@ -0,0 +1,144 @@
+// Bootstrap rtl overrides
+
+.float-start {
+  float: right !important;
+}
+
+.float-end {
+  float: left !important;
+}
+
+.modal-header {
+  .btn-close {
+    margin: -.5rem auto -.5rem -.5rem;
+  }
+}
+
+.text-start {
+  text-align: right !important;
+}
+
+.text-end {
+  text-align: left !important;
+}
+
+.me-0 {
+  margin-right: auto !important;
+  margin-left: 0 !important;
+}
+
+.me-1 {
+  margin-right: auto !important;
+  margin-left: .25rem !important;
+}
+
+.me-2 {
+  margin-right: auto !important;
+  margin-left: .5rem !important;
+}
+
+.me-3 {
+  margin-right: auto !important;
+  margin-left: 1rem !important;
+}
+
+.me-4 {
+  margin-right: auto !important;
+  margin-left: 1.5rem !important;
+}
+
+.me-5 {
+  margin-right: auto !important;
+  margin-left: 3rem !important;
+}
+
+.me-auto {
+  margin-right: 0 !important;
+  margin-left: auto !important;
+}
+
+.ms-0 {
+  margin-right: 0 !important;
+  margin-left: auto !important;
+}
+
+.ms-1 {
+  margin-right: .25rem !important;
+  margin-left: auto !important;
+}
+
+.ms-2 {
+  margin-right: .5rem !important;
+  margin-left: auto !important;
+}
+
+.ms-3 {
+  margin-right: 1rem !important;
+  margin-left: auto !important;
+}
+
+.ms-4 {
+  margin-right: 1.5rem !important;
+  margin-left: auto !important;
+}
+
+.ms-5 {
+  margin-right: 3rem !important;
+  margin-left: auto !important;
+}
+
+.ms-auto {
+  margin-right: 0 !important;
+  margin-left: auto !important;
+}
+
+.pe-0 {
+  padding-right: 0 !important;
+  padding-left: 0 !important;
+}
+.pe-1 {
+  padding-right: 0 !important;
+  padding-left: .25rem !important;
+}
+.pe-2 {
+  padding-right: 0 !important;
+  padding-left: .5rem !important;
+}
+.pe-3 {
+  padding-right: 0 !important;
+  padding-left: 1rem !important;
+}
+.pe-4 {
+  padding-right: 0 !important;
+  padding-left: 1.5rem !important;
+}
+.pe-5 {
+  padding-right: 0 !important;
+  padding-left: 3rem !important;
+}
+
+.ps-0 {
+  padding-right: 0 !important;
+  padding-left: 0 !important;
+}
+.ps-1 {
+  padding-right: .25rem !important;
+  padding-left: 0 !important;
+}
+.ps-2 {
+  padding-right: .5rem !important;
+  padding-left: 0 !important;
+}
+.ps-3 {
+  padding-right: 1rem !important;
+  padding-left: 0 !important;
+}
+.ps-4 {
+  padding-right: 1.5rem !important;
+  padding-left: 0 !important;
+}
+.ps-5 {
+  padding-right: 3rem !important;
+  padding-left: 0 !important;
+}
+