diff --git a/assets/controllers/appUi_controller.js b/assets/controllers/appUi_controller.js
index 9dda23a6..2b05e650 100644
--- a/assets/controllers/appUi_controller.js
+++ b/assets/controllers/appUi_controller.js
@@ -3,6 +3,20 @@ import { Controller } from '@hotwired/stimulus';
 export default class extends Controller {
     connect() {
         this.initTabs();
+        this.initClickListeners();
+    }
+
+    initClickListeners() {
+        const selectorConfirm = '.text-danger, .btn-danger, .btw-warning, [data-click-confirm]';
+        Array.prototype.forEach.call(document.querySelectorAll(selectorConfirm), function (element) {
+            element.addEventListener('click', function(event) {
+                if (confirm(window.translations.confirmAction)) {
+                    return true;
+                }
+                event.preventDefault();
+                return false;
+            });
+        });
     }
 
     initTabs() {
diff --git a/assets/styles/colors.css b/assets/styles/colors.css
index e8d330e7..d4a5de5f 100644
--- a/assets/styles/colors.css
+++ b/assets/styles/colors.css
@@ -102,6 +102,18 @@
     @apply card-element bg-datenkategorie-50 text-datenkategorie-800 border-datenkategorie-100;
 }
 
+.card-akademie {
+    @apply card-element bg-indigo-50 text-indigo-800 border-indigo-100;
+}
+
+.card-client {
+    @apply card-element bg-pink-50 text-pink-800 border-pink-100;
+}
+
+.card-customer {
+    @apply card-element bg-teal-50 text-teal-800 border-teal-100;
+}
+
 /* .card links */
 
 .card-vvt a {
@@ -150,4 +162,16 @@
 
 .card-datenkategorie a {
     @apply hover:text-datenkategorie-950 text-datenkategorie-800;
+}
+
+.card-akademie a {
+    @apply hover:text-indigo-950 text-indigo-800;
+}
+
+.card-client a {
+    @apply hover:text-pink-950 text-pink-800;
+}
+
+.card-customer a {
+    @apply hover:text-teal-950 text-teal-800;
 }
\ No newline at end of file
diff --git a/assets/styles/dataTablesApp.css b/assets/styles/dataTablesApp.css
index 02b5d061..8c0200ed 100644
--- a/assets/styles/dataTablesApp.css
+++ b/assets/styles/dataTablesApp.css
@@ -94,5 +94,5 @@ table.dataTable > tbody > tr[data-href] > td {
 }
 
 table.dataTable > tbody > tr > td > a {
-    @apply text-primary-600 hover:underline;
+    @apply hover:underline;
 }
\ No newline at end of file
diff --git a/assets/styles/tailmater.css b/assets/styles/tailmater.css
index ab2a6506..0cab5171 100644
--- a/assets/styles/tailmater.css
+++ b/assets/styles/tailmater.css
@@ -835,7 +835,7 @@ form > fieldset {
 }
 
 form > fieldset > legend {
-    @apply bg-surface-200 rounded-xl px-3 py-1 text-base;
+    @apply bg-surface-200 rounded-xl px-3 py-1 text-lg;
 }
 
 form > fieldset .btn-primary {
diff --git a/src/Form/Type/AbteilungType.php b/src/Form/Type/AbteilungType.php
index 49c9c0ea..1769210e 100644
--- a/src/Form/Type/AbteilungType.php
+++ b/src/Form/Type/AbteilungType.php
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add('name', TextType::class, ['label' => 'newDepartment', 'required' => true, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/AssignType.php b/src/Form/Type/AssignType.php
index b75e1019..1e607701 100644
--- a/src/Form/Type/AssignType.php
+++ b/src/Form/Type/AssignType.php
@@ -30,7 +30,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'multiple' => false,
                 'required' => false
             ])
-            ->add('submit', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-sm'), 'label' => 'assign', 'translation_domain' => 'form']);
+            ->add('submit', SubmitType::class, ['attr' => array('class' => 'btn btn-sm'), 'label' => 'assign', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/AuditTomType.php b/src/Form/Type/AuditTomType.php
index 92ab9407..40d455c6 100644
--- a/src/Form/Type/AuditTomType.php
+++ b/src/Form/Type/AuditTomType.php
@@ -136,7 +136,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ],
             ])
 
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/ClientRequesCommentType.php b/src/Form/Type/ClientRequesCommentType.php
index 49e4c175..9cb2cf74 100644
--- a/src/Form/Type/ClientRequesCommentType.php
+++ b/src/Form/Type/ClientRequesCommentType.php
@@ -21,7 +21,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add('comment', TextareaType::class, ['label' => 'message', 'required' => true, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'send', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'send', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/ClientRequestInternalNoteType.php b/src/Form/Type/ClientRequestInternalNoteType.php
index e5f370b2..4b2a259a 100644
--- a/src/Form/Type/ClientRequestInternalNoteType.php
+++ b/src/Form/Type/ClientRequestInternalNoteType.php
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add('notes', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'internalComment', 'required' => false, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/ClientRequestType.php b/src/Form/Type/ClientRequestType.php
index 160d005d..cb1d4aad 100644
--- a/src/Form/Type/ClientRequestType.php
+++ b/src/Form/Type/ClientRequestType.php
@@ -55,7 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('birthday', DateType::class, ['label' => 'Geburtstag', 'required' => false, 'translation_domain' => 'form', 'widget' => 'single_text'])
             ->add('street', TextType::class, ['label' => 'Straße und Hausnummer', 'required' => false, 'translation_domain' => 'form'])
             ->add('city', TextType::class, ['label' => 'Postleitzahl und Stadt', 'required' => false, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'Speichern', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'Speichern', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/ClientRequestViewType.php b/src/Form/Type/ClientRequestViewType.php
index bcbe4926..19bf52b2 100644
--- a/src/Form/Type/ClientRequestViewType.php
+++ b/src/Form/Type/ClientRequestViewType.php
@@ -24,7 +24,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('password', PasswordType::class, ['label' => 'Zugangspasswort ', 'required' => true, 'translation_domain' => 'form'])
             ->add('uuid', TextType::class, ['label' => 'Ticket ID ', 'required' => true, 'translation_domain' => 'form'])
             ->add('email', TextType::class, ['label' => 'Email Adresse', 'required' => true, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'Anzeigen', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'Anzeigen', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/DatenweitergabeType.php b/src/Form/Type/DatenweitergabeType.php
index a0063213..63a56ee1 100644
--- a/src/Form/Type/DatenweitergabeType.php
+++ b/src/Form/Type/DatenweitergabeType.php
@@ -121,7 +121,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'translation_domain' => 'form',
                 'download_label' => false
             ])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block'), 'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block'), 'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/DsbType.php b/src/Form/Type/DsbType.php
index 5c46a4f7..ef356137 100644
--- a/src/Form/Type/DsbType.php
+++ b/src/Form/Type/DsbType.php
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add('dsb', TextType::class, ['required' => false, 'label' => 'dpoEmail', 'help' => 'dpoEmailHelp', 'translation_domain' => 'form'])
-            ->add('submit', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'appoint', 'translation_domain' => 'form']);
+            ->add('submit', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'appoint', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/FormsType.php b/src/Form/Type/FormsType.php
index 1c4e4ed4..a25e29f0 100644
--- a/src/Form/Type/FormsType.php
+++ b/src/Form/Type/FormsType.php
@@ -79,7 +79,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-live-search' => 'true'
                 ]
             ])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/KontaktType.php b/src/Form/Type/KontaktType.php
index 32fab5ed..ea6a0a35 100644
--- a/src/Form/Type/KontaktType.php
+++ b/src/Form/Type/KontaktType.php
@@ -44,7 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('email', TextType::class, ['label' => 'email', 'required' => false, 'translation_domain' => 'form'])
             ->add('telefon', TextType::class, ['label' => 'phone', 'required' => false, 'translation_domain' => 'form'])
             ->add('bemerkung', TextareaType::class, ['label' => 'comment', 'required' => false, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/KursAnmeldungType.php b/src/Form/Type/KursAnmeldungType.php
index 248fddff..11faa4d6 100644
--- a/src/Form/Type/KursAnmeldungType.php
+++ b/src/Form/Type/KursAnmeldungType.php
@@ -53,7 +53,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('invite', CheckboxType::class, ['label' => 'Einladungs-EMail an alle Nutzer senden (Wenn nicht ausgewählt wird die Einladung automatisch am nächsten Tag verschickt)', 'required' => false, 'translation_domain' => 'form'])
 
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'Kurse zuweisen', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'Kurse zuweisen', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/KursType.php b/src/Form/Type/KursType.php
index c1e116c8..c61a458b 100644
--- a/src/Form/Type/KursType.php
+++ b/src/Form/Type/KursType.php
@@ -91,7 +91,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             [
                 'label' => 'save',
                 'translation_domain' => 'general',
-                'attr' => ['class' => 'btn btn-primary'],
+                'attr' => ['class' => 'btn'],
             ],
         );
     }
diff --git a/src/Form/Type/NewType.php b/src/Form/Type/NewType.php
index 260e6564..770ff4bf 100644
--- a/src/Form/Type/NewType.php
+++ b/src/Form/Type/NewType.php
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add('name', TextType::class, ['label' => 'new', 'required' => true, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/PolicyType.php b/src/Form/Type/PolicyType.php
index 47d7a523..78f9d23e 100644
--- a/src/Form/Type/PolicyType.php
+++ b/src/Form/Type/PolicyType.php
@@ -113,7 +113,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'translation_domain' => 'form',
                 'download_label' => false
             ])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/ProduktType.php b/src/Form/Type/ProduktType.php
index 9064ed22..1aa00a1a 100644
--- a/src/Form/Type/ProduktType.php
+++ b/src/Form/Type/ProduktType.php
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add('name', TextType::class, ['label' => 'Neues Produkt hinzufügen', 'required' => true, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'Speichern', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'Speichern', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/Questionnaire/Question/DynamicQuestionType.php b/src/Form/Type/Questionnaire/Question/DynamicQuestionType.php
index 55684eae..86afbc96 100644
--- a/src/Form/Type/Questionnaire/Question/DynamicQuestionType.php
+++ b/src/Form/Type/Questionnaire/Question/DynamicQuestionType.php
@@ -44,7 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             SubmitType::class,
             [
                 'attr' => [
-                    'class' => 'btn btn-primary'
+                    'class' => 'btn'
                 ],
                 'label' => 'continue',
                 'translation_domain' => 'general',
diff --git a/src/Form/Type/Questionnaire/QuestionType.php b/src/Form/Type/Questionnaire/QuestionType.php
index b94fedb6..6655fe7a 100644
--- a/src/Form/Type/Questionnaire/QuestionType.php
+++ b/src/Form/Type/Questionnaire/QuestionType.php
@@ -82,7 +82,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             SubmitType::class,
             [
                 'attr' => [
-                    'class' => 'btn btn-primary'
+                    'class' => 'btn'
                 ],
                 'label' => 'save.word',
                 'translation_domain' => 'general',
diff --git a/src/Form/Type/ReportExportType.php b/src/Form/Type/ReportExportType.php
index 5c0ec449..da80301c 100644
--- a/src/Form/Type/ReportExportType.php
+++ b/src/Form/Type/ReportExportType.php
@@ -27,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('bis', DateType::class, ['label' => 'Bis', 'required' => true, 'translation_domain' => 'form', 'widget' => 'single_text'])
             ->add('user', TextType::class, ['label' => 'Bearbeiter (Email Adresse)', 'required' => false, 'translation_domain' => 'form'])
             ->add('report', CheckboxType::class, ['label' => 'Nur Aktivitäten für offiziellen Tätigkeitsbericht beinhalten', 'required' => false, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'Export erstellen', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'Export erstellen', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/ReportType.php b/src/Form/Type/ReportType.php
index 40f91478..4cc291e0 100644
--- a/src/Form/Type/ReportType.php
+++ b/src/Form/Type/ReportType.php
@@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('invoice', CheckboxType::class, ['label' => 'billed', 'required' => false, 'translation_domain' => 'form'])
             ->add('inReport', CheckboxType::class, ['label' => 'showInReport', 'required' => false, 'translation_domain' => 'form'])
             ->add('onsite', CheckboxType::class, ['label' => 'onSite', 'required' => false, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/SettingsType.php b/src/Form/Type/SettingsType.php
index 3f852801..4541d969 100644
--- a/src/Form/Type/SettingsType.php
+++ b/src/Form/Type/SettingsType.php
@@ -29,7 +29,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('useKeycloakGroups', CheckboxType::class, ['label' => 'useKeycloakGroups', 'help'=> 'useKeycloakGroupsHelp', 'required' => false, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/SoftwareConfigType.php b/src/Form/Type/SoftwareConfigType.php
index 9e7fcb3d..cf85ff51 100644
--- a/src/Form/Type/SoftwareConfigType.php
+++ b/src/Form/Type/SoftwareConfigType.php
@@ -27,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('name', TextType::class, ['label' => 'Bezeichnung der Konfiguration', 'required' => true, 'translation_domain' => 'form'])
             ->add('config', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'Konfiguration', 'required' => true, 'translation_domain' => 'form'])
             ->add('activ', CheckboxType::class, ['label' => 'Konfiguration Aktiv', 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'Speichern', 'translation_domain' => 'form'])
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'Speichern', 'translation_domain' => 'form'])
             ->add('uploadFile', VichImageType::class, [
                 'required' => false,
                 'allow_delete' => true,
diff --git a/src/Form/Type/SoftwareType.php b/src/Form/Type/SoftwareType.php
index 754752c4..f0592814 100644
--- a/src/Form/Type/SoftwareType.php
+++ b/src/Form/Type/SoftwareType.php
@@ -92,7 +92,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('archiving', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'backupPolicy', 'required' => false, 'translation_domain' => 'form', 'help' => 'backupPolicyHelp'])
             ->add('recovery', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'emergencyPlan', 'required' => false, 'translation_domain' => 'form', 'help' => 'emergencyPlanHelp'])
             ->add('permissions', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'privilegePolicy', 'required' => false, 'translation_domain' => 'form', 'help' => 'privilegePolicyHelp'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/TasksType.php b/src/Form/Type/TasksType.php
index fdbdb5d3..84b1d10a 100644
--- a/src/Form/Type/TasksType.php
+++ b/src/Form/Type/TasksType.php
@@ -56,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-live-search' => 'true'
                 ],
             ])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/TeamType.php b/src/Form/Type/TeamType.php
index 4e490cda..f10c340b 100644
--- a/src/Form/Type/TeamType.php
+++ b/src/Form/Type/TeamType.php
@@ -49,7 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('slug', TextType::class, ['label' => 'slug', 'required' => false, 'translation_domain' => 'form', 'help' => 'slugHelp'])
             ->add('externalLink', TextType::class, ['label' => 'externalLink', 'required' => false, 'translation_domain' => 'form', 'help' => 'externalLinkHelp'])
             ->add('video', TextType::class, ['label' => 'jitsiLink', 'required' => false, 'translation_domain' => 'form', 'help' => 'jitsiLinkHelp'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/TomType.php b/src/Form/Type/TomType.php
index 4252e280..ae91b286 100644
--- a/src/Form/Type/TomType.php
+++ b/src/Form/Type/TomType.php
@@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('tomWiederherstellbarkeit', TextareaType::class, ['attr' => ['class' => 'summernote', 'rows' => 8],'label' => 'tomRecoverability', 'required' => true, 'translation_domain' => 'form'])
             ->add('tomAudit', TextareaType::class, ['attr' => ['class' => 'summernote', 'rows' => 8],'label' => 'tomAuditProcedure', 'required' => true, 'translation_domain' => 'form'])
 
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/UploadTyp.php b/src/Form/Type/UploadTyp.php
index 276c82cb..24909692 100644
--- a/src/Form/Type/UploadTyp.php
+++ b/src/Form/Type/UploadTyp.php
@@ -29,7 +29,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'translation_domain' => 'form',
                 'download_label' => false
             ])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'uploadFile', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'uploadFile', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Type/VVTType.php b/src/Form/Type/VVTType.php
index 50c34bb3..3c23611c 100644
--- a/src/Form/Type/VVTType.php
+++ b/src/Form/Type/VVTType.php
@@ -307,7 +307,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ],
             ])
             ->add('save', SubmitType::class, [
-                'attr' => array('class' => 'btn btn-primary btn-block'),
+                'attr' => array('class' => 'btn btn-block'),
                 'label' => 'save',
                 'translation_domain' => 'form'
             ]);
diff --git a/src/Form/Type/VorfallType.php b/src/Form/Type/VorfallType.php
index a155662f..7f89fffb 100644
--- a/src/Form/Type/VorfallType.php
+++ b/src/Form/Type/VorfallType.php
@@ -33,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('auswirkung', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'incidentConsequences', 'required' => true, 'translation_domain' => 'form'])
             ->add('massnahmen', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'incidentMeasures', 'required' => true, 'translation_domain' => 'form'])
             ->add('datum', DateTimeType::class, ['label' => 'incidentDiscovered', 'required' => true, 'translation_domain' => 'form', 'widget' => 'single_text'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'save', 'translation_domain' => 'form'])
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'save', 'translation_domain' => 'form'])
             ->add('personen', EntityType::class, [
                 'choice_label' => 'name',
                 'class' => VVTPersonen::class,
diff --git a/src/Form/Type/VvtDsfaType.php b/src/Form/Type/VvtDsfaType.php
index ec0a3ff4..e63d09df 100644
--- a/src/Form/Type/VvtDsfaType.php
+++ b/src/Form/Type/VvtDsfaType.php
@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('standpunkt', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'Standpunkt von weiteren Organen (z.B. Betriebsrat)', 'required' => true, 'translation_domain' => 'form'])
             ->add('dsb', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'Standpunkt des Datenschutzbeauftragten', 'required' => false, 'translation_domain' => 'form'])
             ->add('ergebnis', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'Ergebnis der Datenschutz-Folgenabschätzung', 'required' => false, 'translation_domain' => 'form'])
-            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'Speichern', 'translation_domain' => 'form']);
+            ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'Speichern', 'translation_domain' => 'form']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 068f8d60..4c766a79 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -36,6 +36,11 @@
             <div class="modal-inner"></div>
         </div>
         {{ encore_entry_script_tags('app') }}
