diff --git a/fet2020/templates/authentications/login.html b/fet2020/templates/authentications/login.html
index b813fe11..25e99264 100644
--- a/fet2020/templates/authentications/login.html
+++ b/fet2020/templates/authentications/login.html
@@ -12,7 +12,7 @@
 
                 {% for message in messages %}
                     <div class="alert alert-danger">
-                        <i class="alert-icon fas fa-check-circle"></i>
+                        <i class="alert-icon fa-solid fa-check-circle"></i>
                         <h2 class="alert-title">Fehler:</h2>
                         <div class="alert-body">{{ message }}</div>
                     </div>
diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html
index be33f161..00880ca2 100644
--- a/fet2020/templates/base.html
+++ b/fet2020/templates/base.html
@@ -63,7 +63,7 @@
 			<button class="navbar-toggle"
 				@click="showNavBar = ! showNavBar"
 			>
-				<i class="fas fa-bars"></i>
+				<i class="fa-solid fa-bars"></i>
 			</button>
 			<ul id="navBarContent" class="navbar-content sm:block"
 				x-show="showNavBar || $screen('sm')"
@@ -116,7 +116,7 @@
                             <li class="navInternal"><a href="{% url 'admin:index' %}"><i class="fa-fw fa-solid fa-user-secret mr-2"></i>Admin</a></li>
                             <li class="navInternal"><a href="{% url 'tasks:index' %}"><i class="fa-fw fa-solid fa-list-check mr-2"></i>Tasks</a></li>
                             <li class="navInternal"><a href="{% url 'intern:index' %}"><i class="fa-fw fa-solid fa-database mr-2"></i>Intern</a></li>
-                            <li class="navInternal"><a href="https://legacy.fet.at/home/intern"><i class="fa-fw fa-solid fa-database mr-2"></i>Legacy</a></li>
+                            <li class="navInternal"><a href="https://legacy.fet.at/home/intern"><i class="fa-fw fa-solid fa-box-archive mr-2"></i>Legacy</a></li>
                             <li class="navInternal"
                                 x-show="!$screen('sm')"
                             ><a href="{% url 'authentications:logout' %}?next={{ request.path }}"><i class="fa-fw fa-solid fa-power-off mr-2"></i>Abmelden</a></li>
@@ -133,19 +133,19 @@
     <footer>
         <ul class="icon-list">
             <li>
-                <a href="{% url 'facebook' %}"><i class="fab fa-facebook"></i></a>
+                <a href="{% url 'facebook' %}"><i class="fa-brands fa-facebook"></i></a>
             </li>
             <li>
-                <a href="{% url 'instagram' %}"><i class="fab fa-instagram"></i></a>
+                <a href="{% url 'instagram' %}"><i class="fa-brands fa-instagram"></i></a>
             </li>
             <li>
-                <a href="{% url 'discord' %}"><i class="fab fa-discord"></i></a>
+                <a href="{% url 'discord' %}"><i class="fa-brands fa-discord"></i></a>
             </li>
             <li>
-                <a href="{% url 'telegram' %}"><i class="fab fa-telegram"></i></a>
+                <a href="{% url 'telegram' %}"><i class="fa-brands fa-telegram"></i></a>
             </li>
             <li>
-                <a href="mailto:service@fet.at"><i class="fas fa-envelope"></i></a>
+                <a href="mailto:service@fet.at"><i class="fa-solid fa-envelope"></i></a>
             </li>
         </ul>
         {% get_flatpages '/impressum/' as pages %}
diff --git a/fet2020/templates/blackboard/index.html b/fet2020/templates/blackboard/index.html
index 6566064c..3273d7c8 100644
--- a/fet2020/templates/blackboard/index.html
+++ b/fet2020/templates/blackboard/index.html
@@ -20,7 +20,7 @@
 
                     {% if request.user.is_authenticated %}
                         <a href="{% url 'admin:core_customflatpage_change' bb_infos.first.id %}" class="self-center sm:self-end btn-small btn-primary w-full sm:w-auto max-w-sm">
-                            <i class="fa-regular fa-pen-to-square mr-1"></i>Info-Text bearbeiten
+                            <i class="fa-solid fa-pen-to-square mr-1"></i>Info-Text bearbeiten
                         </a>
                     {% endif %}
                 </section>
@@ -41,7 +41,7 @@
                     {% if request.user.is_authenticated %}
                         <div class="inline-flex flex-col sm:flex-row sm:justify-end gap-2 w-full sm:w-auto">
                             <a href="{% url 'admin:blackboard_jobposting_add' %}" class="self-center block btn-small btn-primary w-full sm:w-auto max-w-sm">
-                                <i class="fa-regular fa-square-plus mr-1"></i>Neuer Eintrag
+                                <i class="fa-solid fa-square-plus mr-1"></i>Neuer Eintrag
                             </a>
                         </div>
                     {% endif %}
@@ -59,11 +59,11 @@
                     {% if request.user.is_authenticated %}
                         <div class="inline-flex flex-col sm:flex-row gap-2 w-full sm:w-auto">
                             <a href="{% url 'admin:blackboard_jobposting_add' %}" class="self-center block btn-small btn-primary w-full sm:w-auto max-w-sm">
