diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index dbc98f1..543bf48 100644
Binary files a/locale/de/LC_MESSAGES/django.mo and b/locale/de/LC_MESSAGES/django.mo differ
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 43b5635..065b8ea 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wira-risk-management\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-12 22:29+0200\n"
+"POT-Creation-Date: 2025-09-15 11:24+0200\n"
 "PO-Revision-Date: 2025-09-09 13:45+0200\n"
 "Last-Translator: Kevin Heyer <kevin@example.com>\n"
 "Language-Team: German\n"
@@ -25,7 +25,7 @@ msgstr "Admin"
 msgid "Risks"
 msgstr "Risiken"
 
-#: risks/admin.py:34 risks/models.py:184 templates/base.html:38
+#: risks/admin.py:34 risks/models.py:184 templates/base.html:54
 #: templates/risks/item_control.html:5 templates/risks/list_controls.html:5
 msgid "Controls"
 msgstr "Maßnahmen"
@@ -38,7 +38,7 @@ msgstr "Restrisiken"
 msgid "Reviews"
 msgstr "Prüfung"
 
-#: risks/admin.py:37 risks/models.py:255 templates/base.html:39
+#: risks/admin.py:37 risks/models.py:255 templates/base.html:55
 #: templates/risks/item_incident.html:5 templates/risks/item_risk.html:14
 #: templates/risks/list_incidents.html:5 templates/risks/list_incidents.html:18
 msgid "Incidents"
@@ -48,75 +48,75 @@ msgstr "Vorfälle"
 msgid "Users"
 msgstr "Benutzer"
 
-#: risks/admin.py:159 risks/models.py:362 templates/risks/item_control.html:96
-#: templates/risks/item_incident.html:88 templates/risks/item_risk.html:234
+#: risks/admin.py:166 risks/models.py:362 templates/risks/item_control.html:96
+#: templates/risks/item_incident.html:88 templates/risks/item_risk.html:245
 msgid "User"
 msgstr "Benutzer"
 
-#: risks/admin.py:163
+#: risks/admin.py:170
 msgid "Message"
 msgstr "Nachricht"
 
-#: risks/admin.py:169
+#: risks/admin.py:176
 msgid "Mark selected as read"
 msgstr "Alle als gelesen Markieren"
 
-#: risks/admin.py:172
+#: risks/admin.py:179
 #, python-format
 msgid "%(n)d notifications marked as read."
 msgstr "%(n)d Benachrichtigungen wurden als gelesen Markiert"
 
-#: risks/admin.py:174
+#: risks/admin.py:181
 msgid "Mark selected as unread"
 msgstr "Alle als gelesen Markieren"
 
-#: risks/admin.py:177
+#: risks/admin.py:184
 #, python-format
 msgid "%(n)d notifications marked as unread."
 msgstr "%(n)d Benachrichtigungen wurden als ungelesen Markiert"
 
-#: risks/admin.py:179
+#: risks/admin.py:186
 msgid "Mark selected as sent"
 msgstr "Auswahl als gelesen markieren"
 
-#: risks/admin.py:182
+#: risks/admin.py:189
 #, python-format
 msgid "%(n)d notifications marked as sent."
 msgstr "%(n)d  Benachrichtigungen wurden als gelesen Markiert"
 
-#: risks/admin.py:184
+#: risks/admin.py:191
 msgid "Mark selected as unsent"
 msgstr "Auswahl als ungesendet markieren"
 
-#: risks/admin.py:187
+#: risks/admin.py:194
 #, python-format
 msgid "%(n)d notifications marked as unsent."
 msgstr "%(n)d Benachrichtigungen wurden als gelesen Markiert"
 
-#: risks/admin.py:199
+#: risks/admin.py:206
 msgid "Extra recipients"
 msgstr "Zusätzliche Empfänger"
 
-#: risks/admin.py:211
+#: risks/admin.py:218
 msgid "SSO Information"
 msgstr "SSO-Informationen"
 
-#: risks/admin.py:221
+#: risks/admin.py:228
 msgid "Risks Owned"
 msgstr "Eigene Risiken"
 
-#: risks/admin.py:225
+#: risks/admin.py:232
 msgid "Controls Responsible"
 msgstr "Verantwortlich für Maßnahmen"
 
