diff --git a/babybuddy/templates/babybuddy/nav-dropdown.html b/babybuddy/templates/babybuddy/nav-dropdown.html
index 6ea774b2..da0cbc04 100644
--- a/babybuddy/templates/babybuddy/nav-dropdown.html
+++ b/babybuddy/templates/babybuddy/nav-dropdown.html
@@ -12,7 +12,7 @@
             <div>
                 <a class="text-success"
                     href="{% url 'core:timeline' %}"
-                    aria-expanded="false"><i class="icon icon-2x icon-timeline" aria-hidden="true"></i>
+                    aria-expanded="false"><i class="icon-2x icon-timeline" aria-hidden="true"></i>
                 </a>
                 &nbsp;
             </div>
@@ -20,7 +20,7 @@
                 {% csrf_token %}
                 <label class="sr-only">{% trans "Quick Start Timer" %}</label>
                 <button class="btn m-0 p-0 text-success">
-                    <i class="icon icon-2x icon-timer" aria-hidden="true"></i>
+                    <i class="icon-2x icon-timer" aria-hidden="true"></i>
                 </button>
             </form>
             <div class="dropdown show">
@@ -30,49 +30,49 @@
                    id="nav-quick-add-link"
                    data-toggle="dropdown"
                    aria-haspopup="true"
-                   aria-expanded="false"><i class="icon icon-2x icon-add" aria-hidden="true"></i>
+                   aria-expanded="false"><i class="icon-2x icon-add" aria-hidden="true"></i>
                 </a>
 
                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-quick-add-link">
                     {% if perms.core.add_diaperchange %}
                         <a class="dropdown-item p-2" href="{% url 'core:diaperchange-add' %}">
-                            <i class="icon icon-diaperchange" aria-hidden="true"></i>
+                            <i class="icon-diaperchange" aria-hidden="true"></i>
                             {% trans "Diaper Change" %}
                         </a>
                     {% endif %}
                     {% if perms.core.add_feeding %}
                         <a class="dropdown-item p-2" href="{% url 'core:feeding-add' %}">
-                            <i class="icon icon-feeding" aria-hidden="true"></i>
+                            <i class="icon-feeding" aria-hidden="true"></i>
                             {% trans "Feeding" %}
                         </a>
                     {% endif %}
                     {% if perms.core.add_note %}
                         <a class="dropdown-item p-2" href="{% url 'core:note-add' %}">
-                            <i class="icon icon-note" aria-hidden="true"></i>
+                            <i class="icon-note" aria-hidden="true"></i>
                             {% trans "Note" %}
                         </a>
                     {% endif %}
                     {% if perms.core.add_sleep %}
                         <a class="dropdown-item p-2" href="{% url 'core:sleep-add' %}">
-                            <i class="icon icon-sleep" aria-hidden="true"></i>
+                            <i class="icon-sleep" aria-hidden="true"></i>
                             {% trans "Sleep" %}
                         </a>
                     {% endif %}
                     {% if perms.core.add_temperature %}
                         <a class="dropdown-item p-2" href="{% url 'core:temperature-add' %}">
-                            <i class="icon icon-temperature" aria-hidden="true"></i>
+                            <i class="icon-temperature" aria-hidden="true"></i>
                             {% trans "Temperature" %}
                         </a>
                     {% endif %}
                     {% if perms.core.add_tummytime %}
                         <a class="dropdown-item p-2" href="{% url 'core:tummytime-add' %}">
-                            <i class="icon icon-tummytime" aria-hidden="true"></i>
+                            <i class="icon-tummytime" aria-hidden="true"></i>
                             {% trans "Tummy Time" %}
                         </a>
                     {% endif %}
                     {% if perms.core.add_weight %}
                         <a class="dropdown-item p-2" href="{% url 'core:weight-add' %}">
-                            <i class="icon icon-weight" aria-hidden="true"></i>
+                            <i class="icon-weight" aria-hidden="true"></i>
                             {% trans "Weight" %}
                         </a>
                     {% endif %}
@@ -91,14 +91,14 @@
             <ul class="navbar-nav mr-auto">
                 <li class="nav-item{% if request.path == '/' %} active{% endif %}">
                     <a class="nav-link" href="{% url 'dashboard:dashboard' %}">
-                        <i class="icon icon-dashboard" aria-hidden="true"></i>
+                        <i class="icon-dashboard" aria-hidden="true"></i>
                         {% trans "Dashboard" %}
                     </a>
                 </li>
 
                 <li class="nav-item{% if request.path == '/timeline' %} active{% endif %}">
                     <a class="nav-link" href="{% url 'core:timeline' %}">
-                        <i class="icon icon-timeline" aria-hidden="true"></i>
+                        <i class="icon-timeline" aria-hidden="true"></i>
                         {% trans "Timeline" %}
                     </a>
                 </li>
@@ -109,7 +109,7 @@
                        href="#"
                        data-toggle="dropdown"
                        aria-haspopup="true"
-                       aria-expanded="false"><i class="icon icon-child" aria-hidden="true"></i>
+                       aria-expanded="false"><i class="icon-child" aria-hidden="true"></i>
                         {% trans "Children" %}
                     </a>
                     <div class="dropdown-menu" aria-labelledby="nav-children-menu-link">
@@ -117,13 +117,13 @@
                         {% if perms.core.view_child %}
                             <a class="dropdown-item{% if request.path == '/children/' %} active{% endif %}"
                                href="{% url 'core:child-list' %}">
-                                <i class="icon icon-child" aria-hidden="true"></i>
+                                <i class="icon-child" aria-hidden="true"></i>
                                 {% trans "Children" %}
                             </a>
                         {% endif %}
                         {% if perms.core.add_child %}
                             <a class="dropdown-item pl-5{% if request.path == '/children/add/' %} active{% endif %}"