-                                <i class="fa-regular fa-square-plus mr-1"></i>Neuer Eintrag
+                                <i class="fa-solid fa-square-plus mr-1"></i>Neuer Eintrag
                             </a>
                             {% if bb_blanks %}
                                 <a href="{% url 'admin:core_customflatpage_change' bb_blanks.first.id %}" class="self-center block btn-small btn-primary w-full sm:w-auto max-w-sm">
-                                    <i class="fa-solid fa-asterisk mr-1"></i>Fülltext bearbeiten
+                                    <i class="fa-solid fa-pen-to-square mr-1"></i>Fülltext bearbeiten
                                 </a>
                             {% endif %}
                         </div>
diff --git a/fet2020/templates/blackboard/partials/_show_job_posting.html b/fet2020/templates/blackboard/partials/_show_job_posting.html
index 16268fa9..ac6d4deb 100644
--- a/fet2020/templates/blackboard/partials/_show_job_posting.html
+++ b/fet2020/templates/blackboard/partials/_show_job_posting.html
@@ -8,6 +8,6 @@
         <p class="jobsList-amount ">/ {{ job.number_of_hours }} <span class="sm:hidden">h</span><span class="hidden sm:inline">Stunden</span></p>
     </div>
     <div class="jobsList-expand">
-        <i class="fas fa-angle-right"></i>
+        <i class="fa-solid fa-angle-right"></i>
     </div>
 </a>
diff --git a/fet2020/templates/flatpages/default.html b/fet2020/templates/flatpages/default.html
index 2965b2fb..9b0bec9a 100644
--- a/fet2020/templates/flatpages/default.html
+++ b/fet2020/templates/flatpages/default.html
@@ -12,7 +12,7 @@
         {% if request.user.is_authenticated %}
             <div class="max-w-4xl mx-auto mt-8 flex justify-end">
                 <a href="{% url 'admin:core_customflatpage_change' flatpage.id %}" class="btn-small btn-primary w-full sm:w-auto">
-                    <i class="fa-regular fa-memo mr-2"></i>Seite bearbeiten
+                    <i class="fa-solid fa-pen-to-square mr-2"></i>Seite bearbeiten
                 </a>
             </div>
         {% endif %}
diff --git a/fet2020/templates/gallery/album.html b/fet2020/templates/gallery/album.html
index 5d3191c5..36a7dff0 100644
--- a/fet2020/templates/gallery/album.html
+++ b/fet2020/templates/gallery/album.html
@@ -15,11 +15,11 @@
     {% if request.user.is_authenticated %}
         {% if album.id %}
             <a href="{% url 'admin:gallery_album_change' album.id %}" class="self-center sm:self-end btn-small btn-primary w-full sm:w-auto max-w-sm">
-                <i class="fa-regular fa-pen-to-square mr-1"></i>Album bearbeiten
+                <i class="fa-solid fa-pen-to-square mr-1"></i>Album bearbeiten
             </a>
         {% else %}
             <a href="{% url 'admin:gallery_album_add' %}" class="self-center sm:self-end btn-small btn-primary w-full sm:w-auto max-w-sm">
-                <i class="fa-regular fa-pen-to-square mr-1"></i>neues Album hinzufügen
+                <i class="fa-solid fa-square-plus mr-1"></i>neues Album hinzufügen
             </a>
         {% endif %}
     {% endif %}
diff --git a/fet2020/templates/gallery/index.html b/fet2020/templates/gallery/index.html
index e9ba2a60..ba494800 100644
--- a/fet2020/templates/gallery/index.html
+++ b/fet2020/templates/gallery/index.html
@@ -16,7 +16,7 @@
             {% endif %}
                     <img src="{{ album.thumbnail }}" class="rounded">
                     <h2 class="px-2 text-proprietary-dark dark:text-sky-300">{{ album.title }}</h2>
-                    <h3 class="px-2 text-sm text-proprietary dark:text-sky-400 font-normal"><i class="fa-regular fa-calendar-day mr-1"></i>{{ album.event_date }}</h3>
+                    <h3 class="px-2 text-sm text-proprietary dark:text-sky-400 font-normal"><i class="fa-solid fa-calendar-day mr-1"></i>{{ album.event_date }}</h3>
                 </a>
         {% endfor %}
 
@@ -24,7 +24,7 @@
 
     {% if request.user.is_authenticated %}
         <a href="{% url 'admin:gallery_album_add' %}" class="self-center sm:self-end btn-small btn-primary w-full sm:w-auto max-w-sm">
-            <i class="fa-regular fa-pen-to-square mr-1"></i>neues Album hinzufügen
+            <i class="fa-solid fa-square-plus mr-1"></i>neues Album hinzufügen
         </a>
     {% endif %}
 </main>
diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index 0160cc76..5288fad0 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -12,7 +12,7 @@
 				<span class="text-proprietary-darker dark:text-proprietary-lightest">Elektrotechnik</span>
 			</h1>
 			<div class="hidden sm:block flex-none w-2/5 lg:w-1/3 bg-white dark:bg-gray-800 p-2 lg:p-4 rounded shadow-xl dark:border-2 dark:border-gray-700">
