diff --git a/app/components/documents/DocumentView.vue b/app/components/documents/DocumentView.vue
index 72c202fd5..c067e7de6 100644
--- a/app/components/documents/DocumentView.vue
+++ b/app/components/documents/DocumentView.vue
@@ -403,21 +403,15 @@ defineShortcuts({
                         "
                         block
                         class="flex-1 flex-col"
-                        :color="!doc.deletedAt ? 'red' : undefined"
+                        :color="!doc.deletedAt ? 'red' : 'green'"
                         :icon="!doc.deletedAt ? 'i-mdi-trash-can' : 'i-mdi-restore'"
+                        :label="!doc.deletedAt ? $t('common.delete') : $t('common.restore')"
                         @click="
                             modal.open(ConfirmModal, {
                                 confirm: async () => deleteDocument(documentId),
                             })
                         "
-                    >
-                        <template v-if="!doc.deletedAt">
-                            {{ $t('common.delete') }}
-                        </template>
-                        <template v-else>
-                            {{ $t('common.restore') }}
-                        </template>
-                    </UButton>
+                    />
                 </div>
             </template>
         </UDashboardToolbar>
diff --git a/app/components/jobs/timeclock/TimeclockList.vue b/app/components/jobs/timeclock/TimeclockList.vue
index 8810aaaf1..1454d77be 100644
--- a/app/components/jobs/timeclock/TimeclockList.vue
+++ b/app/components/jobs/timeclock/TimeclockList.vue
@@ -118,7 +118,6 @@ const {
 
 async function listTimeclockEntries(): Promise<ListTimeclockResponse> {
     try {
-        console.log('TEST1');
         if (!isBefore(query.date.start, query.date.end)) {
             query.date.start = query.mode > TimeclockMode.DAILY ? subWeeks(query.date.end, 1) : query.date.start;
         }
@@ -148,7 +147,6 @@ async function listTimeclockEntries(): Promise<ListTimeclockResponse> {
 
         const call = getGRPCJobsTimeclockClient().listTimeclock(req);
         const { response } = await call;
-        console.log('TEST2', response);
 
         return response;
     } catch (e) {
diff --git a/app/components/mailer/MailerThread.vue b/app/components/mailer/MailerThread.vue
index ffc3ca2e0..ae8d964a5 100644
--- a/app/components/mailer/MailerThread.vue
+++ b/app/components/mailer/MailerThread.vue
@@ -232,10 +232,14 @@ const onSubmitThrottle = useThrottleFn(async (event: FormSubmitEvent<Schema>) =>
                 <UDivider>
                     <GenericTime :value="message.createdAt" type="short" />
 
-                    <UTooltip v-if="isSuperuser" :text="$t('common.delete')" square class="ml-2">
+                    <UTooltip
+                        v-if="isSuperuser"
+                        :text="!message.deletedAt ? $t('common.delete') : $t('common.restore')"
+                        class="ml-2"
+                    >
                         <UButton
-                            icon="i-mdi-trash-can-outline"
-                            color="red"
+                            :color="!message.deletedAt ? 'red' : 'green'"
+                            :icon="!message.deletedAt ? 'i-mdi-trash-can' : 'i-mdi-restore'"
                             variant="ghost"
                             size="xs"
                             @click="
diff --git a/app/components/partials/access/AccessManager.vue b/app/components/partials/access/AccessManager.vue
index 5a14e9a14..42121ce06 100644
--- a/app/components/partials/access/AccessManager.vue
+++ b/app/components/partials/access/AccessManager.vue
@@ -187,7 +187,7 @@ watch(usersAccess, setFromPropsUsers);
 watch(qualificationsAccess, setFromPropsQualifications);
 
 function addEntry(): void {
-    let idx = aTypes.value.findIndex((at) => at.name === props.defaultAccessType);
+    let idx = aTypes.value.findIndex((at) => at.type === props.defaultAccessType);
     if (idx === -1) {
         idx = aTypes.value.length - 1;
     }
diff --git a/app/components/qualifications/QualificationView.vue b/app/components/qualifications/QualificationView.vue
index 007cd8f4e..d9cd4a882 100644
--- a/app/components/qualifications/QualificationView.vue
+++ b/app/components/qualifications/QualificationView.vue
@@ -236,16 +236,15 @@ const accordionItems = computed(() =>
 
                     <UButton
                         v-if="can('QualificationsService.DeleteQualification').value && canDo.delete"
-                        icon="i-mdi-trash-can"
-                        color="red"
+                        :color="!qualification.deletedAt ? 'red' : 'green'"
+                        :icon="!qualification.deletedAt ? 'i-mdi-trash-can' : 'i-mdi-restore'"
+                        :label="!qualification.deletedAt ? $t('common.delete') : $t('common.restore')"
                         @click="
                             modal.open(ConfirmModal, {
                                 confirm: async () => deleteQualification(qualification!.id),
                             })
                         "
-                    >
-                        {{ $t('common.delete') }}
-                    </UButton>
+                    />
                 </div>
             </template>
         </UDashboardToolbar>
diff --git a/app/components/wiki/PageView.vue b/app/components/wiki/PageView.vue
index 43ee37649..cac11fa0b 100644
--- a/app/components/wiki/PageView.vue
+++ b/app/components/wiki/PageView.vue
@@ -167,11 +167,11 @@ const accordionItems = computed(() =>
                                 can('WikiService.DeletePage').value &&
                                 checkPageAccess(page.access, page.meta.creator, AccessLevel.OWNER)
                             "
-                            :text="$t('common.delete')"
+                            :text="!page.meta.deletedAt ? $t('common.delete') : $t('common.restore')"
                         >
                             <UButton
-                                color="red"
-                                icon="i-mdi-trash-can"
+                                :color="!page.meta.deletedAt ? 'red' : 'green'"
+                                :icon="!page.meta.deletedAt ? 'i-mdi-trash-can' : 'i-mdi-restore'"
                                 @click="
                                     modal.open(ConfirmModal, {
                                         confirm: async () => page && deletePage(page.id),
diff --git a/app/pages/mail/index.vue b/app/pages/mail/index.vue
index 65b557cab..57e82ebe2 100644
--- a/app/pages/mail/index.vue
+++ b/app/pages/mail/index.vue
@@ -443,10 +443,13 @@ onBeforeMount(async () => {
                             />
                         </UTooltip>
 
-                        <UTooltip v-if="isSuperuser" :text="$t('common.delete')">
+                        <UTooltip
+                            v-if="isSuperuser"
+                            :text="!selectedThread.deletedAt ? $t('common.delete') : $t('common.restore')"
+                        >
                             <UButton
-                                icon="i-mdi-trash-can-outline"
-                                color="red"
+                                :color="!selectedThread.deletedAt ? 'red' : 'green'"
+                                :icon="!selectedThread.deletedAt ? 'i-mdi-trash-can-outline' : 'i-mdi-restore'"
                                 variant="ghost"
                                 @click="
                                     modal.open(ConfirmModal, {
diff --git a/gen/go/proto/services/mailer/email.go b/gen/go/proto/services/mailer/email.go
index 00cb4f601..5b8dc1131 100644
--- a/gen/go/proto/services/mailer/email.go
+++ b/gen/go/proto/services/mailer/email.go
@@ -626,11 +626,16 @@ func (s *Server) DeleteEmail(ctx context.Context, req *DeleteEmailRequest) (*Del
 		req.Id,
 	)
 
+	deletedAtTime := jet.CURRENT_TIMESTAMP()
+	if email != nil && email.DeletedAt != nil && userInfo.SuperUser {
+		deletedAtTime = jet.TimestampExp(jet.NULL)
+	}
+
 	tEmails := table.FivenetMailerEmails
 	stmt := tEmails.
 		UPDATE().
 		SET(
-			tEmails.DeletedAt.SET(jet.CURRENT_TIMESTAMP()),
+			tEmails.DeletedAt.SET(deletedAtTime),
 		).
 		WHERE(jet.AND(
 			tEmails.ID.EQ(jet.Uint64(req.Id)),
diff --git a/gen/go/proto/services/mailer/message.go b/gen/go/proto/services/mailer/message.go
index 811601316..070124200 100644
--- a/gen/go/proto/services/mailer/message.go
+++ b/gen/go/proto/services/mailer/message.go
@@ -312,6 +312,7 @@ func (s *Server) DeleteMessage(ctx context.Context, req *DeleteMessageRequest) (
 		deletedAtTime = jet.TimestampExp(jet.NULL)
 	}
 
+	tMessages := table.FivenetMailerMessages
 	stmt := tMessages.
 		UPDATE(
 			tMessages.DeletedAt,
diff --git a/gen/go/proto/services/mailer/thread.go b/gen/go/proto/services/mailer/thread.go
index 0ac15c328..95e4347bf 100644
--- a/gen/go/proto/services/mailer/thread.go
+++ b/gen/go/proto/services/mailer/thread.go
@@ -415,6 +415,7 @@ func (s *Server) DeleteThread(ctx context.Context, req *DeleteThreadRequest) (*D
 		deletedAtTime = jet.TimestampExp(jet.NULL)
 	}
 
+	tThreads := table.FivenetMailerThreads
 	stmt := tThreads.
 		UPDATE(
 			tThreads.DeletedAt,
diff --git a/gen/go/proto/services/qualifications/qualifications.go b/gen/go/proto/services/qualifications/qualifications.go
index 420edb733..54dcef02e 100644
--- a/gen/go/proto/services/qualifications/qualifications.go
+++ b/gen/go/proto/services/qualifications/qualifications.go
@@ -596,6 +596,7 @@ func (s *Server) DeleteQualification(ctx context.Context, req *DeleteQualificati
 		deletedAtTime = jet.TimestampExp(jet.NULL)
 	}
 
+	tQuali := table.FivenetQualifications
 	stmt := tQuali.
 		UPDATE(
 			tQuali.DeletedAt,