diff --git a/scm-ui-components/packages/ui-components/src/OverviewPageActions.js b/scm-ui-components/packages/ui-components/src/OverviewPageActions.js
index 96c0be72f8..972560fb1a 100644
--- a/scm-ui-components/packages/ui-components/src/OverviewPageActions.js
+++ b/scm-ui-components/packages/ui-components/src/OverviewPageActions.js
@@ -32,7 +32,7 @@ class OverviewPageActions extends React.Component<Props> {
     const { history, location, link } = this.props;
     let directory = link.substring(0, link.indexOf("/"));
     return (
-      <PageActions>
+      <>
         <FilterInput
           value={urls.getQueryStringFromLocation(location)}
           filter={filter => {
@@ -40,7 +40,7 @@ class OverviewPageActions extends React.Component<Props> {
           }}
         />
         {this.renderCreateButton()}
-      </PageActions>
+      </>
     );
   }
 
diff --git a/scm-ui-components/packages/ui-components/src/layout/Page.js b/scm-ui-components/packages/ui-components/src/layout/Page.js
index 6c44112074..ef4363cd8f 100644
--- a/scm-ui-components/packages/ui-components/src/layout/Page.js
+++ b/scm-ui-components/packages/ui-components/src/layout/Page.js
@@ -7,7 +7,6 @@ import ErrorNotification from "./../ErrorNotification";
 import Title from "./Title";
 import Subtitle from "./Subtitle";
 import PageActions from "./PageActions";
-import OverviewPageActions from "../OverviewPageActions";
 import ErrorBoundary from "../ErrorBoundary";
 
 type Props = {
@@ -52,10 +51,7 @@ class Page extends React.Component<Props> {
     let pageActionsExists = false;
     React.Children.forEach(children, child => {
       if (child && !error) {
-        if (
-          child.type.name === PageActions.name ||
-          child.type.name === OverviewPageActions.name
-        )
+        if (child.type.name === PageActions.name)
           pageActions = (
             <div
               className={classNames(
@@ -100,10 +96,7 @@ class Page extends React.Component<Props> {
     let content = [];
     React.Children.forEach(children, child => {
       if (child) {
-        if (
-          child.type.name !== PageActions.name &&
-          child.type.name !== OverviewPageActions.name
-        ) {
+        if (child.type.name !== PageActions.name) {
           content.push(child);
         }
       }
diff --git a/scm-ui/src/groups/components/buttons/CreateGroupButton.js b/scm-ui/src/groups/components/buttons/CreateGroupButton.js
deleted file mode 100644
index 73e0eddd63..0000000000
--- a/scm-ui/src/groups/components/buttons/CreateGroupButton.js
+++ /dev/null
@@ -1,19 +0,0 @@
-//@flow
-import React from "react";
-import { translate } from "react-i18next";
-import { CreateButton } from "@scm-manager/ui-components";
-
-type Props = {
-  t: string => string
-};
-
-class CreateGroupButton extends React.Component<Props> {
-  render() {
-    const { t } = this.props;
-    return (
-      <CreateButton label={t("create-group-button.label")} link="/groups/add" />
-    );
-  }
-}
-
-export default translate("groups")(CreateGroupButton);
diff --git a/scm-ui/src/groups/containers/Groups.js b/scm-ui/src/groups/containers/Groups.js
index 158440cd96..535cc0867b 100644
--- a/scm-ui/src/groups/containers/Groups.js
+++ b/scm-ui/src/groups/containers/Groups.js
@@ -14,13 +14,14 @@ import {
 } from "../modules/groups";
 import {
   Page,
+  PageActions,
   OverviewPageActions,
   Notification,
   LinkPaginator,
-  urls
+  urls,
+  CreateButton
 } from "@scm-manager/ui-components";
 import { GroupTable } from "./../components/table";
-import CreateGroupButton from "../components/buttons/CreateGroupButton";
 import { getGroupsLink } from "../../modules/indexResource";
 
 type Props = {
@@ -83,11 +84,13 @@ class Groups extends React.Component<Props> {
       >
         {this.renderGroupTable()}
         {this.renderCreateButton()}
-        <OverviewPageActions
-          showCreateButton={canAddGroups}
-          link="groups/add"
-          label={t("create-group-button.label")}
-        />
+        <PageActions>
+          <OverviewPageActions
+            showCreateButton={canAddGroups}
+            link="groups/add"
+            label={t("create-group-button.label")}
+          />
+        </PageActions>
       </Page>
     );
   }
@@ -110,8 +113,14 @@ class Groups extends React.Component<Props> {
   }
 
   renderCreateButton() {
-    if (this.props.canAddGroups) {
-      return <CreateGroupButton />;
+    const { canAddGroups, t } = this.props;
+    if (canAddGroups) {
+      return (
+        <CreateButton
+          label={t("create-group-button.label")}
+          link="/groups/add"
+        />
+      );
     }
     return null;
   }
diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js
index adf25a2325..982b2c5d1e 100644
--- a/scm-ui/src/repos/containers/Overview.js
+++ b/scm-ui/src/repos/containers/Overview.js
@@ -14,6 +14,7 @@ import {
 } from "../modules/repos";
 import {
   Page,
+  PageActions,
   OverviewPageActions,
   CreateButton,
   Notification,
@@ -81,11 +82,13 @@ class Overview extends React.Component<Props> {
         error={error}
       >
         {this.renderOverview()}
-        <OverviewPageActions
-          showCreateButton={showCreateButton}
-          link="repos/create"
-          label={t("overview.createButton")}
-        />
+        <PageActions>
+          <OverviewPageActions
+            showCreateButton={showCreateButton}
+            link="repos/create"
+            label={t("overview.createButton")}
+          />
+        </PageActions>
       </Page>
     );
   }
diff --git a/scm-ui/src/users/components/buttons/CreateUserButton.js b/scm-ui/src/users/components/buttons/CreateUserButton.js
deleted file mode 100644
index 36ab9c137d..0000000000
--- a/scm-ui/src/users/components/buttons/CreateUserButton.js
+++ /dev/null
@@ -1,19 +0,0 @@
-//@flow
-import React from "react";
-import { translate } from "react-i18next";
-import { CreateButton } from "@scm-manager/ui-components";
-
-type Props = {
-  t: string => string
-};
-
-class CreateUserButton extends React.Component<Props> {
-  render() {
-    const { t } = this.props;
-    return (
-      <CreateButton label={t("users.createButton")} link="/users/add" />
-    );
-  }
-}
-
-export default translate("users")(CreateUserButton);
diff --git a/scm-ui/src/users/containers/Users.js b/scm-ui/src/users/containers/Users.js
index c2c73c2517..cc9d2f5d16 100644
--- a/scm-ui/src/users/containers/Users.js
+++ b/scm-ui/src/users/containers/Users.js
@@ -14,13 +14,14 @@ import {
 } from "../modules/users";
 import {
   Page,
+  PageActions,
   OverviewPageActions,
   Notification,
   LinkPaginator,
-  urls
+  urls,
+  CreateButton
 } from "@scm-manager/ui-components";
 import { UserTable } from "./../components/table";
-import CreateUserButton from "../components/buttons/CreateUserButton";
 import { getUsersLink } from "../../modules/indexResource";
 
 type Props = {
@@ -83,11 +84,13 @@ class Users extends React.Component<Props> {
       >
         {this.renderUserTable()}
         {this.renderCreateButton()}
-        <OverviewPageActions
-          showCreateButton={canAddUsers}
-          link="users/add"
-          label={t("users.createButton")}
-        />
+        <PageActions>
+          <OverviewPageActions
+            showCreateButton={canAddUsers}
+            link="users/add"
+            label={t("users.createButton")}
+          />
+        </PageActions>
       </Page>
     );
   }
@@ -110,8 +113,9 @@ class Users extends React.Component<Props> {
   }
 
   renderCreateButton() {
-    if (this.props.canAddUsers) {
-      return <CreateUserButton />;
+    const { canAddUsers, t } = this.props;
+    if (canAddUsers) {
+      return <CreateButton label={t("users.createButton")} link="/users/add" />;
     }
     return null;
   }