-#: risks/apps.py:12 templates/base.html:7 templates/base.html:32
+#: risks/apps.py:12 templates/base.html:7 templates/base.html:48
 msgid "Risk Management"
 msgstr "Risikomanagement"
 
 #: risks/forms.py:13 risks/models.py:87 templates/risks/dashboard.html:83
 #: templates/risks/dashboard.html:108 templates/risks/item_control.html:35
-#: templates/risks/item_incident.html:36 templates/risks/item_risk.html:46
-#: templates/risks/item_risk.html:178 templates/risks/item_risk.html:208
+#: templates/risks/item_incident.html:36 templates/risks/item_risk.html:51
+#: templates/risks/item_risk.html:189 templates/risks/item_risk.html:219
 #: templates/risks/list_controls.html:48 templates/risks/list_controls.html:100
 #: templates/risks/list_incidents.html:48
 #: templates/risks/list_incidents.html:99 templates/risks/list_risks.html:128
@@ -197,7 +197,7 @@ msgid "Availability"
 msgstr "Verfügbarkeit"
 
 #: risks/models.py:78 risks/models.py:194 risks/models.py:263
-#: templates/risks/item_risk.html:177
+#: templates/risks/item_risk.html:188
 msgid "Title"
 msgstr "Titel"
 
@@ -207,34 +207,34 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: risks/models.py:80 templates/risks/item_control.html:68
-#: templates/risks/item_incident.html:60 templates/risks/item_risk.html:35
+#: templates/risks/item_incident.html:60 templates/risks/item_risk.html:40
 #: templates/risks/list_risks.html:119
 msgid "Asset"
 msgstr "Asset"
 
 #: risks/models.py:81 templates/risks/item_control.html:69
-#: templates/risks/item_incident.html:61 templates/risks/item_risk.html:36
+#: templates/risks/item_incident.html:61 templates/risks/item_risk.html:41
 #: templates/risks/list_risks.html:125
 msgid "Process"
 msgstr "Prozess"
 
 #: risks/models.py:82 templates/risks/item_control.html:67
-#: templates/risks/item_incident.html:59 templates/risks/item_risk.html:37
+#: templates/risks/item_incident.html:59 templates/risks/item_risk.html:42
 #: templates/risks/list_risks.html:122
 msgid "Category"
 msgstr "Kategorie"
 
 #: risks/models.py:83 templates/risks/item_control.html:46
-#: templates/risks/item_incident.html:39 templates/risks/item_risk.html:50
+#: templates/risks/item_incident.html:39 templates/risks/item_risk.html:55
 msgid "Created at"
 msgstr "Erstellt am"
 
 #: risks/models.py:84 templates/risks/item_control.html:47
-#: templates/risks/item_incident.html:40 templates/risks/item_risk.html:51
+#: templates/risks/item_incident.html:40 templates/risks/item_risk.html:56
 msgid "Updated at"
 msgstr "Aktualisiert am"
 
-#: risks/models.py:85 templates/risks/item_risk.html:58
+#: risks/models.py:85 templates/risks/item_risk.html:63
 msgid "Effects"
 msgstr "Auswirkungen"
 
@@ -280,7 +280,7 @@ msgid "Auditlogs"
 msgstr "Audit-Logs"
 
 #: risks/models.py:254 templates/risks/item_incident.html:33
-#: templates/risks/item_risk.html:207 templates/risks/list_incidents.html:97
+#: templates/risks/item_risk.html:218 templates/risks/list_incidents.html:97
 msgid "Incident"
 msgstr "Vorfall"
 
@@ -374,7 +374,7 @@ msgstr "Benutzer gelöscht"
 msgid "Notification"
 msgstr "Nachricht"
 
-#: risks/models.py:315 templates/base.html:80
+#: risks/models.py:315 templates/base.html:96
 #: templates/risks/notifications.html:4
 msgid "Notifications"
 msgstr "Nachrichten"
@@ -455,6 +455,7 @@ msgid "Control deleted: {t}"
 msgstr "Maßnahme gelöscht: {t}"
 
 #: risks/signals.py:213
+#, python-brace-format
 msgid "Residual review required for risk '{t}' due to control change"
 msgstr "Restrisikoprüfung nötig für das Risiko: '{t}', da Maßnahmen geändert wurden"
 