+        <script>
+            window.translations = {
+                'confirmAction': '{{ 'confirmAction'|trans }}',
+            }
+        </script>
         {% block javascripts %}{% endblock %}
     </body>
 </html>
\ No newline at end of file
diff --git a/templates/base/__approveBtn.html.twig b/templates/base/__approveBtn.html.twig
index 4d29c3c9..76791edb 100644
--- a/templates/base/__approveBtn.html.twig
+++ b/templates/base/__approveBtn.html.twig
@@ -1,7 +1,7 @@
 {% trans_default_domain 'base' %}
 
 {% if data.team in app.user.adminRoles and not data.activ == 0 %}
-    <a onClick="return confirm('{% trans %}confirmAction{% endtrans %}')"
+    <a data-click-confirm
        href='{{ path(dataLink,{'id':data.id}) }}' type='button'
        class='btn btn-create'>
         {% if data.approved %}
diff --git a/templates/base/__disableBtn.html.twig b/templates/base/__disableBtn.html.twig
index c937af9b..cec2335e 100644
--- a/templates/base/__disableBtn.html.twig
+++ b/templates/base/__disableBtn.html.twig
@@ -1,9 +1,7 @@
 {% trans_default_domain 'base' %}
 
 {% if data.team in app.user.adminRoles and not data.approved and not data.activ == 0 %}