-                               href="{% url 'core:child-add' %}"><i class="icon icon-add" aria-hidden="true"></i>
+                               href="{% url 'core:child-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                 {% trans "Child" %}
                             </a>
                         {% endif %}
@@ -131,13 +131,13 @@
                         {% if perms.core.view_note %}
                             <a class="dropdown-item{% if request.path == '/notes/' %} active{% endif %}"
                                href="{% url 'core:note-list' %}">
-                                <i class="icon icon-note" aria-hidden="true"></i>
+                                <i class="icon-note" aria-hidden="true"></i>
                                 {% trans "Notes" %}
                             </a>
                         {% endif %}
                         {% if perms.core.add_note %}
                             <a class="dropdown-item pl-5{% if request.path == '/notes/add/' %} active{% endif %}"
-                               href="{% url 'core:note-add' %}"><i class="icon icon-add" aria-hidden="true"></i>
+                               href="{% url 'core:note-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                 {% trans "Note" %}
                             </a>
                         {% endif %}
@@ -145,13 +145,13 @@
                         {% if perms.core.view_temperature %}
                             <a class="dropdown-item{% if request.path == '/temperature/' %} active{% endif %}"
                                href="{% url 'core:temperature-list' %}">
-                                <i class="icon icon-temperature" aria-hidden="true"></i>
+                                <i class="icon-temperature" aria-hidden="true"></i>
                                 {% trans "Temperature" %}
                             </a>
                         {% endif %}
                         {% if perms.core.add_temperature %}
                             <a class="dropdown-item pl-5{% if request.path == '/temperature/add/' %} active{% endif %}"
-                               href="{% url 'core:temperature-add' %}"><i class="icon icon-add" aria-hidden="true"></i>
+                               href="{% url 'core:temperature-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                 {% trans "Temperature reading" %}
                             </a>
                         {% endif %}
@@ -159,13 +159,13 @@
                         {% if perms.core.view_weight %}
                             <a class="dropdown-item{% if request.path == '/weight/' %} active{% endif %}"
                                href="{% url 'core:weight-list' %}">
-                                <i class="icon icon-weight" aria-hidden="true"></i>
+                                <i class="icon-weight" aria-hidden="true"></i>
                                 {% trans "Weight" %}
                             </a>
                         {% endif %}
                         {% if perms.core.add_weight %}
                             <a class="dropdown-item pl-5{% if request.path == '/weight/add/' %} active{% endif %}"
-                               href="{% url 'core:weight-add' %}"><i class="icon icon-add" aria-hidden="true"></i>
+                               href="{% url 'core:weight-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                 {% trans "Weight entry" %}
                             </a>
                         {% endif %}
@@ -179,59 +179,59 @@
                        href="#"
                        data-toggle="dropdown"
                        aria-haspopup="true"
-                       aria-expanded="false"><i class="icon icon-activities" aria-hidden="true"></i>
+                       aria-expanded="false"><i class="icon-activities" aria-hidden="true"></i>
                         {% trans "Activities" %}
                     </a>
                     <div class="dropdown-menu" aria-labelledby="nav-activity-menu-link">
 
                         {% if perms.core.view_diaperchange %}
                             <a class="dropdown-item{% if request.path == '/changes/' %} active{% endif %}"
-                               href="{% url 'core:diaperchange-list' %}"><i class="icon icon-diaperchange" aria-hidden="true"></i>
+                               href="{% url 'core:diaperchange-list' %}"><i class="icon-diaperchange" aria-hidden="true"></i>
                                 {% trans "Changes" %}
                             </a>
                         {% endif %}
                         {% if perms.core.add_diaperchange %}
                             <a class="dropdown-item pl-5{% if request.path == '/changes/add/' %} active{% endif %}"
-                               href="{% url 'core:diaperchange-add' %}"><i class="icon icon-add" aria-hidden="true"></i>
+                               href="{% url 'core:diaperchange-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                 {% trans "Change" %}
                             </a>
                         {% endif %}
 
                         {% if perms.core.view_feeding %}
                             <a class="dropdown-item{% if request.path == '/feedings/' %} active{% endif %}"
-                               href="{% url 'core:feeding-list' %}"><i class="icon icon-feeding" aria-hidden="true"></i>
+                               href="{% url 'core:feeding-list' %}"><i class="icon-feeding" aria-hidden="true"></i>
                                 {% trans "Feedings" %}
                             </a>
                         {% endif %}
                         {% if perms.core.add_diaperchange %}
                             <a class="dropdown-item pl-5{% if request.path == '/feedings/add/' %} active{% endif %}"
-                               href="{% url 'core:feeding-add' %}"><i class="icon icon-add" aria-hidden="true"></i>
+                               href="{% url 'core:feeding-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                 {% trans "Feeding" %}
                             </a>
                         {% endif %}
 
                         {% if perms.core.view_sleep %}
                             <a class="dropdown-item{% if request.path == '/sleep/' %} active{% endif %}"
-                               href="{% url 'core:sleep-list' %}"><i class="icon icon-sleep" aria-hidden="true"></i>
+                               href="{% url 'core:sleep-list' %}"><i class="icon-sleep" aria-hidden="true"></i>
                                 {% trans "Sleep" %}
                             </a>
                         {% endif %}
                         {% if perms.core.add_sleep %}
                             <a class="dropdown-item pl-5{% if request.path == '/sleep/add/' %} active{% endif %}"