@@ -498,65 +499,77 @@ msgstr "Vorfall gelöscht: {t}"
 msgid "Follow-up reached: review required for risk '{t}'"
 msgstr "Wiedervorlagedatum erreicht: Prüfung nötig für Risiko '{t}'"
 
-#: risks/views.py:353
+#: risks/views.py:208
+msgid "Risk has been marked as reviewed and closed."
+msgstr "Das Risiko wurde geprüft und als geschlossen markiert"
+
+#: risks/views.py:210
+msgid "Not all controls are completed. Risk cannot be closed yet."
+msgstr "Nicht alle Maßnhamen sind abgeschlossen, das Risiko kann nicht geschlossen werden."
+
+#: risks/views.py:368
 msgid "Notification marked as read."
 msgstr "Nachricht als gelesen markiert"
 
-#: risks/views.py:363
+#: risks/views.py:378
 msgid "All notifications marked as read."
 msgstr "Alle Benachrichtigungen wurden als gelesen Markiert"
 
-#: risks/views.py:382
+#: risks/views.py:397
 msgid "Risk status updated."
 msgstr "Risikostatus Aktualisiert"
 
-#: risks/views.py:398
+#: risks/views.py:413
 msgid "Control status updated."
 msgstr "Maßnahmenstatus Aktualisiert"
 
-#: risks/views.py:414
+#: risks/views.py:429
 msgid "Incident status updated."
 msgstr "Vorfallstatus Aktualisiert"
 
-#: risks/views.py:431
+#: risks/views.py:446
 msgid "Residual review flag updated."
 msgstr "Restrisiko geprüft"
 
-#: templates/base.html:34 templates/risks/dashboard.html:4
+#: templates/admin/change_form.html:10
+msgid "Schließen"
+msgstr "Schließen"
+
+#: templates/base.html:50 templates/risks/dashboard.html:4
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: templates/base.html:35 templates/risks/risk_matrix.html:4
+#: templates/base.html:51 templates/risks/risk_matrix.html:4
 #: templates/risks/risk_matrix.html:8
 msgid "Risk Matrix"
 msgstr "Risikomatrix"
 
-#: templates/base.html:37 templates/risks/item_risk.html:5
+#: templates/base.html:53 templates/risks/item_risk.html:5
 #: templates/risks/list_risks.html:4
 msgid "Risk analysis"
 msgstr "Risikoanalyse"
 
-#: templates/base.html:75
+#: templates/base.html:91
 msgid "AdminCP"
 msgstr "Adminbereich"
 
-#: templates/base.html:88
+#: templates/base.html:104
 msgid "Derk Mode"
 msgstr "Dark Mode"
 
-#: templates/base.html:94
+#: templates/base.html:110
 msgid "Logout"
 msgstr "Logout"
 
-#: templates/base.html:109
+#: templates/base.html:125
 msgid "Login"
 msgstr "Login"
 
-#: templates/base.html:144 templates/base.html:151
+#: templates/base.html:160 templates/base.html:167
 msgid "Light Mode"
 msgstr "Light Mode"
 
-#: templates/base.html:154
+#: templates/base.html:170
 msgid "Dark Mode"
 msgstr "Dark Mode"
 
@@ -589,7 +602,7 @@ msgid "Count"
 msgstr "Anzahl"
 
 #: templates/risks/dashboard.html:94 templates/risks/dashboard.html:119
-#: templates/risks/list_risks.html:172
+#: templates/risks/list_risks.html:185
 msgid "No data"
 msgstr "Keine Daten"
 
@@ -624,24 +637,22 @@ msgstr "Maßnahme bearbeiten"
 msgid "Delete Control"
 msgstr "Maßnahme löschen"
 
-#: templates/risks/item_control.html:34 templates/risks/item_risk.html:180
+#: templates/risks/item_control.html:34 templates/risks/item_risk.html:191
 #: templates/risks/list_controls.html:63 templates/risks/list_controls.html:99
 msgid "Responsible"
 msgstr "Verantwortliche/r"
 
-#: templates/risks/item_control.html:37 templates/risks/item_risk.html:181
+#: templates/risks/item_control.html:37 templates/risks/item_risk.html:192
 #: templates/risks/list_controls.html:102
 msgid "Link"
 msgstr "Link"
 
