diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1058d8c80..6bad4fa09e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Use <predefined> to disable feed object editing and filter creation on feed status page [#2398](https://github.com/greenbone/gsa/pull/2398)
 
 ### Fixed
+- Stop growing of toolbars which only have the help icon [#2641](https://github.com/greenbone/gsa/pull/2641)
 - Fixed initial value of dropdown for including related resources for permissions [#2632](https://github.com/greenbone/gsa/pull/2632)
 - Fixed compiling gsad with libmicrohttp 0.9.71 and later [#2625](https://github.com/greenbone/gsa/pull/2625)
 - Fixed display of alert condition "Severity changed" [#2623](https://github.com/greenbone/gsa/pull/2623)
diff --git a/gsa/src/web/pages/extras/cvsscalculatorpage.js b/gsa/src/web/pages/extras/cvsscalculatorpage.js
index e3121bc25a..bab4840c93 100644
--- a/gsa/src/web/pages/extras/cvsscalculatorpage.js
+++ b/gsa/src/web/pages/extras/cvsscalculatorpage.js
@@ -198,7 +198,11 @@ const CvssCalculator = ({gmp, onInteraction, ...props}) => {
 
   return (
     <Layout flex="column">
-      <ToolBarIcons />
+      <span>
+        {' '}
+        {/* span prevents Toolbar from growing */}
+        <ToolBarIcons />
+      </span>
       <Section
         img={<CvssIcon size="large" />}
         title={_('CVSSv2 Base Score Calculator')}
@@ -370,10 +374,7 @@ const mapDispatchToProps = (dispatch, {gmp}) => ({
 
 export default compose(
   withGmp,
-  connect(
-    undefined,
-    mapDispatchToProps,
-  ),
+  connect(undefined, mapDispatchToProps),
 )(CvssCalculator);
 
 // vim: set ts=2 sw=2 tw=80:
diff --git a/gsa/src/web/pages/extras/feedstatuspage.js b/gsa/src/web/pages/extras/feedstatuspage.js
index fe99886c01..e9b4e53149 100644
--- a/gsa/src/web/pages/extras/feedstatuspage.js
+++ b/gsa/src/web/pages/extras/feedstatuspage.js
@@ -105,7 +105,11 @@ const FeedStatus = ({feeds}) => {
     <React.Fragment>
       <PageTitle title={_('Feed Status')} />
       <Layout flex="column">
-        <ToolBarIcons />
+        <span>
+          {' '}
+          {/* span prevents Toolbar from growing */}
+          <ToolBarIcons />
+        </span>
         <Section img={<FeedIcon size="large" />} title={_('Feed Status')} />
         <Table>
           <TableBody>
diff --git a/gsa/src/web/pages/extras/trashcanpage.js b/gsa/src/web/pages/extras/trashcanpage.js
index 898f1e2906..4e04fd7482 100644
--- a/gsa/src/web/pages/extras/trashcanpage.js
+++ b/gsa/src/web/pages/extras/trashcanpage.js
@@ -372,7 +372,11 @@ class Trashcan extends React.Component {
       <React.Fragment>
         <PageTitle title={_('Trashcan')} />
         <Layout flex="column">
-          <ToolBarIcons />
+          <span>
+            {' '}
+            {/* span prevents Toolbar from growing */}
+            <ToolBarIcons />
+          </span>
           {error && (
             <ErrorDialog
               text={error.message}
@@ -560,10 +564,7 @@ const mapDispatchToProps = (dispatch, {gmp}) => ({
 
 export default compose(
   withGmp,
-  connect(
-    undefined,
-    mapDispatchToProps,
-  ),
+  connect(undefined, mapDispatchToProps),
 )(Trashcan);
 
 // vim: set ts=2 sw=2 tw=80:
diff --git a/gsa/src/web/pages/start/__tests__/page.js b/gsa/src/web/pages/start/__tests__/page.js
index c65569fdc5..77d4d06e51 100644
--- a/gsa/src/web/pages/start/__tests__/page.js
+++ b/gsa/src/web/pages/start/__tests__/page.js
@@ -110,7 +110,7 @@ describe('StartPage tests', () => {
     expect(icons[0]).toHaveAttribute('title', 'Help: Dashboards');
 
     // Tabs
-    expect(spans[2]).toHaveTextContent('Overview');
+    expect(spans[3]).toHaveTextContent('Overview');
     expect(icons[2]).toHaveAttribute('title', 'Add new Dashboard');
 
     // Dashboard Controls
diff --git a/gsa/src/web/pages/start/page.js b/gsa/src/web/pages/start/page.js
index d6e43d2099..8d0f80aabf 100644
--- a/gsa/src/web/pages/start/page.js
+++ b/gsa/src/web/pages/start/page.js
@@ -401,7 +401,11 @@ class StartPage extends React.Component {
     return (
       <React.Fragment>
         <PageTitle title={_('Dashboards')} />
-        <ToolBarIcons />
+        <span>
+          {' '}
+          {/* span prevents Toolbar from growing */}
+          <ToolBarIcons />
+        </span>
         <Section title={_('Dashboards')} img={<DashboardIcon size="large" />}>
           {isLoading ? (
             <Loading />
@@ -557,10 +561,7 @@ const mapDispatchToProps = (dispatch, {gmp}) => ({
 
 export default compose(
   withGmp,
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  ),
+  connect(mapStateToProps, mapDispatchToProps),
 )(StartPage);
 
 // vim: set ts=2 sw=2 tw=80: