diff --git a/adhocracy-plus/assets/scss/components/_dashboard_nav.scss b/adhocracy-plus/assets/scss/components/_dashboard_nav.scss
index 8380629983..fc11f3bd72 100644
--- a/adhocracy-plus/assets/scss/components/_dashboard_nav.scss
+++ b/adhocracy-plus/assets/scss/components/_dashboard_nav.scss
@@ -10,8 +10,8 @@
     position: relative;
     padding: 0.7 * $spacer 2.7 * $spacer 0.7 * $spacer 1.8 * $spacer;
 
-    .fa-exclamation-circle,
-    .fa-check-circle {
+    .fa-circle-exclamation,
+    .fa-circle-check {
         position: absolute;
         left: 0.5 * $spacer;
         top: $spacer;
@@ -60,8 +60,8 @@
         margin: 0;
     }
 
-    .fa-exclamation-circle,
-    .fa-check-circle {
+    .fa-circle-exclamation,
+    .fa-circle-check {
         position: absolute;
         left: 0.3 * $spacer;
         top: $spacer;
diff --git a/adhocracy-plus/templates/a4dashboard/base_dashboard.html b/adhocracy-plus/templates/a4dashboard/base_dashboard.html
index bad492da46..bf9198945b 100644
--- a/adhocracy-plus/templates/a4dashboard/base_dashboard.html
+++ b/adhocracy-plus/templates/a4dashboard/base_dashboard.html
@@ -14,7 +14,7 @@
             {% else %}
               <div class="dashboard-nav__logo-link">
                 <a class="font-weight-bold" href="{% url 'organisation' organisation_slug=ORGANISATION.slug %}">
-                  <i class="fas fa-home pt-2" aria-label="{{ ORGANISATION.name }} {% translate 'Home' %}" role="img"></i>
+                  <i class="fas fa-house pt-2" aria-label="{{ ORGANISATION.name }} {% translate 'Home' %}" role="img"></i>
                 </a>
               </div>
             {% endif %}
diff --git a/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html b/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html
index de1a0ff424..670c57ddb2 100644
--- a/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html
+++ b/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html
@@ -33,9 +33,9 @@
                     data-bs-target="#dashboardCollapseProj"
                 >
                     {% if project_progress.project_is_complete %}
-                    <i class="fas fa-check-circle text-info" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
+                    <i class="fas fa-circle-check text-info" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
                     {% else %}
-                    <i class="fas fa-exclamation-circle text-danger" title="{% translate 'Project not ready for publication' %}" aria-label="{% translate 'Project not ready for publication' %}"></i>
+                    <i class="fas fa-circle-exclamation text-danger" title="{% translate 'Project not ready for publication' %}" aria-label="{% translate 'Project not ready for publication' %}"></i>
                     {% endif %}
                     {{ project.name }}
                     <i class="fa fa-chevron-up" aria-hidden="true"></i>
@@ -46,7 +46,7 @@
                             <a href="{{ item.url }}"
                                class="dashboard-nav__item dashboard-nav__item--interactive {{ item.is_active|yesno:"is-active," }}">
                                  {% if not item.is_complete %}
-                                     <i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
+                                     <i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
                                  {% endif %}
                                 {{ item.label }}
                             </a>
@@ -60,7 +60,7 @@
                 {% if module_menu.module.is_draft %}
                 <div class="btn btn--none px-0 dropdown dashboard-nav__module-dropdown">
                     <button class="dropdown-toggle" id="dashboardModuleMenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                      <i class="fas fa-ellipsis-v"></i>
+                      <i class="fas fa-ellipsis-vertical"></i>
                     </button>
                     <div class="dropdown-menu dropdown-menu-end" aria-labelledby="dashboardModuleMenu">
                       <a class="p-0" href="#">
@@ -86,9 +86,9 @@
                         data-bs-target="#dashboardCollapse_{{ forloop.counter }}"
                     >
                       {% if module_menu.is_complete %}
-                          <i class="fas fa-check-circle text-info" title="{% translate 'Module ready for addition' %}" aria-label="{% translate 'Module ready for addition' %}"></i>
+                          <i class="fas fa-circle-check text-info" title="{% translate 'Module ready for addition' %}" aria-label="{% translate 'Module ready for addition' %}"></i>
                       {% else %}
-                          <i class="fas fa-exclamation-circle text-danger" title="{% translate 'Module not ready for addition' %}" aria-label="{% translate 'Module not ready for addition' %}"></i>
+                          <i class="fas fa-circle-exclamation text-danger" title="{% translate 'Module not ready for addition' %}" aria-label="{% translate 'Module not ready for addition' %}"></i>
                       {% endif %}
                       {{ module_menu.module.name }}
                       <i class="fa fa-chevron-up {% if module_menu.module.is_draft %}dashboard-nav-i-spacer{% endif %}" aria-hidden="true"></i>
@@ -100,7 +100,7 @@
                               <a href="{{ item.url }}"
                                  class="dashboard-nav__item dashboard-nav__item--interactive {{ item.is_active|yesno:"is-active," }}">
                                     {% if not item.is_complete %}
-                                        <i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
+                                        <i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
                                     {% endif %}
                                     {{ item.label }}
                                 </a>
diff --git a/adhocracy-plus/templates/a4dashboard/includes/progress_line.html b/adhocracy-plus/templates/a4dashboard/includes/progress_line.html
index 2311da1862..ef41661053 100644
--- a/adhocracy-plus/templates/a4dashboard/includes/progress_line.html
+++ b/adhocracy-plus/templates/a4dashboard/includes/progress_line.html
@@ -3,7 +3,7 @@
 <ul class="progress-line u-spacer-bottom">
     <li class="progress-line__entry">
         <span class="progress-line__line--bottom"></span>
-        <i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Project created' %}" aria-label="{% translate 'Project created' %}"></i>
+        <i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Project created' %}" aria-label="{% translate 'Project created' %}"></i>
         <span>{% translate 'Create project' %}</span>
     </li>
 
@@ -11,7 +11,7 @@
         <span class="progress-line__line--top"></span>
         <span class="progress-line__line--bottom"></span>
         {% if project_progress.project_is_complete %}
-            <i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
+            <i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
         {% else %}
             <i class="fas fa-circle progress-line__icon--active" title="{% translate 'Project not ready for publication' %}" aria-label="{% translate 'Project not ready for publication' %}"></i>
         {% endif %}
@@ -30,7 +30,7 @@
         {% if dashboard_menu.modules|length == 0 %}
             <i class="fas fa-circle progress-line__icon--active" title="{% translate 'No module created' %}" aria-label="{% translate 'No module created' %}"></i>
         {% else %}
-            <i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Module created' %}" aria-label="{% translate 'Module created' %}"></i>
+            <i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Module created' %}" aria-label="{% translate 'Module created' %}"></i>
         {% endif %}
         <span>{% translate 'Add participation module(s)' %}</span>
     </li>
@@ -43,7 +43,7 @@
         {% elif not dashboard_menu.modules|has_publishable_module %}
             <i class="fas fa-circle progress-line__icon--active" title="{% translate 'Fill in module details' %}" aria-label="{% translate 'Fill in module details' %}"></i>
         {% else %}
-            <i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Module ready to be added to project' %}" aria-label="{% translate 'Module ready to be added to project' %}"></i>
+            <i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Module ready to be added to project' %}" aria-label="{% translate 'Module ready to be added to project' %}"></i>
         {% endif %}
 
         <span {% if dashboard_menu.modules|module_nav_is_active %}class="progress-line__entry--active"{% endif %}>
@@ -60,7 +60,7 @@
         {% elif dashboard_menu.modules|has_publishable_module and project.published_modules.count == 0 %}
             <i class="fas fa-circle progress-line__icon--active" title="{% translate 'Show module(s) in project' %}" aria-label="{% translate 'Show module(s) in project' %}"></i>
         {% else %}
-            <i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Module added to project' %}" aria-label="{% translate 'Module added to project' %}"></i>
+            <i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Module added to project' %}" aria-label="{% translate 'Module added to project' %}"></i>
         {% endif %}
         <span>{% translate 'Add module(s) to project' %}</span>
     </li>
diff --git a/adhocracy-plus/templates/a4dashboard/includes/progress_line_done.html b/adhocracy-plus/templates/a4dashboard/includes/progress_line_done.html
index 536286bfef..0883de5bf9 100644
--- a/adhocracy-plus/templates/a4dashboard/includes/progress_line_done.html
+++ b/adhocracy-plus/templates/a4dashboard/includes/progress_line_done.html
@@ -3,7 +3,7 @@
 <ul class="progress-line u-spacer-bottom">
     <li class="progress-line__entry--published">
         <i
-          class="fas fa-check-circle progress-line__icon progress-line__icon--success"
+          class="fas fa-circle-check progress-line__icon progress-line__icon--success"
           title="{% translate 'Project type has been published' %}"
           aria-label="{% translate 'Project type has been published' %}"
           role="img"
diff --git a/adhocracy-plus/templates/a4dashboard/includes/project_list_item.html b/adhocracy-plus/templates/a4dashboard/includes/project_list_item.html
index caee5b0cb5..16daeb6b38 100644
--- a/adhocracy-plus/templates/a4dashboard/includes/project_list_item.html
+++ b/adhocracy-plus/templates/a4dashboard/includes/project_list_item.html
@@ -66,7 +66,7 @@ <h3 class="u-first-heading">
                                 </button>
                             </form>
                             <a href="#" class="dropdown-item font-weight-normal" data-bs-toggle="modal" data-bs-target="#project{{ project.pk }}DeleteModal">
-                                <i class="far fa-trash-alt" aria-hidden="true"></i>
+                                <i class="far fa-trash-can" aria-hidden="true"></i>
                                 {% translate 'delete' %}
                             </a>
                         </div>
@@ -90,7 +90,7 @@ <h2 className="u-no-margin-bottom u-spacer-top-one-half">
                     {% translate 'delete' %}
                 </h2>
                 <button class="close" data-bs-dismiss="modal" aria-label="Close">
-                    <i class="fa fa-times"></i>
+                    <i class="fa fa-xmark"></i>
                 </button>
             </div>
             <div class="modal-body">
diff --git a/adhocracy-plus/templates/a4dashboard/organisation_form_base.html b/adhocracy-plus/templates/a4dashboard/organisation_form_base.html
index 7174c812ed..41f19bf3a5 100644
--- a/adhocracy-plus/templates/a4dashboard/organisation_form_base.html
+++ b/adhocracy-plus/templates/a4dashboard/organisation_form_base.html
@@ -15,7 +15,7 @@
                         class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == 'organisation-settings' %}is-active{% endif %}">
                         {% translate "General information" %}
                         {% if not object.title %}
-                            <i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing important fields' %}" aria-label="{% translate 'Missing important fields' %}"></i>
+                            <i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing important fields' %}" aria-label="{% translate 'Missing important fields' %}"></i>
                         {% endif %}
 
                     </a>
@@ -25,7 +25,7 @@
                         class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == 'organisation-legal-information' %}is-active{% endif %}">
                         {% translate "Legal information" %}
                         {% if not object.imprint or not object.terms_of_use or not object.data_protection %}
-                            <i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing important fields' %}" aria-label="{% translate 'Missing important fields' %}"></i>
+                            <i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing important fields' %}" aria-label="{% translate 'Missing important fields' %}"></i>
                         {% endif %}
                     </a>
                 </li>
diff --git a/adhocracy-plus/templates/a4filters/widgets/free_text_filter.html b/adhocracy-plus/templates/a4filters/widgets/free_text_filter.html
index d8286dc186..612a326728 100644
--- a/adhocracy-plus/templates/a4filters/widgets/free_text_filter.html
+++ b/adhocracy-plus/templates/a4filters/widgets/free_text_filter.html
@@ -8,6 +8,6 @@
         {% endif %}
     {% endfor %}
     <button class="btn btn--light" type="submit" title="{% translate 'Search' %}">
-        <i class="fa fa-search" aria-label="{% translate 'Search' %}"></i>
+        <i class="fa fa-magnifying-glass" aria-label="{% translate 'Search' %}"></i>
     </button>
 </form>
diff --git a/adhocracy-plus/templates/a4forms/includes/inline_form.html b/adhocracy-plus/templates/a4forms/includes/inline_form.html
index ebc9488382..8c6db05dfa 100644
--- a/adhocracy-plus/templates/a4forms/includes/inline_form.html
+++ b/adhocracy-plus/templates/a4forms/includes/inline_form.html
@@ -12,11 +12,11 @@
 
         {% if not form.name.value %}
             <button type="button" class="category-formset__delete-label js-remove-form" title="{% translate 'Remove item' %}">
-                <i class="fa fa-times" aria-label="{% translate 'Remove item' %}"></i>
+                <i class="fa fa-xmark" aria-label="{% translate 'Remove item' %}"></i>
             </button>
         {% elif can_delete %}
             <label for="{{ form.DELETE.id_for_label }}" class="category-formset__delete-label" title="{% translate 'Remove item' %}">
-                <i class="far fa-trash-alt" aria-label="{% translate 'Remove item' %}"></i>
+                <i class="far fa-trash-can" aria-label="{% translate 'Remove item' %}"></i>
             </label>
         {% endif %}
         {% for hidden in form.hidden_fields %}
diff --git a/adhocracy-plus/templates/a4images/image_upload_widget.html b/adhocracy-plus/templates/a4images/image_upload_widget.html
index a2d51bf9db..5080dbae75 100644
--- a/adhocracy-plus/templates/a4images/image_upload_widget.html
+++ b/adhocracy-plus/templates/a4images/image_upload_widget.html
@@ -8,13 +8,13 @@
             <label for="{{ checkbox_id }}"
                 class="upload-wrapper__action btn btn--danger"
                 title="{% translate 'Remove the picture' %}">
-                <i class="far fa-trash-alt" aria-label="{% translate 'Remove the picture' %}"></i>
+                <i class="far fa-trash-can" aria-label="{% translate 'Remove the picture' %}"></i>
             </label>
         {% else %}
             <label for="{{ id }}"
                 class="upload-wrapper__action btn btn--default"
                 title="{% translate 'Upload a picture' %}">
-                <i class="fas fa-cloud-upload-alt" aria-label="{% translate 'Upload a picture' %}"></i>
+                <i class="fas fa-cloud-arrow-up-alt" aria-label="{% translate 'Upload a picture' %}"></i>
             </label>
         {% endif %}
         </div>
diff --git a/adhocracy-plus/templates/a4images/image_upload_widget_simple.html b/adhocracy-plus/templates/a4images/image_upload_widget_simple.html
index e35048efbe..27f69b11ff 100644
--- a/adhocracy-plus/templates/a4images/image_upload_widget_simple.html
+++ b/adhocracy-plus/templates/a4images/image_upload_widget_simple.html
@@ -8,13 +8,13 @@
             <label for="{{ checkbox_id }}"
                 class="upload-wrapper__action btn btn--danger"
                 title="{% translate 'Remove the picture' %}">
-                <i class="far fa-trash-alt" aria-label="{% translate 'Remove the picture' %}"></i>
+                <i class="far fa-trash-can" aria-label="{% translate 'Remove the picture' %}"></i>
             </label>
         {% else %}
             <label for="{{ id }}"
                 class="upload-wrapper__action btn btn--default"
                 title="{% translate 'Upload a picture' %}">
-                <i class="fas fa-cloud-upload-alt" aria-label="{% translate 'Upload a picture' %}"></i>
+                <i class="fas fa-cloud-arrow-up-alt" aria-label="{% translate 'Upload a picture' %}"></i>
             </label>
         {% endif %}
         </div>
diff --git a/apps/account/templates/a4_candy_account/account_dashboard.html b/apps/account/templates/a4_candy_account/account_dashboard.html
index 03b344b50d..1d8600ed69 100644
--- a/apps/account/templates/a4_candy_account/account_dashboard.html
+++ b/apps/account/templates/a4_candy_account/account_dashboard.html
@@ -46,7 +46,7 @@
                     <li class="dashboard-nav__page">
                         <a href="{% url 'user_agreements' %}"
                            class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == "user_agreements" %}is-active{% endif %}">
