diff --git a/babybuddy/templates/babybuddy/nav-dropdown.html b/babybuddy/templates/babybuddy/nav-dropdown.html
index efc2e04d..9b15000a 100644
--- a/babybuddy/templates/babybuddy/nav-dropdown.html
+++ b/babybuddy/templates/babybuddy/nav-dropdown.html
@@ -200,8 +200,7 @@
                             {% endif %}
                             {% if perms.core.add_temperature %}
                                 <a class="dropdown-item ps-5{% if request.path == '/temperature/add/' %} active{% endif %}"
-                                   href="{% url 'core:temperature-add' %}"><i class="icon-add"
-                                                                                     aria-hidden="true"></i>
+                                   href="{% url 'core:temperature-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                     {% trans "Temperature reading" %}
                                 </a>
                             {% endif %}
@@ -214,7 +213,7 @@
                                 </a>
                             {% endif %}
                             {% if perms.core.add_weight %}
-                                <a class="dropdown-item pl-5{% if request.path == '/weight/add/' %} active{% endif %}"
+                                <a class="dropdown-item ps-5{% if request.path == '/weight/add/' %} active{% endif %}"
                                    href="{% url 'core:weight-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                     {% trans "Weight entry" %}
                                 </a>
diff --git a/core/templates/core/child_quick_switch.html b/core/templates/core/child_quick_switch.html
index 1559484f..d04cbc0a 100644
--- a/core/templates/core/child_quick_switch.html
+++ b/core/templates/core/child_quick_switch.html
@@ -2,7 +2,7 @@
 
 <a href="{% url 'core:child' current_child.slug %}">{{ current_child }}</a>
 {% if children.count > 0 %}
-    <a href="#" class="ml-1 pl-1 pr-1 dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    <a href="#" class="ms-1 ps-1 pe-1 dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <span class="visually-hidden">{% trans 'Switch child' %}</span>
         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"             fill="currentColor" viewBox="0 0 16 16">
             <path d="M3.626 6.832A.5.5 0 0 1 4 6h8a.5.5 0 0 1 .374.832l-4 4.5a.5.5 0 0 1-.748 0l-4-4.5z"></path>
@@ -14,7 +14,7 @@
         {% for child in children %}
             <a class="dropdown-item d-flex align-items-center" href="{% url target_url child.slug %}">
                 {% include "core/child_thumbnail.html" %}
-                <span class="text-wrap ml-2">{{ child }}</span>
+                <span class="text-wrap ms-2">{{ child }}</span>
             </a>
         {% endfor %}
     </div>
diff --git a/core/templates/core/quick_timer_nav.html b/core/templates/core/quick_timer_nav.html
index be992b82..8b3879b1 100644
--- a/core/templates/core/quick_timer_nav.html
+++ b/core/templates/core/quick_timer_nav.html
@@ -20,7 +20,7 @@
                 {% for child in children %}
                     <button class="dropdown-item d-flex align-items-center" type="submit" name="child" value="{{ child.pk }}">
                         {% include "core/child_thumbnail.html" %}
-                        <span class="text-wrap ml-2">{{ child }}</span>
+                        <span class="text-wrap ms-2">{{ child }}</span>
                     </button>
                 {% endfor %}
             </div>
diff --git a/core/templates/core/timer_nav.html b/core/templates/core/timer_nav.html
index 26e0afa5..41efa7af 100644
--- a/core/templates/core/timer_nav.html
+++ b/core/templates/core/timer_nav.html
@@ -29,7 +29,7 @@
                     {% for child in children %}
                         <button class="dropdown-item d-flex align-items-center" type="submit" name="child" value="{{ child.pk }}">
                             {% include "core/child_thumbnail.html" %}
-                            <span class="text-wrap ml-2">{{ child }}</span>
+                            <span class="text-wrap ms-2">{{ child }}</span>
                         </button>
                     {% endfor %}
                 {% else %}