-    <a onClick="return confirm('{% trans %}confirmAction{% endtrans %}')"
-       href='{{ path(dataLink,{'id':data.id}) }}' type='button'
-       class='btn btn-danger'>
+    <a href='{{ path(dataLink,{'id':data.id}) }}' type='button' class='btn btn-danger'>
         {% if data.activ == 1 %}
             {% trans %}delete{% endtrans %}
         {% else %}
diff --git a/templates/bericht/index.html.twig b/templates/bericht/index.html.twig
index 0e49805e..4278bb0f 100644
--- a/templates/bericht/index.html.twig
+++ b/templates/bericht/index.html.twig
@@ -123,14 +123,14 @@
                 </a><br>
             </div>
 
-            <div class="card-filled">
+            <div class="card-client">
                 <h3>Kundenanfragen</h3>
                 <a href="{{ path('bericht_request') }}">
                     <span>Alle Anfragen exportieren</span>
                 </a><br>
             </div>
 
-            <div class="card-filled">
+            <div class="card-customer">
                 <h3>{% trans %}customerRequest.word{% endtrans %}</h3>
                 <a href="{{ path('bericht_reports', {'team':currentTeam.id}) }}"
                    data-type="dialogs"
diff --git a/templates/kurs/__indexTable.html.twig b/templates/kurs/__indexTable.html.twig
index b81dc084..5ba90fc3 100644
--- a/templates/kurs/__indexTable.html.twig
+++ b/templates/kurs/__indexTable.html.twig
@@ -23,10 +23,10 @@
                         <td>{{ t.createdAt|date('d.m.Y') }}</td>
                         <td>
                             <a href="{{ path('kurs_anmelden',{'id':t.id}) }}">{% trans from 'general' %}login{% endtrans %}</a>
-                            {% if app.user == t.user %}<a href="{{ path('akademie_kurs_edit',{'id':t.id}) }}"
-                                                         >{% trans from 'general' %}edit{% endtrans %}</a>{% endif %}
-                            <a onClick="return confirm('{% trans %}confirmAction{% endtrans %}')"
-                               href="{{ path('kurs_deaktivieren',{'id':t.id}) }}">{% trans from 'general' %}delete{% endtrans %}</a>
+                            {% if app.user == t.user %}
+                                <a href="{{ path('akademie_kurs_edit',{'id':t.id}) }}"> {% trans from 'general' %}edit{% endtrans %}</a>
+                            {% endif %}
+                            <a class="text-danger" href="{{ path('kurs_deaktivieren',{'id':t.id}) }}">{% trans from 'general' %}delete{% endtrans %}</a>
                         </td>
                     </tr>
                 {% endfor %}
diff --git a/templates/questionnaire/questionnaire/list.html.twig b/templates/questionnaire/questionnaire/list.html.twig
index b5b9cc6a..f70e7211 100644
--- a/templates/questionnaire/questionnaire/list.html.twig
+++ b/templates/questionnaire/questionnaire/list.html.twig
@@ -18,7 +18,7 @@
                 <td>
                     <a href="{{ path('questionnaire_details', {'id': questionnaire.id}) }}">{% trans from 'general' %}show{% endtrans %}</a>
                     <a href="{{ path('questionnaire_edit', {'id': questionnaire.id}) }}">{% trans from 'general' %}edit{% endtrans %}</a>