-                            <i class="far fa-check-square" aria-hidden="true"></i>
+                            <i class="far fa-square-check" aria-hidden="true"></i>
                             {% translate 'User Agreements' %}
                         </a>
                     </li>
diff --git a/apps/budgeting/templates/a4_candy_budgeting/includes/proposal_list_item.html b/apps/budgeting/templates/a4_candy_budgeting/includes/proposal_list_item.html
index 0e8859c490..d0be2548be 100644
--- a/apps/budgeting/templates/a4_candy_budgeting/includes/proposal_list_item.html
+++ b/apps/budgeting/templates/a4_candy_budgeting/includes/proposal_list_item.html
@@ -29,7 +29,7 @@ <h3 class="u-first-heading">
             <span class="label label--big">{{ object.category }}</span>
         {% endif %}
         {% if object.point_label %}
-            <span class="label label--big"><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ object.point_label }}</span>
+            <span class="label label--big"><i class="fas fa-location-pin-alt" aria-hidden="true"></i> {{ object.point_label }}</span>
         {% endif %}
         {% if object.budget > 0 %}
             <span class="label label--big">{{ object.budget|intcomma }}€</span>
diff --git a/apps/contrib/templates/a4_candy_contrib/component_library.html b/apps/contrib/templates/a4_candy_contrib/component_library.html
index fa8d3e0613..ee04bcba58 100644
--- a/apps/contrib/templates/a4_candy_contrib/component_library.html
+++ b/apps/contrib/templates/a4_candy_contrib/component_library.html
@@ -692,7 +692,7 @@ <h2 id="cl-category_formset">Category Formset</h2>
                             <input name="category_set-0-DELETE" id="id_category_set-0-DELETE" class="category-formset__delete" type="checkbox">
                             <input name="category_set-0-name" value="category 1" placeholder="Kategorie" id="id_category_set-0-name" type="text">
                             <label for="id_category_set-0-DELETE" class="category-formset__delete-label" title="Kategorie entfernen">