-				<h2 class="section-title sm:text-left"><i class="fas fa-comments text-gray-300 dark:text-gray-400 mr-2"></i>Events</h2>
+				<h2 class="section-title sm:text-left"><i class="fa-solid fa-comments text-gray-300 dark:text-gray-400 mr-2"></i>Events</h2>
 				<div class="-mb-2 text-gray-700 dark:text-gray-200 text-sm md:text-base">
 
                     {% if featured_event %}
@@ -28,9 +28,6 @@
 
 				</div>
 			</div>
-			<!--<div class="w-full self-end flex justify-center mb-4">
-				<i class="fas fa-chevron-down animate-bounce text-proprietary text-2xl"></i>
-			</div>-->
 		</div>
 	</section>
 
@@ -62,7 +59,7 @@
                             {% include 'posts/partials/_date_box.html' %}
                         {% endfor %}
                         
-						<a href="{% url 'posts:calendar' %}" class="btn btn-secondary block w-full"><i class="fas fa-calendar-alt mr-2"></i>Kalender abonnieren</a>
+						<a href="{% url 'posts:calendar' %}" class="btn btn-secondary block w-full"><i class="fa-solid fa-calendar-days mr-2"></i>Kalender abonnieren</a>
 					</div>
 				</div>
 			</aside>
@@ -80,7 +77,7 @@
                     {% include 'posts/partials/_posts_hero.html' %}
                 {% endfor %}
 
-				<a href="{% url 'posts:index' %}" class="btn btn-primary block w-full"><i class="fas fa-plus-square mr-2"></i>Mehr anzeigen</a>
+				<a href="{% url 'posts:index' %}" class="btn btn-primary block w-full"><i class="fa-solid fa-plus-square mr-2"></i>Mehr anzeigen</a>
 			</section>
 		</div>
 
@@ -96,15 +93,15 @@
 					<span class="animate-ping absolute inline-flex h-full w-full rounded-full bg-sky-600 dark:bg-proprietary opacity-80"></span>
 					<span class="relative inline-flex rounded-full h-3 w-3 bg-sky-600 dark:bg-proprietary"></span>
 				</span>
-				<i class="fab fa-discord text-4xl"></i> 
+				<i class="fa-brands fa-discord text-4xl"></i> 
 			</div>
 			<a href="{% url 'discord' %}" class="flex-1">
 				FET Discord-Server<br>
-				<span class="hidden lg:inline text-sm text-gray-300 dark:text-gray-400">Du hast Fragen zum Studium oder möchtest dich einfach mich anderen Studierenden austauschen? </span><span class="text-sm text-gray-300 dark:text-gray-400">Klicke hier zum Beitreten <span class="hidden sm:inline"><i class="far fa-angle-right"></i></span></span>
+				<span class="hidden lg:inline text-sm text-gray-300 dark:text-gray-400">Du hast Fragen zum Studium oder möchtest dich einfach mich anderen Studierenden austauschen? </span><span class="text-sm text-gray-300 dark:text-gray-400">Klicke hier zum Beitreten <span class="hidden sm:inline"><i class="fa-solid fa-angle-right"></i></span></span>
 			</a>
 			<button id="infoBox-closeButton" class="flex-none self-stretch px-2 -mr-2" onclick="hideInfoBox('m', 1)"
 				@click="consent = false"
-			><i class="fas fa-times text-gray-300 dark:text-gray-500"></i></button>
+			><i class="fa-solid fa-xmark text-gray-300 dark:text-gray-500"></i></button>
         </div>
 	</main>
 {% endblock %}
diff --git a/fet2020/templates/intern/attachment.html b/fet2020/templates/intern/attachment.html
index b6acdde8..991d65c0 100644
--- a/fet2020/templates/intern/attachment.html
+++ b/fet2020/templates/intern/attachment.html
@@ -36,7 +36,7 @@
                 {% for etherpad in etherpads %}
                     <a href="{{ etherpad.etherpad_key }}" class="flex justify-between items-center gap-2">
                         <h3 class="text-gray-800 dark:text-gray-200">{{ etherpad.title }}</h2>
-                        <span class=" text-gray-700 dark:text-gray-300">{{ etherpad.date }}<span class="ml-2 hidden sm:inline-block"><i class="fas fa-angle-right text-gray-400 dark:text-gray-600"></i></span>
+                        <span class=" text-gray-700 dark:text-gray-300">{{ etherpad.date }}<span class="ml-2 hidden sm:inline-block"><i class="fa-solid fa-angle-right text-gray-400 dark:text-gray-600"></i></span>
                     </a>
                 {% endfor %}
             </div>
@@ -52,13 +52,13 @@
                 {% for file in files %}
                     <a href="{{ file.file_field.url }}" target="_blank" class="flex justify-between items-center gap-2">
                         <h3 class="text-gray-800 dark:text-gray-200"><i class="fa-solid fa-file-pdf fa-fw mr-1 hidden sm:inline-block"></i>{{ file.title }}</h2>