-                    <a href="{{ path('questionnaire_delete', {'id': questionnaire.id}) }}">{% trans from 'general' %}remove{% endtrans %}</a>
+                    <a href="{{ path('questionnaire_delete', {'id': questionnaire.id}) }}" class="text-danger">{% trans from 'general' %}remove{% endtrans %}</a>
                 </td>
             </tr>
         {% endfor %}
diff --git a/templates/task/edit.html.twig b/templates/task/edit.html.twig
index d32599d9..f249098f 100644
--- a/templates/task/edit.html.twig
+++ b/templates/task/edit.html.twig
@@ -12,8 +12,9 @@
           >{% trans %}task.edit{% endtrans %}</a>
     {% endif %}
     {% if task.activ and not task.done %}
-        <a onClick="return confirm('{% trans %}confirmAction{% endtrans %}')"
-           href='{{ path('task_done',{'id':task.id}) }}' type='button'
+        <a data-click-confirm
+           href='{{ path('task_done',{'id':task.id}) }}'
+           type='button'
            class='btn btn-success ml-1 btn-sm'>{% trans %}finish{% endtrans %}</a>
     {% endif %}
     {% if nextAudit is defined %}
@@ -24,8 +25,7 @@
     {% if not task.assignedUser %}
         <button class="btn" data-type="dialogs" data-target="#assignModal">{% trans from 'general' %}assign{% endtrans %}</button>
     {% endif %}
