diff --git a/administrator/components/com_actionlogs/config.xml b/administrator/components/com_actionlogs/config.xml
index 8ccd6e176e251..eb7a6c6f980a6 100644
--- a/administrator/components/com_actionlogs/config.xml
+++ b/administrator/components/com_actionlogs/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config addfieldprefix="Joomla\Component\Actionlogs\Administrator\Field">
+	<help key="User_Actions_Log:_Options"/>
 	<fieldset name="actionlogs" label="COM_ACTIONLOGS_OPTIONS">
 		<field
 			name="ip_logging"
diff --git a/administrator/components/com_associations/config.xml b/administrator/components/com_associations/config.xml
index 1074b48ec73fb..2ed30eb016107 100644
--- a/administrator/components/com_associations/config.xml
+++ b/administrator/components/com_associations/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Multilingual_Associations:_Options"/>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml
index f3e07e3c93230..e92bfe5facaaa 100644
--- a/administrator/components/com_banners/config.xml
+++ b/administrator/components/com_banners/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Banners:_Options"/>
 	<fieldset
 		name="component"
 		label="COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_LABEL"
diff --git a/administrator/components/com_cache/config.xml b/administrator/components/com_cache/config.xml
index 692b89a61db12..746566a455e80 100644
--- a/administrator/components/com_cache/config.xml
+++ b/administrator/components/com_cache/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Cache:_Options"/>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
diff --git a/administrator/components/com_checkin/config.xml b/administrator/components/com_checkin/config.xml
index 6507e3488258c..cb610afa1c000 100644
--- a/administrator/components/com_checkin/config.xml
+++ b/administrator/components/com_checkin/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Check-in:_Options"/>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
index ea1170481a05a..5b891903a735b 100644
--- a/administrator/components/com_contact/config.xml
+++ b/administrator/components/com_contact/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Contacts:_Options"/>
 	<fieldset
 		name="contact"
 		label="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DISPLAY"
diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index 1362527a3349e..be41e8ebb901a 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Articles:_Options"/>
 	<fieldset
 		name="articles"
 		label="JGLOBAL_ARTICLES"
diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml
index c9a020fdd524a..e052a804246ba 100644
--- a/administrator/components/com_finder/config.xml
+++ b/administrator/components/com_finder/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Smart_Search:_Options"/>
 	<fieldset
 		name="search"
 		label="COM_FINDER_FIELDSET_SEARCH_OPTIONS_LABEL"
diff --git a/administrator/components/com_installer/config.xml b/administrator/components/com_installer/config.xml
index fad56e8f7a55d..84131a8cb7204 100644
--- a/administrator/components/com_installer/config.xml
+++ b/administrator/components/com_installer/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Installer:_Options"/>
 	<fieldset
 		name="preferences"
 		label="COM_INSTALLER_PREFERENCES_LABEL"
diff --git a/administrator/components/com_joomlaupdate/config.xml b/administrator/components/com_joomlaupdate/config.xml
index f2d98163c4579..a96a57eb5cc67 100644
--- a/administrator/components/com_joomlaupdate/config.xml
+++ b/administrator/components/com_joomlaupdate/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Joomla_Update:_Options"/>
 	<fieldset
 		name="sources"
 		label="COM_JOOMLAUPDATE_CONFIG_SOURCES_LABEL"
diff --git a/administrator/components/com_languages/config.xml b/administrator/components/com_languages/config.xml
index d01bce850edf7..593fc75e06b97 100644
--- a/administrator/components/com_languages/config.xml
+++ b/administrator/components/com_languages/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Languages:_Options"/>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
diff --git a/administrator/components/com_mails/config.xml b/administrator/components/com_mails/config.xml
index 09a4519a9b87a..4206a0eb80f8a 100644
--- a/administrator/components/com_mails/config.xml
+++ b/administrator/components/com_mails/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Mail_Templates:_Options"/>
 	<fieldset
 		name="mails_options"
 		label="COM_MAILS_CONFIG_MAIL_OPTIONS" >
diff --git a/administrator/components/com_media/config.xml b/administrator/components/com_media/config.xml
index 0c8d0b83121c9..5b075e242a498 100644
--- a/administrator/components/com_media/config.xml
+++ b/administrator/components/com_media/config.xml
@@ -4,6 +4,8 @@
 		name="component"
 		label="COM_MEDIA_FIELDSET_OPTIONS_LABEL">
 
+		<help key="Media:_Options"/>
+
 		<field
 			name="upload_maxsize"
 			type="number"
diff --git a/administrator/components/com_menus/config.xml b/administrator/components/com_menus/config.xml
index 700a309ca5bc8..9a8028f55136e 100644
--- a/administrator/components/com_menus/config.xml
+++ b/administrator/components/com_menus/config.xml
@@ -5,6 +5,8 @@
 		label="COM_MENUS_PAGE_OPTIONS_LABEL"
 		>
 
