diff --git a/app/views/admin/announcements/index.html.haml b/app/views/admin/announcements/index.html.haml
index 5d573fca4..9e4aeb763 100644
--- a/app/views/admin/announcements/index.html.haml
+++ b/app/views/admin/announcements/index.html.haml
@@ -19,7 +19,7 @@
       .col
         .d-flex.align-items-start
           = image_tag(announcement.created_by.avatar(25), alt: announcement.created_by.full_name)
-          %p.ml-2.mb-0= announcement.created_by.full_name
+          %p.ms-2.mb-0= announcement.created_by.full_name
       .col-4
         = dot_markdown(announcement.message)
       .col
diff --git a/app/views/admin/bans/new.html.haml b/app/views/admin/bans/new.html.haml
index 5431dac5c..8368200cc 100644
--- a/app/views/admin/bans/new.html.haml
+++ b/app/views/admin/bans/new.html.haml
@@ -2,7 +2,7 @@
   .row.mb-4
     .col
       %nav{'aria-label': 'breadcrumb'}
-        %ol.breadcrumb.ml-0
+        %ol.breadcrumb.ms-0
           %li.breadcrumb-item= link_to @member.full_name, admin_member_path(@member)
           %li.breadcrumb-item.active=t('.title')
 
diff --git a/app/views/admin/chapters/show.html.haml b/app/views/admin/chapters/show.html.haml
index 537abf6bf..bf2b90eb4 100644
--- a/app/views/admin/chapters/show.html.haml
+++ b/app/views/admin/chapters/show.html.haml
@@ -13,7 +13,7 @@
       .card.border-info.mb-4
         .card-body
           %h3 Organisers
-          %ul.list-unstyled.ml-0
+          %ul.list-unstyled.ms-0
             - @chapter.organisers.each do |organiser|
               %li
                 = organiser.full_name
@@ -23,7 +23,7 @@
                   %span.badge.bg-warning.text-dark Phone no. not set
           - if current_user.is_admin?
             = link_to 'Edit organisers', admin_chapter_organisers_path(@chapter), class: 'btn btn-primary btn-sm'
-      %ul.nav.flex-column.ml-0.mb-4
+      %ul.nav.flex-column.ms-0.mb-4
         - @groups.each do |group|
           %li.nav-item
             = link_to [ :admin, group ], class: 'nav-link' do
@@ -42,7 +42,7 @@
           %h3 Upcoming Workshops
           = link_to 'New workshop', new_admin_workshop_path, class: 'btn btn-primary btn-sm'
         - if @workshops.any?
-          %ul.list-unstyled.ml-0.mb-0
+          %ul.list-unstyled.ms-0.mb-0
             - @workshops.each do |workshop|
               %li.py-2
                 = link_to admin_workshop_path(workshop) do
diff --git a/app/views/admin/contacts/index.html.haml b/app/views/admin/contacts/index.html.haml
index fe5427488..c435a6787 100644
--- a/app/views/admin/contacts/index.html.haml
+++ b/app/views/admin/contacts/index.html.haml
@@ -2,7 +2,7 @@
   .row.mb-4
     .col
       %nav{'aria-label': 'breadcrumb'}
-        %ol.breadcrumb.ml-0
+        %ol.breadcrumb.ms-0
           %li.breadcrumb-item= link_to t('admin.shared.sponsors'), admin_sponsors_path
           %li.breadcrumb-item.active Contacts
 
diff --git a/app/views/admin/events/_attendances.html.haml b/app/views/admin/events/_attendances.html.haml
index 2a0c84aa4..1509b035d 100644
--- a/app/views/admin/events/_attendances.html.haml
+++ b/app/views/admin/events/_attendances.html.haml
@@ -1,4 +1,4 @@
-%ul.list-unstyled.ml-0
+%ul.list-unstyled.ms-0
   - invitations.each do |invitation|
     %li
       .row
diff --git a/app/views/admin/events/_invitation_management.html.haml b/app/views/admin/events/_invitation_management.html.haml
index 3957442a8..3fced484c 100644
--- a/app/views/admin/events/_invitation_management.html.haml
+++ b/app/views/admin/events/_invitation_management.html.haml
@@ -17,7 +17,7 @@
 -#                 data: { placeholder: t('messages.invitations.select_a_member_to_rsvp') } }
 -#       = f.hidden_field :event_id, value: @event.id
 -#     .col-auto