-    <a onClick="return confirm('{% trans %}confirmAction{% endtrans %}')"
-       href='{{ path('task_disable',{'id':task.id}) }}' type='button'
+    <a href='{{ path('task_disable',{'id':task.id}) }}' type='button'
        class='btn btn-danger ml-1 btn-sm'>{% if task.activ == 1 %}{% trans from 'general' %}delete{% endtrans %}{% else %}{% trans from 'general' %}restore{% endtrans %}{% endif %}</a>
 {% endblock %}
 
diff --git a/templates/team/academy.html.twig b/templates/team/academy.html.twig
index 52f9c341..a3a73453 100644
--- a/templates/team/academy.html.twig
+++ b/templates/team/academy.html.twig
@@ -36,8 +36,7 @@
                                         <p>{{ d.email }}</p>
                                     </div>
                                     <div>
-                                        <a href="{{ path('team_mitglieder_remove',{'memberId':d.id, 'teamId':team.id, 'type':'academy'}) }}"
-                                           onclick="return confirm('{% trans from 'general' %}confirmAction{% endtrans %}')">
+                                        <a href="{{ path('team_mitglieder_remove',{'memberId':d.id, 'teamId':team.id, 'type':'academy'}) }}" class="text-danger">
                                             {% trans from 'general' %}remove{% endtrans %}
                                         </a>
                                     </div>
