diff --git a/application/views/pages/instance/instance_update_page.php b/application/views/pages/instance/instance_update_page.php
index aba1bfd3..07bfcfba 100644
--- a/application/views/pages/instance/instance_update_page.php
+++ b/application/views/pages/instance/instance_update_page.php
@@ -63,7 +63,7 @@
                     </p>
                 </div>
 
-                <div class="well text-left">
+                <div class="well text-start">
                     Error Message: <?= $exception ?>
                 </div>
             <?php endif; ?>
diff --git a/application/views/pages/providers/providers_page.php b/application/views/pages/providers/providers_page.php
index 499fdb9c..80fd9d0e 100755
--- a/application/views/pages/providers/providers_page.php
+++ b/application/views/pages/providers/providers_page.php
@@ -67,7 +67,7 @@
         </div>
 
         <div class="record-details column col-12 col-md-7">
-            <div class="float-md-left mb-4 me-4">
+            <div class="float-md-start mb-4 me-4">
                 <div class="add-edit-delete-group btn-group">
                     <button id="add-provider" class="btn btn-primary">
                         <i class="fas fa-plus-square me-2"></i>
diff --git a/application/views/pages/settings/business_logic/business_logic_page.php b/application/views/pages/settings/business_logic/business_logic_page.php
index ef748155..9d837d07 100755
--- a/application/views/pages/settings/business_logic/business_logic_page.php
+++ b/application/views/pages/settings/business_logic/business_logic_page.php
@@ -74,7 +74,7 @@
                             <tbody><!-- Dynamic Content --></tbody>
                         </table>
 
-                        <div class="text-right">
+                        <div class="text-end">
                             <button class="btn btn-outline-secondary" id="apply-global-working-plan" type="button">
                                 <i class="fas fa-check"></i>
                                 <?= lang('apply_to_all_providers') ?>
diff --git a/application/views/pages/users/users_page.php b/application/views/pages/users/users_page.php
index a6e7d701..b05e3b24 100755
--- a/application/views/pages/users/users_page.php
+++ b/application/views/pages/users/users_page.php
@@ -112,7 +112,7 @@
                 </div>
 
                 <div class="record-details column col-12 col-md-7">
-                    <div class="float-md-left mb-4 me-4">
+                    <div class="float-md-start mb-4 me-4">
                         <div class="add-edit-delete-group btn-group">
                             <button id="add-provider" class="btn btn-primary">
                                 <i class="fas fa-plus-square me-2"></i>
diff --git a/assets/js/backend_calendar_default_view.js b/assets/js/backend_calendar_default_view.js
index db37c495..020f5f9e 100755
--- a/assets/js/backend_calendar_default_view.js
+++ b/assets/js/backend_calendar_default_view.js
@@ -366,18 +366,18 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
             displayEdit =
                 ($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) &&
                 GlobalVariables.user.privileges.appointments.edit === true
-                    ? 'mr-2'
+                    ? 'me-2'
                     : 'd-none';
             displayDelete =
                 ($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) &&
                 GlobalVariables.user.privileges.appointments.delete === true
-                    ? 'mr-2'
+                    ? 'me-2'
                     : 'd-none'; // Same value at the time.
 
             $html = $('<div/>', {
                 'html': [
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.start
                     }),
                     $('<span/>', {
@@ -390,7 +390,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.end
                     }),
                     $('<span/>', {
@@ -416,10 +416,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                         'class': 'd-flex justify-content-center',
                         'html': [
                             $('<button/>', {
-                                'class': 'close-popover btn btn-outline-secondary mr-2',
+                                'class': 'close-popover btn btn-outline-secondary me-2',
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-ban mr-2'
+                                        'class': 'fas fa-ban me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.close
@@ -430,7 +430,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                                 'class': 'delete-popover btn btn-outline-secondary ' + displayDelete,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-trash-alt mr-2'
+                                        'class': 'fas fa-trash-alt me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.delete
@@ -441,7 +441,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                                 'class': 'edit-popover btn btn-primary ' + displayEdit,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-edit mr-2'
+                                        'class': 'fas fa-edit me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.edit
@@ -460,13 +460,13 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
             displayDelete =
                 ($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) &&
                 GlobalVariables.user.privileges.appointments.delete === true
-                    ? 'mr-2'
+                    ? 'me-2'
                     : 'd-none'; // Same value at the time.
 
             $html = $('<div/>', {
                 'html': [
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.provider
                     }),
                     $('<span/>', {
@@ -475,7 +475,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.start
                     }),
                     $('<span/>', {
@@ -488,7 +488,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.end
                     }),
                     $('<span/>', {
@@ -501,7 +501,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.timezone
                     }),
                     $('<span/>', {
@@ -515,10 +515,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                         'class': 'd-flex justify-content-between',
                         'html': [
                             $('<button/>', {
-                                'class': 'close-popover btn btn-outline-secondary mr-2',
+                                'class': 'close-popover btn btn-outline-secondary me-2',
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-ban mr-2'
+                                        'class': 'fas fa-ban me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.close
@@ -529,7 +529,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                                 'class': 'delete-popover btn btn-outline-secondary ' + displayDelete,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-trash-alt mr-2'
+                                        'class': 'fas fa-trash-alt me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.delete
@@ -540,7 +540,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                                 'class': 'edit-popover btn btn-primary ' + displayEdit,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-edit mr-2'
+                                        'class': 'fas fa-edit me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.edit
@@ -552,13 +552,13 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                 ]
             });
         } else {
-            displayEdit = GlobalVariables.user.privileges.appointments.edit === true ? 'mr-2' : 'd-none';
-            displayDelete = GlobalVariables.user.privileges.appointments.delete === true ? 'mr-2' : 'd-none';
+            displayEdit = GlobalVariables.user.privileges.appointments.edit === true ? 'me-2' : 'd-none';
+            displayDelete = GlobalVariables.user.privileges.appointments.delete === true ? 'me-2' : 'd-none';
 
             $html = $('<div/>', {
                 'html': [
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.start
                     }),
                     $('<span/>', {
@@ -571,7 +571,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.end
                     }),
                     $('<span/>', {
@@ -584,7 +584,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.timezone
                     }),
                     $('<span/>', {
@@ -593,7 +593,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.service
                     }),
                     $('<span/>', {
@@ -602,7 +602,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.provider
                     }),
                     GeneralFunctions.renderMapIcon(event.data.provider),
@@ -612,34 +612,34 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.customer
                     }),
                     GeneralFunctions.renderMapIcon(event.data.customer),
                     $('<span/>', {
-                        'class': 'd-inline-block ml-1',
+                        'class': 'd-inline-block ms-1',
                         'text': event.data.customer.first_name + ' ' + event.data.customer.last_name
                     }),
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.email
                     }),
                     GeneralFunctions.renderMailIcon(event.data.customer.email),
                     $('<span/>', {
-                        'class': 'd-inline-block ml-1',
+                        'class': 'd-inline-block ms-1',
                         'text': event.data.customer.email
                     }),
                     $('<br/>'),
 
                     $('<strong/>', {
-                        'class': 'd-inline-block mr-2',
+                        'class': 'd-inline-block me-2',
                         'text': EALang.phone
                     }),
                     GeneralFunctions.renderPhoneIcon(event.data.customer.phone_number),
                     $('<span/>', {
-                        'class': 'd-inline-block ml-1',
+                        'class': 'd-inline-block ms-1',
                         'text': event.data.customer.phone_number
                     }),
                     $('<br/>'),
@@ -658,10 +658,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                         'class': 'd-flex justify-content-center',
                         'html': [
                             $('<button/>', {
-                                'class': 'close-popover btn btn-outline-secondary mr-2',
+                                'class': 'close-popover btn btn-outline-secondary me-2',
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-ban mr-2'
+                                        'class': 'fas fa-ban me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.close
@@ -672,7 +672,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                                 'class': 'delete-popover btn btn-outline-secondary ' + displayDelete,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-trash-alt mr-2'
+                                        'class': 'fas fa-trash-alt me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.delete
@@ -683,7 +683,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                                 'class': 'edit-popover btn btn-primary ' + displayEdit,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-edit mr-2'
+                                        'class': 'fas fa-edit me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.edit
diff --git a/assets/js/backend_calendar_table_view.js b/assets/js/backend_calendar_table_view.js
index 9ff9bf7f..5f6dad86 100755
--- a/assets/js/backend_calendar_table_view.js
+++ b/assets/js/backend_calendar_table_view.js
@@ -349,7 +349,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
         }).appendTo('#calendar');
 
         $('<button/>', {
-            'class': 'btn btn-xs btn-outline-secondary previous mr-2',
+            'class': 'btn btn-xs btn-outline-secondary previous me-2',
             'html': [
                 $('<span/>', {
                     'class': 'fas fa-chevron-left'
@@ -359,7 +359,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
 
         $('<input/>', {
             'type': 'text',
-            'class': 'form-control d-inline-block select-date mr-2',
+            'class': 'form-control d-inline-block select-date me-2',
             'value': GeneralFunctions.formatDate(new Date(), GlobalVariables.dateFormat, false)
         }).appendTo($calendarHeader);
 
@@ -1190,10 +1190,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                         'class': 'd-flex justify-content-center',
                         'html': [
                             $('<button/>', {
-                                'class': 'close-popover btn btn-outline-secondary mr-2',
+                                'class': 'close-popover btn btn-outline-secondary me-2',
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-ban mr-2'
+                                        'class': 'fas fa-ban me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.close
@@ -1201,10 +1201,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                                 ]
                             }),
                             $('<button/>', {
-                                'class': 'delete-popover btn btn-outline-secondary mr-2 ' + displayDelete,
+                                'class': 'delete-popover btn btn-outline-secondary me-2 ' + displayDelete,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-trash-alt mr-2'
+                                        'class': 'fas fa-trash-alt me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.delete
@@ -1215,7 +1215,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                                 'class': 'edit-popover btn btn-primary ' + displayEdit,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-edit mr-2'
+                                        'class': 'fas fa-edit me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.edit
@@ -1291,10 +1291,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                         'class': 'd-flex justify-content-center',
                         'html': [
                             $('<button/>', {
-                                'class': 'close-popover btn btn-outline-secondary mr-2',
+                                'class': 'close-popover btn btn-outline-secondary me-2',
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-ban mr-2'
+                                        'class': 'fas fa-ban me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.close
@@ -1302,10 +1302,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                                 ]
                             }),
                             $('<button/>', {
-                                'class': 'delete-popover btn btn-outline-secondary mr-2 ' + displayDelete,
+                                'class': 'delete-popover btn btn-outline-secondary me-2 ' + displayDelete,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-trash-alt mr-2'
+                                        'class': 'fas fa-trash-alt me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.delete
@@ -1316,7 +1316,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                                 'class': 'edit-popover btn btn-primary ' + displayEdit,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-edit mr-2'
+                                        'class': 'fas fa-edit me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.edit
@@ -1423,10 +1423,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                         'class': 'd-flex justify-content-center',
                         'html': [
                             $('<button/>', {
-                                'class': 'close-popover btn btn-outline-secondary mr-2',
+                                'class': 'close-popover btn btn-outline-secondary me-2',
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-ban mr-2'
+                                        'class': 'fas fa-ban me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.close
@@ -1434,10 +1434,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                                 ]
                             }),
                             $('<button/>', {
-                                'class': 'delete-popover btn btn-outline-secondary mr-2 ' + displayDelete,
+                                'class': 'delete-popover btn btn-outline-secondary me-2 ' + displayDelete,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-trash-alt mr-2'
+                                        'class': 'fas fa-trash-alt me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.delete
@@ -1448,7 +1448,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
                                 'class': 'edit-popover btn btn-primary ' + displayEdit,
                                 'html': [
                                     $('<i/>', {
-                                        'class': 'fas fa-edit mr-2'
+                                        'class': 'fas fa-edit me-2'
                                     }),
                                     $('<span/>', {
                                         'text': EALang.edit
diff --git a/assets/js/backend_customers_helper.js b/assets/js/backend_customers_helper.js
index fb130a46..92235489 100644
--- a/assets/js/backend_customers_helper.js
+++ b/assets/js/backend_customers_helper.js
@@ -326,7 +326,7 @@
                         'href': GlobalVariables.baseUrl + '/index.php/backend/index/' + appointment.hash,
                         'html': [
                             $('<i/>', {
-                                'class': 'fas fa-edit mr-1'
+                                'class': 'fas fa-edit me-1'
                             }),
                             $('<strong/>', {
                                 'text':
diff --git a/assets/js/working_plan_exceptions_modal.js b/assets/js/working_plan_exceptions_modal.js
index 07dcfaf6..8f3533b5 100644
--- a/assets/js/working_plan_exceptions_modal.js
+++ b/assets/js/working_plan_exceptions_modal.js
@@ -180,7 +180,7 @@ $(function () {
                     'html': [
                         $('<button/>', {
                             'type': 'button',
-                            'class': 'btn btn-outline-secondary btn-sm mr-2 working-plan-exceptions-edit-break',
+                            'class': 'btn btn-outline-secondary btn-sm me-2 working-plan-exceptions-edit-break',
                             'title': EALang.edit,
                             'html': [
                                 $('<span/>', {
@@ -200,7 +200,7 @@ $(function () {
                         }),
                         $('<button/>', {
                             'type': 'button',
-                            'class': 'btn btn-outline-secondary btn-sm mr-2 working-plan-exceptions-save-break d-none',
+                            'class': 'btn btn-outline-secondary btn-sm me-2 working-plan-exceptions-save-break d-none',
                             'title': EALang.save,
                             'html': [
                                 $('<span/>', {