-                        <span class=" text-gray-700 dark:text-gray-300">{{ file.date }}<span class="ml-2 hidden sm:inline-block"><i class="fas fa-angle-right text-gray-400 dark:text-gray-600"></i></span>
+                        <span class=" text-gray-700 dark:text-gray-300">{{ file.date }}<span class="ml-2 hidden sm:inline-block"><i class="fa-solid fa-angle-right text-gray-400 dark:text-gray-600"></i></span>
                     </a>
                 {% endfor %}
             </div>
         </section>
 
-        <a href="{% url 'intern:attachment-update' active_topic.slug attachment.slug %}" class="btn btn-primary block place-self-end"><i class="fas fa-pen-to-square mr-2"></i>Beschreibung bearbeiten</a>
+        <a href="{% url 'intern:attachment-update' active_topic.slug attachment.slug %}" class="btn btn-primary block place-self-end"><i class="fa-solid fa-pen-to-square mr-2"></i>Beschreibung bearbeiten</a>
     </div>
 </main>
 {% endblock %}
diff --git a/fet2020/templates/intern/attachment/attachment_create.html b/fet2020/templates/intern/attachment/attachment_create.html
index 6a72184c..ea63f995 100644
--- a/fet2020/templates/intern/attachment/attachment_create.html
+++ b/fet2020/templates/intern/attachment/attachment_create.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
diff --git a/fet2020/templates/intern/attachment/attachment_update.html b/fet2020/templates/intern/attachment/attachment_update.html
index 9ba1f166..ef151ffa 100644
--- a/fet2020/templates/intern/attachment/attachment_update.html
+++ b/fet2020/templates/intern/attachment/attachment_update.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
diff --git a/fet2020/templates/intern/etherpad_create.html b/fet2020/templates/intern/etherpad_create.html
index bbc3f3a3..c4df6403 100644
--- a/fet2020/templates/intern/etherpad_create.html
+++ b/fet2020/templates/intern/etherpad_create.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
diff --git a/fet2020/templates/intern/file_create.html b/fet2020/templates/intern/file_create.html
index 16090e22..72ddd99f 100644
--- a/fet2020/templates/intern/file_create.html
+++ b/fet2020/templates/intern/file_create.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
diff --git a/fet2020/templates/intern/index.html b/fet2020/templates/intern/index.html
index eac174a5..8e6c2d66 100644
--- a/fet2020/templates/intern/index.html
+++ b/fet2020/templates/intern/index.html
@@ -87,7 +87,7 @@
             </section>
         {% endif %}
 
-        <a href="{% url 'admin:intern_topicgroup_add' %}" class="btn btn-primary block w-full"><i class="fas fa-plus-square mr-2"></i>Neuer Themenbereich</a>
+        <a href="{% url 'admin:intern_topicgroup_add' %}" class="btn btn-primary block w-full"><i class="fa-solid fa-plus-square mr-2"></i>Neuer Themenbereich</a>
     </div>
 </main>
 {% endblock %}
diff --git a/fet2020/templates/intern/task_create.html b/fet2020/templates/intern/task_create.html
index 921860ed..1f48ceb8 100644
--- a/fet2020/templates/intern/task_create.html
+++ b/fet2020/templates/intern/task_create.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
diff --git a/fet2020/templates/intern/topic.html b/fet2020/templates/intern/topic.html
index 6b888f7b..4ffa8659 100644
--- a/fet2020/templates/intern/topic.html
+++ b/fet2020/templates/intern/topic.html
@@ -35,9 +35,9 @@
         </ul>
         
         <section class="flex flex-col sm:flex-row justify-end gap-4">
-            <a href="{% url 'intern:topic-update' active_topic.slug %}" class="btn btn-primary block"><i class="fas fa-pen-to-square mr-2"></i>Thema bearbeiten</a>
+            <a href="{% url 'intern:topic-update' active_topic.slug %}" class="btn btn-primary block"><i class="fa-solid fa-pen-to-square mr-2"></i>Thema bearbeiten</a>
             {% if active_topic.task_list %}
-                <a href="{% url 'intern:task-create' active_topic.slug %}" class="btn btn-primary block"><i class="fas fa-plus-square mr-2"></i>Task hinzufügen</a>
+                <a href="{% url 'intern:task-create' active_topic.slug %}" class="btn btn-primary block"><i class="fa-solid fa-plus-square mr-2"></i>Task hinzufügen</a>
             {% endif %}
         </section>
     </div>
diff --git a/fet2020/templates/intern/topic/topic_create.html b/fet2020/templates/intern/topic/topic_create.html
index 0409d091..ca2e117f 100644
--- a/fet2020/templates/intern/topic/topic_create.html
+++ b/fet2020/templates/intern/topic/topic_create.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
diff --git a/fet2020/templates/intern/topic/topic_update.html b/fet2020/templates/intern/topic/topic_update.html
index fe375c53..e8fb2704 100644
--- a/fet2020/templates/intern/topic/topic_update.html
+++ b/fet2020/templates/intern/topic/topic_update.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html
index 9b55efdc..89241023 100644
--- a/fet2020/templates/members/index.html
+++ b/fet2020/templates/members/index.html
@@ -37,7 +37,7 @@
                                 Kategorien
                             </h2>
                             <div class="ml-4 -mr-2 px-2 rounded text-xl text-gray-600 dark:text-gray-400 sm:hidden cursor-pointer" @click="showModal = false">