-                               href="{% url 'core:sleep-add' %}"><i class="icon icon-add" aria-hidden="true"></i>
+                               href="{% url 'core:sleep-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                 {% trans "Sleep entry" %}
                             </a>
                         {% endif %}
 
                         {% if perms.core.view_tummytime %}
                             <a class="dropdown-item{% if request.path == '/tummy-time/' %} active{% endif %}"
-                               href="{% url 'core:tummytime-list' %}"><i class="icon icon-tummytime" aria-hidden="true"></i>
+                               href="{% url 'core:tummytime-list' %}"><i class="icon-tummytime" aria-hidden="true"></i>
                                 {% trans "Tummy Time" %}
                             </a>
                         {% endif %}
                         {% if perms.core.add_tummytime %}
                             <a class="dropdown-item pl-5{% if request.path == '/tummy-time/add/' %} active{% endif %}"
-                               href="{% url 'core:tummytime-add' %}"><i class="icon icon-add" aria-hidden="true"></i>
+                               href="{% url 'core:tummytime-add' %}"><i class="icon-add" aria-hidden="true"></i>
                                 {% trans "Tummy Time entry" %}
                             </a>
                         {% endif %}
@@ -253,7 +253,7 @@
                            data-toggle="dropdown"
                            aria-haspopup="true"
                            aria-expanded="false">
-                            <i class="icon icon-user" aria-hidden="true"></i>
+                            <i class="icon-user" aria-hidden="true"></i>
                             {% firstof user.get_full_name user.get_username %}
                         </a>
                         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-user-menu-link">
@@ -273,11 +273,11 @@
                             <a href="https://github.com/babybuddy/babybuddy"
                                class="dropdown-item"
                                target="_blank">
-                                <i class="icon icon-source" aria-hidden="true"></i> {% trans "Source Code" %}</a>
+                                <i class="icon-source" aria-hidden="true"></i> {% trans "Source Code" %}</a>
                             <a href="https://gitter.im/babybuddy/Lobby"
                                class="dropdown-item"
                                target="_blank">
-                                <i class="icon icon-chat" aria-hidden="true"></i> {% trans "Chat / Support" %}</a>
+                                <i class="icon-chat" aria-hidden="true"></i> {% trans "Chat / Support" %}</a>
                             <h6 class="dropdown-header">v{% version_string %}</h6>
                         </div>
                     </li>
diff --git a/babybuddy/templates/babybuddy/paginator.html b/babybuddy/templates/babybuddy/paginator.html
index bf266a96..233a0d8b 100644
--- a/babybuddy/templates/babybuddy/paginator.html
+++ b/babybuddy/templates/babybuddy/paginator.html
@@ -7,7 +7,7 @@
             {% if page_obj.has_previous %}
                 <li class="page-item">
                     <a class="page-link" href="{% relative_url 'page' page_obj.previous_page_number %}" aria-label="Previous">
-                        <i class="icon icon-chevron-left" aria-hidden="true"></i>
+                        <i class="icon-chevron-left" aria-hidden="true"></i>
                         <span class="sr-only">{% trans "Previous" %}</span>
                     </a>
                 </li>
@@ -24,7 +24,7 @@
             {% if page_obj.has_next %}
                 <li class="page-item">
                     <a class="page-link" href="{% relative_url 'page' page_obj.next_page_number %}" aria-label="Next">
-                        <i class="icon icon-chevron-right" aria-hidden="true"></i>
+                        <i class="icon-chevron-right" aria-hidden="true"></i>
                         <span class="sr-only">{% trans "Next" %}</span>
                     </a>
                 </li>
diff --git a/babybuddy/templates/babybuddy/user_list.html b/babybuddy/templates/babybuddy/user_list.html
index aed6f57d..587756ab 100644
--- a/babybuddy/templates/babybuddy/user_list.html
+++ b/babybuddy/templates/babybuddy/user_list.html
@@ -37,13 +37,13 @@
 
                                 {% if perms.admin.change_user %}
                                     <a href="{% url 'babybuddy:user-update' object.id %}" class="btn btn-warning">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.admin.delete_user %}
                                     <a href="{% url 'babybuddy:user-delete' object.id %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
@@ -62,7 +62,7 @@
 
     {% if perms.admin.add_user %}
         <a href="{% url 'babybuddy:user-add' %}" class="btn btn-sm btn-success">
-            <i class="icon icon-add" aria-hidden="true"></i> {% trans "Create User" %}
+            <i class="icon-add" aria-hidden="true"></i> {% trans "Create User" %}
         </a>
     {% endif %}
 
diff --git a/babybuddy/templates/babybuddy/welcome.html b/babybuddy/templates/babybuddy/welcome.html
index d9d7d029..8b6bacbb 100644
--- a/babybuddy/templates/babybuddy/welcome.html
+++ b/babybuddy/templates/babybuddy/welcome.html
@@ -20,7 +20,7 @@
         <div class="card-deck">
             <div class="card card-diaperchange">
                 <div class="card-header text-center">
-                    <i class="icon icon-2x icon-diaperchange" aria-hidden="true"></i>
+                    <i class="icon-2x icon-diaperchange" aria-hidden="true"></i>
                 </div>
                 <div class="card-body">
                     <h3 class="card-title text-center">{% trans "Diaper Changes" %}</h3>
@@ -28,7 +28,7 @@
             </div>
             <div class="card card-feeding">
                 <div class="card-header text-center">
-                    <i class="icon icon-2x icon-feeding" aria-hidden="true"></i>
+                    <i class="icon-2x icon-feeding" aria-hidden="true"></i>
                 </div>
                 <div class="card-body">
                     <h3 class="card-title text-center">{% trans "Feedings" %}</h3>
@@ -36,7 +36,7 @@
             </div>
             <div class="card card-sleep">
                 <div class="card-header text-center">