+		<help key="Menus:_Options"/>
+
 		<field
 			name="page_title"
 			type="text"
diff --git a/administrator/components/com_messages/config.xml b/administrator/components/com_messages/config.xml
index ddb9b37b8cecd..45b91a33e1e25 100644
--- a/administrator/components/com_messages/config.xml
+++ b/administrator/components/com_messages/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Messages:_Options"/>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
@@ -13,7 +14,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_messages"
-			section="component" 
+			section="component"
 		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_modules/config.xml b/administrator/components/com_modules/config.xml
index 2cb76164c13be..d89b170d99c6c 100644
--- a/administrator/components/com_modules/config.xml
+++ b/administrator/components/com_modules/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Module:_Options"/>
 	<fieldset
 		name="modules"
 		label="COM_MODULES_GENERAL"
diff --git a/administrator/components/com_newsfeeds/config.xml b/administrator/components/com_newsfeeds/config.xml
index 883d14a87d282..071570823ab49 100644
--- a/administrator/components/com_newsfeeds/config.xml
+++ b/administrator/components/com_newsfeeds/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="News_Feed:_Options"/>
 
 	<fieldset
 		name="newsfeed"
diff --git a/administrator/components/com_plugins/config.xml b/administrator/components/com_plugins/config.xml
index f95a4f66bc211..b5910e27e97ec 100644
--- a/administrator/components/com_plugins/config.xml
+++ b/administrator/components/com_plugins/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Plugin:_Options"/>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
@@ -12,7 +13,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_plugins"
-			section="component" 
+			section="component"
 		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_postinstall/config.xml b/administrator/components/com_postinstall/config.xml
index 620bddaaeed15..e5f3eee41769d 100644
--- a/administrator/components/com_postinstall/config.xml
+++ b/administrator/components/com_postinstall/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
+	<help key="Post-installation_Messages:_Options"/>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
@@ -12,7 +13,7 @@
 			label="JCONFIG_PERMISSIONS_LABEL"
 			filter="rules"
 			component="com_postinstall"
-			section="component" 
+			section="component"
 		/>
-	</fieldset>	
-</config>
\ No newline at end of file
+	</fieldset>
+</config>
diff --git a/administrator/components/com_privacy/config.xml b/administrator/components/com_privacy/config.xml
index 833d1a2834a2b..91416d64299ab 100644
--- a/administrator/components/com_privacy/config.xml
+++ b/administrator/components/com_privacy/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Privacy:_Options"/>
 	<fieldset
 		name="privacy"
 		label="COM_PRIVACY_OPTION_LABEL"
diff --git a/administrator/components/com_redirect/config.xml b/administrator/components/com_redirect/config.xml
index e4c5155e9971d..8e685ee0fe421 100644
--- a/administrator/components/com_redirect/config.xml
+++ b/administrator/components/com_redirect/config.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-	<fieldset 
+	<help key="Redirect:_Options"/>
+	<fieldset
 		name="redirect"
 		label="COM_REDIRECT_ADVANCED_OPTIONS"
 		>
@@ -46,7 +47,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_redirect"
-			section="component" 
+			section="component"
 		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml
index 5a197f7b1c258..3c0ad44eaac7a 100644
--- a/administrator/components/com_tags/config.xml
+++ b/administrator/components/com_tags/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Tags:_Options"/>
 	<fieldset
 		name="taglist"
 		label="COM_TAGS_CONFIG_TAG_SETTINGS_LABEL"
diff --git a/administrator/components/com_templates/config.xml b/administrator/components/com_templates/config.xml
index 6641561dd5e13..d835736a3b028 100644
--- a/administrator/components/com_templates/config.xml
+++ b/administrator/components/com_templates/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Template:_Options"/>
 	<fieldset
 		name="templates"
 		label="COM_TEMPLATES_SUBMENU_TEMPLATES"
diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml
index 56f19b9bb6c92..baffa28980ad0 100644
--- a/administrator/components/com_users/config.xml
+++ b/administrator/components/com_users/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Users:_Options"/>
 	<fieldset
 		name="user_options"
 		label="COM_USERS_CONFIG_USER_OPTIONS" >
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
index 2ba39e4e88657..e5dbfa312acb3 100644
--- a/administrator/language/en-GB/joomla.ini
+++ b/administrator/language/en-GB/joomla.ini
@@ -718,30 +718,6 @@ JHELP_COMPONENTS_BANNERS_CATEGORY_EDIT="Banners:_New_or_Edit_Category"
 JHELP_COMPONENTS_BANNERS_CLIENTS="Banners:_Clients"
 JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Banners:_New_or_Edit_Client"
 JHELP_COMPONENTS_BANNERS_TRACKS="Banners:_Tracks"
