diff --git a/adhocracy4/comments/static/comments/CommentManageDropdown.jsx b/adhocracy4/comments/static/comments/CommentManageDropdown.jsx
index 80fb64d2d..533f7b65d 100644
--- a/adhocracy4/comments/static/comments/CommentManageDropdown.jsx
+++ b/adhocracy4/comments/static/comments/CommentManageDropdown.jsx
@@ -12,7 +12,7 @@ const CommentManageDropdown = (props) => {
           type="button" className="dropdown-toggle" aria-haspopup="true"
           aria-expanded="false" data-bs-toggle="dropdown"
         >
-          <i className="fa fa-ellipsis-h" aria-hidden="true" />
+          <i className="fa fa-ellipsis" aria-hidden="true" />
         </button>
         <ul className="dropdown-menu">
           {props.renderModeratorOptions && [
diff --git a/adhocracy4/comments_async/static/comments_async/comment.jsx b/adhocracy4/comments_async/static/comments_async/comment.jsx
index 7ca4e290c..6ce23fc4b 100644
--- a/adhocracy4/comments_async/static/comments_async/comment.jsx
+++ b/adhocracy4/comments_async/static/comments_async/comment.jsx
@@ -325,7 +325,7 @@ export default class Comment extends React.Component {
     return (
       <div>
         {this.state.displayNotification &&
-          <div className="alert alert--success a4-comments__success-notification"><i className="fas fa-check" /> {translated.successMessage}</div>}
+          <div className="alert alert--success a4-comments__success-notification"><i className="fa-solid fa-check" /> {translated.successMessage}</div>}
         <div className={(this.props.is_users_own_comment ? 'a4-comments__comment a4-comments__comment-owner' : 'a4-comments__comment')}>
           <a className="a4-comments__anchor" id={'comment_' + this.props.id} href={'./?comment=' + this.props.id}>{'Comment ' + this.props.id}</a>
           <ReportModal
@@ -425,7 +425,7 @@ export default class Comment extends React.Component {
                   {((this.allowForm() && !this.props.is_deleted) || (this.props.child_comments && this.props.child_comments.length > 0)) &&
                     <button className="btn btn--no-border a4-comments__action-bar__btn" type="button" onClick={this.toggleShowComments.bind(this)}>
                       <a href="#child-comment-form">
-                        <i className={this.state.showChildComments ? 'fa fa-minus' : 'far fa-comment'} aria-hidden="true" /> {getAnswerForm(this.state.showChildComments, this.props.child_comments.length)}
+                        <i className={this.state.showChildComments ? 'fa fa-minus' : 'fa-regular fa-comment'} aria-hidden="true" /> {getAnswerForm(this.state.showChildComments, this.props.child_comments.length)}
                       </a>
                     </button>}
 
@@ -433,14 +433,14 @@ export default class Comment extends React.Component {
                     <a
                       className="btn btn--no-border a4-comments__action-bar__btn" href={'?comment_' + this.props.id}
                       data-bs-toggle="modal" data-bs-target={'#share_comment_' + this.props.id}
-                    ><i className="fas fa-share" /> {translated.share}
+                    ><i className="fa-solid fa-share" /> {translated.share}
                     </a>}
 
                   {!this.props.is_deleted && this.props.authenticated_user_pk && !this.props.is_users_own_comment &&
                     <a
                       className="btn btn--no-border a4-comments__action-bar__btn" href={'#report_comment_' + this.props.id}
                       data-bs-toggle="modal"
-                    ><i className="fas fa-exclamation-triangle" />{translated.report}
+                    ><i className="fa-solid fa-triangle-exclamation" />{translated.report}
                     </a>}
 
                 </div>
diff --git a/adhocracy4/comments_async/static/comments_async/comment_box.jsx b/adhocracy4/comments_async/static/comments_async/comment_box.jsx
index 7ac143315..ed8691e12 100644
--- a/adhocracy4/comments_async/static/comments_async/comment_box.jsx
+++ b/adhocracy4/comments_async/static/comments_async/comment_box.jsx
@@ -479,7 +479,7 @@ export const CommentBox = (props) => {
               onClick={handleToggleFilters}
             >
               <i
-                className="fas fa-sliders-h ms-2"
+                className="fa-solid fa-sliders ms-2"
                 aria-label={translated.showFilters}
               />
               {translated.filters}
@@ -492,7 +492,7 @@ export const CommentBox = (props) => {
               onClick={handleToggleFilters}
             >
               <i
-                className="fas fa-times ms-2"
+                className="fa-solid fa-xmark ms-2"
                 aria-label={translated.hideFilters}
               />
               {translated.hideFilters}
diff --git a/adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx b/adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx
index 2089b64fd..262fb4c34 100644
--- a/adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx
+++ b/adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx
@@ -16,7 +16,7 @@ const CommentManageDropdown = (props) => {
         aria-expanded="false"
         data-bs-toggle="dropdown"
       >
-        <i className="fas fa-ellipsis-h" aria-hidden="true" />
+        <i className="fa-solid fa-ellipsis" aria-hidden="true" />
       </button>
       <div className="dropdown-menu dropdown-menu-end">
         {props.has_changing_permission && [
diff --git a/adhocracy4/comments_async/static/comments_async/filter_category.jsx b/adhocracy4/comments_async/static/comments_async/filter_category.jsx
index 1125b2d06..ecbc15d42 100644
--- a/adhocracy4/comments_async/static/comments_async/filter_category.jsx
+++ b/adhocracy4/comments_async/static/comments_async/filter_category.jsx
@@ -21,7 +21,7 @@ export const FilterCategory = ({
           <span className={filter === 'all' ? 'a4-comments__filters__btn-text' : 'd-none'}>{translated.display}{filterDisplay}</span>
           <span className={filter !== 'all' ? 'a4-comments__filters__btn-text small-screen' : 'd-none'}>{filterDisplay}</span>
 
-          <i className={filter === 'all' ? 'fa fa-caret-down' : 'fas fa-check'} aria-hidden="true" />
+          <i className={filter === 'all' ? 'fa fa-caret-down' : 'fa-solid fa-check'} aria-hidden="true" />
         </button>
         <div className="dropdown-menu dropend" aria-labelledby="categoryDropdownBtn">
           {filter !== 'all' &&
diff --git a/adhocracy4/comments_async/static/comments_async/filter_search.jsx b/adhocracy4/comments_async/static/comments_async/filter_search.jsx
index 509dfdde4..3df942c4f 100644
--- a/adhocracy4/comments_async/static/comments_async/filter_search.jsx
+++ b/adhocracy4/comments_async/static/comments_async/filter_search.jsx
@@ -40,8 +40,8 @@ export const FilterSearch = ({
         onClick={handleClearQuery}
       >
         <span className="fa-stack fa-2x">
-          <i className="far fa-circle fa-stack-2x" />
-          <i className="fas fa-times fa-stack-1x" aria-label={translated.clearSearch} />
+          <i className="fa-regular fa-circle fa-stack-2x" />
+          <i className="fa-solid fa-xmark fa-stack-1x" aria-label={translated.clearSearch} />
         </span>
       </button>
 
@@ -50,7 +50,7 @@ export const FilterSearch = ({
         type="button"
         onClick={() => onSearch(query)}
       >
-        <i className="fas fa-search" aria-label={translated.searchContrib} />
+        <i className="fa-solid fa-magnifying-glass" aria-label={translated.searchContrib} />
       </button>
     </div>
   )
diff --git a/adhocracy4/comments_async/static/comments_async/filter_sort.jsx b/adhocracy4/comments_async/static/comments_async/filter_sort.jsx
index 1af167dba..aa317e727 100644
--- a/adhocracy4/comments_async/static/comments_async/filter_sort.jsx
+++ b/adhocracy4/comments_async/static/comments_async/filter_sort.jsx
@@ -19,7 +19,7 @@ export const FilterSort = ({
         >
           <span className={sort === 'new' ? 'a4-comments__filters__btn-text' : 'd-none'}>{translated.sortedBy}{sorts[sort]}</span>
           <span className={sort !== 'new' ? 'a4-comments__filters__btn-text small-screen' : 'd-none'}>{sorts[sort]}</span>
-          <i className={sort === 'new' ? 'fa fa-caret-down' : 'fas fa-check'} aria-hidden="true" />
+          <i className={sort === 'new' ? 'fa fa-caret-down' : 'fa-solid fa-check'} aria-hidden="true" />
         </button>
         <div className="dropdown-menu dropdown-menu-end" aria-labelledby="sortDropdownBtn">
           {Object.keys(sorts).map(objectKey => {
diff --git a/adhocracy4/comments_async/static/comments_async/moderator_feedback.jsx b/adhocracy4/comments_async/static/comments_async/moderator_feedback.jsx
index 5d804c8d7..fa31b75b5 100644
--- a/adhocracy4/comments_async/static/comments_async/moderator_feedback.jsx
+++ b/adhocracy4/comments_async/static/comments_async/moderator_feedback.jsx
@@ -7,7 +7,7 @@ export const ModeratorFeedback = ({ lastEdit, feedbackText }) => {
   return (
     <div className="row">
       <div className="a4-comments__moderator-feedback__container">
-        <i className="fas fa-share a4-comments__moderator-feedback__icon" />
+        <i className="fa-solid fa-share a4-comments__moderator-feedback__icon" />
         <div className="a4-comments__moderator-feedback__content">
           <div className="a4-comments__moderator-feedback__moderator">
             {translated.moderator}
diff --git a/adhocracy4/dashboard/templates/a4dashboard/base_dashboard_project.html b/adhocracy4/dashboard/templates/a4dashboard/base_dashboard_project.html
index 970d8e401..b15a0bbf9 100644
--- a/adhocracy4/dashboard/templates/a4dashboard/base_dashboard_project.html
+++ b/adhocracy4/dashboard/templates/a4dashboard/base_dashboard_project.html
@@ -12,7 +12,7 @@
                            class="{{ item.is_active|yesno:"is-active," }}">
                             {{ item.label }}
                             {% if not item.is_complete %}
-                                <i class="fa fa-exclamation-circle u-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
+                                <i class="fa fa-circle-exclamation u-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
                             {% endif %}
                         </a>
                     </li>
@@ -30,7 +30,7 @@
                                class="{{ item.is_active|yesno:"is-active," }}">
                                 {{ item.label }}
                                 {% if not item.is_complete %}
-                                    <i class="fa fa-exclamation-circle u-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
+                                    <i class="fa fa-circle-exclamation u-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
                                 {% endif %}
                             </a>
                         </li>
diff --git a/adhocracy4/dashboard/templates/a4dashboard/includes/form_field.html b/adhocracy4/dashboard/templates/a4dashboard/includes/form_field.html
index 1b8f556db..910a5141e 100644
--- a/adhocracy4/dashboard/templates/a4dashboard/includes/form_field.html
+++ b/adhocracy4/dashboard/templates/a4dashboard/includes/form_field.html
@@ -3,6 +3,6 @@
 
 {% block after_label %}
     {% if field.field.required_for_publish and not field.value %}
-        <i class="fa fa-exclamation-circle u-danger" title="{% translate 'Missing field for publication' %}" aria-label="{% translate 'Missing field for publication' %}"></i>
+        <i class="fa fa-circle-exclamation u-danger" title="{% translate 'Missing field for publication' %}" aria-label="{% translate 'Missing field for publication' %}"></i>
     {% endif %}
 {% endblock %}
diff --git a/adhocracy4/dashboard/templates/a4dashboard/project_list.html b/adhocracy4/dashboard/templates/a4dashboard/project_list.html
index 36596ac5c..4f644728f 100644
--- a/adhocracy4/dashboard/templates/a4dashboard/project_list.html
+++ b/adhocracy4/dashboard/templates/a4dashboard/project_list.html
@@ -44,7 +44,7 @@ <h2>
 
                     <a href="{% url 'a4dashboard:project-edit' project_slug=project.slug %}"
                        class="btn btn--light btn--small">
-                        <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+                        <i class="fa-solid fa-pencil" aria-hidden="true"></i>
                         {% translate 'Edit' %}
                     </a>
 
@@ -53,7 +53,7 @@ <h2>
                         <input type="hidden" name="project_pk" value="{{ project.pk }}">
                         <button type="submit" name="duplicate" value="{{ project }}"
                                 class="dropdown-item">
-                            <i class="far fa-copy" aria-hidden="true"></i>
+                            <i class="fa-regular fa-copy" aria-hidden="true"></i>
                             {% translate 'Duplicate' %}
                         </button>
                     </form>
diff --git a/adhocracy4/filters/templates/a4filters/widgets/free_text_filter.html b/adhocracy4/filters/templates/a4filters/widgets/free_text_filter.html
index 244e6972f..dcaafb70a 100644
--- a/adhocracy4/filters/templates/a4filters/widgets/free_text_filter.html
+++ b/adhocracy4/filters/templates/a4filters/widgets/free_text_filter.html
@@ -12,6 +12,6 @@
             {% endif %}
         {% endfor %}
         <input class="search-filter-input" id="{{ id }}" type="search" name="{{ name }}" value="{{ value }}">
-        <button class="search-filter-btn btn" type="submit" title="{% translate 'Search' %}"><i class="fa fa-search" aria-label="{% translate 'Search' %}"></i></button>
+        <button class="search-filter-btn btn" type="submit" title="{% translate 'Search' %}"><i class="fa fa-magnifying-glass" aria-label="{% translate 'Search' %}"></i></button>
     </form>
 </div>
diff --git a/adhocracy4/forms/templates/a4forms/includes/inline_form.html b/adhocracy4/forms/templates/a4forms/includes/inline_form.html
index f5e86b31d..b482659ee 100644
--- a/adhocracy4/forms/templates/a4forms/includes/inline_form.html
+++ b/adhocracy4/forms/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 category' %}">
-                <i class="fa fa-times" aria-label="{% translate 'Remove category' %}"></i>
+                <i class="fa fa-xmark" aria-label="{% translate 'Remove category' %}"></i>
             </button>
         {% elif can_delete %}
             <label for="{{ form.DELETE.id_for_label }}" class="category-formset__delete-label" title="{% translate 'Remove category' %}">
-                <i class="fas fa-trash-alt" aria-label="{% translate 'Remove category' %}"></i>
+                <i class="fa-solid fa-trash-can" aria-label="{% translate 'Remove category' %}"></i>
             </label>
         {% endif %}
         {% for hidden in form.hidden_fields %}
diff --git a/adhocracy4/images/templates/a4images/image_upload_widget.html b/adhocracy4/images/templates/a4images/image_upload_widget.html
index f1f05299b..708e10723 100644
--- a/adhocracy4/images/templates/a4images/image_upload_widget.html
+++ b/adhocracy4/images/templates/a4images/image_upload_widget.html
@@ -6,11 +6,11 @@
             {% if has_image_set and not is_required %}
             <label for="{{ checkbox_id }}" class="btn btn-danger"
                    title="{% translate 'Remove the picture' %}">
-                <i class="fas fa-trash-alt"></i>
+                <i class="fa-solid fa-trash-can"></i>
             </label>
             {% else %}
             <label for="{{ id }}" class="btn btn-default" title="{% translate  'Upload a picture' %}">
-                <i class="fas fa-cloud-upload-alt"></i>
+                <i class="fa-solid fa-cloud-arrow-up"></i>
             </label>
             {% endif  %}
         </span>
diff --git a/adhocracy4/maps/static/a4maps/a4maps_choose_polygon_with_preset.js b/adhocracy4/maps/static/a4maps/a4maps_choose_polygon_with_preset.js
index 9b35dce7e..951588f40 100644
--- a/adhocracy4/maps/static/a4maps/a4maps_choose_polygon_with_preset.js
+++ b/adhocracy4/maps/static/a4maps/a4maps_choose_polygon_with_preset.js
@@ -85,7 +85,7 @@ function init () {
             '<div class="modal-content">' +
               '<div class="modal-header">' +
                 '<h2 class="modal-title u-first-heading">' + modalTitle + '</h2>' +
-                '<button class="close" aria-label="' + django.gettext('Close') + '" data-bs-dismiss="modal"><i class="fa fa-times"></i></button>' +
+                '<button class="close" aria-label="' + django.gettext('Close') + '" data-bs-dismiss="modal"><i class="fa fa-xmark"></i></button>' +
               '</div>' +
               '<div class="modal-body">' +
                 '<form id="map-import-form" data-ignore-submit="true">' +
diff --git a/adhocracy4/maps/static/a4maps/a4maps_display_points.js b/adhocracy4/maps/static/a4maps/a4maps_display_points.js
index 7a3da61d4..a2411326f 100644
--- a/adhocracy4/maps/static/a4maps/a4maps_display_points.js
+++ b/adhocracy4/maps/static/a4maps/a4maps_display_points.js
@@ -121,7 +121,7 @@ function init () {
 
     function getCommentCount (feature) {
       return '<span class="map-popup-comments-count">' +
-               feature.properties.comments_count + ' <i class="far fa-comment" aria-hidden="true"></i>' +
+               feature.properties.comments_count + ' <i class="fa-regular fa-comment" aria-hidden="true"></i>' +
                '<span class="visually-hidden">' +
                   django.ngettext(
                     'person commented on this proposal.',
diff --git a/adhocracy4/polls/static/PollDashboard/EditPollChoice.jsx b/adhocracy4/polls/static/PollDashboard/EditPollChoice.jsx
index 99399ab5d..5e4fa970e 100644
--- a/adhocracy4/polls/static/PollDashboard/EditPollChoice.jsx
+++ b/adhocracy4/polls/static/PollDashboard/EditPollChoice.jsx
@@ -31,7 +31,7 @@ export const EditPollChoice = (props) => {
           disabled={props.undeletable}
         >
           <i
-            className="fa fa-times"
+            className="fa fa-xmark"
             aria-label={django.gettext('remove')}
           />
         </button>
diff --git a/adhocracy4/polls/static/PollDashboard/EditPollOpenQuestion.jsx b/adhocracy4/polls/static/PollDashboard/EditPollOpenQuestion.jsx
index 48a758ee3..ed0a1eca3 100644
--- a/adhocracy4/polls/static/PollDashboard/EditPollOpenQuestion.jsx
+++ b/adhocracy4/polls/static/PollDashboard/EditPollOpenQuestion.jsx
@@ -73,7 +73,7 @@ export const EditPollOpenQuestion = (props) => {
           type="button"
         >
           <i
-            className="fas fa-trash-alt"
+            className="fa-solid fa-trash-can"
             aria-label={django.gettext('Delete')}
           />
         </button>
diff --git a/adhocracy4/polls/static/PollDashboard/EditPollQuestion.jsx b/adhocracy4/polls/static/PollDashboard/EditPollQuestion.jsx
index 9d3d49a70..c0d4f265f 100644
--- a/adhocracy4/polls/static/PollDashboard/EditPollQuestion.jsx
+++ b/adhocracy4/polls/static/PollDashboard/EditPollQuestion.jsx
@@ -155,7 +155,7 @@ export const EditPollQuestion = (props) => {
           type="button"
         >
           <i
-            className="fas fa-trash-alt"
+            className="fa-solid fa-trash-can"
             aria-label={django.gettext('Delete')}
           />
         </button>
diff --git a/adhocracy4/polls/static/PollDetail/PollResults.jsx b/adhocracy4/polls/static/PollDetail/PollResults.jsx
index 2dbdf7362..fee05fa53 100644
--- a/adhocracy4/polls/static/PollDetail/PollResults.jsx
+++ b/adhocracy4/polls/static/PollDetail/PollResults.jsx
@@ -104,7 +104,7 @@ export default class PollResult extends React.Component {
             const highlight = choice.count === max && max > 0
             return !this.state.question.is_open &&
               <div key={choice.id} className="poll-row__container">
-                {chosen ? <i className="poll-row__chosen fas fa-check-circle" aria-label={django.gettext('Your choice')} /> : ''}
+                {chosen ? <i className="poll-row__chosen fa-solid fa-circle-check" aria-label={django.gettext('Your choice')} /> : ''}
                 <div className="poll-row poll-row--answered">
                   <div className="poll-row__number">{percent}%</div>
                   <div className="poll-row__label">{choice.is_other_choice ? django.gettext('other') : choice.label}</div>
@@ -129,7 +129,7 @@ export default class PollResult extends React.Component {
                               key={index}
                             >
                               <div className="poll-slider__answer">
-                                {this.isUserAnswer(slide) && <i className="fas fa-check-circle" />} {slide.answer}
+                                {this.isUserAnswer(slide) && <i className="fa-solid fa-circle-check" />} {slide.answer}
                               </div>
                               <div className={this.props.question.other_choice_answers.length > 1 ? 'poll-slider__count--spaced' : 'poll-slider__count'}>
                                 {index + 1}/{this.props.question.other_choice_answers.length}
@@ -152,7 +152,7 @@ export default class PollResult extends React.Component {
                     key={index}
                   >
                     <div className="poll-slider__answer">
-                      {this.isUserAnswer(slide) && <i className="fas fa-check-circle" />} {slide.answer}
+                      {this.isUserAnswer(slide) && <i className="fa-solid fa-circle-check" />} {slide.answer}
                     </div>
                     <div className={this.props.question.answers.length > 1 ? 'poll-slider__count--spaced' : 'poll-slider__count'}>
                       {index + 1}/{this.props.question.answers.length}
diff --git a/adhocracy4/static/Alert.jsx b/adhocracy4/static/Alert.jsx
index 375af07b2..25fda874e 100644
--- a/adhocracy4/static/Alert.jsx
+++ b/adhocracy4/static/Alert.jsx
@@ -23,7 +23,7 @@ const Alert = ({ type, alertAttribute, message, onClick, timeInMs }) => {
         <div className="container">
           {message}
           <button className="alert__close" title={closeTag} onClick={onClick}>
-            <i className="fa fa-times" aria-label={closeTag} />
+            <i className="fa fa-xmark" aria-label={closeTag} />
           </button>
         </div>
 
diff --git a/adhocracy4/static/Modal.jsx b/adhocracy4/static/Modal.jsx
index a3e005553..b2236502b 100644
--- a/adhocracy4/static/Modal.jsx
+++ b/adhocracy4/static/Modal.jsx
@@ -31,7 +31,7 @@ const Modal = (props) => {
               data-bs-dismiss="modal"
               onClick={props.handleClose}
             >
-              <i className="fa fa-times" aria-hidden="true" />
+              <i className="fa fa-xmark" aria-hidden="true" />
             </button>
           </div>