-                                <i class="far fa-trash-alt" aria-label="Kategorie entfernen"></i>
+                                <i class="far fa-trash-can" aria-label="Kategorie entfernen"></i>
                             </label>
                         </div>
 
@@ -741,7 +741,7 @@ <h2>Contents</h2>
                                                     aria-label="Move up"></i></button><button class="btn btn--light btn--small" disabled=""
                                                 title="Move down" type="button"><i class="fa fa-chevron-down"
                                                     aria-label="Move down"></i></button><button class="btn btn--light btn--small"
-                                                disabled="" title="Delete" type="button"><i class="far fa-trash-alt"
+                                                disabled="" title="Delete" type="button"><i class="far fa-trash-can"
                                                     aria-label="Delete"></i></button></div>
                                     </div>
                                 </li>
@@ -772,7 +772,7 @@ <h2>Edit chapter</h2>
                                         aria-label="Move up"></i></button><button class="btn btn--light btn--small" disabled=""
                                         title="Move down" type="button"><i class="fa fa-chevron-down"
                                         aria-label="Move down"></i></button><button class="btn btn--light btn--small" title="Delete"
-                                        type="button"><i class="far fa-trash-alt" aria-label="Delete"></i></button></div>
+                                        type="button"><i class="far fa-trash-can" aria-label="Delete"></i></button></div>
                                 </section>
                             </div>
                             <button class="btn btn--light btn--small" type="button"><i class="fa fa-plus"></i> Add a new
@@ -798,7 +798,7 @@ <h2 id="cl-comments">Comments</h2>
                                         Feb. 9, 2022, 5:54 p.m.</time>
                                 </div>
                                 <div class="col-1 col-md-1 ms-auto a4-comments__dropdown-container">