-#: templates/risks/item_control.html:48 templates/risks/item_risk.html:179
+#: templates/risks/item_control.html:48 templates/risks/item_risk.html:190
 #: templates/risks/list_controls.html:101
 msgid "Deadline"
 msgstr "Frist"
 
 #: templates/risks/item_control.html:66 templates/risks/item_incident.html:58
-#, fuzzy
-#| msgid "Risk Owner"
 msgid "Owner"
 msgstr "Risikoeigner"
 
@@ -650,17 +661,17 @@ msgid "No linked risks."
 msgstr "Keine zugehörigen Risiken"
 
 #: templates/risks/item_control.html:95 templates/risks/item_incident.html:87
-#: templates/risks/item_risk.html:233
+#: templates/risks/item_risk.html:244
 msgid "Time"
 msgstr "Zeitpunkt"
 
 #: templates/risks/item_control.html:97 templates/risks/item_incident.html:89
-#: templates/risks/item_risk.html:235
+#: templates/risks/item_risk.html:246
 msgid "Action"
 msgstr "Aktion"
 
 #: templates/risks/item_control.html:108 templates/risks/item_incident.html:100
-#: templates/risks/item_risk.html:246
+#: templates/risks/item_risk.html:257
 msgid "No history found."
 msgstr "Keine Historie vorhanden"
 
@@ -672,7 +683,7 @@ msgstr "Vorfall bearbeiten"
 msgid "Delete Incident"
 msgstr "Vorfall löschen"
 
-#: templates/risks/item_incident.html:35 templates/risks/item_risk.html:209
+#: templates/risks/item_incident.html:35 templates/risks/item_risk.html:220
 #: templates/risks/list_incidents.html:100
 msgid "Reported on"
 msgstr "Gemeldet am"
@@ -681,71 +692,75 @@ msgstr "Gemeldet am"
 msgid "Measures"
 msgstr "Maßnahmen"
 
-#: templates/risks/item_risk.html:18
+#: templates/risks/item_risk.html:18 templates/risks/item_risk.html:19
 msgid "Edit Risk"
 msgstr "Risiko bearbeiten"
 
-#: templates/risks/item_risk.html:21
+#: templates/risks/item_risk.html:21 templates/risks/item_risk.html:22
 msgid "Delete Risk"
 msgstr "Risiko löschen"
 
-#: templates/risks/item_risk.html:39
+#: templates/risks/item_risk.html:26 templates/risks/item_risk.html:27
+msgid "Mark Risk as reviewed"
+msgstr "Risiko als geprüft markieren"
+
+#: templates/risks/item_risk.html:44
 msgid "Protection goals"
 msgstr "Schutzziele"
 
-#: templates/risks/item_risk.html:43
+#: templates/risks/item_risk.html:48
 msgid "Not yet assigned"
 msgstr "Keine Zugewiesenen Ziele"
 
-#: templates/risks/item_risk.html:49
+#: templates/risks/item_risk.html:54
 msgid "Risk owner"
 msgstr "Risikoeigner"
 
-#: templates/risks/item_risk.html:52
+#: templates/risks/item_risk.html:57
 msgid "Resubmission"
 msgstr "Wiedervorlagedatum"
 
-#: templates/risks/item_risk.html:65
+#: templates/risks/item_risk.html:70
 msgid "Risk assessment"
 msgstr "Risikomanagement"
 
-#: templates/risks/item_risk.html:74
+#: templates/risks/item_risk.html:79
 msgid "Gross (before measures)"
 msgstr "Brutto (vor Maßnahmen)"
 
-#: templates/risks/item_risk.html:80 templates/risks/item_risk.html:126
+#: templates/risks/item_risk.html:85 templates/risks/item_risk.html:131
 #: templates/risks/risk_matrix.html:21 templates/risks/risk_matrix.html:79
 #: templates/risks/risk_matrix.html:121
 msgid "Likelihood"
 msgstr "Eintritt"
 
-#: templates/risks/item_risk.html:89 templates/risks/item_risk.html:135
+#: templates/risks/item_risk.html:94 templates/risks/item_risk.html:140
 #: templates/risks/risk_matrix.html:21 templates/risks/risk_matrix.html:79
 #: templates/risks/risk_matrix.html:121
 msgid "Impact"
 msgstr "Schaden"
 