--#       = f.button :button, 'Add', class: 'btn btn-sm btn-primary mb-0 mr-2'
+-#       = f.button :button, 'Add', class: 'btn btn-sm btn-primary mb-0 me-2'
 -#       %span{ "data-tooltip" => true, "aria-haspopup" => "true", class: "has-tip", title: t('admin.workshop.manage_rsvps.text') }
 -#         %i.fas.fa-info-circle
 
diff --git a/app/views/admin/events/show.html.haml b/app/views/admin/events/show.html.haml
index a79c23409..ff4adfbbc 100644
--- a/app/views/admin/events/show.html.haml
+++ b/app/views/admin/events/show.html.haml
@@ -44,28 +44,28 @@
       - if @event.sponsors?
         - if @event.sponsors?(:standard)
           %h5 Standard
-          %ul.list-unstyled.ml-0
+          %ul.list-unstyled.ms-0
             - @event.sponsors.each do |sponsor|
               %li
                 %span
                   = link_to sponsor.name, [:admin, sponsor]
         - if @event.sponsors?(:bronze)
           %h5 Bronze
-          %ul.list-unstyled.ml-0
+          %ul.list-unstyled.ms-0
             - @event.bronze_sponsors.each do |sponsor|
               %li
                 %span
                   = link_to sponsor.name, [:admin, sponsor]
         - if @event.sponsors?(:silver)
           %h5 Silver
-          %ul.list-unstyled.ml-0
+          %ul.list-unstyled.ms-0
             - @event.silver_sponsors.each do |sponsor|
               %li
                 %span
                   = link_to sponsor.name, [:admin, sponsor]
         - if @event.sponsors?(:gold)
           %h5 Gold
-          %ul.list-unstyled.ml-0
+          %ul.list-unstyled.ms-0
             - @event.gold_sponsors.each do |sponsor|
               %li
                 %span
@@ -83,7 +83,7 @@
     .col-12.col-md-6.col-lg-3.mb-4
       %h4 Chapters
       - if @event.chapters.any?
-        %ul.list-inline.ml-0
+        %ul.list-inline.ms-0
           - @event.chapters.each do |chapter|
             %li.list-inline-item= link_to chapter.name, [:admin, chapter]
       - else
diff --git a/app/views/admin/feedback/index.html.haml b/app/views/admin/feedback/index.html.haml
index 488b839d5..df9e6e7a8 100644
--- a/app/views/admin/feedback/index.html.haml
+++ b/app/views/admin/feedback/index.html.haml
@@ -15,7 +15,7 @@
                 .d-block.pr-4
                   = image_tag(feedback.coach.avatar(24), class: 'rounded-circle', alt: feedback.coach.full_name)
                   %small= feedback.coach.full_name
-              .d-block.text-warning.ml-auto
+              .d-block.text-warning.ms-auto
                 - (0...feedback.rating).each do |rating|
                   %i.fas.fa-star
             .card-body
diff --git a/app/views/admin/meetings/_form.html.haml b/app/views/admin/meetings/_form.html.haml
index a9630ce8b..2da3dd6d2 100644
--- a/app/views/admin/meetings/_form.html.haml
+++ b/app/views/admin/meetings/_form.html.haml
@@ -21,6 +21,6 @@
     .col-12
       = f.input :chapters, collection: Chapter.all, label_method: :name, value_method: :id, selected: @meeting.chapters.map(&:id), input_html: { multiple: true }
     .col-12
-      = f.input :invitable, as: :boolean, hint: 'Allow members to RSVP', hint_html: { class: 'ml-1' }
+      = f.input :invitable, as: :boolean, hint: 'Allow members to RSVP', hint_html: { class: 'ms-1' }
     .text-right
       = f.button :button, 'Save', class: 'btn btn-primary'
diff --git a/app/views/admin/meetings/_invitation_management.html.haml b/app/views/admin/meetings/_invitation_management.html.haml
index e9bc58372..5b2bd6255 100644
--- a/app/views/admin/meetings/_invitation_management.html.haml
+++ b/app/views/admin/meetings/_invitation_management.html.haml
@@ -14,7 +14,7 @@
                   data: { placeholder: t('messages.invitations.select_a_member_to_rsvp') } }
       = f.hidden_field :meeting_id, value: @meeting.slug
     .col