-                    <i class="icon icon-2x icon-sleep" aria-hidden="true"></i>
+                    <i class="icon-2x icon-sleep" aria-hidden="true"></i>
                 </div>
                 <div class="card-body">
                     <h3 class="card-title text-center">{% trans "Sleep" %}</h3>
@@ -44,7 +44,7 @@
             </div>
             <div class="card card-tummytime">
                 <div class="card-header text-center">
-                    <i class="icon icon-2x icon-tummytime" aria-hidden="true"></i>
+                    <i class="icon-2x icon-tummytime" aria-hidden="true"></i>
                 </div>
                 <div class="card-body">
                     <h3 class="card-title text-center">{% trans "Tummy Time" %}</h3>
@@ -65,7 +65,7 @@
         <p class="text-center">
             {% if perms.core.add_child %}
                 <a href="{% url 'core:child-add' %}" class="btn btn-lg btn-success">
-                    <i class="icon icon-child" aria-hidden="true"></i> {% trans "Add a Child" %}
+                    <i class="icon-child" aria-hidden="true"></i> {% trans "Add a Child" %}
                 </a>
             {% endif %}
         </p>
diff --git a/babybuddy/templates/registration/login.html b/babybuddy/templates/registration/login.html
index 2a6a23c0..6cd707ba 100644
--- a/babybuddy/templates/registration/login.html
+++ b/babybuddy/templates/registration/login.html
@@ -13,7 +13,7 @@
         </label>
         <div class="input-group mb-3 fade-in">
             <div class="input-group-prepend">
-                <span class="input-group-text"><i class="icon icon-user" aria-hidden="true"></i></span>
+                <span class="input-group-text"><i class="icon-user" aria-hidden="true"></i></span>
             </div>
             {% render_field form.username name='username' class+='form-control' id='username-input-group' placeholder=form.username.label %}
         </div>
@@ -23,7 +23,7 @@
         </label>
         <div class="input-group mb-3 fade-in">
             <div class="input-group-prepend">
-                <span class="input-group-text"><i class="icon icon-lock" aria-hidden="true"></i></span>
+                <span class="input-group-text"><i class="icon-lock" aria-hidden="true"></i></span>
             </div>
             {% render_field form.password name='password' class+='form-control' id='password-input-group' placeholder=form.password.label %}
         </div>
diff --git a/babybuddy/templates/registration/password_reset_confirm.html b/babybuddy/templates/registration/password_reset_confirm.html
index b72e813b..54c21990 100644
--- a/babybuddy/templates/registration/password_reset_confirm.html
+++ b/babybuddy/templates/registration/password_reset_confirm.html
@@ -27,7 +27,7 @@
         </label>
         <div class="input-group mb-3 fade-in">
             <div class="input-group-prepend">
-                <span class="input-group-text"><i class="icon icon-lock" aria-hidden="true"></i></span>
+                <span class="input-group-text"><i class="icon-lock" aria-hidden="true"></i></span>
             </div>
             {% render_field form.new_password1 name='new_password1' class+='form-control' id='password1-input-group' %}
         </div>
@@ -37,7 +37,7 @@
         </label>
         <div class="input-group mb-3 fade-in">
             <div class="input-group-prepend">
-                <span class="input-group-text"><i class="icon icon-lock" aria-hidden="true"></i></span>
+                <span class="input-group-text"><i class="icon-lock" aria-hidden="true"></i></span>
             </div>
             {% render_field form.new_password2 name='new_password2' class+='form-control' id='password2-input-group' %}
         </div>
diff --git a/babybuddy/templates/registration/password_reset_form.html b/babybuddy/templates/registration/password_reset_form.html
index 87a63626..e9561e76 100644
--- a/babybuddy/templates/registration/password_reset_form.html
+++ b/babybuddy/templates/registration/password_reset_form.html
@@ -22,7 +22,7 @@
         </label>
         <div class="input-group mb-3 fade-in">
             <div class="input-group-prepend">
-                <span class="input-group-text"><i class="icon icon-envelope" aria-hidden="true"></i></span>
+                <span class="input-group-text"><i class="icon-envelope" aria-hidden="true"></i></span>
             </div>
             {% render_field form.email name='email' class+='form-control' id='email-input-group' placeholder=form.email.label %}
         </div>
diff --git a/core/templates/core/child_list.html b/core/templates/core/child_list.html
index 7afa92ba..094455c1 100644
--- a/core/templates/core/child_list.html
+++ b/core/templates/core/child_list.html
@@ -12,7 +12,7 @@
         {% trans "Children" %}
         {% if perms.core.add_child %}
             <a href="{% url 'core:child-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-child" aria-hidden="true"></i> {% trans "Add Child" %}
+                <i class="icon-child" aria-hidden="true"></i> {% trans "Add Child" %}
             </a>
         {% endif %}
     </h1>
@@ -21,7 +21,7 @@
         <table class="table table-striped table-hover child-list">
             <thead class="thead-inverse">
                 <tr>
-                    <th class="picture-column"><i class="icon icon-camera" aria-hidden="true"></i></th>
+                    <th class="picture-column"><i class="icon-camera" aria-hidden="true"></i></th>
                     <th>{% trans "First Name" %}</th>
                     <th>{% trans "Last Name" %}</th>
                     <th>{% trans "Birth Date" %}</th>
@@ -49,13 +49,13 @@
 
                                 {% if perms.core.change_child %}
                                     <a href="{% url 'core:child-update' child.slug %}" class="btn btn-warning">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_child %}
                                     <a href="{% url 'core:child-delete' child.slug %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