-#: templates/risks/item_risk.html:98 templates/risks/item_risk.html:144
+#: templates/risks/item_risk.html:103 templates/risks/item_risk.html:149
 msgid "Level"
 msgstr "Stufe"
 
-#: templates/risks/item_risk.html:107 templates/risks/item_risk.html:153
+#: templates/risks/item_risk.html:112 templates/risks/item_risk.html:158
 msgid "Score"
 msgstr "Score"
 
-#: templates/risks/item_risk.html:120
+#: templates/risks/item_risk.html:125
 msgid "Net (after measures)"
 msgstr "Netto (nach Maßnahmen)"
 
-#: templates/risks/item_risk.html:160
-msgid "No net risk recorded yet."
-msgstr "Kein Restrisiko vergeben"
+#: templates/risks/item_risk.html:169
+msgid "Add net Risk"
+msgstr "Restrisiko hinzufügen"
 
-#: templates/risks/item_risk.html:194
+#: templates/risks/item_risk.html:205
 msgid "No measures recorded."
 msgstr "Keine Maßnahmen gefunden."
 
-#: templates/risks/item_risk.html:220
+#: templates/risks/item_risk.html:231
 msgid "No incidents recorded."
 msgstr "Keine Vorfälle gefunden."
 
@@ -847,6 +862,9 @@ msgstr "Brutto"
 msgid "Net"
 msgstr "Netto"
 
+#~ msgid "No net risk recorded yet."
+#~ msgstr "Kein Restrisiko vergeben"
+
 #, python-brace-format
 #~ msgid "Risk '{title}' {state}"
 #~ msgstr "Risiko '{title}' {state}"
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index e53b9ed..008003e 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-12 22:29+0200\n"
+"POT-Creation-Date: 2025-09-15 11:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +31,7 @@ msgstr ""
 msgid "Risks"
 msgstr ""
 
-#: risks/admin.py:34 risks/models.py:184 templates/base.html:38
+#: risks/admin.py:34 risks/models.py:184 templates/base.html:54
 #: templates/risks/item_control.html:5 templates/risks/list_controls.html:5
 msgid "Controls"
 msgstr ""
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Reviews"
 msgstr ""
 
-#: risks/admin.py:37 risks/models.py:255 templates/base.html:39
+#: risks/admin.py:37 risks/models.py:255 templates/base.html:55
 #: templates/risks/item_incident.html:5 templates/risks/item_risk.html:14
 #: templates/risks/list_incidents.html:5 templates/risks/list_incidents.html:18
 msgid "Incidents"
@@ -54,75 +54,75 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: risks/admin.py:159 risks/models.py:362 templates/risks/item_control.html:96
-#: templates/risks/item_incident.html:88 templates/risks/item_risk.html:234
+#: risks/admin.py:166 risks/models.py:362 templates/risks/item_control.html:96
+#: templates/risks/item_incident.html:88 templates/risks/item_risk.html:245
 msgid "User"
 msgstr ""
 
-#: risks/admin.py:163
+#: risks/admin.py:170
 msgid "Message"
 msgstr ""
 
-#: risks/admin.py:169
+#: risks/admin.py:176
 msgid "Mark selected as read"
 msgstr ""
 
-#: risks/admin.py:172
+#: risks/admin.py:179
 #, python-format
 msgid "%(n)d notifications marked as read."
 msgstr ""
 
-#: risks/admin.py:174
+#: risks/admin.py:181
 msgid "Mark selected as unread"
 msgstr ""
 
-#: risks/admin.py:177
+#: risks/admin.py:184
 #, python-format
 msgid "%(n)d notifications marked as unread."
 msgstr ""
 
-#: risks/admin.py:179
+#: risks/admin.py:186
 msgid "Mark selected as sent"
 msgstr ""
 
-#: risks/admin.py:182
+#: risks/admin.py:189
 #, python-format
 msgid "%(n)d notifications marked as sent."
 msgstr ""
 
-#: risks/admin.py:184
+#: risks/admin.py:191
 msgid "Mark selected as unsent"
 msgstr ""
 