-								<i class="far fa-times"></i>
+								<i class="fa-solid fa-xmark"></i>
                             </div>
                         </div>
                         <ul class="sideBarNav">
@@ -67,7 +67,7 @@
                                 {% if active_job_group %}
                                     <li class="internalLI">
                                         <a href="{% url 'admin:members_jobgroup_change' active_job_group.id %}">
-                                            <i class="fa-regular fa-pen-to-square mr-1"></i>{{ active_job_group.name|softhyphen|safe }} bearbeiten
+                                            <i class="fa-solid fa-pen-to-square mr-1"></i>{{ active_job_group.name|softhyphen|safe }} bearbeiten
                                         </a>
                                     </li>
                                 {% endif %}
@@ -76,7 +76,7 @@
                                 {% if pages %}
                                     <li class="internalLI">
                                         <a href="{% url 'admin:core_customflatpage_change' pages.first.id %}">
-                                            <i class="fa-regular fa-pen-to-square mr-1"></i>Fachschaft-Text bearbeiten
+                                            <i class="fa-solid fa-pen-to-square mr-1"></i>Fachschaft-Text bearbeiten
                                         </a>
                                     </li>
                                 {% endif %}
@@ -84,7 +84,7 @@
                                 {% if member %}
                                     <li class="internalLI">
                                         <a href="{% url 'admin:members_member_change' member.id %}">
-                                            <i class="fa-regular fa-pen-to-square mr-1"></i>Profil bearbeiten
+                                            <i class="fa-solid fa-pen-to-square mr-1"></i>Profil bearbeiten
                                         </a>
                                     </li>
                                 {% endif %}
diff --git a/fet2020/templates/members/jobs.html b/fet2020/templates/members/jobs.html
index a7ccb550..a03ccdd5 100644
--- a/fet2020/templates/members/jobs.html
+++ b/fet2020/templates/members/jobs.html
@@ -16,7 +16,7 @@
         {% for jobmem in all_jobmem_list %}
             <article id="{{ jobmem.list.0.job.slug }}" class="members-article">
                 <a href="#{{ jobmem.list.0.job.slug }}" class="title">
-                    <i class="far fa-link"></i>
+                    <i class="fa-solid fa-link"></i>
                     <h3 class="members-section-title">{{ jobmem.grouper }}</h3>
                 </a>
                 <div class="members-listing">
diff --git a/fet2020/templates/posts/index.html b/fet2020/templates/posts/index.html
index 6ca4af86..12f39a23 100644
--- a/fet2020/templates/posts/index.html
+++ b/fet2020/templates/posts/index.html
@@ -30,12 +30,12 @@
                         <div class="flex justify-between items-center mb-2">
                             <h2 class="text-gray-800 dark:text-gray-100 sm:section-title sm:section-title-margins sm:w-full">
 								<span class="mr-1 text-gray-400 sm:hidden">
-                                    <i class="fas fa-filter"></i>
+                                    <i class="fa-solid fa-filter"></i>
                                 </span>
                                 Auswahl einschränken
                             </h2>
 							<div class="ml-4 -mr-2 px-2 rounded text-xl text-gray-600 dark:text-gray-400 sm:hidden cursor-pointer" @click="showModal = false">
-								<i class="far fa-times"></i>
+								<i class="fa-solid fa-xmark"></i>
                             </div>
                         </div>
                         <form action="" method="POST" class="grid grid-cols-1 gap-2 sm:gap-4" x-data="{ selectedYear: '' }">
@@ -43,7 +43,7 @@
 
                             {% for message in messages %}
                                 <div class="alert alert-danger">
-                                    <i class="alert-icon fas fa-exclamation-circle"></i>
+                                    <i class="alert-icon fa-solid fa-exclamation-circle"></i>
                                     <h2 class="alert-title">Fehler:</h2>
                                     <div class="alert-body">{{message}}</div>
                                 </div>
@@ -111,7 +111,7 @@
 					x-transition:leave-start="opacity-100"
 					x-transition:leave-end="opacity-0"
 				>
-					<i class="fas fa-filter p-2"></i>
+					<i class="fa-solid fa-filter p-2"></i>
 				</button>
 			</aside>
 
diff --git a/fet2020/templates/posts/partials/_article_row.html b/fet2020/templates/posts/partials/_article_row.html
index 338471e9..8ecc2445 100644
--- a/fet2020/templates/posts/partials/_article_row.html
+++ b/fet2020/templates/posts/partials/_article_row.html
@@ -1,7 +1,7 @@
 <a href="{{ post.get_absolute_url }}" class="block">
     <h3 class="text-gray-700 dark:text-gray-200">{{ post.title }}</h3>
     <p class="my-1 text-sm text-gray-600 dark:text-gray-300">
-        <i class="fas fa-calendar-alt text-gray-500 dark:text-gray-400"></i>
+        <i class="fa-solid fa-calendar-days text-gray-500 dark:text-gray-400"></i>
         <span>{{ post.event_start|date }} · {{ post.event_start|time }} Uhr</span>
     </p>
 </a>