-      = f.button :button, 'Add', class: 'btn btn-sm btn-primary mb-0 mr-2'
+      = f.button :button, 'Add', class: 'btn btn-sm btn-primary mb-0 me-2'
       %span{'data-bs-toggle': 'tooltip', 'data-bs-placement': 'bottom', title: t('admin.workshop.manage_rsvps.text')}
         %i.fas.fa-info-circle
 
diff --git a/app/views/admin/members/_actions.html.haml b/app/views/admin/members/_actions.html.haml
index 397327a19..924a58094 100644
--- a/app/views/admin/members/_actions.html.haml
+++ b/app/views/admin/members/_actions.html.haml
@@ -1,20 +1,20 @@
 .container-fluid.p-0
   .btn-group.d-flex
     = link_to '#', class: 'btn btn-primary d-block py-4 rounded-0', 'data-bs-toggle': 'modal', 'data-bs-target': "#note-modal" do
-      %i.fas.fa-pencil-alt.mr-2
+      %i.fas.fa-pencil-alt.me-2
       Add note
     = link_to admin_member_send_eligibility_email_path(@member), data: {confirm: "Clicking OK will send an automated email to this user now to verify their eligibility for codebar. This cannot be undone. Are you sure?"}, class: 'btn btn-primary d-block py-4' do
-      %i.fas.fa-paper-plane.mr-2
+      %i.fas.fa-paper-plane.me-2
       Send eligibility inquiry
     - if @member.attendance_warnings.empty?
       = link_to admin_member_send_attendance_email_path(@member), data: {confirm: "Clicking OK will send an automated email to this user now to warn them about missing too many workshops. This cannot be undone. Are you sure?"}, class: 'btn btn-primary d-block py-4' do
-        %i.far.fa-clock.mr-2
+        %i.far.fa-clock.me-2
         Send attendance warning
     - else
       = link_to admin_member_send_attendance_email_path(@member), data: {confirm: "#{@member.name} has already received a warning about missing too many workshops on #{@member.attendance_warnings.last.created_at.strftime("%Y-%m-%d at %H:%M")}. Are you sure you want to proceed with sending another one?"}, class: 'btn btn-primary d-block py-4' do
-        %i.far.fa-clock.mr-2
+        %i.far.fa-clock.me-2
         Send attendance warning
     = link_to new_admin_member_ban_path(@member), class: 'btn btn-primary d-block py-4 rounded-0' do
-      %i.fas.fa-ban.warning.mr-2
+      %i.fas.fa-ban.warning.me-2
       Suspend
   = render 'note'
diff --git a/app/views/admin/members/_profile.html.haml b/app/views/admin/members/_profile.html.haml
index c1ae97f74..bd4e7f583 100644
--- a/app/views/admin/members/_profile.html.haml
+++ b/app/views/admin/members/_profile.html.haml
@@ -15,7 +15,7 @@
   - if @workshop_attendances.positive? || @meeting_rsvps.positive? || @event_rsvps.positive?
     .attendance-summary.mt-4
       %h5 Attendance summary
-      %ul.list-unstyled.ml-0
+      %ul.list-unstyled.ms-0
         - if @workshop_attendances.positive?
           %li
             .badge.rounded-pill.bg-secondary
@@ -36,7 +36,7 @@
 
   - if @member.groups.any?
     %h5 Groups
-    %ul.list-unstyled.ml-0#subscriptions
+    %ul.list-unstyled.ms-0#subscriptions
       - @member.groups.each do |group|
         %li
           = link_to [:admin, group] do
diff --git a/app/views/admin/sponsors/_contact_fields.html.haml b/app/views/admin/sponsors/_contact_fields.html.haml
index dc88e2564..6961fac3e 100644
--- a/app/views/admin/sponsors/_contact_fields.html.haml
+++ b/app/views/admin/sponsors/_contact_fields.html.haml
@@ -5,4 +5,4 @@
     = f.input :name
     = f.input :surname
     = f.input :email