diff --git a/core/templates/core/diaperchange_list.html b/core/templates/core/diaperchange_list.html
index 2e6020e1..0a211606 100644
--- a/core/templates/core/diaperchange_list.html
+++ b/core/templates/core/diaperchange_list.html
@@ -12,7 +12,7 @@
         {% trans "Diaper Changes" %}
         {% if perms.core.add_diaperchange %}
             <a href="{% url 'core:diaperchange-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-diaperchange" aria-hidden="true"></i> {% trans "Add Diaper Change" %}
+                <i class="icon-diaperchange" aria-hidden="true"></i> {% trans "Add Diaper Change" %}
             </a>
         {% endif %}
     </h1>
@@ -40,13 +40,13 @@
 
                                 {% if perms.core.change_diaperchange %}
                                     <a href="{% url 'core:diaperchange-update' change.id %}" class="btn btn-primary">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_diaperchange %}
                                     <a href="{% url 'core:diaperchange-delete' change.id %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
@@ -65,7 +65,7 @@
                     </tr>
                     {% if change.notes %}
                         <tr class="{{ row_class }} row-details">
-                            <td colspan="7"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ change.notes }}</td>
+                            <td colspan="7"><i class="icon-note mr-2" aria-hidden="true"></i>{{ change.notes }}</td>
                         </tr>
                     {% endif %}
                 {% empty %}
diff --git a/core/templates/core/feeding_list.html b/core/templates/core/feeding_list.html
index 79586ea2..90331d37 100644
--- a/core/templates/core/feeding_list.html
+++ b/core/templates/core/feeding_list.html
@@ -12,7 +12,7 @@
         {% trans "Feedings" %}
         {% if perms.core.add_feeding %}
             <a href="{% url 'core:feeding-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-feeding" aria-hidden="true"></i> {% trans "Add Feeding" %}
+                <i class="icon-feeding" aria-hidden="true"></i> {% trans "Add Feeding" %}
             </a>
         {% endif %}
     </h1>
@@ -42,13 +42,13 @@
 
                                 {% if perms.core.change_feeding %}
                                     <a href="{% url 'core:feeding-update' feeding.id %}" class="btn btn-primary">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_feeding %}
                                     <a href="{% url 'core:feeding-delete' feeding.id %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
@@ -69,7 +69,7 @@
                     </tr>
                     {% if feeding.notes %}
                         <tr class="{{ row_class }} row-details">
-                            <td colspan="7"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ feeding.notes }}</td>
+                            <td colspan="7"><i class="icon-note mr-2" aria-hidden="true"></i>{{ feeding.notes }}</td>
                         </tr>
                     {% endif %}
                 {% empty %}
diff --git a/core/templates/core/note_list.html b/core/templates/core/note_list.html
index bad148b2..77fda053 100644
--- a/core/templates/core/note_list.html
+++ b/core/templates/core/note_list.html
@@ -12,7 +12,7 @@
         {% trans "Notes" %}
         {% if perms.core.add_note %}
             <a href="{% url 'core:note-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-note" aria-hidden="true"></i> {% trans "Add Note" %}
+                <i class="icon-note" aria-hidden="true"></i> {% trans "Add Note" %}
             </a>
         {% endif %}
     </h1>
@@ -37,13 +37,13 @@
 
                                 {% if perms.core.change_note %}
                                     <a href="{% url 'core:note-update' note.id %}" class="btn btn-primary">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_note %}
                                     <a href="{% url 'core:note-delete' note.id %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
diff --git a/core/templates/core/sleep_list.html b/core/templates/core/sleep_list.html
index 186d65ff..eb17e524 100644
--- a/core/templates/core/sleep_list.html
+++ b/core/templates/core/sleep_list.html
@@ -12,7 +12,7 @@
         {% trans "Sleep" %}
         {% if perms.core.add_sleep %}
             <a href="{% url 'core:sleep-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-sleep" aria-hidden="true"></i> {% trans "Add Sleep" %}
+                <i class="icon-sleep" aria-hidden="true"></i> {% trans "Add Sleep" %}
             </a>
         {% endif %}
     </h1>
@@ -40,13 +40,13 @@
 
                                 {% if perms.core.change_sleep %}
                                     <a href="{% url 'core:sleep-update' sleep.id %}" class="btn btn-primary">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_sleep %}
                                     <a href="{% url 'core:sleep-delete' sleep.id %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
@@ -62,7 +62,7 @@
                     </tr>
                     {% if sleep.notes %}
                         <tr class="{{ row_class }} row-details">
-                            <td colspan="6"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ sleep.notes }}</td>
+                            <td colspan="6"><i class="icon-note mr-2" aria-hidden="true"></i>{{ sleep.notes }}</td>
                         </tr>
                     {% endif %}
                 {% empty %}
diff --git a/core/templates/core/temperature_list.html b/core/templates/core/temperature_list.html
index 7d1c0ce8..f34056ee 100644
--- a/core/templates/core/temperature_list.html
+++ b/core/templates/core/temperature_list.html
@@ -12,7 +12,7 @@
         {% trans "Temperature" %}
         {% if perms.core.add_temperature %}
             <a href="{% url 'core:temperature-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-temperature" aria-hidden="true"></i> {% trans "Add Temperature Reading" %}
+                <i class="icon-temperature" aria-hidden="true"></i> {% trans "Add Temperature Reading" %}
             </a>
         {% endif %}
     </h1>
@@ -38,13 +38,13 @@
 
                                 {% if perms.core.change_temperature %}
                                     <a href="{% url 'core:temperature-update' temperature.id %}" class="btn btn-primary">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_temperature %}
                                     <a href="{% url 'core:temperature-delete' temperature.id %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
@@ -58,7 +58,7 @@
                     </tr>
                     {% if temperature.notes %}
                         <tr class="{{ row_class }} row-details">