diff --git a/fet2020/templates/posts/partials/_meeting_row.html b/fet2020/templates/posts/partials/_meeting_row.html
index fff37675..cbfedf5c 100644
--- a/fet2020/templates/posts/partials/_meeting_row.html
+++ b/fet2020/templates/posts/partials/_meeting_row.html
@@ -2,7 +2,7 @@
     <a href="{{ post.get_absolute_url }}">
         <h3 class="">{{ post.title }}</h3>
         <p class="py-1 text-sm lg:text-base text-gray-600 dark:text-gray-300">
-			<i class="fas fa-calendar-alt text-gray-500 dark:text-gray-400"></i>
+			<i class="fa-solid fa-calendar-days text-gray-500 dark:text-gray-400"></i>
             <span>{{ post.event_start|date }} · {{ post.event_start|time }} Uhr</span>
         </p>
     </a>
diff --git a/fet2020/templates/posts/partials/_posts_hero.html b/fet2020/templates/posts/partials/_posts_hero.html
index 1291372b..e2488b05 100644
--- a/fet2020/templates/posts/partials/_posts_hero.html
+++ b/fet2020/templates/posts/partials/_posts_hero.html
@@ -9,7 +9,7 @@
             <div>
                 <a href="{{ post.get_absolute_url }}"><h3 class="text-gray-50">{{ post.title|safe }}</h3></a>
                 <div class="text-gray-200">
-                    <i class="fas fa-clock"></i>
+                    <i class="fa-solid fa-clock"></i>
                     {{ post.date|date:"d. F Y" }}
                 </div>
             </div>
diff --git a/fet2020/templates/posts/partials/_posts_pinned.html b/fet2020/templates/posts/partials/_posts_pinned.html
index ed0000d1..5822b230 100644
--- a/fet2020/templates/posts/partials/_posts_pinned.html
+++ b/fet2020/templates/posts/partials/_posts_pinned.html
@@ -17,7 +17,7 @@
             <div>
                 <a href="{{ post.get_absolute_url }}"><h3 class="text-gray-50">{{ post.title|safe }}</h3></a>
                 <div class="text-gray-200">
-                    <i class="fas fa-clock"></i>
+                    <i class="fa-solid fa-clock"></i>
                     {{ post.date|date:"d. F Y" }}
                 </div>
             </div>
diff --git a/fet2020/templates/posts/partials/_posts_related.html b/fet2020/templates/posts/partials/_posts_related.html
index e3ceab6c..81b82c06 100644
--- a/fet2020/templates/posts/partials/_posts_related.html
+++ b/fet2020/templates/posts/partials/_posts_related.html
@@ -1,7 +1,7 @@
 <div class="w-full h-full bg-gradient-to-t from-black rounded-md flex flex-col justify-end p-2">
     <h2 class="text-gray-50 line-clamp-2"><span aria-label="Link zum Artikel: "></span>{{ post.title|safe }}</h2>
     <span class="text-gray-300 text-sm">
-        <i class="fas fa-clock mr-1"></i>
+        <i class="fa-solid fa-clock"></i>
         <span aria-label=" vom "></span>
         {{ post.date|date:"d. F Y" }}
     </span>
diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html
index bd513eca..974e258a 100644
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -19,7 +19,7 @@
 			@mouseleave="showPrevArticleButton = false"
 			@mouseover="showPrevArticleButton = true"
 		>
-			<i class="fa-light fa-chevron-left text-5xl -m-2 p-2 bg-gray-100 dark:bg-gray-700 rounded-md"></i>
+			<i class="fa-solid fa-chevron-left text-5xl -m-2 p-2 bg-gray-100 dark:bg-gray-700 rounded-md"></i>
 			<span class="text-gray-600 dark:text-gray-300 font-medium bg-gray-100 dark:bg-gray-700 -m-2 p-2 rounded-r-md origin-left"
 				x-show="showPrevArticleButton"
         x-transition:enter="transition ease-out duration-300"
@@ -44,7 +44,7 @@
 				x-transition:leave-start="opacity-100 transform scale-100"
 				x-transition:leave-end="opacity-0 bg-opacity-0 transform scale-100"
 			>Nächster<br>Artikel</span>
-			<i class="fa-light fa-chevron-right text-5xl -m-2 p-2 bg-gray-100 dark:bg-gray-700 rounded-md"></i>
+			<i class="fa-solid fa-chevron-right text-5xl -m-2 p-2 bg-gray-100 dark:bg-gray-700 rounded-md"></i>
 		</a>
 		<section>
 			<div class="mb-4 flex flex-col sm:flex-col gap-2 mx-auto">
@@ -90,15 +90,15 @@
                     {% if request.user.is_authenticated %}
                         {% if post.post_type == 'N' %}
                             <a href="{% url 'admin:posts_news_change' post.id %}" class="hidden sm:block btn-small btn-primary">
