diff --git a/src/main/resources/templates/layout/task.html b/src/main/resources/templates/layout/task.html
index df986f2d..1afddabc 100644
--- a/src/main/resources/templates/layout/task.html
+++ b/src/main/resources/templates/layout/task.html
@@ -138,7 +138,7 @@
       </label>
       <div class="form-group input-group is-invalid">
           <span class="input-group-text is-invalid" id="basic-addon7">
-            <i class="fa-solid fa-cloud"></i>
+            <i class="fa-solid fa-diagram-project"></i>
           </span>
           <select th:field="*{project.id}" class="form-control form-control-lg" aria-describedby="basic-addon7">
             <option value="0"></option>
diff --git a/src/main/resources/templates/layout/tasks.html b/src/main/resources/templates/layout/tasks.html
index 76eb1ff5..1bb45943 100644
--- a/src/main/resources/templates/layout/tasks.html
+++ b/src/main/resources/templates/layout/tasks.html
@@ -101,7 +101,7 @@
                                       class="task_col_content task_col_content_duedate twtooltip"
                                       th:text="${#calendars.format(task.dueDate,'dd.MM.yyyy')}">
                                 </span>
-                            <span th:if="${#locale.language eq 'en'}"
+                                <span th:if="${#locale.language eq 'en'}"
                                   th:id="'task_' + ${task.id} + '_col_due_date'"
                                   draggable="true" ondragstart="dragTask(event)"
                                   th:alt-title="#{task.col.twtooltip.duedate}"
@@ -147,12 +147,12 @@
                         </td>
                         <td th:id="'task_' + ${task.id} + '_col_context'" class="task_col task_col_context"
                             th:if="${myTaskState eq 'ALL'}">
-                                <span th:if="${#locale.language eq 'de'}"
-                                      th:id="'task_' + ${task.id} + '_col_context_txt'"
-                                      draggable="true" ondragstart="dragTask(event)"
-                                      class="task_col_content task_col_content_context twtooltip"
-                                      th:alt-title="#{task.col.twtooltip.context}"
-                                      th:text="${task.context.nameDe}">task.context.nameDe</span>
+                            <span th:if="${#locale.language eq 'de'}"
+                                  th:id="'task_' + ${task.id} + '_col_context_txt'"
+                                  draggable="true" ondragstart="dragTask(event)"
+                                  class="task_col_content task_col_content_context twtooltip"
+                                  th:alt-title="#{task.col.twtooltip.context}"
+                                  th:text="${task.context.nameDe}">task.context.nameDe</span>
                             <span th:if="${#locale.language ne 'de'}"
                                   th:id="'task_' + ${task.id} + '_col_context_txt'"
                                   draggable="true" ondragstart="dragTask(event)"
@@ -223,7 +223,7 @@ <h5 class="modal-title" id="taskModalScrollableTitle">
                             <b th:text="#{tasks.inbox.project}" class="me-2">Project</b>
                             <span th:if="${task.project ne null}">
                               <a th:href="@{/project/{id}(id=${task.project.id})}">
-                                <i class="fas fa-folder-open"></i>
+                                <i class="fa-solid fa-diagram-project"></i>
                                 <span th:text="${task.project.name}">task.project.name</span></a>
                             </span>
                             <span th:if="${task.project eq null}">