-    = f.input :mailing_list_consent, as: :boolean, hint_html: { class: 'd-block ml-1' }
+    = f.input :mailing_list_consent, as: :boolean, hint_html: { class: 'd-block ms-1' }
diff --git a/app/views/admin/sponsors/index.html.haml b/app/views/admin/sponsors/index.html.haml
index 29ae551c6..9f02b1354 100644
--- a/app/views/admin/sponsors/index.html.haml
+++ b/app/views/admin/sponsors/index.html.haml
@@ -2,7 +2,7 @@
   .row.mb-4
     .col-12
       %nav{'aria-label': 'breadcrumb'}
-        %ol.breadcrumb.ml-0
+        %ol.breadcrumb.ms-0
           %li.breadcrumb-item.active= t('admin.shared.sponsors')
 
     .col-12
diff --git a/app/views/admin/sponsors/show.html.haml b/app/views/admin/sponsors/show.html.haml
index 70495ac3a..ce7701b5c 100644
--- a/app/views/admin/sponsors/show.html.haml
+++ b/app/views/admin/sponsors/show.html.haml
@@ -2,7 +2,7 @@
   .row.mb-4
     .col
       %nav{'aria-label': 'breadcrumb'}
-        %ol.breadcrumb.ml-0
+        %ol.breadcrumb.ms-0
           %li.breadcrumb-item= link_to t('admin.shared.sponsors'), admin_sponsors_path
           %li.breadcrumb-item.active= @sponsor.name
 
@@ -53,7 +53,7 @@
 
           %dt.mb-0= t('.contacts')
           %dd
-            %ul.list-unstyled.ml-0.mb-0#contacts
+            %ul.list-unstyled.ms-0.mb-0#contacts
               - @sponsor.contacts.each do |contact|
                 %li.mt-1
                   = mail_to(contact.email, contact.full_name)
@@ -77,7 +77,7 @@
             - if @sponsor.workshops.any?
               .col
                 %strong= t('admin.shared.workshops')
-                %ul.list-unstyled.ml-0
+                %ul.list-unstyled.ms-0
                   - @sponsor.workshop_sponsors.each do |ws|
                     %li
                       = link_to admin_workshop_path(ws.workshop) do
@@ -86,7 +86,7 @@
             - if @sponsor.event_sponsorships.any?
               .col
                 %strong= t('admin.shared.events')
-                %ul.list-unstyled.ml-0
+                %ul.list-unstyled.ms-0
                   - @sponsor.event_sponsorships.each do |sponsorship|
                     %li
                       = link_to admin_event_path(sponsorship.event) do
@@ -97,7 +97,7 @@
             - if @sponsor.meetings.any?
               .col
                 %strong= t('admin.shared.meetings')
-                %ul.list-unstyled.ml-0
+                %ul.list-unstyled.ms-0
                   - @sponsor.meetings.each do |meeting|
                     %li
                       = link_to admin_meeting_path(meeting) do
@@ -106,5 +106,5 @@
 
       #activities
         %h2.h3.mb-3= t('.activities')
-        %ul.list-unstyled.ml-0
+        %ul.list-unstyled.ms-0
           = render_activities @sponsor.activities
diff --git a/app/views/admin/workshops/_edit_form.html.haml b/app/views/admin/workshops/_edit_form.html.haml
index b382d157b..44578c34d 100644
--- a/app/views/admin/workshops/_edit_form.html.haml
+++ b/app/views/admin/workshops/_edit_form.html.haml
@@ -7,7 +7,7 @@
     .col-12.col-md-6
       = f.input :organisers, collection: Member.all, value_method: :id, label_method: :full_name, selected: @workshop.organisers.map(&:id), input_html: { multiple: true }
     .col-12
-      = f.input :invitable, hint_html: { class: 'd-block ml-1' }
+      = f.input :invitable, hint_html: { class: 'd-block ms-1' }
   .row
     .col
       = f.button :button, 'Save', class: 'btn btn-primary'
diff --git a/app/views/admin/workshops/_form.html.haml b/app/views/admin/workshops/_form.html.haml
index f201f4aff..c2efc2437 100644
--- a/app/views/admin/workshops/_form.html.haml
+++ b/app/views/admin/workshops/_form.html.haml
@@ -5,7 +5,7 @@
     .col-12.col-md-6
       = render partial: 'virtual_workshop_fields', locals: { f: f }
     .col-12
-      = f.input :invitable, hint_html: { class: 'd-block ml-1' }
+      = f.input :invitable, hint_html: { class: 'd-block ms-1' }
   .row
     .col
       = f.button :button, 'Save', class: 'btn btn-primary'