-JHELP_COMPONENTS_COM_ACTIONLOGS_OPTIONS="User_Actions_Log:_Options"
-JHELP_COMPONENTS_COM_ASSOCIATIONS_OPTIONS="Multilingual_Associations:_Options"
-JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Banners:_Options"
-JHELP_COMPONENTS_COM_CACHE_OPTIONS="Cache:_Options"
-JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Check-in:_Options"
-JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Contacts:_Options"
-JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Articles:_Options"
-JHELP_COMPONENTS_COM_FINDER_OPTIONS="Smart_Search:_Options"
-JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Installer:_Options"
-JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Joomla_Update:_Options"
-JHELP_COMPONENTS_COM_LANGUAGES_OPTIONS="Languages:_Options"
-JHELP_COMPONENTS_COM_MAILS_OPTIONS="Mail_Templates:_Options"
-JHELP_COMPONENTS_COM_MEDIA_OPTIONS="Media:_Options"
-JHELP_COMPONENTS_COM_MENUS_OPTIONS="Menus:_Options"
-JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Messages:_Options"
-JHELP_COMPONENTS_COM_MODULES_OPTIONS="Module:_Options"
-JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="News_Feed:_Options"
-JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Plugin:_Options"
-JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Post-installation_Messages:_Options"
-JHELP_COMPONENTS_COM_PRIVACY_OPTIONS="Privacy:_Options"
-JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Redirect:_Options"
-JHELP_COMPONENTS_COM_TAGS_OPTIONS="Tags:_Options"
-JHELP_COMPONENTS_COM_TEMPLATES_OPTIONS="Template:_Options"
-JHELP_COMPONENTS_COM_USERS_OPTIONS="Users:_Options"
 JHELP_COMPONENTS_CONTACT_CATEGORIES="Contacts:_Categories"
 JHELP_COMPONENTS_CONTACT_CATEGORY_ADD="Contacts:_New_or_Edit_Category"
 JHELP_COMPONENTS_CONTACT_CATEGORY_EDIT="Contacts:_New_or_Edit_Category"
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
index c848f9bf17108..b7beb430406a3 100644
--- a/api/language/en-GB/joomla.ini
+++ b/api/language/en-GB/joomla.ini
@@ -714,30 +714,6 @@ JHELP_COMPONENTS_BANNERS_CATEGORY_EDIT="Banners:_New_or_Edit_Category"
 JHELP_COMPONENTS_BANNERS_CLIENTS="Banners:_Clients"
 JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Banners:_New_or_Edit_Client"
 JHELP_COMPONENTS_BANNERS_TRACKS="Banners:_Tracks"
-JHELP_COMPONENTS_COM_ACTIONLOGS_OPTIONS="User_Actions_Log:_Options"
-JHELP_COMPONENTS_COM_ASSOCIATIONS_OPTIONS="Multilingual_Associations:_Options"
-JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Banners:_Options"
-JHELP_COMPONENTS_COM_CACHE_OPTIONS="Cache:_Options"
-JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Check-in:_Options"
-JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Contacts:_Options"
-JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Articles:_Options"
-JHELP_COMPONENTS_COM_FINDER_OPTIONS="Smart_Search:_Options"
-JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Installer:_Options"
-JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Joomla_Update:_Options"
-JHELP_COMPONENTS_COM_LANGUAGES_OPTIONS="Languages:_Options"
-JHELP_COMPONENTS_COM_MAILS_OPTIONS="Mail_Templates:_Options"
-JHELP_COMPONENTS_COM_MEDIA_OPTIONS="Media:_Options"
-JHELP_COMPONENTS_COM_MENUS_OPTIONS="Menus:_Options"
-JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Messages:_Options"
-JHELP_COMPONENTS_COM_MODULES_OPTIONS="Module:_Options"
-JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="News_Feed:_Options"
-JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Plugin:_Options"
-JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Post-installation_Messages:_Options"
-JHELP_COMPONENTS_COM_PRIVACY_OPTIONS="Privacy:_Options"
-JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Redirect:_Options"
-JHELP_COMPONENTS_COM_TAGS_OPTIONS="Tags:_Options"
-JHELP_COMPONENTS_COM_TEMPLATES_OPTIONS="Template:_Options"
-JHELP_COMPONENTS_COM_USERS_OPTIONS="Users:_Options"
 JHELP_COMPONENTS_CONTACT_CATEGORIES="Contacts:_Categories"
 JHELP_COMPONENTS_CONTACT_CATEGORY_ADD="Contacts:_New_or_Edit_Category"
 JHELP_COMPONENTS_CONTACT_CATEGORY_EDIT="Contacts:_New_or_Edit_Category"