-                                    <div class="dropdown a4-comments__dropdown"><button type="button" class="dropdown-toggle btn btn--link" aria-haspopup="true" aria-expanded="false" data-bs-toggle="dropdown"><i class="fas fa-ellipsis-h"
+                                    <div class="dropdown a4-comments__dropdown"><button type="button" class="dropdown-toggle btn btn--link" aria-haspopup="true" aria-expanded="false" data-bs-toggle="dropdown"><i class="fas fa-ellipsis"
                                               aria-hidden="true"></i></button>
                                         <div class="dropdown-menu dropdown-menu-end"><button class="dropdown-item" type="button">Edit</button>
                                             <div class="divider"></div><a class="dropdown-item" href="#comment_delete_25" data-bs-toggle="modal" data-bs-target="#delete_modal">Delete</a>
@@ -878,7 +878,7 @@ <h2 id="cl-dashboard-nav">Dashboard Nav</h2>
                 <div class="cl-example">
                   <div class="dashboard-nav">
                     <div class="dashboard-nav__dropdown" data-bs-toggle="collapse" href="#dashboardCollapseProj" aria-expanded="true" aria-controls="#dashboardCollapseProj" data-bs-target="#dashboardCollapseProj">
-                        <i class="fas fa-check-circle text-info" title="Projekt bereit zur Veröffentlichung" aria-label="Projekt bereit zur Veröffentlichung"></i>
+                        <i class="fas fa-circle-check text-info" title="Projekt bereit zur Veröffentlichung" aria-label="Projekt bereit zur Veröffentlichung"></i>
                         Project of all the modules
                         <i class="fa fa-chevron-up" aria-hidden="true"></i>
                     </div>
@@ -910,7 +910,7 @@ <h2 id="cl-dashboard-nav">Dashboard Nav</h2>
                             <li class="dashboard-nav__page">
                                 <a href="#" class="dashboard-nav__item dashboard-nav__item--interactive">
                                     If there is information missing, a red exclamation mark is shown
-                                    <i class="fa fa-exclamation-circle text-danger" title="Missing fields for publication" aria-label="Missing fields for publication"></i>
+                                    <i class="fa fa-circle-exclamation text-danger" title="Missing fields for publication" aria-label="Missing fields for publication"></i>
                                 </a>
                             </li>
                             <li class="dashboard-nav__page">
@@ -1087,7 +1087,7 @@ <h2 id="cl-form-inline">Filter Bar</h2>
                                           class="dropdown-item" data-value="Right" href="#">Right</button><button class="dropdown-item" data-value="Center" href="#">Center</button></div>
                                 </div>
                                 <div class="checkbox-btn livequestion__filter--btn"><label for="showFilters" class="checkbox-btn__label--light" aria-label="Click to view filters" title="Click to view filters"><input class="checkbox-btn__input"
-                                          type="checkbox" id="showFilters" name="showFilter"><span class="checkbox-btn__text"><i class="fas fa-sliders-h me-1" aria-hidden="true"></i> Filters</span></label></div>
+                                          type="checkbox" id="showFilters" name="showFilter"><span class="checkbox-btn__text"><i class="fas fa-sliders me-1" aria-hidden="true"></i> Filters</span></label></div>
                             </div>
                         </div>
 
@@ -1102,7 +1102,7 @@ <h2 id="cl-overlapping-ctrl-bar">Filter bar Overlapping</h2>
                                           <input class="form-control" type="search" name="search" placeholder="Search" value="">
                                           <input type="hidden" name="ordering" value="-created">
                                           <button class="btn btn--light" type="submit" title="Search">
-                                              <i class="fa fa-search" aria-label="Search"></i>
+                                              <i class="fa fa-magnifying-glass" aria-label="Search"></i>
                                           </button>
                                       </form>
                                   </div>
@@ -1397,7 +1397,7 @@ <h2 id="cl-idea_remark">Idea Remark</h2>
                         <div class="dropdown dropdown-menu-end show">
                             <button title="Remark" type="button" class="dropdown-toggle btn btn--light btn--small" aria-haspopup="true" aria-expanded="true" id="idea-remark__dropdown">
                                 <i class="fa fa-comment" aria-label="Moderator remark"></i>
-                                <i class="fa fa-check-circle idea-remark__btn__notify  d-none " aria-hidden="true"></i>
+                                <i class="fa fa-circle-check idea-remark__btn__notify  d-none " aria-hidden="true"></i>
                             </button>
                             <ul class="dropdown-menu idea-remark" id="remark__dropdown-menu" aria-labelledby="id_remark_dropdown">
                                 <li>
@@ -1418,7 +1418,7 @@ <h2 id="cl-idea_remark">Idea Remark</h2>
                         <div class="dropdown dropdown-menu-end">
                             <button title="Remark" type="button" class="dropdown-toggle btn btn--light btn--small" data-flip="false" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true" id="idea-remark__dropdown">
                                 <i class="fa fa-comment" aria-label="Moderator remark"></i>
-                                <i class="fa fa-check-circle idea-remark__btn__notify  d-none " aria-hidden="true" style="display: inline;"></i>
+                                <i class="fa fa-circle-check idea-remark__btn__notify  d-none " aria-hidden="true" style="display: inline;"></i>
                             </button>
                         </div>
                     </div>
@@ -1463,7 +1463,7 @@ <h1 class="item-detail__title">Item Detail Title</h1>
                             </div>
                             <div class="dropdown dropdown-menu-end lr-bar__right">
                                 <button class="dropdown-toggle btn btn--light btn--small">
-                                    <i class="fa fa-ellipsis-v px-1"></i>
+                                    <i class="fa fa-ellipsis-vertical px-1"></i>
                                 </button>
                             </div>
                         </div>
@@ -1665,7 +1665,7 @@ <h2 className="u-no-margin-bottom u-spacer-top-one-half">
                                     Send Report
                                 </h2>
                                 <button class="close" aria-label="Abort" data-bs-dismiss="modal">
-                                    <i class="fa fa-times"></i>
+                                    <i class="fa fa-xmark"></i>
                                 </button>
                             </div>
                             <div class="modal-body">
@@ -1691,7 +1691,7 @@ <h2 className="u-no-margin-bottom u-spacer-top-one-half">
                                     Share Link
                                 </h2>
                                 <button class="close" aria-label="Abort" data-bs-dismiss="modal">
-                                    <i class="fa fa-times"></i>
+                                    <i class="fa fa-xmark"></i>
                                 </button>
                             </div>
                             <div class="modal-body">
@@ -1710,7 +1710,7 @@ <h2 className="u-no-margin-bottom u-spacer-top-one-half">
                                 <h2 className="u-no-margin-bottom u-spacer-top-one-half">
                                     Delete
                                 </h2>
-                                <button class="close" aria-label="Abort" data-bs-dismiss="modal"><i class="fa fa-times"></i></button>
+                                <button class="close" aria-label="Abort" data-bs-dismiss="modal"><i class="fa fa-xmark"></i></button>
                             </div>
                             <div class="modal-body">
                                 Do you really want to delete this comment?