diff --git a/app/views/admin/workshops/send_invites.html.haml b/app/views/admin/workshops/send_invites.html.haml
index 5a00f695e..17234cccc 100644
--- a/app/views/admin/workshops/send_invites.html.haml
+++ b/app/views/admin/workshops/send_invites.html.haml
@@ -22,9 +22,9 @@
           Who should receive the invitations?
         %p
           If you click "Students" now, you can come back and send them to the coaches at a separate time, and vice versa.
-        = link_to admin_workshop_invite_path(@workshop, for: "students"), method: :post, class: 'btn btn-primary btn-lg mr-2' do
+        = link_to admin_workshop_invite_path(@workshop, for: "students"), method: :post, class: 'btn btn-primary btn-lg me-2' do
           Students
-        = link_to admin_workshop_invite_path(@workshop, for: "coaches"), method: :post, class: 'btn btn-primary btn-lg mr-2' do
+        = link_to admin_workshop_invite_path(@workshop, for: "coaches"), method: :post, class: 'btn btn-primary btn-lg me-2' do
           Coaches
-        = link_to admin_workshop_invite_path(@workshop, for: "everyone"), method: :post, class: 'btn btn-primary btn-lg mr-2' do
+        = link_to admin_workshop_invite_path(@workshop, for: "everyone"), method: :post, class: 'btn btn-primary btn-lg' do
           Everybody
diff --git a/app/views/contact_preferences/show.html.haml b/app/views/contact_preferences/show.html.haml
index 4a8e6c941..af7b206ad 100644
--- a/app/views/contact_preferences/show.html.haml
+++ b/app/views/contact_preferences/show.html.haml
@@ -5,5 +5,5 @@
       - if @contact.present?
         = simple_form_for @contact, url: :contact_preferences, method: :put do |f|
           = f.hidden_field :token, value: @contact.token
-          = f.input :mailing_list_consent, label: 'Sponsors mailing list', hint_html: { class: 'd-block ml-1' }
+          = f.input :mailing_list_consent, label: 'Sponsors mailing list', hint_html: { class: 'd-block ms-1' }
           = f.button :button, 'Update', class: 'btn btn-primary'
diff --git a/app/views/dashboard/dashboard.html.haml b/app/views/dashboard/dashboard.html.haml
index 14194b8af..89d766e17 100644
--- a/app/views/dashboard/dashboard.html.haml
+++ b/app/views/dashboard/dashboard.html.haml
@@ -13,7 +13,7 @@
 
         .d-flex.align-items-center.mb-2
           %h4 Subscriptions
-          %small= link_to 'Edit', subscriptions_path, class: 'ml-2'
+          %small= link_to 'Edit', subscriptions_path, class: 'ms-2'
         - if current_user.chapters.any?
           .list-group.list-group-flush
             - current_user.chapters.each do |chapter|
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 8939be0c7..157020e45 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -76,7 +76,7 @@
     .col-lg-4.pl-lg-5
       %h3
         = t('homepage.chapters.title')
-      %ul.list-unstyled.ml-0
+      %ul.list-unstyled.ms-0
         - @chapters.each do |chapter|
           %li
             = link_to chapter.name, chapter_path(chapter.slug)
diff --git a/app/views/events/_event_actions.html.haml b/app/views/events/_event_actions.html.haml
index 3e3746769..28f0e3cc6 100644
--- a/app/views/events/_event_actions.html.haml
+++ b/app/views/events/_event_actions.html.haml
@@ -8,13 +8,13 @@
     - else
       - if logged_in?
         - unless @event.coaches_only?
-          = link_to event_student_rsvp_path(@event), class: 'btn btn-primary mr-2' do
+          = link_to event_student_rsvp_path(@event), class: 'btn btn-primary me-2' do
             = t('events.attend_as_student')
         - unless @event.students_only?
           = link_to event_coach_rsvp_path(@event), class: 'btn btn-primary' do
             = t('events.attend_as_coach')
       - else
-        = link_to 'Sign up', new_member_path, class: 'btn btn-primary mr-2'
+        = link_to 'Sign up', new_member_path, class: 'btn btn-primary me-2'
         = link_to 'Log in', login_path, class: 'btn btn-primary'
   - else
     %p.badge.bg-primary= t('events.not_open_for_rsvp')