-                            <td colspan="4"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ temperature.notes }}</td>
+                            <td colspan="4"><i class="icon-note mr-2" aria-hidden="true"></i>{{ temperature.notes }}</td>
                         </tr>
                     {% endif %}
                 {% empty %}
diff --git a/core/templates/core/timer_detail.html b/core/templates/core/timer_detail.html
index 2bc5961a..66ff5a3f 100644
--- a/core/templates/core/timer_detail.html
+++ b/core/templates/core/timer_detail.html
@@ -39,7 +39,7 @@
         {% if perms.core.add_feeding %}
             <a class="btn btn-success btn-lg btn-block mb-3"
                href="{% instance_add_url 'core:feeding-add' %}"
-               role="button"><i class="icon icon-feeding" aria-hidden="true"></i>
+               role="button"><i class="icon-feeding" aria-hidden="true"></i>
                 {% trans "Feeding" %}
             </a>
         {% endif %}
@@ -47,7 +47,7 @@
         {% if perms.core.add_sleep %}
             <a class="btn btn-success btn-lg btn-block mb-3"
                href="{% instance_add_url 'core:sleep-add' %}"
-               role="button"><i class="icon icon-sleep" aria-hidden="true"></i>
+               role="button"><i class="icon-sleep" aria-hidden="true"></i>
                 {% trans "Sleep" %}
             </a>
         {% endif %}
@@ -55,7 +55,7 @@
         {% if perms.core.add_tummytime %}
             <a class="btn btn-success btn-lg btn-block mb-3"
                href="{% instance_add_url 'core:tummytime-add' %}"
-               role="button"><i class="icon icon-tummytime" aria-hidden="true"></i>
+               role="button"><i class="icon-tummytime" aria-hidden="true"></i>
                 {% trans "Tummy Time" %}
             </a>
         {% endif %}
@@ -64,25 +64,25 @@
             {% if perms.core.delete_timer %}
                 <a class="btn btn-lg btn-danger"
                    href="{% url 'core:timer-delete' timer.id %}"
-                   role="button"><i class="icon icon-delete" aria-hidden="true"></i></a>
+                   role="button"><i class="icon-delete" aria-hidden="true"></i></a>
             {% endif %}
 
             {% if perms.core.change_timer %}
                 <a class="btn btn-lg btn-primary"
                    href="{% url 'core:timer-update' timer.id %}"
-                   role="button"><i class="icon icon-update" aria-hidden="true"></i></a>
+                   role="button"><i class="icon-update" aria-hidden="true"></i></a>
 
                 <form action="{% url 'core:timer-restart' timer.id %}" role="form" method="post" class="d-inline">
                     {% csrf_token %}
                     <label class="sr-only">{% trans "Restart timer" %}</label>
-                    <button type="submit" class="btn btn-lg btn-secondary"><i class="icon icon-refresh" aria-hidden="true"></i></button>
+                    <button type="submit" class="btn btn-lg btn-secondary"><i class="icon-refresh" aria-hidden="true"></i></button>
                 </form>
 
                 {% if object.active %}
                     <form action="{% url 'core:timer-stop' timer.id %}" role="form" method="post" class="d-inline">
                         {% csrf_token %}
                         <label class="sr-only">{% trans "Delete timer" %}</label>
-                        <button type="submit" class="btn btn-lg btn-warning"><i class="icon icon-stop" aria-hidden="true"></i></button>
+                        <button type="submit" class="btn btn-lg btn-warning"><i class="icon-stop" aria-hidden="true"></i></button>
                     </form>
                 {% endif %}
             {% endif %}
diff --git a/core/templates/core/timer_list.html b/core/templates/core/timer_list.html
index 570328ab..b6b7d42d 100644
--- a/core/templates/core/timer_list.html
+++ b/core/templates/core/timer_list.html
@@ -12,7 +12,7 @@
         {% trans "Timers" %}
         {% if perms.core.add_timer %}
             <a href="{% url 'core:timer-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-timer" aria-hidden="true"></i> {% trans "Start Timer" %}
+                <i class="icon-timer" aria-hidden="true"></i> {% trans "Start Timer" %}
             </a>
         {% endif %}
     </h1>
@@ -65,7 +65,7 @@
 
     {% if perms.core.delete_timer %}
         <a href="{% url 'core:timer-delete-inactive' %}" class="btn btn-sm btn-danger">
-            <i class="icon icon-delete" aria-hidden="true"></i> {% trans "Delete Inactive Timers" %}
+            <i class="icon-delete" aria-hidden="true"></i> {% trans "Delete Inactive Timers" %}
         </a>
     {% endif %}
 
diff --git a/core/templates/core/timer_nav.html b/core/templates/core/timer_nav.html
index e308d0ab..fa8b6018 100644
--- a/core/templates/core/timer_nav.html
+++ b/core/templates/core/timer_nav.html
@@ -6,7 +6,7 @@
        href="#"
        data-toggle="dropdown"
        aria-haspopup="true"
-       aria-expanded="false"><i class="icon icon-timer" aria-hidden="true"></i>
+       aria-expanded="false"><i class="icon-timer" aria-hidden="true"></i>
         {% trans "Timers" %}
     </a>
     <div class="dropdown-menu" aria-labelledby="nav-timer-menu-link">
@@ -15,17 +15,17 @@
                 <form action="{% url 'core:timer-add-quick' %}" role="form" method="post" class="d-inline">
                     {% csrf_token %}
                     <button class="btn text-left p-0">
-                        <i class="icon icon-timer" aria-hidden="true"></i> {% trans "Quick Start Timer" %}
+                        <i class="icon-timer" aria-hidden="true"></i> {% trans "Quick Start Timer" %}
                     </button>
                 </form>
             </div>
             <a class="dropdown-item" href="{% url 'core:timer-add' %}">