@@ -1843,13 +1843,13 @@ <h2 id="cl-progress">Progress</h2>
                         <ul class="progress-line u-spacer-bottom">
                             <li class="progress-line__entry">
                                 <span class="progress-line__line--bottom"></span>
-                                <i class="fas fa-check-circle u-success progress-line__icon" title="Project type created" aria-label="Project type created"></i>
+                                <i class="fas fa-circle-check u-success progress-line__icon" title="Project type created" aria-label="Project type created"></i>
                                 <span>Create a new Project</span>
                             </li>
                             <li class="progress-line__entry">
                                 <span class="progress-line__line--top"></span>
                                 <span class="progress-line__line--bottom"></span>
-                                <i class="fas fa-check-circle u-success progress-line__icon" title="Project type ready for publication" aria-label="Project type ready for publication"></i>
+                                <i class="fas fa-circle-check u-success progress-line__icon" title="Project type ready for publication" aria-label="Project type ready for publication"></i>
                                 <span class="progress-line__entry--active">
                                     <span>Fill in project details</span>
                                 </span>
@@ -2268,7 +2268,7 @@ <h2 id="cl-upload">Upload</h2>
                                             placeholder="Select a picture from your local folder." tabindex="-1" id="text-id_image">
                                         <div class="upload-wrapper__action-parent">
                                             <label for="id_image" class="upload-wrapper__action btn btn--default" title="Upload a picture">
-                                                <i class="fas fa-cloud-upload-alt" aria-label="Upload a picture"></i>
+                                                <i class="fas fa-cloud-arrow-up-alt" aria-label="Upload a picture"></i>
                                             </label>
                                         </div>
                                     </div>
diff --git a/apps/contrib/templates/a4_candy_contrib/item_detail.html b/apps/contrib/templates/a4_candy_contrib/item_detail.html
index f687141894..164b3a4f41 100644
--- a/apps/contrib/templates/a4_candy_contrib/item_detail.html
+++ b/apps/contrib/templates/a4_candy_contrib/item_detail.html
@@ -95,7 +95,7 @@ <h1 class="item-detail__title">{{ object.name }}</h1>
                                         aria-expanded="false"
                                         id="idea-{{ object.pk }}-actions"
                                 >
-                                    <i class="fa fa-ellipsis-v px-1" aria-label="{% translate 'Actions' %}"></i>
+                                    <i class="fa fa-ellipsis-vertical px-1" aria-label="{% translate 'Actions' %}"></i>
                                 </button>
                                 <div class="dropdown-menu dropdown-menu-end" aria-labelledby="idea-{{ object.pk }}-actions">
                                     {% if user_may_change %}
diff --git a/apps/dashboard/templates/a4_candy_dashboard/includes/progress.html b/apps/dashboard/templates/a4_candy_dashboard/includes/progress.html
index 3b11ccaab9..fa2cc79c63 100644
--- a/apps/dashboard/templates/a4_candy_dashboard/includes/progress.html
+++ b/apps/dashboard/templates/a4_candy_dashboard/includes/progress.html
@@ -36,7 +36,7 @@ <h2 className="u-no-margin-bottom u-spacer-top-one-half">
                     </h2>
                 {% endif %}
                 <button type="button" class="close" data-bs-dismiss="modal" aria-label="{% translate 'Close'%}">
-                    <i class="fas fa-times" aria-hidden="true"></i>
+                    <i class="fas fa-xmark" aria-hidden="true"></i>
                 </button>
             </div>
             <div class="modal-body">
diff --git a/apps/debate/templates/a4_candy_debate/includes/subject_dashboard_list_item.html b/apps/debate/templates/a4_candy_debate/includes/subject_dashboard_list_item.html
index aad3bb72ca..6a480f4e32 100644
--- a/apps/debate/templates/a4_candy_debate/includes/subject_dashboard_list_item.html
+++ b/apps/debate/templates/a4_candy_debate/includes/subject_dashboard_list_item.html
@@ -15,12 +15,12 @@ <h3>{{ object.name }}</h3>
                     </a>
                     <a href="{% url 'a4dashboard:subject-update' organisation_slug=project.organisation.slug pk=object.pk year=object.created.year %}"
                        class="btn btn--small btn--light">
-                        <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+                        <i class="fas fa-pencil" aria-hidden="true"></i>
                         {% translate 'Edit'%}
                     </a>
                     <a href="{% url 'a4dashboard:subject-delete' organisation_slug=project.organisation.slug pk=object.pk year=object.created.year %}"
                        class="btn btn--small btn--light">
-                        <i class="fas fa-times" aria-hidden="true"></i>
+                        <i class="fas fa-xmark" aria-hidden="true"></i>
                         {% translate 'Delete'%}
                     </a>
                 {% endspaceless %}
