diff --git a/.changes/unreleased/Feature-20250724-161556.yaml b/.changes/unreleased/Feature-20250724-161556.yaml
new file mode 100644
index 000000000..e661f72e1
--- /dev/null
+++ b/.changes/unreleased/Feature-20250724-161556.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Only allow delete of attachment on workflows that are not final
+time: 2025-07-24T16:15:56.042884578+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250724-161628.yaml b/.changes/unreleased/Feature-20250724-161628.yaml
new file mode 100644
index 000000000..db2013b66
--- /dev/null
+++ b/.changes/unreleased/Feature-20250724-161628.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Move up signature buttons on index workflow page for easier access
+time: 2025-07-24T16:16:28.609598883+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250724-172013.yaml b/.changes/unreleased/Feature-20250724-172013.yaml
new file mode 100644
index 000000000..ab12bd88b
--- /dev/null
+++ b/.changes/unreleased/Feature-20250724-172013.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Filter out document from attachment list if it is the same as the workflow document
+time: 2025-07-24T17:20:13.118537573+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/js/generic-doc-api.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/js/generic-doc-api.ts
index 8ec988707..ee2295f57 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/js/generic-doc-api.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/js/generic-doc-api.ts
@@ -1,6 +1,6 @@
 import {fetchResults, makeFetch} from "ChillMainAssets/lib/api/apiMethods";
 import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
-import {Address, EntityWorkflow} from "ChillMainAssets/types";
+import {EntityWorkflow} from "ChillMainAssets/types";
 
 export function fetch_generic_docs_by_accompanying_period(
     periodId: number,
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
index facc55e58..13f6908a7 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -25,7 +25,7 @@ export interface GenericDoc {
     type: "doc_store_generic_doc";
     uniqueKey: string;
     key: string;
-    identifiers: object;
+    identifiers: { id: number; };
     context: "person" | "accompanying-period";
     doc_date: DateTime;
     metadata: GenericDocMetadata;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
index 01e9c3a0e..a279c4c0c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
-import {
-    GenericDoc,
-    GenericDocForAccompanyingPeriod,
-} from "ChillDocStoreAssets/types/generic_doc";
+import {GenericDoc, GenericDocForAccompanyingPeriod,} from "ChillDocStoreAssets/types/generic_doc";
 import PickGenericDocItem from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue";
-import { fetch_generic_docs_by_accompanying_period } from "ChillDocStoreAssets/js/generic-doc-api";
-import { computed, onMounted, ref } from "vue";
+import {fetch_generic_docs_by_accompanying_period} from "ChillDocStoreAssets/js/generic-doc-api";
+import {computed, onMounted, ref} from "vue";
+import {EntityWorkflow} from "ChillMainAssets/types";
 
 interface PickGenericDocProps {
+    workflow: EntityWorkflow | null;
     accompanyingPeriodId: number;
     pickedList: GenericDocForAccompanyingPeriod[];
     toRemove: GenericDocForAccompanyingPeriod[];
@@ -36,9 +35,19 @@ const isPicked = (genericDoc: GenericDocForAccompanyingPeriod): boolean =>
     ) !== -1;
 
 onMounted(async () => {
-    genericDocs.value = await fetch_generic_docs_by_accompanying_period(
+    const fetchedGenericDocs = await fetch_generic_docs_by_accompanying_period(
         props.accompanyingPeriodId,
     );
+    const documentClasses = [
+        "Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument",
+        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+        "Chill\\DocStoreBundle\\Entity\\PersonDocument"
+    ];
+
+    genericDocs.value = fetchedGenericDocs.filter(doc =>
+        !documentClasses.includes(props.workflow?.relatedEntityClass || '') ||
+        props.workflow?.relatedEntityId !== doc.identifiers.id
+    );
     loaded.value = true;
 });
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
index cd3e9253d..2dea721c5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
@@ -3,8 +3,10 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import { computed, ref, useTemplateRef } from "vue";
 import PickGenericDoc from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue";
 import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
+import {EntityWorkflow} from "ChillMainAssets/types";
 
 interface PickGenericDocModalProps {
+    workflow: EntityWorkflow | null;
     accompanyingPeriodId: number;
     toRemove: GenericDocForAccompanyingPeriod[];
 }
@@ -80,6 +82,7 @@ defineExpose({ openModal, closeModal });
         </template>
         <template v-slot:body>
             <pick-generic-doc
+                :workflow="props.workflow"
                 :accompanying-period-id="props.accompanyingPeriodId"
                 :to-remove="props.toRemove"
                 :picked-list="pickeds"