diff --git a/app/views/invitation/show.html.haml b/app/views/invitation/show.html.haml
index cbd0e37d3..e2a6ef797 100644
--- a/app/views/invitation/show.html.haml
+++ b/app/views/invitation/show.html.haml
@@ -123,22 +123,22 @@
     .row
       .col-12.col-md-6
         %h3 Students (#{@workshop.attending_and_available_student_spots})
-        %ul.list-unstyled.ml-0
+        %ul.list-unstyled.ms-0
           - @workshop.attending_students.each do |invitation|
             %li.mt-4
               .d-flex.align-items-center
                 = image_tag(invitation.member.avatar(56), class: 'rounded-circle', title: invitation.member.full_name, alt: invitation.member.full_name)
-                .ml-3
+                .ms-3
                   = invitation.member.full_name
                   %br
                   %small.text-muted= invitation.note
 
       .col-12.col-md-6.mt-5.mt-md-0
         %h3 Coaches (#{@workshop.attending_and_available_coach_spots})
-        %ul.list-unstyled.ml-0
+        %ul.list-unstyled.ms-0
           - @workshop.attending_coaches.each do |invitation|
             %li.mt-4
               .d-flex.align-items-center
                 = image_tag(invitation.member.avatar(56), class: 'rounded-circle', title: invitation.member.full_name, alt: invitation.member.full_name)
-                .ml-3
+                .ms-3
                   = invitation.member.full_name
diff --git a/app/views/invitations/show.html.haml b/app/views/invitations/show.html.haml
index 041a3389a..73e82629e 100644
--- a/app/views/invitations/show.html.haml
+++ b/app/views/invitations/show.html.haml
@@ -55,7 +55,7 @@
           - if @event.surveys_required
             .alert.alert-warning.mt-4{ "data-alert" => true }
               .d-flex.align-items-center
-                %i.fas.fa-exclamation-triangle.warning.mr-3
+                %i.fas.fa-exclamation-triangle.warning.me-3
                 %p.mb-0 
                   To complete signing up for the event, you must #{link_to("complete our questionnaire", @event.questionnaire(@invitation), class: 'alert-link border-0 text-decoration-underline')} as we need to know a couple of things in advance to plan the day.
                   %strong You will receive an email when your attendance is verified.
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index 6a634b568..2f2d4535c 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -10,7 +10,7 @@
           <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#104;&#101;&#108;&#108;&#111;&#64;&#99;&#111;&#100;&#101;&#98;&#97;&#114;&#46;&#105;&#111;&#63;&#83;&#117;&#98;&#106;&#101;&#99;&#116;&#61;&#72;&#101;&#108;&#108;&#111;&#32;&#99;&#111;&#100;&#101;&#98;&#97;&#114;">&#104;&#101;&#108;&#108;&#111;&#64;&#99;&#111;&#100;&#101;&#98;&#97;&#114;&#46;&#105;&#111;</a>.
 
       .col-sm-12.col-md-6.col-lg-3
-        %ul.list-unstyled.ml-0
+        %ul.list-unstyled.ms-0
           %li= link_to 'Impact Report 2022', "https://impact-report-22.codebar.io/"
           %li= link_to t("navigation.code_of_conduct"), code_of_conduct_path
           %li= link_to t("navigation.breach_code_of_conduct"), breach_code_of_conduct_path
@@ -21,7 +21,7 @@
           %li= link_to t("navigation.faq"), faq_path
 
       .col-sm-12.col-md-6.col-lg-3
-        %ul.list-unstyled.ml-0
+        %ul.list-unstyled.ms-0
           %li= link_to t("navigation.stats"), "http://stats.codebar.io/"
           %li= link_to t("navigation.blog"), "https://medium.com/the-codelog"
           %li= link_to t("navigation.codebar_stories"), "https://medium.com/codebar-stories"
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index f43cc7b8f..5b356d398 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -5,7 +5,7 @@
     %button.navbar-toggler.collapsed.mb-0{'type': 'button', 'data-bs-toggle': 'collapse', 'data-bs-target': '#navbarSupportedContent', 'aria-controls': 'navbarSupportedContent', 'aria-expanded': 'false', 'aria-label': 'Toggle navigation'}
       %span.navbar-toggler-icon
     %div.collapse.navbar-collapse.justify-content-end#navbarSupportedContent
-      %ul.navbar-nav.ml-0
+      %ul.navbar-nav.ms-0
         %li.nav-item.dropdown
           = link_to '#', {'role': 'button', 'aria-expanded': 'false', 'data-bs-toggle': 'dropdown', class: 'nav-link border-0 dropdown-toggle', id: 'navbarDropdownMenuLinkEvents'} do
             Events
diff --git a/app/views/meetings/_meeting.html.haml b/app/views/meetings/_meeting.html.haml
index 97fc29d18..172848057 100644
--- a/app/views/meetings/_meeting.html.haml
+++ b/app/views/meetings/_meeting.html.haml
@@ -32,7 +32,7 @@
         - if meeting.organisers.any?
           .mb-3.mb-md-0
             - meeting.organisers.each do |organiser|
-              = link_to twitter_url_for(organiser.twitter), class: 'border-0 d-inline-block mr-2' do
+              = link_to twitter_url_for(organiser.twitter), class: 'border-0 d-inline-block me-2' do
                 = image_tag(organiser.avatar(26), class: 'rounded-circle', title: organiser.full_name, alt: organiser.full_name)
         - if meeting.venue.present?
           %div
diff --git a/app/views/members/edit.html.haml b/app/views/members/edit.html.haml
index 29acff194..986e80d8e 100644
--- a/app/views/members/edit.html.haml
+++ b/app/views/members/edit.html.haml
@@ -10,7 +10,7 @@
       .bg-light.p-3
         .d-flex.d-lg-block.align-items-center.text-lg-center
           = image_tag(current_user.avatar(80), alt: current_user.full_name, class: 'rounded-circle mb-lg-2')
-          %p.mb-0.ml-2.ml-lg-0
+          %p.mb-0.ms-2.ms-lg-0
             You can change your avatar at
             = link_to('gravatar.com.', 'http://en.gravatar.com/')
     .col-12.col-lg-8.offset-lg-1.mb-4
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 55adc641b..878dca4f7 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -40,7 +40,7 @@
     .col-12.col-md-4.offset-md-1.mb-4
       - if @member.groups.any?
         %h4 Subscriptions
-        %ul.list-unstyled.ml-0
+        %ul.list-unstyled.ms-0
           - @member.groups.each do |group|
             %li
               = link_to chapter_path(group.chapter.slug) do
diff --git a/app/views/shared/_social_media.html.haml b/app/views/shared/_social_media.html.haml
index aae71c5b6..aa9be2fc0 100644
--- a/app/views/shared/_social_media.html.haml
+++ b/app/views/shared/_social_media.html.haml
@@ -1,4 +1,4 @@
-%ul.list-inline.ml-0.social-media
+%ul.list-inline.ms-0.social-media
   %li.list-inline-item
     = link_to 'https://slack.codebar.io' do
       %span.sr-only codebar Slack team
diff --git a/app/views/workshops/_actions.html.haml b/app/views/workshops/_actions.html.haml
index 59a216f50..3d6976ba0 100644
--- a/app/views/workshops/_actions.html.haml
+++ b/app/views/workshops/_actions.html.haml
@@ -18,7 +18,7 @@
   - else
     - if current_user.student? && current_user.coach?
       .d-flex
-        = button_to 'Attend as a student', rsvp_workshop_path(@workshop, role: 'Student'), method: :post, class: 'btn btn-primary mr-3'
+        = button_to 'Attend as a student', rsvp_workshop_path(@workshop, role: 'Student'), method: :post, class: 'btn btn-primary me-3'
         = button_to 'Attend as a coach', rsvp_workshop_path(@workshop, role: 'Coach'), method: :post, class: 'btn btn-primary'
     - elsif current_user.student?
       = button_to 'Attend as a student', rsvp_workshop_path(@workshop, role: 'Student'), method: :post, class: 'btn btn-primary'
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index 338ef43aa..04891cf25 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -257,7 +257,7 @@
   end
 
   # inline input for boolean
-  config.wrappers :inline_boolean, tag: 'span', class: 'form-check flex-wrap justify-content-start mr-sm-2', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
+  config.wrappers :inline_boolean, tag: 'span', class: 'form-check flex-wrap justify-content-start me-sm-2', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b|
     b.use :html5
     b.optional :readonly
     b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid'