diff --git a/app/javascript/styles/lines.scss b/app/javascript/styles/lines.scss
index a80cc7439..c108a1202 100644
--- a/app/javascript/styles/lines.scss
+++ b/app/javascript/styles/lines.scss
@@ -16,6 +16,6 @@
   }
 
   .form-check-label {
-    @extend .ml-8;
+    @extend .ms-8;
   }
 }
diff --git a/app/views/accountants/_search_form.html.erb b/app/views/accountants/_search_form.html.erb
index 64d500e8c..4acbb4007 100644
--- a/app/views/accountants/_search_form.html.erb
+++ b/app/views/accountants/_search_form.html.erb
@@ -17,7 +17,7 @@
                  include_blank: t('accountants.search_all_clinics'),
                  class: 'search_form_input accountant' %>
 
-    <%= f.button title: t('common.search'), class: 'btn btn-primary ml-4' do %>
+    <%= f.button title: t('common.search'), class: 'btn btn-primary ms-4' do %>
       <i class="fas fa-search"></i>
     <% end %>
   <% end %>
diff --git a/app/views/accountants/index.html.erb b/app/views/accountants/index.html.erb
index 7fc9cfd93..c6dbd5ff6 100644
--- a/app/views/accountants/index.html.erb
+++ b/app/views/accountants/index.html.erb
@@ -5,7 +5,7 @@
 <h1 class='border-bottom title'>
   <%= t 'accountants.title' %>
 
-  <div id="accountants-pagination" class="float-right">
+  <div id="accountants-pagination" class="float-start">
     <small>
       <span class='pagination-entries'>
         <%= page_entries_info @patients, entry_name: t('common.patient').downcase %>
diff --git a/app/views/clinicfinders/_search_form.html.erb b/app/views/clinicfinders/_search_form.html.erb
index e78d9d9bb..db938e01f 100644
--- a/app/views/clinicfinders/_search_form.html.erb
+++ b/app/views/clinicfinders/_search_form.html.erb
@@ -3,7 +3,7 @@
     <h4 class="clinic-finder-expand patient-section-title">
       <%= t('clinic_locator.title') %>
       <small><%= t('clinic_locator.experimental_note') %></small>
-      <i class='fas fa-plus-circle float-right'></i>
+      <i class='fas fa-plus-circle float-end'></i>
     </h4>
   </div>
 
diff --git a/app/views/dashboards/_search_form.html.erb b/app/views/dashboards/_search_form.html.erb
index ff8c155e1..02bf24321 100644
--- a/app/views/dashboards/_search_form.html.erb
+++ b/app/views/dashboards/_search_form.html.erb
@@ -10,7 +10,7 @@
                      placeholder: t('dashboard.search.input_placeholder'),
                      hide_label: true,
                      class: 'search_form_input' %>
-    <%= p.button class: 'btn btn-primary ml-5',
+    <%= p.button class: 'btn btn-primary ms-5',
                  title: t('common.search'),
                  aria: { label: t('common.search') } do %>
       <i class="fas fa-search"></i>
diff --git a/app/views/dashboards/_table_content.html.erb b/app/views/dashboards/_table_content.html.erb
index 6e586b21a..36c0435f9 100644
--- a/app/views/dashboards/_table_content.html.erb
+++ b/app/views/dashboards/_table_content.html.erb
@@ -91,7 +91,7 @@
   <% if table_type == 'call_list' && current_user.call_list_entries.count.nonzero? %>
     <%= link_to t('dashboard.table_content.clear_call_list'),
                 clear_current_user_call_list_path,
-                class: "float-right text-danger",
+                class: "float-end text-danger",
                 data: { confirm: t('dashboard.table_content.clear_call_list_confirm') },
                 method: :patch,
                 remote: true %>
diff --git a/app/views/patients/_call_log.html.erb b/app/views/patients/_call_log.html.erb
index c0d76b7ee..3e21a134b 100644
--- a/app/views/patients/_call_log.html.erb
+++ b/app/views/patients/_call_log.html.erb
@@ -1,7 +1,7 @@
 <div id="call_log_content">
   <h2 class="mt-5">
     <%= t('patient.call_log.title') %>