diff --git a/apps/documents/assets/ChapterNavItem.jsx b/apps/documents/assets/ChapterNavItem.jsx
index bef6ad61a2..c90ade1745 100644
--- a/apps/documents/assets/ChapterNavItem.jsx
+++ b/apps/documents/assets/ChapterNavItem.jsx
@@ -58,7 +58,7 @@ const ChapterNavItem = (props) => {
           type="button"
         >
           <i
-            className="far fa-trash-alt"
+            className="far fa-trash-can"
             aria-label={django.gettext('Delete')}
           />
         </button>
diff --git a/apps/documents/assets/ParagraphForm.jsx b/apps/documents/assets/ParagraphForm.jsx
index a4206e3104..c5040e1f0b 100644
--- a/apps/documents/assets/ParagraphForm.jsx
+++ b/apps/documents/assets/ParagraphForm.jsx
@@ -134,7 +134,7 @@ class ParagraphForm extends React.Component {
             type="button"
           >
             <i
-              className="far fa-trash-alt"
+              className="far fa-trash-can"
               aria-label={django.gettext('Delete')}
             />
           </button>
diff --git a/apps/interactiveevents/assets/Filters.jsx b/apps/interactiveevents/assets/Filters.jsx
index 88a106122d..fe8bc575c4 100644
--- a/apps/interactiveevents/assets/Filters.jsx
+++ b/apps/interactiveevents/assets/Filters.jsx
@@ -79,7 +79,7 @@ export default class Filter extends React.Component {
                 onChange={this.handleToggleFilters.bind(this)} // eslint-disable-line react/jsx-handler-names
               />
               <span className="checkbox-btn__text--colour">
-                <i className="fas fa-sliders-h me-1" aria-hidden="true" />
+                <i className="fas fa-sliders me-1" aria-hidden="true" />
                 {textFilters}
               </span>
             </label>
diff --git a/apps/interactiveevents/assets/InfoBox.jsx b/apps/interactiveevents/assets/InfoBox.jsx
index 0ccf46fb34..ea294c2f5d 100644
--- a/apps/interactiveevents/assets/InfoBox.jsx
+++ b/apps/interactiveevents/assets/InfoBox.jsx
@@ -58,7 +58,7 @@ export default class InfoBox extends React.Component {
           </div>}
         {!this.state.displayInfo &&
           <button type="button" className="btn btn--none text-muted pe-0" onClick={this.toggleInformation.bind(this)}>
-            <span aria-label={ariaOpenInfo}><i className="fas fa-info-circle me-1" />{textInfo}</span>
+            <span aria-label={ariaOpenInfo}><i className="fas fa-circle-info me-1" />{textInfo}</span>
           </button>}
       </div>
     )
diff --git a/apps/interactiveevents/templates/a4_candy_interactive_events/module_detail.html b/apps/interactiveevents/templates/a4_candy_interactive_events/module_detail.html
index 61fa305333..760210d30b 100644
--- a/apps/interactiveevents/templates/a4_candy_interactive_events/module_detail.html
+++ b/apps/interactiveevents/templates/a4_candy_interactive_events/module_detail.html
@@ -5,7 +5,7 @@
     <div class="row">
         <div class="col-md-12 my-2">
             <div class="alert" role="alert">
-                <i class="fas fa-info-circle" aria-hidden="true"></i>
+                <i class="fas fa-circle-info" aria-hidden="true"></i>
                 {% translate 'During this event you can ask questions live' %}
             </div>
         </div>
diff --git a/apps/mapideas/templates/a4_candy_mapideas/includes/mapidea_list_item.html b/apps/mapideas/templates/a4_candy_mapideas/includes/mapidea_list_item.html
index d6ae4eb652..f8146b12d2 100644
--- a/apps/mapideas/templates/a4_candy_mapideas/includes/mapidea_list_item.html
+++ b/apps/mapideas/templates/a4_candy_mapideas/includes/mapidea_list_item.html
@@ -31,7 +31,7 @@ <h3 class="u-first-heading">
             <span class="label label--big">{{ object.category }}</span>
         {% endif %}
         {% if object.point_label %}
-            <span class="label label--big"><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ object.point_label }}</span>
+            <span class="label label--big"><i class="fas fa-location-pin-alt" aria-hidden="true"></i> {{ object.point_label }}</span>
         {% endif %}
         {% if object.moderator_status %}
             <span class="label label--big label--{{ object.moderator_status|classify }} list-item__label--moderator-feedback">
diff --git a/apps/mapideas/templates/a4_candy_mapideas/mapidea_detail.html b/apps/mapideas/templates/a4_candy_mapideas/mapidea_detail.html
index 5d37e52473..abb3d23736 100644
--- a/apps/mapideas/templates/a4_candy_mapideas/mapidea_detail.html
+++ b/apps/mapideas/templates/a4_candy_mapideas/mapidea_detail.html
@@ -11,7 +11,7 @@
 
 {% block additional_labels %}
     {% if object.point_label %}
-        <span class="label label--big"><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ object.point_label }}</span>
+        <span class="label label--big"><i class="fas fa-location-pin-alt" aria-hidden="true"></i> {{ object.point_label }}</span>
     {% endif %}
 {% endblock %}
 
diff --git a/apps/maps/assets/map-address.js b/apps/maps/assets/map-address.js
index 8a362a0aed..3ded77067b 100644
--- a/apps/maps/assets/map-address.js
+++ b/apps/maps/assets/map-address.js
@@ -60,10 +60,10 @@ const setBusy = function ($group, busy) {
   if (busy) {
     $group.find('.fa, .fas, .far')
       .addClass('fa-spinner fa-pulse')
-      .removeClass('fa-search')
+      .removeClass('fa-magnifying-glass')
   } else {
     $group.find('.fa, .fas, .far')
-      .addClass('fa-search')
+      .addClass('fa-magnifying-glass')
       .removeClass('fa-spinner fa-pulse')
   }
 }
