From d2f437cfe47611be3284b85dc201d26a55149301 Mon Sep 17 00:00:00 2001
From: Steffen Waterkamp <steffen.waterkamp@greenbone.net>
Date: Tue, 6 Aug 2019 17:32:02 +0200
Subject: [PATCH 1/4] Set DEFAULT_MANUAL_URL to use GOS 5 manual

---
 gsa/src/gmp/gmpsettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gsa/src/gmp/gmpsettings.js b/gsa/src/gmp/gmpsettings.js
index ee599d4a73..3980bfa9d9 100644
--- a/gsa/src/gmp/gmpsettings.js
+++ b/gsa/src/gmp/gmpsettings.js
@@ -19,7 +19,7 @@
 import {isDefined} from './utils/identity';
 
 export const DEFAULT_RELOAD_INTERVAL = 15 * 1000; // fifteen seconds
-export const DEFAULT_MANUAL_URL = 'http://docs.greenbone.net/GSM-Manual/gos-4/';
+export const DEFAULT_MANUAL_URL = 'http://docs.greenbone.net/GSM-Manual/gos-5/';
 export const DEFAULT_PROTOCOLDOC_URL =
   'https://docs.greenbone.net/API/GMP/gmp-8.0.html';
 export const DEFAULT_LOG_LEVEL = 'warn';

From f1b99a6e78d7e6adbffa7c7bd3d4b5c04222c9bb Mon Sep 17 00:00:00 2001
From: Steffen Waterkamp <steffen.waterkamp@greenbone.net>
Date: Tue, 6 Aug 2019 18:56:42 +0200
Subject: [PATCH 2/4] Add new HelpIcon to Dashboards page (start)

---
 gsa/src/web/pages/start/page.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gsa/src/web/pages/start/page.js b/gsa/src/web/pages/start/page.js