-                <i class="icon icon-add" aria-hidden="true"></i> {% trans "Start Timer" %}
+                <i class="icon-add" aria-hidden="true"></i> {% trans "Start Timer" %}
             </a>
         {% endif %}
         {% if perms.core.view_timer %}
             <a class="dropdown-item" href="{% url 'core:timer-list' %}">
-                <i class="icon icon-list" aria-hidden="true"></i> {% trans "View Timers" %}
+                <i class="icon-list" aria-hidden="true"></i> {% trans "View Timers" %}
             </a>
         {% endif %}
         {% if timers %}
diff --git a/core/templates/core/tummytime_list.html b/core/templates/core/tummytime_list.html
index c9dd2626..f2857a80 100644
--- a/core/templates/core/tummytime_list.html
+++ b/core/templates/core/tummytime_list.html
@@ -12,7 +12,7 @@
         {% trans "Tummy Time" %}
         {% if perms.core.add_tummytime %}
             <a href="{% url 'core:tummytime-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-tummytime" aria-hidden="true"></i> {% trans "Add Tummy Time" %}</a>
+                <i class="icon-tummytime" aria-hidden="true"></i> {% trans "Add Tummy Time" %}</a>
         {% endif %}
     </h1>
     {% include 'babybuddy/filter.html' %}
@@ -38,13 +38,13 @@
 
                                 {% if perms.core.change_tummytime %}
                                     <a href="{% url 'core:tummytime-update' tummytime.id %}" class="btn btn-primary">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_tummytime %}
                                     <a href="{% url 'core:tummytime-delete' tummytime.id %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
diff --git a/core/templates/core/weight_list.html b/core/templates/core/weight_list.html
index a252f963..925f8b42 100644
--- a/core/templates/core/weight_list.html
+++ b/core/templates/core/weight_list.html
@@ -12,7 +12,7 @@
         {% trans "Weight" %}
         {% if perms.core.add_weight %}
             <a href="{% url 'core:weight-add' %}" class="btn btn-sm btn-success">
-                <i class="icon icon-weight" aria-hidden="true"></i> {% trans "Add Weight" %}
+                <i class="icon-weight" aria-hidden="true"></i> {% trans "Add Weight" %}
             </a>
         {% endif %}
     </h1>
@@ -38,13 +38,13 @@
 
                                 {% if perms.core.change_weight %}
                                     <a href="{% url 'core:weight-update' weight.id %}" class="btn btn-primary">
-                                        <i class="icon icon-update" aria-hidden="true"></i>
+                                        <i class="icon-update" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
                                 {% if perms.core.delete_weight %}
                                     <a href="{% url 'core:weight-delete' weight.id %}" class="btn btn-danger">
-                                        <i class="icon icon-delete" aria-hidden="true"></i>
+                                        <i class="icon-delete" aria-hidden="true"></i>
                                     </a>
                                 {% endif %}
 
@@ -58,7 +58,7 @@
                     </tr>
                     {% if weight.notes %}
                         <tr class="{{ row_class }} row-details">
-                            <td colspan="4"><i class="icon icon-note mr-2" aria-hidden="true"></i>{{ weight.notes }}</td>
+                            <td colspan="4"><i class="icon-note mr-2" aria-hidden="true"></i>{{ weight.notes }}</td>
                         </tr>
                     {% endif %}
                 {% empty %}
diff --git a/core/templates/timeline/_timeline.html b/core/templates/timeline/_timeline.html
index 135a4f59..2a8dd90f 100644
--- a/core/templates/timeline/_timeline.html
+++ b/core/templates/timeline/_timeline.html
@@ -3,14 +3,14 @@
 <h3 class="text-center">
     {% if date_previous %}
         <a class="btn btn-sm btn-default" href="?date={{ date_previous|date:"Y-m-d" }}" aria-label="{% trans "Previous" %}">
-            <i class="icon icon-chevron-left" aria-hidden="true"></i>
+            <i class="icon-chevron-left" aria-hidden="true"></i>
             <span class="sr-only">{% trans "Previous" %}</span>
         </a>
     {% endif %}
     {{ date|date }}
     {% if date_next %}
         <a class="btn btn-sm btn-default" href="?date={{ date_next|date:"Y-m-d" }}" aria-label="{% trans "Next" %}">
-            <i class="icon icon-chevron-right" aria-hidden="true"></i>
+            <i class="icon-chevron-right" aria-hidden="true"></i>
             <span class="sr-only">{% trans "Next" %}</span>
         </a>
     {% endif %}
@@ -20,7 +20,7 @@
         {% for object in timeline_objects %}
             <li{% cycle "" ' class="timeline-inverted"' %}>
                 <div class="timeline-badge {% if object.type == "start" %}bg-success{% elif object.type == "end" %}bg-danger{% else %}bg-info{% endif %}">
-                    <i class="icon icon-{{ object.model_name }}"></i>
+                    <i class="icon-{{ object.model_name }}"></i>
                 </div>
                 <div class="card text-right">
                     <div class="card-body">
@@ -56,14 +56,14 @@
     <h3 class="text-center">
         {% if date_previous %}
             <a class="btn btn-sm btn-default" href="?date={{ date_previous|date:"Y-m-d" }}" aria-label="{% trans "Previous" %}">
-                <i class="icon icon-chevron-left" aria-hidden="true"></i>
+                <i class="icon-chevron-left" aria-hidden="true"></i>
                 <span class="sr-only">{% trans "Previous" %}</span>
             </a>
         {% endif %}
         {{ date|date }}
         {% if date_next %}
             <a class="btn btn-sm btn-default" href="?date={{ date_next|date:"Y-m-d" }}" aria-label="{% trans "Next" %}">