diff --git a/apps/maps/assets/map_choose_polygon_with_preset.js b/apps/maps/assets/map_choose_polygon_with_preset.js
index 53e8361e91..55185f4027 100644
--- a/apps/maps/assets/map_choose_polygon_with_preset.js
+++ b/apps/maps/assets/map_choose_polygon_with_preset.js
@@ -84,7 +84,7 @@ function init () {
               '<div class="modal-header">' +
                 // Not using Bootstrap, but utility classes on purpose to align with component in A4
                 '<h2 class="u-no-margin-bottom u-spacer-top-one-half">' + modalTitle + '</h2>' +
-                '<button class="close" aria-label="' + django.gettext('Close') + '" data-bs-dismiss="modal"><i class="fa fa-times" aria-hidden="true"></i></button>' +
+                '<button class="close" aria-label="' + django.gettext('Close') + '" data-bs-dismiss="modal"><i class="fa fa-xmark" aria-hidden="true"></i></button>' +
               '</div>' +
               '<div class="modal-body">' +
                 '<form id="map-import-form" data-ignore-submit="true">' +
diff --git a/apps/moderatorremark/templates/a4_candy_moderatorremark/includes/popover_remark.html b/apps/moderatorremark/templates/a4_candy_moderatorremark/includes/popover_remark.html
index ec8ffa0153..291d19b749 100644
--- a/apps/moderatorremark/templates/a4_candy_moderatorremark/includes/popover_remark.html
+++ b/apps/moderatorremark/templates/a4_candy_moderatorremark/includes/popover_remark.html
@@ -13,7 +13,7 @@
         id="idea-remark__dropdown"
     >
         <i class="fa fa-comment" aria-label="{% translate 'Moderator remark' %}"></i>
-        <i class="fa fa-check-circle idea-remark__btn__notify {% if not remark or not remark.content %} d-none {% endif %}" aria-hidden="true"></i>
+        <i class="fa fa-circle-check idea-remark__btn__notify {% if not remark or not remark.content %} d-none {% endif %}" aria-hidden="true"></i>
     </button>
     <div class="dropdown-menu dropdown-menu-end idea-remark" id="remark__dropdown-menu" aria-labelledby="id_remark_dropdown">
         <form class="general-form" id="idea-remark__form">
diff --git a/apps/offlineevents/templates/a4_candy_offlineevents/includes/offlineevent_list_item.html b/apps/offlineevents/templates/a4_candy_offlineevents/includes/offlineevent_list_item.html
index 2e223df9b8..1f0e1e5597 100644
--- a/apps/offlineevents/templates/a4_candy_offlineevents/includes/offlineevent_list_item.html
+++ b/apps/offlineevents/templates/a4_candy_offlineevents/includes/offlineevent_list_item.html
@@ -21,7 +21,7 @@ <h3>{{ object.name }}</h3>
                     </a>
                     <a href="{% url 'a4dashboard:offlineevent-delete' organisation_slug=project.organisation.slug slug=object.slug %}"
                        class="btn btn--small btn--light">
-                        <i class="fa fa-times" aria-hidden="true"></i>
+                        <i class="fa fa-xmark" aria-hidden="true"></i>
                         {% translate 'Delete'%}
                     </a>
                 {% endspaceless %}
diff --git a/apps/organisations/templates/a4_candy_organisations/communication_form_social_media.html b/apps/organisations/templates/a4_candy_organisations/communication_form_social_media.html
index be8362ce00..4b6af1b7d2 100644
--- a/apps/organisations/templates/a4_candy_organisations/communication_form_social_media.html
+++ b/apps/organisations/templates/a4_candy_organisations/communication_form_social_media.html
@@ -78,7 +78,7 @@ <h1 class="u-first-heading">{% translate "Create Content" %}</h1>
                 <div class="d-flex justify-content-end mb-3">
                     <button type="submit" class="btn btn--primary btn--icon">
                         {% if image_preview %}
-                            <i class="fas fa-sync-alt"></i>{% translate 'Refresh' %}
+                            <i class="fas fa-arrows-rotate-alt"></i>{% translate 'Refresh' %}
                         {% else %}
                             {% translate 'Generate' %}
                         {% endif %}
diff --git a/apps/organisations/templates/a4_candy_organisations/includes/form_field.html b/apps/organisations/templates/a4_candy_organisations/includes/form_field.html
index dfde553253..37e92b745f 100644
--- a/apps/organisations/templates/a4_candy_organisations/includes/form_field.html
+++ b/apps/organisations/templates/a4_candy_organisations/includes/form_field.html
@@ -3,7 +3,7 @@
 
 {% block after_label %}
     {% if important and not field.value %}
-        <i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing important field' %}" aria-label="{% translate 'Missing important field' %}"></i>
+        <i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing important field' %}" aria-label="{% translate 'Missing important field' %}"></i>
     {% endif %}
 {% endblock %}
 
diff --git a/apps/organisations/templates/a4_candy_organisations/organisation_landing_page.html b/apps/organisations/templates/a4_candy_organisations/organisation_landing_page.html
index b969faef6b..637c131c6c 100644
--- a/apps/organisations/templates/a4_candy_organisations/organisation_landing_page.html
+++ b/apps/organisations/templates/a4_candy_organisations/organisation_landing_page.html
@@ -38,7 +38,7 @@
                         <h1 class="marked-box">{{ organisation.title }}</h1>
                         {% if organisation.url %}
                         <a class="ms-3 text-muted" href="{{ organisation.url }}" target="_blank" title="{{ organisation.url }}">
-                            <i class="fas fa-external-link-alt" role="img" aria-label="{{ organisation.title }} {% translate 'Opens in new window' %}"></i>
+                            <i class="fas fa-arrow-up-right-from-square-alt" role="img" aria-label="{{ organisation.title }} {% translate 'Opens in new window' %}"></i>
                         </a>
                         {% endif %}
                         <div class="row">
diff --git a/apps/projects/templates/a4_candy_projects/includes/removeable_invite_list.html b/apps/projects/templates/a4_candy_projects/includes/removeable_invite_list.html
index 1e5820800a..4c95199511 100644
--- a/apps/projects/templates/a4_candy_projects/includes/removeable_invite_list.html
+++ b/apps/projects/templates/a4_candy_projects/includes/removeable_invite_list.html
@@ -19,7 +19,7 @@
                         {% csrf_token %}
                         <input type="hidden" name="invite_pk" value="{{ invite.pk }}">
                         <button type="submit" name="submit_action" value="remove_invite" title="{% translate 'Remove' %}">
-                            <i class="fa fa-times" aria-label="{% translate 'Remove' %}"></i>
+                            <i class="fa fa-xmark" aria-label="{% translate 'Remove' %}"></i>
                         </button>
                     </form>
                 </td>
diff --git a/apps/projects/templates/a4_candy_projects/includes/removeable_user_list.html b/apps/projects/templates/a4_candy_projects/includes/removeable_user_list.html
index 63f51c3d02..b5747291ed 100644
--- a/apps/projects/templates/a4_candy_projects/includes/removeable_user_list.html
+++ b/apps/projects/templates/a4_candy_projects/includes/removeable_user_list.html
@@ -17,7 +17,7 @@
                             {% csrf_token %}
                             <input type="hidden" name="user_pk" value="{{ user.pk }}">
                             <button type="submit" name="submit_action" value="remove_user" title="{% translate 'Remove' %}">
-                                <i class="fa fa-times" aria-label="{% translate 'Remove' %}"></i>
+                                <i class="fa fa-xmark" aria-label="{% translate 'Remove' %}"></i>
                             </button>
                         </form>
                     </td>
diff --git a/apps/topicprio/templates/a4_candy_topicprio/includes/topic_dashboard_list_item.html b/apps/topicprio/templates/a4_candy_topicprio/includes/topic_dashboard_list_item.html
index d81141db4c..1ad754a927 100644
--- a/apps/topicprio/templates/a4_candy_topicprio/includes/topic_dashboard_list_item.html
+++ b/apps/topicprio/templates/a4_candy_topicprio/includes/topic_dashboard_list_item.html
@@ -15,12 +15,12 @@ <h3>{{ object.name }}</h3>
                     </a>
                     <a href="{% url 'a4dashboard:topic-update' organisation_slug=project.organisation.slug pk=object.pk year=object.created.year %}"
                        class="btn btn--small btn--light">
-                        <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+                        <i class="fas fa-pencil" aria-hidden="true"></i>
                         {% translate 'Edit'%}
                     </a>
                     <a href="{% url 'a4dashboard:topic-delete' organisation_slug=project.organisation.slug pk=object.pk year=object.created.year %}"
                        class="btn btn--small btn--light">
-                        <i class="fas fa-times" aria-hidden="true"></i>
+                        <i class="fas fa-xmark" aria-hidden="true"></i>
                         {% translate 'Delete'%}
                     </a>
                 {% endspaceless %}
diff --git a/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationFeedback.jsx b/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationFeedback.jsx
index e0f7112ca2..d520ef3426 100644
--- a/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationFeedback.jsx
+++ b/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationFeedback.jsx
@@ -24,7 +24,7 @@ export const ModerationFeedback = (props) => {
                 type="button" className="dropdown-toggle btn btn--none" aria-haspopup="true"
                 aria-expanded="false" data-bs-toggle="dropdown"
               >
-                <i className="fas fa-ellipsis-v" aria-hidden="true" />
+                <i className="fas fa-ellipsis-vertical" aria-hidden="true" />
               </button>
               <ul className="dropdown-menu dropdown-menu-end">
                 <li key="1">
diff --git a/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationNotification.jsx b/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationNotification.jsx
index ac24dc2a66..4132facfd0 100644
--- a/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationNotification.jsx
+++ b/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationNotification.jsx
@@ -270,7 +270,7 @@ export const ModerationNotification = (props) => {
                 aria-expanded="false"
                 data-bs-toggle="dropdown"
               >
-                <i className="fas fa-ellipsis-v" aria-hidden="true" />
+                <i className="fas fa-ellipsis-vertical" aria-hidden="true" />
               </button>
               <ul className="dropdown-menu dropdown-menu-end">
                 <li key="1">
@@ -293,7 +293,7 @@ export const ModerationNotification = (props) => {
 
         {numReports > 0 &&
           <div>
-            <i className="fas fa-exclamation-circle me-1" aria-hidden="true" />
+            <i className="fas fa-circle-exclamation me-1" aria-hidden="true" />
             <strong>{userProfileUrl ? <a href={userProfileUrl}>{userName}</a> : userName}</strong>
             {getLink(translatedReportText(numReports), commentUrl)}
           </div>}
diff --git a/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationProjects.jsx b/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationProjects.jsx
index 3d875a4da7..263cecac88 100644
--- a/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationProjects.jsx
+++ b/apps/userdashboard/assets/js/a4_candy_userdashboard/ModerationProjects.jsx
@@ -99,7 +99,7 @@ export default class ModerationProjects extends Component {
                     {item.access === 3 && <span className="label label--dark">{privateText}</span>}
                   </div>
                   <div className="row text-muted mt-3">
-                    {item.num_unread_comments > 0 && <div className="col-4"><i className="fas fa-exclamation-circle me-1" aria-hidden="true" /> {item.num_unread_comments} <span className="d-none d-lg-inline-block">{reportCountText}</span></div>}
+                    {item.num_unread_comments > 0 && <div className="col-4"><i className="fas fa-circle-exclamation me-1" aria-hidden="true" /> {item.num_unread_comments} <span className="d-none d-lg-inline-block">{reportCountText}</span></div>}
                     {item.comment_count > 0 && <div className="col-4"><i className="far fa-comment" aria-hidden="true" /> {item.comment_count} <span className="d-none d-lg-inline-block">{commentCountText}</span></div>}
                     {item.future_phase && !item.active_phase && <div className="col-4"><i className="far fa-clock" aria-hidden="true" /> {item.participation_string}</div>}
                     {item.active_phase && <div className="col-4"><i className="far fa-clock" aria-hidden="true" /> <span className="d-inline-block d-lg-none">{this.getMobileTimespan(item)}</span> <span className="d-none d-lg-inline-block">{this.getTimespan(item)}</span></div>}
diff --git a/apps/userdashboard/templates/a4_candy_userdashboard/base_userdashboard.html b/apps/userdashboard/templates/a4_candy_userdashboard/base_userdashboard.html
index 1f51e40dd0..2c8717188d 100644
--- a/apps/userdashboard/templates/a4_candy_userdashboard/base_userdashboard.html
+++ b/apps/userdashboard/templates/a4_candy_userdashboard/base_userdashboard.html
@@ -43,7 +43,7 @@ <h1 class="sr-only">
                                 aria-expanded="false"
                                 id="account-settings"
                             >
-                                <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                                <i class="fa fa-ellipsis-vertical" aria-hidden="true"></i>
                             </button>
                             <div class="dropdown-menu dropdown-menu-end" aria-labelledby="account-settings">
 
@@ -82,7 +82,7 @@ <h2 class="fs-6">{% trans 'Initiator Organisations' %}</h2>
                             {% if organisation.logo %}
                               <img src="{% thumbnail organisation.logo '0x40' %}" alt="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %}" />
                             {% else %}
-                              <i class="fas fa-home font--lg action__icon" aria-label="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %} {% trans 'Home' %}"></i>
+                              <i class="fas fa-house font--lg action__icon" aria-label="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %} {% trans 'Home' %}"></i>
                             {% endif %}
                             <div class="ms-3 text-start">{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %}</div>
                           </a>
@@ -109,7 +109,7 @@ <h2 class="fs-6">{% trans 'Initiator Organisations' %}</h2>
                                      {% if organisation.logo %}
                                        <img src="{% thumbnail organisation.logo '0x40' %}" alt="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %}" />
                                      {% else %}
-                                       <i class="fas fa-home font--lg action__icon" aria-label="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %} {% trans 'Home' %}"></i>
+                                       <i class="fas fa-house font--lg action__icon" aria-label="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %} {% trans 'Home' %}"></i>
                                      {% endif %}
                                      <div class="ms-3 text-start">{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %}</div>
                                    </a>
@@ -130,7 +130,7 @@ <h2 class="fs-6">{% trans 'Organisations' %}</h2>
                           {% if organisation.logo %}
                             <img src="{% thumbnail organisation.logo '0x40' %}" alt="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %}" />
                           {% else %}
-                            <i class="fas fa-home font--lg action__icon" aria-label="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %} {% trans 'Home' %}"></i>
+                            <i class="fas fa-house font--lg action__icon" aria-label="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %} {% trans 'Home' %}"></i>
                           {% endif %}
                             <div class="ms-3 text-start">{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %}</div>
                         </a>
@@ -163,7 +163,7 @@ <h2 class="fs-6">{% trans 'Organisations' %}</h2>
                                      {% if organisation.logo %}
                                        <img src="{% thumbnail organisation.logo '0x40' %}" alt="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %}" />
                                      {% else %}
-                                       <i class="fas font--lg fa-home action__icon" aria-label="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %} {% trans 'Home' %}"></i>
+                                       <i class="fas font--lg fa-house action__icon" aria-label="{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %} {% trans 'Home' %}"></i>
                                      {% endif %}
                                      <div class="ms-3 text-start">{% if organisation.title %}{{ organisation.title }}{% else %}{{ organisation.name}}{% endif %}</div>
                                    </a>
diff --git a/apps/users/templates/a4_candy_users/user_detail.html b/apps/users/templates/a4_candy_users/user_detail.html
index a17a8fb322..12d471897c 100644
--- a/apps/users/templates/a4_candy_users/user_detail.html
+++ b/apps/users/templates/a4_candy_users/user_detail.html
@@ -19,7 +19,7 @@
                             aria-expanded="false"
                             id="account-settings"
                         >
-                            <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                            <i class="fa fa-ellipsis-vertical" aria-hidden="true"></i>
                         </button>
                         <div class="dropdown-menu dropdown-menu-end" aria-labelledby="account-settings">
                             <a class="dropdown-item" href="{% url 'account' %}">{% trans 'Account Settings' %}</a>