index b385453e82..d3fd63506c 100644
--- a/gsa/src/web/pages/start/page.js
+++ b/gsa/src/web/pages/start/page.js
@@ -53,6 +53,7 @@ import {
 import DashboardIcon from 'web/components/icon/dashboardicon';
 import DeleteIcon from 'web/components/icon/deleteicon';
 import EditIcon from 'web/components/icon/editicon';
+import ManualIcon from 'web/components/icon/manualicon';
 import NewIcon from 'web/components/icon/newicon';
 
 import IconDivider from 'web/components/layout/icondivider';
@@ -107,6 +108,14 @@ const StyledTab = styled(Tab)`
   }
 `;
 
+const ToolBarIcons = () => (
+  <ManualIcon
+    page="web-interface"
+    anchor="dashboards-and-dashboard-displays"
+    title={_('Help: Dashboards')}
+  />
+);
+
 class StartPage extends React.Component {
   constructor(...args) {
     super(...args);
@@ -391,6 +400,7 @@ class StartPage extends React.Component {
     const canAdd = dashboards.length < MAX_DASHBOARDS;
     return (
       <React.Fragment>
+        <ToolBarIcons />
         <Section title={_('Dashboards')} img={<DashboardIcon size="large" />}>
           {isLoading ? (
             <Loading />

From f4d53d724c512b27268e35ded9779107fdd5d2ab Mon Sep 17 00:00:00 2001
From: Steffen Waterkamp <steffen.waterkamp@greenbone.net>
Date: Tue, 6 Aug 2019 18:58:13 +0200
Subject: [PATCH 3/4] Update Links to Manual in HelpIcon

...and add HelpIcon to Tickets
---
 gsa/src/web/pages/alerts/detailspage.js            |  4 ++--
 gsa/src/web/pages/alerts/listpage.js               |  4 ++--
 gsa/src/web/pages/certbund/detailspage.js          |  4 ++--
 gsa/src/web/pages/certbund/listpage.js             |  4 ++--
 gsa/src/web/pages/cpes/detailspage.js              |  2 +-
 gsa/src/web/pages/cpes/listpage.js                 |  6 +-----
 gsa/src/web/pages/credentials/detailspage.js       |  4 ++--
 gsa/src/web/pages/credentials/listpage.js          |  4 ++--
 gsa/src/web/pages/cves/detailspage.js              |  2 +-
 gsa/src/web/pages/cves/listpage.js                 |  6 +-----
 gsa/src/web/pages/dfncert/detailspage.js           |  4 ++--
 gsa/src/web/pages/dfncert/listpage.js              |  4 ++--
 gsa/src/web/pages/extras/cvsscalculatorpage.js     |  2 +-
 gsa/src/web/pages/extras/feedstatuspage.js         |  4 ++--
 gsa/src/web/pages/extras/trashcanpage.js           |  6 +++++-
 gsa/src/web/pages/filters/detailspage.js           |  4 ++--
 gsa/src/web/pages/filters/listpage.js              |  6 +++++-
 gsa/src/web/pages/groups/detailspage.js            |  6 +++---
 gsa/src/web/pages/groups/listpage.js               |  4 ++--
 gsa/src/web/pages/hosts/detailspage.js             |  6 +++---
 gsa/src/web/pages/hosts/listpage.js                |  4 ++--
 gsa/src/web/pages/ldap/ldappage.js                 |  2 +-
 gsa/src/web/pages/notes/detailspage.js             |  4 ++--
 gsa/src/web/pages/notes/listpage.js                |  4 ++--
 gsa/src/web/pages/nvts/detailspage.js              |  4 ++--
 gsa/src/web/pages/nvts/listpage.js                 |  4 ++--
 gsa/src/web/pages/operatingsystems/detailspage.js  |  4 ++--
 gsa/src/web/pages/operatingsystems/listpage.js     |  4 ++--
 gsa/src/web/pages/ovaldefs/detailspage.js          |  4 ++--
 gsa/src/web/pages/ovaldefs/listpage.js             |  4 ++--
 gsa/src/web/pages/overrides/detailspage.js         |  4 ++--
 gsa/src/web/pages/overrides/listpage.js            |  4 ++--
 gsa/src/web/pages/performance/performancepage.js   |  2 +-
 gsa/src/web/pages/permissions/detailspage.js       |  4 ++--
 gsa/src/web/pages/permissions/listpage.js          |  4 ++--
 gsa/src/web/pages/portlists/detailspage.js         |  6 +++---
 gsa/src/web/pages/portlists/listpage.js            |  4 ++--
 gsa/src/web/pages/radius/radiuspage.js             |  2 +-
 gsa/src/web/pages/reportformats/detailspage.js     |  4 ++--
 gsa/src/web/pages/reportformats/listpage.js        |  2 +-
 gsa/src/web/pages/reports/detailscontent.js        |  6 +++---
 gsa/src/web/pages/reports/listpage.js              |  4 ++--
 gsa/src/web/pages/results/detailspage.js           |  4 ++--
 gsa/src/web/pages/results/listpage.js              |  4 ++--
 gsa/src/web/pages/roles/detailspage.js             |  4 ++--
 gsa/src/web/pages/roles/listpage.js                |  4 ++--
 gsa/src/web/pages/scanconfigs/detailspage.js       |  4 ++--
 gsa/src/web/pages/scanconfigs/listpage.js          |  4 ++--
 gsa/src/web/pages/scanners/detailspage.js          |  4 ++--
 gsa/src/web/pages/scanners/listpage.js             |  4 ++--
 gsa/src/web/pages/schedules/detailspage.js         |  4 ++--
 gsa/src/web/pages/schedules/listpage.js            |  4 ++--
 gsa/src/web/pages/secinfo/listpage.js              |  3 +--
 gsa/src/web/pages/tags/detailspage.js              |  4 ++--
 gsa/src/web/pages/tags/listpage.js                 |  6 +++++-
 gsa/src/web/pages/targets/detailspage.js           |  4 ++--
 gsa/src/web/pages/targets/listpage.js              |  4 ++--
 gsa/src/web/pages/tasks/detailspage.js             |  4 ++--
 gsa/src/web/pages/tasks/listpage.js                |  4 ++--
 gsa/src/web/pages/tickets/detailspage.js           |  6 ++++++
 gsa/src/web/pages/tickets/listpage.js              | 10 ++++++++++
 gsa/src/web/pages/users/detailspage.js             |  6 +++---
 gsa/src/web/pages/users/listpage.js                |  4 ++--
 gsa/src/web/pages/usersettings/usersettingspage.js |  4 ++--
 gsa/src/web/pages/vulns/listpage.js                |  4 ++--
 65 files changed, 146 insertions(+), 127 deletions(-)

diff --git a/gsa/src/web/pages/alerts/detailspage.js b/gsa/src/web/pages/alerts/detailspage.js
index d7f155425d..14afd13ff9 100644
--- a/gsa/src/web/pages/alerts/detailspage.js
+++ b/gsa/src/web/pages/alerts/detailspage.js
@@ -73,8 +73,8 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="alerts"
+        page="scanning"
+        anchor="managing-alerts"
         title={_('Help: Alerts')}
       />
       <ListIcon title={_('Alerts List')} page="alerts" />
diff --git a/gsa/src/web/pages/alerts/listpage.js b/gsa/src/web/pages/alerts/listpage.js
index 897273e788..60e27181f2 100644
--- a/gsa/src/web/pages/alerts/listpage.js
+++ b/gsa/src/web/pages/alerts/listpage.js
@@ -48,8 +48,8 @@ import AlertTable, {SORT_FIELDS} from './table.js';
 const ToolBarIcons = withCapabilities(({capabilities, onAlertCreateClick}) => (
   <IconDivider>
     <ManualIcon
-      page="vulnerabilitymanagement"
-      anchor="alerts"
+      page="scanning"
+      anchor="managing-alerts"
       title={_('Help: Alerts')}
     />
     {capabilities.mayCreate('alert') && (
diff --git a/gsa/src/web/pages/certbund/detailspage.js b/gsa/src/web/pages/certbund/detailspage.js
index cc01036437..a34d9346fa 100644
--- a/gsa/src/web/pages/certbund/detailspage.js
+++ b/gsa/src/web/pages/certbund/detailspage.js
@@ -66,8 +66,8 @@ const ToolBarIcons = ({entity, onCertBundAdvDownloadClick}) => (
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="cert-bund"
+        page="managing-secinfo"
+        anchor="cert-bund-advisories"
         title={_('Help:  CERT-Bund Advisories')}
       />
       <ListIcon title={_('CERT-Bund Advisories')} page="certbunds" />
diff --git a/gsa/src/web/pages/certbund/listpage.js b/gsa/src/web/pages/certbund/listpage.js
index 67a424acb6..4a1a34ded0 100644
--- a/gsa/src/web/pages/certbund/listpage.js
+++ b/gsa/src/web/pages/certbund/listpage.js
@@ -44,8 +44,8 @@ import CertBundDashboard, {CERTBUND_DASHBOARD_ID} from './dashboard';
 
 const ToolBarIcons = props => (
   <ManualIcon
-    page="vulnerabilitymanagement"
-    anchor="cert-bund"
+    page="managing-secinfo"
+    anchor="cert-bund-advisories"
     title={_('Help: CERT-Bund Advisories')}
   />
 );
diff --git a/gsa/src/web/pages/cpes/detailspage.js b/gsa/src/web/pages/cpes/detailspage.js
index 6f84750fed..4a7c89ed7b 100644
--- a/gsa/src/web/pages/cpes/detailspage.js
+++ b/gsa/src/web/pages/cpes/detailspage.js
@@ -66,7 +66,7 @@ const ToolBarIcons = ({entity, onCpeDownloadClick}) => (
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
+        page="managing-secinfo"
         anchor="cpe"
         title={_('Help: CPEs')}
       />
diff --git a/gsa/src/web/pages/cpes/listpage.js b/gsa/src/web/pages/cpes/listpage.js
index 241a430ac3..bc697d675b 100644
--- a/gsa/src/web/pages/cpes/listpage.js
+++ b/gsa/src/web/pages/cpes/listpage.js
@@ -43,11 +43,7 @@ import CpesTable from './table';
 import CpesDashboard, {CPES_DASHBOARD_ID} from './dashboard';
 
 const ToolBarIcons = props => (
-  <ManualIcon
-    page="vulnerabilitymanagement"
-    anchor="cpe"
-    title={_('Help: CPEs')}
-  />
+  <ManualIcon page="managing-secinfo" anchor="cpe" title={_('Help: CPEs')} />
 );
 
 const Page = ({filter, onFilterChanged, onInteraction, ...props}) => (
diff --git a/gsa/src/web/pages/credentials/detailspage.js b/gsa/src/web/pages/credentials/detailspage.js
index 10dc0b9dfc..acfb87be5b 100644
--- a/gsa/src/web/pages/credentials/detailspage.js
+++ b/gsa/src/web/pages/credentials/detailspage.js
@@ -91,8 +91,8 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="credentials"
+        page="scanning"
+        anchor="managing-credentials"
         title={_('Help: Credentials')}
       />
       <ListIcon title={_('Credential List')} page="credentials" />
diff --git a/gsa/src/web/pages/credentials/listpage.js b/gsa/src/web/pages/credentials/listpage.js
index 3628594647..516e92ac3b 100644
--- a/gsa/src/web/pages/credentials/listpage.js
+++ b/gsa/src/web/pages/credentials/listpage.js
@@ -48,8 +48,8 @@ const ToolBarIcons = withCapabilities(
   ({capabilities, onCredentialCreateClick}) => (
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="credentials"
+        page="scanning"
+        anchor="managing-credentials"
         title={_('Help: Credentials')}
       />
       {capabilities.mayCreate('credential') && (
diff --git a/gsa/src/web/pages/cves/detailspage.js b/gsa/src/web/pages/cves/detailspage.js
index bbaa6f6e63..1c92033771 100644
--- a/gsa/src/web/pages/cves/detailspage.js
+++ b/gsa/src/web/pages/cves/detailspage.js
@@ -65,7 +65,7 @@ const ToolBarIcons = ({entity, onCveDownloadClick}) => (
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
+        page="managing-secinfo"
         anchor="cve"
         title={_('Help: CVEs')}
       />
diff --git a/gsa/src/web/pages/cves/listpage.js b/gsa/src/web/pages/cves/listpage.js
index 2c57a03183..4eafa42c7a 100644
--- a/gsa/src/web/pages/cves/listpage.js
+++ b/gsa/src/web/pages/cves/listpage.js
@@ -43,11 +43,7 @@ import CvesTable from './table';
 import CvesDashboard, {CVES_DASHBOARD_ID} from './dashboard';
 
 const ToolBarIcons = () => (
-  <ManualIcon
-    page="vulnerabilitymanagement"
-    anchor="cve"
-    title={_('Help: CVEs')}
-  />
+  <ManualIcon page="managing-secinfo" anchor="cve" title={_('Help: CVEs')} />
 );
 
 const Page = ({filter, onFilterChanged, onInteraction, ...props}) => (
diff --git a/gsa/src/web/pages/dfncert/detailspage.js b/gsa/src/web/pages/dfncert/detailspage.js
index dd97ecac86..94c995ebeb 100644
--- a/gsa/src/web/pages/dfncert/detailspage.js
+++ b/gsa/src/web/pages/dfncert/detailspage.js
@@ -58,8 +58,8 @@ const ToolBarIcons = ({entity, onDfnCertAdvDownloadClick}) => (
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="id15"
+        page="managing-secinfo"
+        anchor="dfn-cert-advisories"
         title={_('Help: DFN-CERT Advisories')}
       />
       <ListIcon title={_('DFN-CERT Advisories')} page="dfncerts" />
diff --git a/gsa/src/web/pages/dfncert/listpage.js b/gsa/src/web/pages/dfncert/listpage.js
index 2cd8a60c37..f1eb2ea8fb 100644
--- a/gsa/src/web/pages/dfncert/listpage.js
+++ b/gsa/src/web/pages/dfncert/listpage.js
@@ -46,8 +46,8 @@ import DfnCertDashboard, {DFNCERT_DASHBOARD_ID} from './dashboard';
 
 const ToolBarIcons = () => (
   <ManualIcon
-    page="vulnerabilitymanagement"
-    anchor="id15"
+    page="managing-secinfo"
+    anchor="dfn-cert-advisories"
     title={_('Help: DFN-CERT Advisories')}
   />
 );
diff --git a/gsa/src/web/pages/extras/cvsscalculatorpage.js b/gsa/src/web/pages/extras/cvsscalculatorpage.js
index 6ecba192a6..6d06dc0b83 100644
--- a/gsa/src/web/pages/extras/cvsscalculatorpage.js
+++ b/gsa/src/web/pages/extras/cvsscalculatorpage.js
@@ -54,7 +54,7 @@ const StyledTextField = styled(TextField)`
 
 const ToolBarIcons = () => (
   <ManualIcon
-    page="vulnerabilitymanagement"
+    page="managing-secinfo"
     anchor="cvss"
     size="small"
     title={_('Help: CVSS Base Score Calculator')}
diff --git a/gsa/src/web/pages/extras/feedstatuspage.js b/gsa/src/web/pages/extras/feedstatuspage.js
index bd7f083a96..5d056d2bf5 100644
--- a/gsa/src/web/pages/extras/feedstatuspage.js
+++ b/gsa/src/web/pages/extras/feedstatuspage.js
@@ -53,8 +53,8 @@ import withGmp from 'web/utils/withGmp';
 
 const ToolBarIcons = () => (
   <ManualIcon
-    page="search"
-    searchTerm="feed"
+    page="web-interface"
+    anchor="displaying-the-feed-status"
     size="small"
     title={_('Help: Feed Status')}
   />
diff --git a/gsa/src/web/pages/extras/trashcanpage.js b/gsa/src/web/pages/extras/trashcanpage.js
index ef6e0286e0..f02397bd98 100644
--- a/gsa/src/web/pages/extras/trashcanpage.js
+++ b/gsa/src/web/pages/extras/trashcanpage.js
@@ -82,7 +82,11 @@ const Col = styled.col`
 `;
 
 const ToolBarIcons = () => (
-  <ManualIcon page="search" searchTerm="trashcan" title={_('Help: Trashcan')} />
+  <ManualIcon
+    page="web-interface"
+    anchor="using-the-trashcan"
+    title={_('Help: Trashcan')}
+  />
 );
 
 const EmptyTrashButton = withCapabilities(({onClick, capabilities}) => {
diff --git a/gsa/src/web/pages/filters/detailspage.js b/gsa/src/web/pages/filters/detailspage.js
index beab487e9c..94229c34d3 100644
--- a/gsa/src/web/pages/filters/detailspage.js
+++ b/gsa/src/web/pages/filters/detailspage.js
@@ -73,8 +73,8 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="search"
-        searchTerm="filter"
+        page="web-interface"
+        anchor="managing-powerfilters"
         title={_('Help: Filters')}
       />
       <ListIcon title={_('Filter List')} page="filters" />
diff --git a/gsa/src/web/pages/filters/listpage.js b/gsa/src/web/pages/filters/listpage.js
index 8aeae4feda..48805782d7 100644
--- a/gsa/src/web/pages/filters/listpage.js
+++ b/gsa/src/web/pages/filters/listpage.js
@@ -46,7 +46,11 @@ import FiltersTable, {SORT_FIELDS} from './table';
 
 const ToolBarIcons = withCapabilities(({capabilities, onFilterCreateClick}) => (
   <IconDivider>
-    <ManualIcon page="search" searchTerm="filter" title={_('Help: Filters')} />
+    <ManualIcon
+      page="web-interface"
+      anchor="managing-powerfilters"
+      title={_('Help: Filters')}
+    />
     {capabilities.mayCreate('filter') && (
       <NewIcon title={_('New Filter')} onClick={onFilterCreateClick} />
     )}
diff --git a/gsa/src/web/pages/groups/detailspage.js b/gsa/src/web/pages/groups/detailspage.js
index 22ff724f1d..fef94be44d 100644
--- a/gsa/src/web/pages/groups/detailspage.js
+++ b/gsa/src/web/pages/groups/detailspage.js
@@ -73,9 +73,9 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="gui_administration"
-        anchor="groups"
-        title={_('Help: Group Details')}
+        page="web-interface-access"
+        anchor="managing-groups"
+        title={_('Help: Groups')}
       />
       <ListIcon title={_('Groups List')} page="groups" />
     </IconDivider>
diff --git a/gsa/src/web/pages/groups/listpage.js b/gsa/src/web/pages/groups/listpage.js
index 173527b76b..1a342b2868 100644
--- a/gsa/src/web/pages/groups/listpage.js
+++ b/gsa/src/web/pages/groups/listpage.js
@@ -47,8 +47,8 @@ import Table, {SORT_FIELDS} from './table';
 const ToolBarIcons = withCapabilities(({capabilities, onGroupCreateClick}) => (
   <IconDivider>
     <ManualIcon
-      page="gui_administration"
-      anchor="groups"
+      page="web-interface-access"
+      anchor="managing-groups"
       title={_('Help: Groups')}
     />
     {capabilities.mayCreate('group') && (
diff --git a/gsa/src/web/pages/hosts/detailspage.js b/gsa/src/web/pages/hosts/detailspage.js
index 93078e5e2a..12db7be0b1 100644
--- a/gsa/src/web/pages/hosts/detailspage.js
+++ b/gsa/src/web/pages/hosts/detailspage.js
@@ -93,9 +93,9 @@ const ToolBarIcons = ({
     <Divider margin="10px">
       <IconDivider>
         <ManualIcon
-          page="vulnerabilitymanagement"
-          anchor="host-details"
-          title={_('Help: Host Details')}
+          page="managing-assets"
+          anchor="managing-hosts"
+          title={_('Help: Hosts')}
         />
         <ListIcon title={_('Host List')} page="hosts" />
       </IconDivider>
diff --git a/gsa/src/web/pages/hosts/listpage.js b/gsa/src/web/pages/hosts/listpage.js
index c281a63e92..f5383e3c8f 100644
--- a/gsa/src/web/pages/hosts/listpage.js
+++ b/gsa/src/web/pages/hosts/listpage.js
@@ -52,8 +52,8 @@ import HostsDashboard, {HOSTS_DASHBOARD_ID} from './dashboard';
 const ToolBarIcons = withCapabilities(({capabilities, onHostCreateClick}) => (
   <IconDivider>
     <ManualIcon
-      page="vulnerabilitymanagement"
-      anchor="hosts-view"
+      page="managing-assets"
+      anchor="managing-hosts"
       title={_('Help: Hosts')}
     />
     {capabilities.mayCreate('host') && (
diff --git a/gsa/src/web/pages/ldap/ldappage.js b/gsa/src/web/pages/ldap/ldappage.js
index 34f7856f0c..1aa7d1ab57 100644
--- a/gsa/src/web/pages/ldap/ldappage.js
+++ b/gsa/src/web/pages/ldap/ldappage.js
@@ -53,7 +53,7 @@ import LdapDialog from './dialog';
 const ToolBarIcons = ({onOpenDialogClick}) => (
   <IconDivider>
     <ManualIcon
-      page="gui_administration"
+      page="web-interface-access"
       anchor="ldap"
       size="small"
       title={_('Help: LDAP per-User Authentication')}
diff --git a/gsa/src/web/pages/notes/detailspage.js b/gsa/src/web/pages/notes/detailspage.js
index 7e71f0b5ec..d92e1de1dc 100644
--- a/gsa/src/web/pages/notes/detailspage.js
+++ b/gsa/src/web/pages/notes/detailspage.js
@@ -89,8 +89,8 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="notes"
+        page="reports"
+        anchor="managing-notes"
         title={_('Help: Notes')}
       />
       <ListIcon title={_('Note List')} page="notes" />
diff --git a/gsa/src/web/pages/notes/listpage.js b/gsa/src/web/pages/notes/listpage.js
index dcf367c38e..74fc2fbfc6 100644
--- a/gsa/src/web/pages/notes/listpage.js
+++ b/gsa/src/web/pages/notes/listpage.js
@@ -50,8 +50,8 @@ import NoteIcon from 'web/components/icon/noteicon';
 const ToolBarIcons = withCapabilities(({capabilities, onNoteCreateClick}) => (
   <IconDivider>
     <ManualIcon
-      page="vulnerabilitymanagement"
-      anchor="notes"
+      page="reports"
+      anchor="managing-notes"
       title={_('Help: Notes')}
     />
     {capabilities.mayCreate('note') && (
diff --git a/gsa/src/web/pages/nvts/detailspage.js b/gsa/src/web/pages/nvts/detailspage.js
index 42dde76f04..b5ce41e2b1 100644
--- a/gsa/src/web/pages/nvts/detailspage.js
+++ b/gsa/src/web/pages/nvts/detailspage.js
@@ -82,8 +82,8 @@ let ToolBarIcons = ({
     <Divider margin="10px">
       <IconDivider>
         <ManualIcon
-          page="vulnerabilitymanagement"
-          anchor="network-vulnerability-tests"
+          page="managing-secinfo"
+          anchor="network-vulnerability-tests-nvt"
           title={_('Help: NVTs')}
         />
         <ListIcon title={_('NVT List')} page="nvts" />
diff --git a/gsa/src/web/pages/nvts/listpage.js b/gsa/src/web/pages/nvts/listpage.js
index 74d49db4ff..eb8670f94a 100644
--- a/gsa/src/web/pages/nvts/listpage.js
+++ b/gsa/src/web/pages/nvts/listpage.js
@@ -44,8 +44,8 @@ import NvtsDashboard, {NVTS_DASHBOARD_ID} from './dashboard';
 
 const ToolBarIcons = () => (
   <ManualIcon
-    page="vulnerabilitymanagement"
-    anchor="network-vulnerability-tests"
+    page="managing-secinfo"
+    anchor="network-vulnerability-tests-nvt"
     title={_('Help: NVTs')}
   />
 );
diff --git a/gsa/src/web/pages/operatingsystems/detailspage.js b/gsa/src/web/pages/operatingsystems/detailspage.js
index adafdba27b..c0e9ef58e2 100644
--- a/gsa/src/web/pages/operatingsystems/detailspage.js
+++ b/gsa/src/web/pages/operatingsystems/detailspage.js
@@ -86,8 +86,8 @@ let ToolBarIcons = ({
     <Divider margin="10px">
       <IconDivider>
         <ManualIcon
-          page="vulnerabilitymanagement"
-          anchor="operating-systems-view"
+          page="managing-assets"
+          anchor="managing-operating-systems"
           title={_('Help: Operating Systems')}
         />
         <ListIcon title={_('Operating System List')} page="operatingsystems" />
diff --git a/gsa/src/web/pages/operatingsystems/listpage.js b/gsa/src/web/pages/operatingsystems/listpage.js
index 0af31bb9d6..cf873930f5 100644
--- a/gsa/src/web/pages/operatingsystems/listpage.js
+++ b/gsa/src/web/pages/operatingsystems/listpage.js
@@ -48,8 +48,8 @@ import OsDashboard, {OS_DASHBOARD_ID} from './dashboard';
 const ToolBarIcons = () => (
   <Layout>
     <ManualIcon
-      page="vulnerabilitymanagement"
-      anchor="operating-systems-view"
+      page="managing-assets"
+      anchor="managing-operating-systems"
       title={_('Help: Operating Systems')}
     />
   </Layout>
diff --git a/gsa/src/web/pages/ovaldefs/detailspage.js b/gsa/src/web/pages/ovaldefs/detailspage.js
index cd00c1311a..85c8a9b9eb 100644
--- a/gsa/src/web/pages/ovaldefs/detailspage.js
+++ b/gsa/src/web/pages/ovaldefs/detailspage.js
@@ -69,8 +69,8 @@ const ToolBarIcons = ({entity, onOvaldefDownloadClick}) => (
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="oval"
+        page="managing-secinfo"
+        anchor="oval-definitions"
         title={_('Help: OVAL Definitions')}
       />
       <ListIcon title={_('OVAL Definitions List')} page="ovaldefs" />
diff --git a/gsa/src/web/pages/ovaldefs/listpage.js b/gsa/src/web/pages/ovaldefs/listpage.js
index 3dfde3e381..e3761f9886 100644
--- a/gsa/src/web/pages/ovaldefs/listpage.js
+++ b/gsa/src/web/pages/ovaldefs/listpage.js
@@ -44,8 +44,8 @@ import OvaldefDashboard, {OVALDEF_DASHBOARD_ID} from './dashboard';
 
 const ToolBarIcons = () => (
   <ManualIcon
-    page="vulnerabilitymanagement"
-    anchor="oval"
+    page="managing-secinfo"
+    anchor="oval-definitions"
     title={_('Help: OVAL Definitions')}
   />
 );
diff --git a/gsa/src/web/pages/overrides/detailspage.js b/gsa/src/web/pages/overrides/detailspage.js
index fd67162274..1832fe23ec 100644
--- a/gsa/src/web/pages/overrides/detailspage.js
+++ b/gsa/src/web/pages/overrides/detailspage.js
@@ -92,8 +92,8 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="overrides-and-false-positives"
+        page="reports"
+        anchor="managing-overrides"
         title={_('Help: Overrides')}
       />
       <ListIcon title={_('Override List')} page="overrides" />
diff --git a/gsa/src/web/pages/overrides/listpage.js b/gsa/src/web/pages/overrides/listpage.js
index f66f34ce5c..72237bc1a1 100644
--- a/gsa/src/web/pages/overrides/listpage.js
+++ b/gsa/src/web/pages/overrides/listpage.js
@@ -51,8 +51,8 @@ const ToolBarIcons = withCapabilities(
   ({capabilities, onOverrideCreateClick}) => (
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="overrides-and-false-positives"
+        page="reports"
+        anchor="managing-overrides"
         title={_('Help: Overrides')}
       />
 
diff --git a/gsa/src/web/pages/performance/performancepage.js b/gsa/src/web/pages/performance/performancepage.js
index adef08f640..f62e138213 100644
--- a/gsa/src/web/pages/performance/performancepage.js
+++ b/gsa/src/web/pages/performance/performancepage.js
@@ -83,7 +83,7 @@ const ToolBar = ({onDurationChangeClick}) => {
     <IconDivider>
       <ManualIcon
         page="performance"
-        anchor="appliance-performance"
+        anchor="optimizing-the-appliance-performance"
         size="small"
         title={_('Help: Performance')}
       />
diff --git a/gsa/src/web/pages/permissions/detailspage.js b/gsa/src/web/pages/permissions/detailspage.js
index dcc80bd378..01b657e26a 100644
--- a/gsa/src/web/pages/permissions/detailspage.js
+++ b/gsa/src/web/pages/permissions/detailspage.js
@@ -65,8 +65,8 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="gui_administration"
-        anchor="permissions"
+        page="web-interface-access"
+        anchor="managing-permissions"
         title={_('Help: Permissions')}
       />
       <ListIcon title={_('Permission List')} page="permissions" />
diff --git a/gsa/src/web/pages/permissions/listpage.js b/gsa/src/web/pages/permissions/listpage.js
index 47f3eb364f..977f2c4a7f 100644
--- a/gsa/src/web/pages/permissions/listpage.js
+++ b/gsa/src/web/pages/permissions/listpage.js
@@ -49,8 +49,8 @@ const ToolBarIcons = withCapabilities(
   ({capabilities, onPermissionCreateClick}) => (
     <IconDivider>
       <ManualIcon
-        page="gui_administration"
-        anchor="permissions"
+        page="web-interface-access"
+        anchor="managing-permissions"
         title={_('Help: Permissions')}
       />
       {capabilities.mayCreate('permission') && (
diff --git a/gsa/src/web/pages/portlists/detailspage.js b/gsa/src/web/pages/portlists/detailspage.js
index 95fea34f4c..ecf1b68dbd 100644
--- a/gsa/src/web/pages/portlists/detailspage.js
+++ b/gsa/src/web/pages/portlists/detailspage.js
@@ -74,9 +74,9 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="search"
-        searchTerm="port list"
-        title={_('Help: PortList Details')}
+        page="performance"
+        anchor="managing-port-lists"
+        title={_('Help: Port Lists')}
       />
       <ListIcon title={_('PortList List')} page="portlists" />
     </IconDivider>
diff --git a/gsa/src/web/pages/portlists/listpage.js b/gsa/src/web/pages/portlists/listpage.js
index a634c9c80c..d0c77ee53b 100644
--- a/gsa/src/web/pages/portlists/listpage.js
+++ b/gsa/src/web/pages/portlists/listpage.js
@@ -48,8 +48,8 @@ const ToolBarIcons = withCapabilities(
   ({capabilities, onPortListCreateClick, onPortListImportClick}) => (
     <IconDivider>
       <ManualIcon
-        page="search"
-        searchTerm="port list"
+        page="performance"
+        anchor="managing-port-lists"
         title={_('Help: Port Lists')}
       />
       {capabilities.mayCreate('port_list') && (
diff --git a/gsa/src/web/pages/radius/radiuspage.js b/gsa/src/web/pages/radius/radiuspage.js
index 49dfd1eb2f..c2779303dc 100644
--- a/gsa/src/web/pages/radius/radiuspage.js
+++ b/gsa/src/web/pages/radius/radiuspage.js
@@ -53,7 +53,7 @@ import RadiusDialog from './dialog';
 const ToolBarIcons = ({onOpenDialogClick}) => (
   <IconDivider>
     <ManualIcon
-      page="gui_administration"
+      page="web-interface-access"
       anchor="radius"
       size="small"
       title={_('Help: RADIUS Authentication')}
diff --git a/gsa/src/web/pages/reportformats/detailspage.js b/gsa/src/web/pages/reportformats/detailspage.js
index 54bf778b7f..938c26f54d 100644
--- a/gsa/src/web/pages/reportformats/detailspage.js
+++ b/gsa/src/web/pages/reportformats/detailspage.js
@@ -87,8 +87,8 @@ const ToolBarIcons = withCapabilities(
       <IconDivider>
         <ManualIcon
           page="reports"
-          anchor="report-plugins"
-          title={_('Help: Report Format Details')}
+          anchor="managing-report-formats"
+          title={_('Help: Report Formats')}
         />
         <ListIcon title={_('Report Formats List')} page="reportformats" />
       </IconDivider>
diff --git a/gsa/src/web/pages/reportformats/listpage.js b/gsa/src/web/pages/reportformats/listpage.js
index 5367ef6ffe..e861928120 100644
--- a/gsa/src/web/pages/reportformats/listpage.js
+++ b/gsa/src/web/pages/reportformats/listpage.js
@@ -49,7 +49,7 @@ const ToolBarIcons = withCapabilities(
     <IconDivider>
       <ManualIcon
         page="reports"
-        anchor="report-plugins"
+        anchor="managing-report-formats"
         title={_('Help: Report Formats')}
       />
       {capabilities.mayCreate('report_format') && (
diff --git a/gsa/src/web/pages/reports/detailscontent.js b/gsa/src/web/pages/reports/detailscontent.js
index ae54f317f0..8f80512fb4 100644
--- a/gsa/src/web/pages/reports/detailscontent.js
+++ b/gsa/src/web/pages/reports/detailscontent.js
@@ -149,9 +149,9 @@ const ToolBarIcons = ({
     <Divider margin="15px">
       <IconDivider>
         <ManualIcon
-          page="vulnerabilitymanagement"
-          anchor="reports-and-vulnerability-management"
-          title={_('Help: Reports')}
+          page="reports"
+          anchor="reading-a-report"
+          title={_('Help: Reading Reports')}
         />
         <ListIcon title={_('Reports List')} page="reports" />
       </IconDivider>
diff --git a/gsa/src/web/pages/reports/listpage.js b/gsa/src/web/pages/reports/listpage.js
index 259539923b..8270015f93 100644
--- a/gsa/src/web/pages/reports/listpage.js
+++ b/gsa/src/web/pages/reports/listpage.js
@@ -68,8 +68,8 @@ const CONTAINER_TASK_FILTER = Filter.fromString('target=""');
 const ToolBarIcons = ({onUploadReportClick}) => (
   <IconDivider>
     <ManualIcon
-      page="vulnerabilitymanagement"
-      anchor="reading-of-the-reports"
+      page="reports"
+      anchor="using-and-managing-reports"
       title={_('Help: Reports')}
     />
     <UploadIcon title={_('Upload report')} onClick={onUploadReportClick} />
diff --git a/gsa/src/web/pages/results/detailspage.js b/gsa/src/web/pages/results/detailspage.js
index 13fb24a494..953c16a8c2 100644
--- a/gsa/src/web/pages/results/detailspage.js
+++ b/gsa/src/web/pages/results/detailspage.js
@@ -102,8 +102,8 @@ let ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="results"
+        page="reports"
+        anchor="displaying-all-existing-results"
         title={_('Help: Results')}
       />
       <ListIcon title={_('Results List')} page="results" />
diff --git a/gsa/src/web/pages/results/listpage.js b/gsa/src/web/pages/results/listpage.js
index a5c61eb6b9..2a4ff35cc8 100644
--- a/gsa/src/web/pages/results/listpage.js
+++ b/gsa/src/web/pages/results/listpage.js
@@ -46,8 +46,8 @@ import ResultsDashboard, {RESULTS_DASHBOARD_ID} from './dashboard';
 const ToolBarIcons = () => (
   <Layout>
     <ManualIcon
-      page="vulnerabilitymanagement"
-      anchor="results"
+      page="reports"
+      anchor="displaying-all-existing-results"
       title={_('Help: Results')}
     />
   </Layout>
diff --git a/gsa/src/web/pages/roles/detailspage.js b/gsa/src/web/pages/roles/detailspage.js
index 2361daa6d8..934e1075bf 100644
--- a/gsa/src/web/pages/roles/detailspage.js
+++ b/gsa/src/web/pages/roles/detailspage.js
@@ -85,8 +85,8 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="gui_administration"
-        anchor="user-roles"
+        page="web-interface-access"
+        anchor="managing-roles"
         title={_('Help: Roles')}
       />
       <ListIcon title={_('Roles List')} page="roles" />
diff --git a/gsa/src/web/pages/roles/listpage.js b/gsa/src/web/pages/roles/listpage.js
index f976edd005..4061267534 100644
--- a/gsa/src/web/pages/roles/listpage.js
+++ b/gsa/src/web/pages/roles/listpage.js
@@ -47,8 +47,8 @@ import Table, {SORT_FIELDS} from './table';
 const ToolBarIcons = withCapabilities(({capabilities, onRoleCreateClick}) => (
   <IconDivider>
     <ManualIcon
-      page="gui_administration"
-      anchor="user-roles"
+      page="web-interface-access"
+      anchor="managing-roles"
       title={_('Help: Roles')}
     />
     {capabilities.mayCreate('role') && (
diff --git a/gsa/src/web/pages/scanconfigs/detailspage.js b/gsa/src/web/pages/scanconfigs/detailspage.js
index 0a4b50b2f8..a259ea174e 100644
--- a/gsa/src/web/pages/scanconfigs/detailspage.js
+++ b/gsa/src/web/pages/scanconfigs/detailspage.js
@@ -92,8 +92,8 @@ const ToolBarIcons = withCapabilities(
     <Divider margin="10px">
       <IconDivider>
         <ManualIcon
-          page="vulnerabilitymanagement"
-          anchor="scan-configuration"
+          page="scanning"
+          anchor="managing-scan-configurations"
           title={_('Help: ScanConfigs')}
         />
         <ListIcon title={_('ScanConfig List')} page="scanconfigs" />
diff --git a/gsa/src/web/pages/scanconfigs/listpage.js b/gsa/src/web/pages/scanconfigs/listpage.js
index 61e134e2a0..5a9d6dddd1 100644
--- a/gsa/src/web/pages/scanconfigs/listpage.js
+++ b/gsa/src/web/pages/scanconfigs/listpage.js
@@ -49,8 +49,8 @@ const ToolBarIcons = withCapabilities(
   ({capabilities, onScanConfigCreateClick, onScanConfigImportClick}) => (
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="scan-configuration"
+        page="scanning"
+        anchor="managing-scan-configurations"
         title={_('Help: Scan Configs')}
       />
       {capabilities.mayCreate('config') && (
diff --git a/gsa/src/web/pages/scanners/detailspage.js b/gsa/src/web/pages/scanners/detailspage.js
index f9b09a587d..f780e2ba21 100644
--- a/gsa/src/web/pages/scanners/detailspage.js
+++ b/gsa/src/web/pages/scanners/detailspage.js
@@ -83,8 +83,8 @@ const ToolBarIcons = ({
     <Divider margin="10px">
       <IconDivider>
         <ManualIcon
-          page="search"
-          searchTerm="scanner"
+          page="scanning"
+          anchor="managing-scanners"
           title={_('Help: Scanners')}
         />
         <ListIcon title={_('Scanner List')} page="scanners" />
diff --git a/gsa/src/web/pages/scanners/listpage.js b/gsa/src/web/pages/scanners/listpage.js
index 28a62a3cc2..e075dbf91d 100644
--- a/gsa/src/web/pages/scanners/listpage.js
+++ b/gsa/src/web/pages/scanners/listpage.js
@@ -48,8 +48,8 @@ const ToolBarIcons = withCapabilities(
   ({capabilities, onScannerCreateClick}) => (
     <IconDivider>
       <ManualIcon
-        page="search"
-        searchTerm="scanner"
+        page="scanning"
+        anchor="managing-scanners"
         title={_('Help: Scanners')}
       />
       {capabilities.mayCreate('scanner') && (
diff --git a/gsa/src/web/pages/schedules/detailspage.js b/gsa/src/web/pages/schedules/detailspage.js
index 26cf665e46..1b0765c127 100644
--- a/gsa/src/web/pages/schedules/detailspage.js
+++ b/gsa/src/web/pages/schedules/detailspage.js
@@ -73,8 +73,8 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anhcor="scheduled-scan"
+        page="scanning"
+        anchor="managing-schedules"
         title={_('Help: Schedules')}
       />
       <ListIcon title={_('Schedules List')} page="schedules" />
diff --git a/gsa/src/web/pages/schedules/listpage.js b/gsa/src/web/pages/schedules/listpage.js
index 0d64e5aa1e..28d91e06b8 100644
--- a/gsa/src/web/pages/schedules/listpage.js
+++ b/gsa/src/web/pages/schedules/listpage.js
@@ -48,8 +48,8 @@ const ToolBarIcons = withCapabilities(
   ({capabilities, onScheduleCreateClick}) => (
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="scheduled-scan"
+        page="scanning"
+        anchor="managing-schedules"
         title={_('Help: Schedules')}
       />
       {capabilities.mayCreate('schedule') && (
diff --git a/gsa/src/web/pages/secinfo/listpage.js b/gsa/src/web/pages/secinfo/listpage.js
index 7427f80ec3..d886cc6c1b 100644
--- a/gsa/src/web/pages/secinfo/listpage.js
+++ b/gsa/src/web/pages/secinfo/listpage.js
@@ -44,8 +44,7 @@ import {SecInfoDashboard, SECINFO_DASHBOARD_ID} from './dashboard';
 
 const ToolBarIcons = () => (
   <ManualIcon
-    page="vulnerabilitymanagement"
-    anchor="secinfo-management"
+    page="managing-secinfo"
     title={_('Help: All SecInfo Information')}
   />
 );
diff --git a/gsa/src/web/pages/tags/detailspage.js b/gsa/src/web/pages/tags/detailspage.js
index 70fa0d6762..df2066e4eb 100644
--- a/gsa/src/web/pages/tags/detailspage.js
+++ b/gsa/src/web/pages/tags/detailspage.js
@@ -103,8 +103,8 @@ const ToolBarIcons = withCapabilties(
       <Divider margin="10px">
         <IconDivider>
           <ManualIcon
-            page="gui_introduction"
-            anchor="tags"
+            page="web-interface"
+            anchor="managing-tags"
             title={_('Help: Tags')}
           />
           <ListIcon title={_('Tag List')} page="tags" />
diff --git a/gsa/src/web/pages/tags/listpage.js b/gsa/src/web/pages/tags/listpage.js
index 8983eb405a..d8f9157c28 100644
--- a/gsa/src/web/pages/tags/listpage.js
+++ b/gsa/src/web/pages/tags/listpage.js
@@ -74,7 +74,11 @@ export const SORT_FIELDS = [
 
 const ToolBarIcons = withCapabilities(({capabilities, onTagCreateClick}) => (
   <IconDivider>
-    <ManualIcon page="gui_introduction" anchor="tags" title={_('Help: Tags')} />
+    <ManualIcon
+      page="web-interface"
+      anchor="managing-tags"
+      title={_('Help: Tags')}
+    />
     {capabilities.mayCreate('tag') && (
       <NewIcon title={_('New Tag')} onClick={onTagCreateClick} />
     )}
diff --git a/gsa/src/web/pages/targets/detailspage.js b/gsa/src/web/pages/targets/detailspage.js
index 797488925e..0232d92feb 100644
--- a/gsa/src/web/pages/targets/detailspage.js
+++ b/gsa/src/web/pages/targets/detailspage.js
@@ -84,8 +84,8 @@ const ToolBarIcons = ({
     <Divider margin="10px">
       <IconDivider>
         <ManualIcon
-          page="vulnerabilitymanagement"
-          anchor="creating-a-target"
+          page="scanning"
+          anchor="managing-targets"
           title={_('Help: Targets')}
         />
         <ListIcon title={_('Target List')} page="targets" />
diff --git a/gsa/src/web/pages/targets/listpage.js b/gsa/src/web/pages/targets/listpage.js
index f884a724a2..ec1a487550 100644
--- a/gsa/src/web/pages/targets/listpage.js
+++ b/gsa/src/web/pages/targets/listpage.js
@@ -46,8 +46,8 @@ import TargetComponent from './component';
 const ToolBarIcons = withCapabilities(({capabilities, onTargetCreateClick}) => (
   <IconDivider>
     <ManualIcon
-      page="vulnerabilitymanagement"
-      anchor="creating-a-target"
+      page="scanning"
+      anchor="managing-targets"
       title={_('Help: Targets')}
     />
     {capabilities.mayCreate('target') && (
diff --git a/gsa/src/web/pages/tasks/detailspage.js b/gsa/src/web/pages/tasks/detailspage.js
index afc29c032b..e079b86863 100644
--- a/gsa/src/web/pages/tasks/detailspage.js
+++ b/gsa/src/web/pages/tasks/detailspage.js
@@ -125,8 +125,8 @@ const ToolBarIcons = ({
     <Divider margin="10px">
       <IconDivider align={['start', 'start']}>
         <ManualIcon
-          page="vulnerabilitymanagement"
-          anchor="creating-a-task"
+          page="scanning"
+          anchor="managing-tasks"
           title={_('Help: Tasks')}
         />
         <ListIcon title={_('Task List')} page="tasks" />
diff --git a/gsa/src/web/pages/tasks/listpage.js b/gsa/src/web/pages/tasks/listpage.js
index d7e4073ca0..ce2a2cae2e 100644
--- a/gsa/src/web/pages/tasks/listpage.js
+++ b/gsa/src/web/pages/tasks/listpage.js
@@ -64,8 +64,8 @@ const ToolBarIcons = withCapabilities(
   }) => (
     <IconDivider>
       <ManualIcon
-        page="vulnerabilitymanagement"
-        anchor="creating-a-task"
+        page="scanning"
+        anchor="managing-tasks"
         title={_('Help: Tasks')}
       />
       {capabilities.mayOp('run_wizard') && (
diff --git a/gsa/src/web/pages/tickets/detailspage.js b/gsa/src/web/pages/tickets/detailspage.js
index af950fcf12..bbc9310b3e 100644
--- a/gsa/src/web/pages/tickets/detailspage.js
+++ b/gsa/src/web/pages/tickets/detailspage.js
@@ -28,6 +28,7 @@ import Comment from 'web/components/comment/comment';
 
 import ExportIcon from 'web/components/icon/exporticon';
 import ListIcon from 'web/components/icon/listicon';
+import ManualIcon from 'web/components/icon/manualicon';
 import SolutionType from 'web/components/icon/solutiontypeicon';
 import TicketIcon from 'web/components/icon/ticketicon';
 
@@ -77,6 +78,11 @@ const ToolBarIcons = ({
   onTicketEditClick,
 }) => (
   <Divider margin="10px">
+    <ManualIcon
+      page="reports"
+      anchor="managing-tickets"
+      title={_('Help: Remediation Tickets')}
+    />
     <ListIcon title={_('Ticket List')} page="tickets" />
     <IconDivider>
       <EntityCloneIcon
diff --git a/gsa/src/web/pages/tickets/listpage.js b/gsa/src/web/pages/tickets/listpage.js
index dae5b320c3..4bfbf599cf 100644
--- a/gsa/src/web/pages/tickets/listpage.js
+++ b/gsa/src/web/pages/tickets/listpage.js
@@ -22,6 +22,7 @@ import _ from 'gmp/locale';
 
 import {TICKETS_FILTER_FILTER} from 'gmp/models/filter';
 
+import ManualIcon from 'web/components/icon/manualicon';
 import TicketIcon from 'web/components/icon/ticketicon';
 
 import DashboardControls from 'web/components/dashboard/controls';
@@ -46,6 +47,14 @@ const FilterDialog = createFilterDialog({
   sortFields: FIELDS,
 });
 
+const ToolBarIcons = () => (
+  <ManualIcon
+    page="reports"
+    anchor="managing-tickets"
+    title={_('Help: Remediation Tickets')}
+  />
+);
+
 const Page = ({
   filter,
   onFilterChanged,
@@ -92,6 +101,7 @@ const Page = ({
         sectionIcon={<TicketIcon size="large" />}
         table={Table}
         title={_('Tickets')}
+        toolBarIcons={ToolBarIcons}
         onChanged={onChanged}
         onError={onError}
         onFilterChanged={onFilterChanged}
diff --git a/gsa/src/web/pages/users/detailspage.js b/gsa/src/web/pages/users/detailspage.js
index 8cc79452da..0d015c8e43 100644
--- a/gsa/src/web/pages/users/detailspage.js
+++ b/gsa/src/web/pages/users/detailspage.js
@@ -73,9 +73,9 @@ const ToolBarIcons = ({
   <Divider margin="10px">
     <IconDivider>
       <ManualIcon
-        page="gui_administration"
-        anchor="user-management"
-        title={_('Help: User Details')}
+        page="web-interface-access"
+        anchor="managing-users"
+        title={_('Help: Users')}
       />
       <ListIcon title={_('Users List')} page="users" />
     </IconDivider>
diff --git a/gsa/src/web/pages/users/listpage.js b/gsa/src/web/pages/users/listpage.js
index f757c5e3bf..bca80629b3 100644
--- a/gsa/src/web/pages/users/listpage.js
+++ b/gsa/src/web/pages/users/listpage.js
@@ -58,8 +58,8 @@ import UsersTable, {SORT_FIELDS} from './table';
 const ToolBarIcons = withCapabilities(({capabilities, onUserCreateClick}) => (
   <IconDivider>
     <ManualIcon
-      page="gui_administration"
-      anchor="user-management"
+      page="web-interface-access"
+      anchor="managing-users"
       title={_('Help: Users')}
     />
     {capabilities.mayCreate('user') && (
diff --git a/gsa/src/web/pages/usersettings/usersettingspage.js b/gsa/src/web/pages/usersettings/usersettingspage.js
index c0a4aa3ae5..7ee15a3e35 100644
--- a/gsa/src/web/pages/usersettings/usersettingspage.js
+++ b/gsa/src/web/pages/usersettings/usersettingspage.js
@@ -165,8 +165,8 @@ const ToolBarIcons = ({disableEditIcon, onEditSettingsClick}) => (
     <IconDivider>
       <ManualIcon
         size="small"
-        page="gui_introduction"
-        anchor="my-settings"
+        page="web-interface"
+        anchor="changing-the-user-settings"
         title={_('Help: My Settings')}
       />
       <EditIcon
diff --git a/gsa/src/web/pages/vulns/listpage.js b/gsa/src/web/pages/vulns/listpage.js
index 323e44698c..943e117e1f 100644
--- a/gsa/src/web/pages/vulns/listpage.js
+++ b/gsa/src/web/pages/vulns/listpage.js
@@ -47,8 +47,8 @@ import VulnerabilitiesDashboard, {VULNS_DASHBOARD_ID} from './dashboard';
 const ToolBarIcons = () => (
   <Layout>
     <ManualIcon
-      page="search"
-      searchTerm="vulnerabilities"
+      page="reports"
+      anchor="displaying-all-existing-vulnerabilities"
       title={_('Vulnerabilities')}
     />
   </Layout>

From 2f83a62b36bb3a6c6611c66027cbcf7493343246 Mon Sep 17 00:00:00 2001
From: Steffen Waterkamp <steffen.waterkamp@greenbone.net>
Date: Tue, 6 Aug 2019 19:01:11 +0200
Subject: [PATCH 4/4] Update Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfb8782d88..2875054c0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   [#1507](https://github.com/greenbone/gsa/pull/1507)
 
 ### Changed
+- Adjust HelpIcons to use GOS 5 manual [#1549](https://github.com/greenbone/gsa/pull/1549)
 - Adjust clickable areas for Select and MultiSelect [#1545](https://github.com/greenbone/gsa/pull/1545)
 - Redirect to main page when visiting the login page and the user is already
   logged in [#1508](https://github.com/greenbone/gsa/pull/1508)