diff --git a/src/main/java/org/olat/course/nodes/pf/ui/_content/edit.html b/src/main/java/org/olat/course/nodes/pf/ui/_content/edit.html
index e9fe3446e68f78188a136b32a0d60d4d9721a74f..cd4882d7628dbd29a50153d73223aeebe41d615c 100644
--- a/src/main/java/org/olat/course/nodes/pf/ui/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/pf/ui/_content/edit.html
@@ -1,5 +1,5 @@
 <fieldset class="o_sel_course_ms">
-	<legend>$r.contextHelpWithWrapper("Assessment#_bewertung_kursbaustein")
+	<legend>$r.contextHelpWithWrapper("Communication and Collaboration#_participantfolder")
 	$r.translate("form.configuration")</legend>
 	
 	#if ($hasLogEntries)
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java
index eded9838bb7217b0a23a6c7f8ff3491cb140d9bf..054a76acc30f3a0050e14eec38ecab0b923a0766 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/DrawingEditorController.java
@@ -100,7 +100,7 @@ public class DrawingEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp("Test and Questionnaire Editor in Detail#details_testeditor_fragetypen_ft");
+		setFormContextHelp("detail#details_testeditor_fragetypen_drawing");
 		
 		titleEl = uifactory.addTextElement("title", "form.imd.title", -1, itemBuilder.getTitle(), formLayout);
 		titleEl.setMandatory(true);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
index 804f923df429acb124d542910ab424da9e9b5180..eb116587d72cba4096d5441a8516324b0ac475ba 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchEditorController.java
@@ -94,7 +94,7 @@ public class MatchEditorController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer metadata = FormLayoutContainer.createDefaultFormLayout("metadata", getTranslator());
-		metadata.setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_kprim");
+		metadata.setFormContextHelp("detail#details_testeditor_fragetypen_match");
 		metadata.setRootForm(mainForm);
 		formLayout.add(metadata);
 		formLayout.add("metadata", metadata);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/UploadEditorController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/UploadEditorController.java
index f0048fd9b868983ee398fff2d34e96d528024c75..6e3c871e79cd2dde92f280601a3a91fe8d96e5c2 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/UploadEditorController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/UploadEditorController.java
@@ -67,7 +67,7 @@ public class UploadEditorController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp("Test and Questionnaire Editor in Detail#details_testeditor_fragetypen_ft");
+		setFormContextHelp("detail#details_testeditor_fragetypen_fileupload");
 		
 		titleEl = uifactory.addTextElement("title", "form.imd.title", -1, itemBuilder.getTitle(), formLayout);
 		titleEl.setMandatory(true);
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_content/assignment_select_form.html b/src/main/java/org/olat/modules/portfolio/ui/_content/assignment_select_form.html
index 5d61ddf66367a32c1d578c05cb7e9ebc2d4c97fc..9945966cfba0bcd00d3aeb1bb4a34feed55fdef1 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_content/assignment_select_form.html
+++ b/src/main/java/org/olat/modules/portfolio/ui/_content/assignment_select_form.html
@@ -1,2 +1,5 @@
 #if($r.isNotNull($formEntryName)) <i class="o_icon o_icon-lg o_FileResource-FORM_icon"> </i> $formEntryName #end
-#if($r.visible("select.form")) $r.render("select.form") #end
\ No newline at end of file
+#if($r.visible("select.form")) 
+	$r.contextHelpWithWrapper("Survey in the portfolio")
+	$r.render("select.form") 
+#end
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/portfolio/ui/editor/_content/title_editor.html b/src/main/java/org/olat/modules/portfolio/ui/editor/_content/title_editor.html
index f3e441dae6621d9c68d1384f35d611257fb5cc3d..153a6943c13ff40a4e3de977f12564a101b84500 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/editor/_content/title_editor.html
+++ b/src/main/java/org/olat/modules/portfolio/ui/editor/_content/title_editor.html
@@ -1,4 +1,4 @@
-$r.contextHelpWithWrapper("My portfolio binders#portfolioinhalt")		
+$r.contextHelpWithWrapper("Survey in the portfolio")		
 #if($editMode)
 	<div class="o_page_edit_title">
 		<div class="o_page_edit_toolbar"><ul  class="list-inline">
diff --git a/src/main/java/org/olat/repository/ui/RepositoryAdminController.java b/src/main/java/org/olat/repository/ui/RepositoryAdminController.java
index 21465ba213f98851b55892a52e8bc7455c31ecba..4b798b25de9f347b72140e4e693077697cb3aecf 100644
--- a/src/main/java/org/olat/repository/ui/RepositoryAdminController.java
+++ b/src/main/java/org/olat/repository/ui/RepositoryAdminController.java
@@ -67,6 +67,7 @@ public class RepositoryAdminController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer searchCont = FormLayoutContainer.createDefaultFormLayout("search", getTranslator());
+		searchCont.setFormContextHelp("Modules: Repository");
 		searchCont.setFormTitle(translate("repository.admin.title"));
 		formLayout.add(searchCont);
 		searchCont.setRootForm(mainForm);
diff --git a/src/main/java/org/olat/repository/ui/_content/lifecycle_change.html b/src/main/java/org/olat/repository/ui/_content/lifecycle_change.html
index 3a7b18b7b7184b18e1fa30a2b6e18fd80d96b05d..b89b994efc302d643ae824a674d76ebfcc411c92 100644
--- a/src/main/java/org/olat/repository/ui/_content/lifecycle_change.html
+++ b/src/main/java/org/olat/repository/ui/_content/lifecycle_change.html
@@ -1,5 +1,8 @@
 <fieldset>
-	<legend>$r.translate("details.lifecycle.change")</legend>
+	<legend>
+		$r.contextHelpWithWrapper("Course settings#_delete")
+		$r.translate("details.lifecycle.change")
+	</legend>
 
 #if ($r.visible("close"))
 	<h4>$r.translate("details.close.ressoure")</h4>