-#: risks/admin.py:187
+#: risks/admin.py:194
 #, python-format
 msgid "%(n)d notifications marked as unsent."
 msgstr ""
 
-#: risks/admin.py:199
+#: risks/admin.py:206
 msgid "Extra recipients"
 msgstr ""
 
-#: risks/admin.py:211
+#: risks/admin.py:218
 msgid "SSO Information"
 msgstr ""
 
-#: risks/admin.py:221
+#: risks/admin.py:228
 msgid "Risks Owned"
 msgstr ""
 
-#: risks/admin.py:225
+#: risks/admin.py:232
 msgid "Controls Responsible"
 msgstr ""
 
-#: risks/apps.py:12 templates/base.html:7 templates/base.html:32
+#: risks/apps.py:12 templates/base.html:7 templates/base.html:48
 msgid "Risk Management"
 msgstr ""
 
 #: risks/forms.py:13 risks/models.py:87 templates/risks/dashboard.html:83
 #: templates/risks/dashboard.html:108 templates/risks/item_control.html:35
-#: templates/risks/item_incident.html:36 templates/risks/item_risk.html:46
-#: templates/risks/item_risk.html:178 templates/risks/item_risk.html:208
+#: templates/risks/item_incident.html:36 templates/risks/item_risk.html:51
+#: templates/risks/item_risk.html:189 templates/risks/item_risk.html:219
 #: templates/risks/list_controls.html:48 templates/risks/list_controls.html:100
 #: templates/risks/list_incidents.html:48
 #: templates/risks/list_incidents.html:99 templates/risks/list_risks.html:128
@@ -203,7 +203,7 @@ msgid "Availability"
 msgstr ""
 
 #: risks/models.py:78 risks/models.py:194 risks/models.py:263
-#: templates/risks/item_risk.html:177
+#: templates/risks/item_risk.html:188
 msgid "Title"
 msgstr ""
 
@@ -213,34 +213,34 @@ msgid "Description"
 msgstr ""
 
 #: risks/models.py:80 templates/risks/item_control.html:68
-#: templates/risks/item_incident.html:60 templates/risks/item_risk.html:35
+#: templates/risks/item_incident.html:60 templates/risks/item_risk.html:40
 #: templates/risks/list_risks.html:119
 msgid "Asset"
 msgstr ""
 
 #: risks/models.py:81 templates/risks/item_control.html:69
-#: templates/risks/item_incident.html:61 templates/risks/item_risk.html:36
+#: templates/risks/item_incident.html:61 templates/risks/item_risk.html:41
 #: templates/risks/list_risks.html:125
 msgid "Process"
 msgstr ""
 
 #: risks/models.py:82 templates/risks/item_control.html:67
-#: templates/risks/item_incident.html:59 templates/risks/item_risk.html:37
+#: templates/risks/item_incident.html:59 templates/risks/item_risk.html:42
 #: templates/risks/list_risks.html:122
 msgid "Category"
 msgstr ""
 
 #: risks/models.py:83 templates/risks/item_control.html:46
-#: templates/risks/item_incident.html:39 templates/risks/item_risk.html:50
+#: templates/risks/item_incident.html:39 templates/risks/item_risk.html:55
 msgid "Created at"
 msgstr ""
 
 #: risks/models.py:84 templates/risks/item_control.html:47
-#: templates/risks/item_incident.html:40 templates/risks/item_risk.html:51
+#: templates/risks/item_incident.html:40 templates/risks/item_risk.html:56
 msgid "Updated at"
 msgstr ""
 
-#: risks/models.py:85 templates/risks/item_risk.html:58
+#: risks/models.py:85 templates/risks/item_risk.html:63
 msgid "Effects"
 msgstr ""
 
@@ -286,7 +286,7 @@ msgid "Auditlogs"
 msgstr ""
 
 #: risks/models.py:254 templates/risks/item_incident.html:33
-#: templates/risks/item_risk.html:207 templates/risks/list_incidents.html:97
+#: templates/risks/item_risk.html:218 templates/risks/list_incidents.html:97
 msgid "Incident"
 msgstr ""
 
@@ -380,7 +380,7 @@ msgstr ""
 msgid "Notification"
 msgstr ""
 