-                                <i class="fa-regular fa-pen-to-square mr-1"></i>Artikel bearbeiten
+                                <i class="fa-solid fa-pen-to-square mr-1"></i>Artikel bearbeiten
                             </a>
                         {% elif post.post_type == 'E' %}
                             <a href="{% url 'admin:posts_event_change' post.id %}" class="hidden sm:block btn-small btn-primary">
-                                <i class="fa-regular fa-pen-to-square mr-1"></i>Event bearbeiten
+                                <i class="fa-solid fa-pen-to-square mr-1"></i>Event bearbeiten
                             </a>
                         {% elif post.post_type == 'F' %}
                             <a href="{% url 'admin:posts_fetmeeting_change' post.id %}" class="hidden sm:block btn-small btn-primary">
-                                <i class="fa-regular fa-pen-to-square mr-1"></i>FET Sitzung bearbeiten
+                                <i class="fa-solid fa-pen-to-square mr-1"></i>FET Sitzung bearbeiten
                             </a>
                         {% endif %}
                     {% endif %}
@@ -122,7 +122,7 @@
                             </span>
                         </div>
                     </div>
-                    <div class="hidden absolute top-0 right-0 bg-white dark:bg-gray-900 rounded-bl p-2 bg-opacity-80 dark:bg-opacity-70  items-center gap-2">
+                    <div class="hidden absolute top-0 right-0 bg-white dark:bg-gray-900 rounded-bl p-2 bg-opacity-80 dark:bg-opacity-70 items-center gap-2">
                         <i class="flex-none fa-solid fa-calendar-clock text-gray-800 dark:text-gray-200"></i>
                         <span class="flex-1 text-sm text-gray-800 dark:text-gray-200">
                             Event-Start: {{ post.event_start|date }} um {{ post.event_start|time }} Uhr<br>
@@ -296,15 +296,15 @@
             {% if request.user.is_authenticated %}
                 {% if post.post_type == 'N' %}
                     <a href="{% url 'admin:posts_news_change' post.id %}" class="sm:hidden block w-full btn btn-primary mt-4">
-                        <i class="fa-regular fa-pen-to-square mr-1"></i>Artikel bearbeiten
+                        <i class="fa-solid fa-pen-to-square mr-1"></i>Artikel bearbeiten
                     </a>
                 {% elif post.post_type == 'E' %}
                     <a href="{% url 'admin:posts_event_change' post.id %}" class="sm:hidden block w-full btn btn-primary mt-4">
-                        <i class="fa-regular fa-pen-to-square mr-1"></i>Event bearbeiten
+                        <i class="fa-solid fa-pen-to-square mr-1"></i>Event bearbeiten
                     </a>
                 {% elif post.post_type == 'F' %}
                     <a href="{% url 'admin:posts_fetmeeting_change' post.id %}" class="sm:hidden block w-full btn btn-primary mt-4">
-                        <i class="fa-regular fa-pen-to-square mr-1"></i>FET Sitzung bearbeiten
+                        <i class="fa-solid fa-pen-to-square mr-1"></i>FET Sitzung bearbeiten
                     </a>
                 {% endif %}
             {% endif %}
diff --git a/fet2020/templates/tasks/attachment_create.html b/fet2020/templates/tasks/attachment_create.html
index 56782317..adb2cb4d 100644
--- a/fet2020/templates/tasks/attachment_create.html
+++ b/fet2020/templates/tasks/attachment_create.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
diff --git a/fet2020/templates/tasks/index.html b/fet2020/templates/tasks/index.html
index 58906d40..cb123783 100644
--- a/fet2020/templates/tasks/index.html
+++ b/fet2020/templates/tasks/index.html
@@ -30,12 +30,12 @@
                     <div class="flex justify-between items-center mb-2">
                         <h2 class="text-gray-800 dark:text-gray-100 sm:section-title sm:section-title-margins sm:w-full">
                             <span class="mr-1 text-gray-400 sm:hidden">
-                                <i class="fas fa-filter"></i>
+                                <i class="fa-solid fa-filter"></i>
                             </span>
                             Auswahl einschränken
                         </h2>
                         <div class="ml-4 -mr-2 px-2 rounded text-xl text-gray-600 dark:text-gray-400 sm:hidden cursor-pointer" @click="showModal = false">
-                            <i class="far fa-times"></i>
+                            <i class="fa-solid fa-xmark"></i>
                         </div>
                     </div>
                     <form action="" method="GET" class="grid grid-cols-1 gap-2 sm:gap-4">
@@ -78,7 +78,7 @@
                 x-transition:leave-start="opacity-100"
                 x-transition:leave-end="opacity-0"
             >
-                <i class="fas fa-filter p-2"></i>
+                <i class="fa-solid fa-filter p-2"></i>
             </button>
         </aside>
 
@@ -109,14 +109,14 @@
                     <div class="flex flex-col md:flex-row gap-y-2 md:gap-y-0 md:gap-x-2 lg:justify-end mt-4">
                         <input type="submit" name="btn_checkbox" value="Tasks abschließen" class="btn btn-error block md:flex-grow lg:flex-grow-0">
 
