diff --git a/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js b/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js
index 54585871c9..3c6a864dee 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js
+++ b/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js
@@ -1,6 +1,6 @@
 //@flow
 import React from "react";
-import { ButtonGroup, Button } from "@scm-manager/ui-components";
+import { ButtonAddons, Button } from "@scm-manager/ui-components";
 import type { Repository } from "@scm-manager/ui-types";
 import CloneInformation from "./CloneInformation";
 import type { Link } from "@scm-manager/ui-types";
@@ -95,9 +95,9 @@ class ProtocolInformation extends React.Component<Props, State> {
 
     return (
      <div className={classes.protocols}>
-       <ButtonGroup connected={true} className={classes.switcher}>
+       <ButtonAddons className={classes.switcher}>
          {protocols.map(this.renderProtocolButton)}
-       </ButtonGroup>
+       </ButtonAddons>
        { cloneInformation }
      </div>
     );
diff --git a/scm-ui-components/packages/ui-components/src/buttons/ButtonAddons.js b/scm-ui-components/packages/ui-components/src/buttons/ButtonAddons.js
new file mode 100644
index 0000000000..1a3f7fb8fa
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/buttons/ButtonAddons.js
@@ -0,0 +1,29 @@
+// @flow
+import * as React from "react";
+import classNames from "classnames";
+
+type Props = {
+  className?: string,
+  children: React.Node
+};
+
+class ButtonAddons extends React.Component<Props> {
+  render() {
+    const { className, children } = this.props;
+
+    var childWrapper = [];
+    React.Children.forEach(children, child => {
+      if (child) {
+        childWrapper.push(<p className="control">{child}</p>);
+      }
+    });
+
+    return (
+      <div className={classNames("field", "is-addons", className)}>
+        {childWrapper}
+      </div>
+    );
+  }
+}
+
+export default ButtonAddons;
diff --git a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js
index 1afbf97e28..fed517d481 100644
--- a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js
+++ b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js
@@ -3,39 +3,24 @@ import * as React from "react";
 import classNames from "classnames";
 
 type Props = {
-  connected?: boolean,
-  addons?: boolean,
   className?: string,
   children: React.Node
 };
 
 class ButtonGroup extends React.Component<Props> {
-
-  static defaultProps = {
-    addons: true
-  };
-
   render() {
-    const {connected, addons, className, children} = this.props;
+    const { className, children } = this.props;
 
-    if (!connected) {
-      var childWrapper = [];
-      React.Children.forEach(children, child => {
-        if (child) {
-          childWrapper.push(<p className="control">{child}</p>);
-        }
-      });
-
-      return (
-        <div className={classNames("field", "is-grouped", className)}>
-          {childWrapper}
-        </div>
-      );
-    }
+    var childWrapper = [];
+    React.Children.forEach(children, child => {
+      if (child) {
+        childWrapper.push(<p className="control">{child}</p>);
+      }
+    });
 
     return (
-      <div className={classNames("buttons", addons ? "has-addons" : "", className)}>
-        {children}
+      <div className={classNames("field", "is-grouped", className)}>
+        {childWrapper}
       </div>
     );
   }
diff --git a/scm-ui-components/packages/ui-components/src/buttons/index.js b/scm-ui-components/packages/ui-components/src/buttons/index.js
index 014d92958d..49dfaab5d2 100644
--- a/scm-ui-components/packages/ui-components/src/buttons/index.js
+++ b/scm-ui-components/packages/ui-components/src/buttons/index.js
@@ -8,6 +8,7 @@ export { default as EditButton } from "./EditButton.js";
 export { default as SubmitButton } from "./SubmitButton.js";
 export { default as DownloadButton } from "./DownloadButton.js";
 export { default as ButtonGroup } from "./ButtonGroup.js";
+export { default as ButtonAddons } from "./ButtonAddons.js";
 export {
   default as RemoveEntryOfTableButton
 } from "./RemoveEntryOfTableButton.js";
diff --git a/scm-ui-components/packages/ui-components/src/repos/DiffFile.js b/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
index bf2cefc9fc..3d2dba6c8b 100644
--- a/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
+++ b/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
@@ -241,7 +241,7 @@ class DiffFile extends React.Component<Props, State> {
               {this.renderChangeTag(file)}
             </div>
             <div className={classNames("level-right", classes.buttonHeader)}>
-              <ButtonGroup connected={false}>
+              <ButtonGroup>
                 <Button
                   action={this.toggleSideBySide}
                   className="reduced-mobile"
diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
index 240d52a168..72ce9a2b38 100644
--- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
+++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
@@ -1,8 +1,7 @@
 //@flow
 import React from "react";
 import type { Changeset, Repository } from "@scm-manager/ui-types";
-import ButtonGroup from "../../buttons/ButtonGroup";
-import Button from "../../buttons/Button";
+import { ButtonAddons, Button } from "../../buttons";
 import { createChangesetLink, createSourcesLink } from "./changesets";
 import { translate } from "react-i18next";
 
@@ -22,7 +21,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
     const sourcesLink = createSourcesLink(repository, changeset);
 
     return (
-      <ButtonGroup connected={true} className="is-pulled-right">
+      <ButtonAddons className="is-pulled-right">
         <Button link={changesetLink} className="reduced-mobile">
           <span className="icon">
             <i className="fas fa-exchange-alt" />
@@ -35,7 +34,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
           </span>
           <span>{t("changeset.buttons.sources")}</span>
         </Button>
-      </ButtonGroup>
+      </ButtonAddons>
     );
   }
 }
diff --git a/scm-ui/src/repos/branches/components/BranchButtonGroup.js b/scm-ui/src/repos/branches/components/BranchButtonGroup.js
index 3b694767c4..c3ca11aa78 100644
--- a/scm-ui/src/repos/branches/components/BranchButtonGroup.js
+++ b/scm-ui/src/repos/branches/components/BranchButtonGroup.js
@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import type { Repository, Branch } from "@scm-manager/ui-types";
-import { ButtonGroup, Button } from "@scm-manager/ui-components";
+import { ButtonAddons, Button } from "@scm-manager/ui-components";
 import { translate } from "react-i18next";
 
 type Props = {
@@ -24,7 +24,7 @@ class BranchButtonGroup extends React.Component<Props> {
     }/sources/${encodeURIComponent(branch.name)}/`;
 
     return (
-      <ButtonGroup connected={true}>
+      <ButtonAddons>
         <Button link={changesetLink} className="reduced-mobile">
           <span className="icon">
             <i className="fas fa-exchange-alt" />
@@ -37,7 +37,7 @@ class BranchButtonGroup extends React.Component<Props> {
           </span>
           <span>{t("branch.sources")}</span>
         </Button>
-      </ButtonGroup>
+      </ButtonAddons>
     );
   }
 }
diff --git a/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js b/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
index 5ca48d6134..c84c5deb59 100644
--- a/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
+++ b/scm-ui/src/repos/permissions/containers/AdvancedPermissionsDialog.js
@@ -60,7 +60,7 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
 
     const footer = (
       <form onSubmit={this.onSubmit}>
-        <ButtonGroup connected={false}>
+        <ButtonGroup>
           {submitButton}
           <Button
             label={t("permission.advanced.dialog.abort")}
diff --git a/scm-ui/src/repos/sources/components/content/FileButtonGroup.js b/scm-ui/src/repos/sources/components/content/FileButtonGroup.js
index 38e404e4d6..a71756d961 100644
--- a/scm-ui/src/repos/sources/components/content/FileButtonGroup.js
+++ b/scm-ui/src/repos/sources/components/content/FileButtonGroup.js
@@ -1,7 +1,7 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { ButtonGroup, Button } from "@scm-manager/ui-components";
+import { ButtonAddons, Button } from "@scm-manager/ui-components";
 
 type Props = {
   t: string => string,
@@ -26,7 +26,7 @@ class FileButtonGroup extends React.Component<Props> {
     const { t, historyIsSelected } = this.props;
 
     return (
-      <ButtonGroup connected={true}>
+      <ButtonAddons>
         <Button
           action={this.showSources}
           className="reduced-mobile"
@@ -47,7 +47,7 @@ class FileButtonGroup extends React.Component<Props> {
           </span>
           <span>{t("sources.content.historyButton")}</span>
         </Button>
-      </ButtonGroup>
+      </ButtonAddons>
     );
   }
 }