-#: risks/models.py:315 templates/base.html:80
+#: risks/models.py:315 templates/base.html:96
 #: templates/risks/notifications.html:4
 msgid "Notifications"
 msgstr ""
@@ -505,65 +505,77 @@ msgstr ""
 msgid "Follow-up reached: review required for risk '{t}'"
 msgstr ""
 
-#: risks/views.py:353
+#: risks/views.py:208
+msgid "Risk has been marked as reviewed and closed."
+msgstr ""
+
+#: risks/views.py:210
+msgid "Not all controls are completed. Risk cannot be closed yet."
+msgstr ""
+
+#: risks/views.py:368
 msgid "Notification marked as read."
 msgstr ""
 
-#: risks/views.py:363
+#: risks/views.py:378
 msgid "All notifications marked as read."
 msgstr ""
 
-#: risks/views.py:382
+#: risks/views.py:397
 msgid "Risk status updated."
 msgstr ""
 
-#: risks/views.py:398
+#: risks/views.py:413
 msgid "Control status updated."
 msgstr ""
 
-#: risks/views.py:414
+#: risks/views.py:429
 msgid "Incident status updated."
 msgstr ""
 
-#: risks/views.py:431
+#: risks/views.py:446
 msgid "Residual review flag updated."
 msgstr ""
 
-#: templates/base.html:34 templates/risks/dashboard.html:4
+#: templates/admin/change_form.html:10
+msgid "Schließen"
+msgstr ""
+
+#: templates/base.html:50 templates/risks/dashboard.html:4
 msgid "Dashboard"
 msgstr ""
 
-#: templates/base.html:35 templates/risks/risk_matrix.html:4
+#: templates/base.html:51 templates/risks/risk_matrix.html:4
 #: templates/risks/risk_matrix.html:8
 msgid "Risk Matrix"
 msgstr ""
 
-#: templates/base.html:37 templates/risks/item_risk.html:5
+#: templates/base.html:53 templates/risks/item_risk.html:5
 #: templates/risks/list_risks.html:4
 msgid "Risk analysis"
 msgstr ""
 
-#: templates/base.html:75
+#: templates/base.html:91
 msgid "AdminCP"
 msgstr ""
 
-#: templates/base.html:88
+#: templates/base.html:104
 msgid "Derk Mode"
 msgstr ""
 
-#: templates/base.html:94
+#: templates/base.html:110
 msgid "Logout"
 msgstr ""
 
-#: templates/base.html:109
+#: templates/base.html:125
 msgid "Login"
 msgstr ""
 
-#: templates/base.html:144 templates/base.html:151
+#: templates/base.html:160 templates/base.html:167
 msgid "Light Mode"
 msgstr ""
 
-#: templates/base.html:154
+#: templates/base.html:170
 msgid "Dark Mode"
 msgstr ""
 
@@ -596,7 +608,7 @@ msgid "Count"
 msgstr ""
 
 #: templates/risks/dashboard.html:94 templates/risks/dashboard.html:119
-#: templates/risks/list_risks.html:172
+#: templates/risks/list_risks.html:185
 msgid "No data"
 msgstr ""
 
@@ -631,17 +643,17 @@ msgstr ""
 msgid "Delete Control"
 msgstr ""
 
-#: templates/risks/item_control.html:34 templates/risks/item_risk.html:180
+#: templates/risks/item_control.html:34 templates/risks/item_risk.html:191
 #: templates/risks/list_controls.html:63 templates/risks/list_controls.html:99
 msgid "Responsible"
 msgstr ""
 
-#: templates/risks/item_control.html:37 templates/risks/item_risk.html:181
+#: templates/risks/item_control.html:37 templates/risks/item_risk.html:192
 #: templates/risks/list_controls.html:102
 msgid "Link"
 msgstr ""
 
-#: templates/risks/item_control.html:48 templates/risks/item_risk.html:179
+#: templates/risks/item_control.html:48 templates/risks/item_risk.html:190
 #: templates/risks/list_controls.html:101
 msgid "Deadline"
 msgstr ""
@@ -655,17 +667,17 @@ msgid "No linked risks."
 msgstr ""
 
 #: templates/risks/item_control.html:95 templates/risks/item_incident.html:87