-                <i class="icon icon-chevron-right" aria-hidden="true"></i>
+                <i class="icon-chevron-right" aria-hidden="true"></i>
                 <span class="sr-only">{% trans "Next" %}</span>
             </a>
         {% endif %}
diff --git a/core/tests/tests_templatetags.py b/core/tests/tests_templatetags.py
index 1e936ffd..d775160b 100644
--- a/core/tests/tests_templatetags.py
+++ b/core/tests/tests_templatetags.py
@@ -11,10 +11,10 @@ class TemplateTagsTestCase(TestCase):
     def test_bootstrap_bool_icon(self):
         self.assertEqual(
             bootstrap.bool_icon(True),
-            '<i class="icon icon-true text-success" aria-hidden="true"></i>')
+            '<i class="icon-true text-success" aria-hidden="true"></i>')
         self.assertEqual(
             bootstrap.bool_icon(False),
-            '<i class="icon icon-false text-danger" aria-hidden="true"></i>')
+            '<i class="icon-false text-danger" aria-hidden="true"></i>')
 
     def test_child_age_string(self):
         date = timezone.localdate() - timezone.timedelta(days=0, hours=6)
diff --git a/dashboard/templates/cards/base.html b/dashboard/templates/cards/base.html
index 8aac9ad7..6fa1c87a 100644
--- a/dashboard/templates/cards/base.html
+++ b/dashboard/templates/cards/base.html
@@ -1,7 +1,7 @@
 {% if not empty or not hide_empty %}
     <div class="card card-dashboard card-{{ type }}">
         <div class="card-header">
-            <i class="icon icon-{{ type }} pull-left" aria-hidden="true"></i>
+            <i class="icon-{{ type }} pull-left" aria-hidden="true"></i>
             {% block header %}{% endblock %}
         </div>
         <div class="card-body">
diff --git a/dashboard/templates/cards/statistics.html b/dashboard/templates/cards/statistics.html
index 3485a515..b7c432b4 100644
--- a/dashboard/templates/cards/statistics.html
+++ b/dashboard/templates/cards/statistics.html
@@ -3,7 +3,7 @@
 {% if not empty or not hide_empty %}
     <div class="card card-dashboard card-statistics">
         <div class="card-header">
-            <i class="icon icon-graph pull-left" aria-hidden="true"></i>
+            <i class="icon-graph pull-left" aria-hidden="true"></i>
             {% trans "Statistics" %}
         </div>
         <div class="card-body text-center">
diff --git a/dashboard/templates/dashboard/child_button_group.html b/dashboard/templates/dashboard/child_button_group.html
index fcfdf45a..041ddea4 100644
--- a/dashboard/templates/dashboard/child_button_group.html
+++ b/dashboard/templates/dashboard/child_button_group.html
@@ -4,10 +4,10 @@
 
     {% if perms.core.view_child %}
         <a href="{% url 'dashboard:dashboard-child' object.slug %}" class="btn" title="{% trans "Dashboard" %}">
-            <i class="icon icon-dashboard" aria-hidden="true"></i>
+            <i class="icon-dashboard" aria-hidden="true"></i>
         </a>
         <a href="{% url 'core:child' object.slug %}" class="btn" title="{% trans "Timeline" %}">
-            <i class="icon icon-timeline" aria-hidden="true"></i>
+            <i class="icon-timeline" aria-hidden="true"></i>
         </a>
     {% endif %}
 
@@ -18,7 +18,7 @@
                 type="button"
                 data-toggle="dropdown"
                 aria-haspopup="true"
-                aria-expanded="false"><i class="icon icon-graph" aria-hidden="true"></i></button>
+                aria-expanded="false"><i class="icon-graph" aria-hidden="true"></i></button>
         <div class="dropdown-menu" aria-labelledby="reports-dropdown">
             <a class="dropdown-item" href="{% url 'reports:report-diaperchange-amounts-child' object.slug %}">{% trans "Diaper Change Amounts" %}</a>
             <a class="dropdown-item" href="{% url 'reports:report-diaperchange-types-child' object.slug %}">{% trans "Diaper Change Types" %}</a>
@@ -35,14 +35,14 @@
         <a class="btn"
            href="{% url 'core:child-update' object.slug %}"
            title="{% trans "Edit" %}"
-           role="button"><i class="icon icon-update" aria-hidden="true"></i></a>
+           role="button"><i class="icon-update" aria-hidden="true"></i></a>
     {% endif %}
 
     {% if perms.core.delete_child %}
         <a class="btn"
            href="{% url 'core:child-delete' object.slug %}"
            title="{% trans "Delete" %}"
-           role="button"><i class="icon icon-delete" aria-hidden="true"></i></a>
+           role="button"><i class="icon-delete" aria-hidden="true"></i></a>
     {% endif %}
 
 </div>
\ No newline at end of file
diff --git a/reports/templates/reports/report_base.html b/reports/templates/reports/report_base.html
index 1c657b37..d3c47b61 100644
--- a/reports/templates/reports/report_base.html
+++ b/reports/templates/reports/report_base.html
@@ -15,9 +15,9 @@
             {{ html|safe }}
         {% else %}
             <div class="jumbotron text-center">
-                <i class="icon icon-sad" aria-hidden="true"></i>
+                <i class="icon-sad" aria-hidden="true"></i>
                 {% trans "There is not enough data to generate this report." %}
-                <i class="icon icon-sad" aria-hidden="true"></i>
+                <i class="icon-sad" aria-hidden="true"></i>
             </div>
         {% endif %}
     </div>