-                        <a href="{% url 'tasks:task-create' %}" class="btn btn-primary block md:flex-grow lg:flex-grow-0"><i class="fas fa-plus-square mr-2"></i>Task hinzufügen</a>
+                        <a href="{% url 'tasks:task-create' %}" class="btn btn-primary block md:flex-grow lg:flex-grow-0"><i class="fa-solid fa-plus-square mr-2"></i>Task hinzufügen</a>
                     </div>
                 </form>
             {% else %}
                 keine Tasks in dieser Liste für dich.
 
                 <div class="flex flex-col md:flex-row gap-y-2 md:gap-y-0 md:gap-x-2 lg:justify-end mt-4">
-                    <a href="{% url 'tasks:task-create' %}" class="btn btn-primary block md:flex-grow lg:flex-grow-0"><i class="fas fa-plus-square mr-2"></i>Task hinzufügen</a>
+                    <a href="{% url 'tasks:task-create' %}" class="btn btn-primary block md:flex-grow lg:flex-grow-0"><i class="fa-solid fa-plus-square mr-2"></i>Task hinzufügen</a>
                 </div>
         {% endif %}
         </section>
diff --git a/fet2020/templates/tasks/task_create.html b/fet2020/templates/tasks/task_create.html
index bd696c44..f1c804ca 100644
--- a/fet2020/templates/tasks/task_create.html
+++ b/fet2020/templates/tasks/task_create.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
@@ -87,7 +87,7 @@
             <input type="submit" class="block btn btn-primary" value="Hinzufügen">
         </form>
 
-        <a href="{% url 'admin:tasks_tasklist_add' %}" class="btn btn-primary block place-self-end"><i class="fas fa-pen-to-square mr-2"></i>Task-Gruppe erstellen</a>
+        <a href="{% url 'admin:tasks_tasklist_add' %}" class="btn btn-primary block place-self-end"><i class="fa-solid fa-pen-to-square mr-2"></i>Task-Gruppe erstellen</a>
     </div>
 </main>
 {% endblock %}
diff --git a/fet2020/templates/tasks/task_detail.html b/fet2020/templates/tasks/task_detail.html
index 3f7d0694..ba6dc5c0 100644
--- a/fet2020/templates/tasks/task_detail.html
+++ b/fet2020/templates/tasks/task_detail.html
@@ -33,7 +33,7 @@
                 {% for document in documents %}
                     <a href="{{ document.etherpad_key }}" class="flex justify-between items-center gap-2">
                         <h3 class="text-gray-800 dark:text-gray-200">{{ document.title }}</h2>
-                        <span class=" text-gray-700 dark:text-gray-300">{{ document.date }}<span class="ml-2 hidden sm:inline-block"><i class="fas fa-angle-right text-gray-400 dark:text-gray-600"></i></span>
+                        <span class=" text-gray-700 dark:text-gray-300">{{ document.date }}<span class="ml-2 hidden sm:inline-block"><i class="fa-solid fa-angle-right text-gray-400 dark:text-gray-600"></i></span>
                     </a>
                 {% endfor %}
 
@@ -41,10 +41,10 @@
         </section>
 
         {% if topic %}
-            <a href="{% url 'intern:topic' topic.slug %}" class="btn btn-primary block place-self-end"><i class="fas fa-pen-to-square mr-2"></i>Zu {{ topic.title }}</a>
+            <a href="{% url 'intern:topic' topic.slug %}" class="btn btn-primary block place-self-end"><i class="fa-solid fa-pen-to-square mr-2"></i>Zu {{ topic.title }}</a>
         {% endif %}
 
-        <a href="{% url 'tasks:task-update' task.id %}" class="btn btn-primary block place-self-end"><i class="fas fa-pen-to-square mr-2"></i>Task bearbeiten</a>
+        <a href="{% url 'tasks:task-update' task.id %}" class="btn btn-primary block place-self-end"><i class="fa-solid fa-pen-to-square mr-2"></i>Task bearbeiten</a>
     </div>
 </main>
 {% endblock %}
diff --git a/fet2020/templates/tasks/task_update.html b/fet2020/templates/tasks/task_update.html
index f9b98e26..ab22b40a 100644
--- a/fet2020/templates/tasks/task_update.html
+++ b/fet2020/templates/tasks/task_update.html
@@ -12,7 +12,7 @@
 
             {% if form.non_field_errors %}
                 <div class="alert alert-danger">
-                    <i class="alert-icon fas fa-check-circle"></i>
+                    <i class="alert-icon fa-solid fa-check-circle"></i>
                     <h2 class="alert-title">Fehler:</h2>
                     <div class="alert-body">{{ form.non_field_errors }}</div>
                 </div>
@@ -51,7 +51,7 @@
             <input type="submit" class="block btn btn-primary" value="Hinzufügen">
         </form>
 
-        <a href="{% url 'admin:tasks_task_change' task.id %}" class="btn btn-primary block place-self-end"><i class="fas fa-pen-to-square mr-2"></i>Task im Admin bearbeiten</a>
+        <a href="{% url 'admin:tasks_task_change' task.id %}" class="btn btn-primary block place-self-end"><i class="fa-solid fa-pen-to-square mr-2"></i>Task im Admin bearbeiten</a>
     </div>
 </main>
 {% endblock %}