-    <small class="float-right"> 
+    <small class="float-end">
       <%= link_to t('patient.call_log.record_new_call'),
                   new_patient_call_path(@patient),
                   class: "call_button call-#{@patient.primary_phone_display}",
diff --git a/app/views/patients/_notes.html.erb b/app/views/patients/_notes.html.erb
index 596b0f345..b1e7d5fda 100644
--- a/app/views/patients/_notes.html.erb
+++ b/app/views/patients/_notes.html.erb
@@ -19,7 +19,7 @@
   <% end %>
 
       <%= bootstrap_form_with model: patient,
-                              html: { id: 'urgents-form', class: 'text-right text-danger edit_patient' },
+                              html: { id: 'urgents-form', class: 'text-end text-danger edit_patient' },
                               local: false do |f| %>
         <div class="col">
           <%= f.form_group :urgent_flag do %>
diff --git a/app/views/patients/_patient_information.html.erb b/app/views/patients/_patient_information.html.erb
index 01a5b18b9..3450be6ab 100644
--- a/app/views/patients/_patient_information.html.erb
+++ b/app/views/patients/_patient_information.html.erb
@@ -93,7 +93,7 @@
                      autocomplete: 'off' %>
 
         <fieldset>
-          <legend class="font-weight-bold" id="special_circumstances_label">
+          <legend class="fw-bold" id="special_circumstances_label">
             <%= t 'patient.information.special_circumstances.title' %>
           </legend>
 
diff --git a/app/views/patients/_pledge.html.erb b/app/views/patients/_pledge.html.erb
index e5dbd0d79..e5f60b756 100644
--- a/app/views/patients/_pledge.html.erb
+++ b/app/views/patients/_pledge.html.erb
@@ -65,7 +65,7 @@
 
   <div class="modal-footer">
     <div class="col">
-      <button type="button" class="btn btn-outline-secondary js-btn-step float-left" style="color:red;" data-dismiss="modal"><%= t('common.no') %></button>
+      <button type="button" class="btn btn-outline-secondary js-btn-step float-start" style="color:red;" data-dismiss="modal"><%= t('common.no') %></button>
     </div>
 
     <div class="col">
@@ -75,7 +75,7 @@
                               method: 'patch',
                               class: 'edit_patient' do |f| %>
         <%= f.hidden_field :pledge_sent, value: false %>
-        <%= f.submit t('common.yes'), class: "btn btn-success js-btn-step float-right", id: 'cancel-pledge-submit'%>
+        <%= f.submit t('common.yes'), class: "btn btn-success js-btn-step float-end", id: 'cancel-pledge-submit'%>
       <% end %>
     </div>
   </div>
diff --git a/app/views/patients/data_entry.html.erb b/app/views/patients/data_entry.html.erb
index a5ff592a4..d8e0aa7e4 100644
--- a/app/views/patients/data_entry.html.erb
+++ b/app/views/patients/data_entry.html.erb
@@ -142,7 +142,7 @@
   <%= f.check_box :resolved_without_fund, label: t('patient.status.key.resolved', fund: current_tenant.name) %>
 
   <fieldset class="mt-5">
-    <legend class="font-weight-bold" id="special_circumstances_label">
+    <legend class="fw-bold" id="special_circumstances_label">
       <%= t 'patient.information.special_circumstances.title' %>    
     </legend>
 
diff --git a/app/views/users/_search_form.html.erb b/app/views/users/_search_form.html.erb
index 49e0eee86..f23966fe8 100644
--- a/app/views/users/_search_form.html.erb
+++ b/app/views/users/_search_form.html.erb
@@ -1,7 +1,7 @@
 <%= bootstrap_form_with url: users_search_path,
                         local: false,
                         layout: :inline,
-                        html: { class: 'float-right' } do |p| %>
+                        html: { class: 'float-end' } do |p| %>
   <%= p.text_field :search,
                    placeholder: t('user.search.text_field'),
                    skip_label: true,
@@ -9,5 +9,5 @@
                    class: 'search_form_input' %>
   <%= p.submit t('user.search.button'),
                id: 'search_button',
-               class: 'btn btn-primary ml-2' %>
+               class: 'btn btn-primary ms-2' %>
 <% end %>