-#: templates/risks/item_risk.html:233
+#: templates/risks/item_risk.html:244
 msgid "Time"
 msgstr ""
 
 #: templates/risks/item_control.html:97 templates/risks/item_incident.html:89
-#: templates/risks/item_risk.html:235
+#: templates/risks/item_risk.html:246
 msgid "Action"
 msgstr ""
 
 #: templates/risks/item_control.html:108 templates/risks/item_incident.html:100
-#: templates/risks/item_risk.html:246
+#: templates/risks/item_risk.html:257
 msgid "No history found."
 msgstr ""
 
@@ -677,7 +689,7 @@ msgstr ""
 msgid "Delete Incident"
 msgstr ""
 
-#: templates/risks/item_incident.html:35 templates/risks/item_risk.html:209
+#: templates/risks/item_incident.html:35 templates/risks/item_risk.html:220
 #: templates/risks/list_incidents.html:100
 msgid "Reported on"
 msgstr ""
@@ -686,71 +698,75 @@ msgstr ""
 msgid "Measures"
 msgstr ""
 
-#: templates/risks/item_risk.html:18
+#: templates/risks/item_risk.html:18 templates/risks/item_risk.html:19
 msgid "Edit Risk"
 msgstr ""
 
-#: templates/risks/item_risk.html:21
+#: templates/risks/item_risk.html:21 templates/risks/item_risk.html:22
 msgid "Delete Risk"
 msgstr ""
 
-#: templates/risks/item_risk.html:39
+#: templates/risks/item_risk.html:26 templates/risks/item_risk.html:27
+msgid "Mark Risk as reviewed"
+msgstr ""
+
+#: templates/risks/item_risk.html:44
 msgid "Protection goals"
 msgstr ""
 
-#: templates/risks/item_risk.html:43
+#: templates/risks/item_risk.html:48
 msgid "Not yet assigned"
 msgstr ""
 
-#: templates/risks/item_risk.html:49
+#: templates/risks/item_risk.html:54
 msgid "Risk owner"
 msgstr ""
 
-#: templates/risks/item_risk.html:52
+#: templates/risks/item_risk.html:57
 msgid "Resubmission"
 msgstr ""
 
-#: templates/risks/item_risk.html:65
+#: templates/risks/item_risk.html:70
 msgid "Risk assessment"
 msgstr ""
 
-#: templates/risks/item_risk.html:74
+#: templates/risks/item_risk.html:79
 msgid "Gross (before measures)"
 msgstr ""
 
-#: templates/risks/item_risk.html:80 templates/risks/item_risk.html:126
+#: templates/risks/item_risk.html:85 templates/risks/item_risk.html:131
 #: templates/risks/risk_matrix.html:21 templates/risks/risk_matrix.html:79
 #: templates/risks/risk_matrix.html:121
 msgid "Likelihood"
 msgstr ""
 
-#: templates/risks/item_risk.html:89 templates/risks/item_risk.html:135
+#: templates/risks/item_risk.html:94 templates/risks/item_risk.html:140
 #: templates/risks/risk_matrix.html:21 templates/risks/risk_matrix.html:79
 #: templates/risks/risk_matrix.html:121
 msgid "Impact"
 msgstr ""
 
-#: templates/risks/item_risk.html:98 templates/risks/item_risk.html:144
+#: templates/risks/item_risk.html:103 templates/risks/item_risk.html:149
 msgid "Level"
 msgstr ""
 
-#: templates/risks/item_risk.html:107 templates/risks/item_risk.html:153
+#: templates/risks/item_risk.html:112 templates/risks/item_risk.html:158
 msgid "Score"
 msgstr ""
 
-#: templates/risks/item_risk.html:120
+#: templates/risks/item_risk.html:125
 msgid "Net (after measures)"
 msgstr ""
 
-#: templates/risks/item_risk.html:160
-msgid "No net risk recorded yet."
+#: templates/risks/item_risk.html:169
+msgid "Add net Risk"
 msgstr ""
 
-#: templates/risks/item_risk.html:194
+#: templates/risks/item_risk.html:205
 msgid "No measures recorded."
 msgstr ""
 
-#: templates/risks/item_risk.html:220
+#: templates/risks/item_risk.html:231
 msgid "No incidents recorded."
 msgstr ""