diff --git a/templates/team/custom.html.twig b/templates/team/custom.html.twig
index 9eaf656f..eb0ef000 100644
--- a/templates/team/custom.html.twig
+++ b/templates/team/custom.html.twig
@@ -25,8 +25,8 @@
                            data-action="click->appUi#loadContentModal">{{ dd.titleNew }}</a>
                     </div>
                 </div>
-                <ul class="stacked-list">
-                    {% if dd.data is defined %}
+                {% if dd.data is defined %}
+                    <ul class="stacked-list">
                         {% for d in dd.data|sort((a, b) => a.name <=> b.name) %}
                             <li>
                                 <div>
@@ -69,10 +69,10 @@
                                 </div>
                             </li>
                         {% endfor %}
-                    {% else %}
-                        <p>{% trans %}noEntry{% endtrans %}</p>
-                    {% endif %}
-                </ul>
+                    </ul>
+                {% else %}
+                    <p class="mb-5 italic text-muted">{% trans %}noEntry{% endtrans %}</p>
+                {% endif %}
             </div>
         {% endfor %}
     </div>
diff --git a/templates/team/dsb.html.twig b/templates/team/dsb.html.twig
index ed0c6a78..ed62fa62 100644
--- a/templates/team/dsb.html.twig
+++ b/templates/team/dsb.html.twig
@@ -20,8 +20,7 @@
             </div>
             <div>
                 <a href="{{ path('team_dsb_remove', {'id':data.id}) }}"
-                   class="btn btn-danger"
-                   onclick="return confirm('{% trans %}removeDsb{% endtrans %}')">
+                   class="btn btn-danger">
                     {% trans from 'general' %}remove{% endtrans %}
                 </a>
             </div>
diff --git a/translations/dashboard/dashboard.de.yaml b/translations/dashboard/dashboard.de.yaml
index 3f3993f3..cf3a74fe 100644
--- a/translations/dashboard/dashboard.de.yaml
+++ b/translations/dashboard/dashboard.de.yaml
@@ -18,6 +18,7 @@ privacyCenter: Datenschutzcenter
 flowChart: Datenflussplan
 departments:
   all: Alle Abteilungen
+quickAccess: Schnellzugriff
 
 approvedBy: Freigegeben von
 contact: KONTAKT
diff --git a/translations/dashboard/dashboard.en.yaml b/translations/dashboard/dashboard.en.yaml
index 9d473c5f..6c986bbb 100644
--- a/translations/dashboard/dashboard.en.yaml
+++ b/translations/dashboard/dashboard.en.yaml
@@ -18,6 +18,7 @@ privacyCenter: Privacy Center
 flowChart: Data flow chart
 departments:
   all: Alle Abteilungen
+quickAccess: Quick access
 approvedBy: Freigegeben von
 contact: KONTAKT
 licenseExpired: LIZENZ ABGELAUFEN
diff --git a/translations/dashboard/dashboard.ev.yaml b/translations/dashboard/dashboard.ev.yaml
index 04fef8ab..1a24b7cc 100644
--- a/translations/dashboard/dashboard.ev.yaml
+++ b/translations/dashboard/dashboard.ev.yaml
@@ -18,6 +18,7 @@ privacyCenter: Datenschutzcenter
 flowChart: Datenflussplan
 departments:
   all: Alle Abteilungen
+quickAccess: Schnellzugriff
 approvedBy: Freigegeben von
 contact: KONTAKT
 licenseExpired: LIZENZ ABGELAUFEN
diff --git a/translations/dashboard/dashboard.fr.yaml b/translations/dashboard/dashboard.fr.yaml
index 04fef8ab..1a24b7cc 100644
--- a/translations/dashboard/dashboard.fr.yaml
+++ b/translations/dashboard/dashboard.fr.yaml
@@ -18,6 +18,7 @@ privacyCenter: Datenschutzcenter
 flowChart: Datenflussplan
 departments:
   all: Alle Abteilungen
+quickAccess: Schnellzugriff
 approvedBy: Freigegeben von
 contact: KONTAKT
 licenseExpired: LIZENZ ABGELAUFEN