diff --git a/scm-ui/src/components/buttons/index.js b/scm-ui/src/components/buttons/index.js
index 8dfc6e00ef..e0d94d29b9 100644
--- a/scm-ui/src/components/buttons/index.js
+++ b/scm-ui/src/components/buttons/index.js
@@ -4,3 +4,4 @@ export { default as CreateButton } from "./CreateButton";
 export { default as DeleteButton } from "./DeleteButton";
 export { default as EditButton } from "./EditButton";
 export { default as SubmitButton } from "./SubmitButton";
+export {default as RemoveEntryOfTableButton} from "./RemoveEntryOfTableButton";
diff --git a/scm-ui/src/config/components/buttons/RemoveAdminGroupButton.js b/scm-ui/src/config/components/buttons/RemoveAdminGroupButton.js
deleted file mode 100644
index 6a819b6972..0000000000
--- a/scm-ui/src/config/components/buttons/RemoveAdminGroupButton.js
+++ /dev/null
@@ -1,34 +0,0 @@
-//@flow
-import React from "react";
-import { DeleteButton } from "../../../components/buttons";
-import { translate } from "react-i18next";
-import classNames from "classnames";
-
-type Props = {
-  t: string => string,
-  groupname: string,
-  removeGroup: string => void,
-  disabled: boolean
-};
-
-type State = {};
-
-class RemoveAdminGroupButton extends React.Component<Props, State> {
-  render() {
-    const { t, groupname, removeGroup, disabled } = this.props;
-    return (
-      <div className={classNames("is-pulled-right")}>
-        <DeleteButton
-          label={t("admin-settings.remove-group-button")}
-          action={(event: Event) => {
-            event.preventDefault();
-            removeGroup(groupname);
-          }}
-          disabled={disabled}
-        />
-      </div>
-    );
-  }
-}
-
-export default translate("config")(RemoveAdminGroupButton);
diff --git a/scm-ui/src/config/components/buttons/RemoveAdminUserButton.js b/scm-ui/src/config/components/buttons/RemoveAdminUserButton.js
deleted file mode 100644
index 7d79a84030..0000000000
--- a/scm-ui/src/config/components/buttons/RemoveAdminUserButton.js
+++ /dev/null
@@ -1,34 +0,0 @@
-//@flow
-import React from "react";
-import { DeleteButton } from "../../../components/buttons";
-import { translate } from "react-i18next";
-import classNames from "classnames";
-
-type Props = {
-  t: string => string,
-  username: string,
-  removeUser: string => void,
-  disabled: boolean
-};
-
-type State = {};
-
-class RemoveAdminUserButton extends React.Component<Props, State> {
-  render() {
-    const { t, username, removeUser, disabled } = this.props;
-    return (
-      <div className={classNames("is-pulled-right")}>
-        <DeleteButton
-          label={t("admin-settings.remove-user-button")}
-          action={(event: Event) => {
-            event.preventDefault();
-            removeUser(username);
-          }}
-          disabled={disabled}
-        />
-      </div>
-    );
-  }
-}
-
-export default translate("config")(RemoveAdminUserButton);
diff --git a/scm-ui/src/config/components/buttons/RemoveProxyExcludeButton.js b/scm-ui/src/config/components/buttons/RemoveProxyExcludeButton.js
deleted file mode 100644
index acdfd6292a..0000000000
--- a/scm-ui/src/config/components/buttons/RemoveProxyExcludeButton.js
+++ /dev/null
@@ -1,36 +0,0 @@
-//@flow
-import React from "react";
-import {DeleteButton} from "../../../components/buttons";
-import { translate } from "react-i18next";
-import classNames from "classnames";
-
-type Props = {
-  t: string => string,
-  proxyExcludeName: string,
-  removeProxyExclude: string => void,
-  disabled: boolean
-};
-
-type State = {};
-
-
-
-class RemoveProxyExcludeButton extends React.Component<Props, State> {
-  render() {
-    const { t , proxyExcludeName, removeProxyExclude} = this.props;
-    return (
-      <div className={classNames("is-pulled-right")}>
-        <DeleteButton
-          label={t("proxy-settings.remove-proxy-exclude-button")}
-          action={(event: Event) => {
-            event.preventDefault();
-            removeProxyExclude(proxyExcludeName);
-          }}
-          disabled={this.props.disabled}
-        />
-      </div>
-    );
-  }
-}
-
-export default translate("config")(RemoveProxyExcludeButton);
diff --git a/scm-ui/src/config/components/table/AdminGroupTable.js b/scm-ui/src/config/components/table/AdminGroupTable.js
index d5566e7ce1..fc05c75f06 100644
--- a/scm-ui/src/config/components/table/AdminGroupTable.js
+++ b/scm-ui/src/config/components/table/AdminGroupTable.js
@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import { translate } from "react-i18next";
-import RemoveAdminGroupButton from "../buttons/RemoveAdminGroupButton";
+import { RemoveEntryOfTableButton } from "../../../components/buttons";
 
 type Props = {
   adminGroups: string[],
@@ -25,10 +25,11 @@ class AdminGroupTable extends React.Component<Props, State> {
                 <tr key={group}>
                   <td key={group}>{group}</td>
                   <td>
-                    <RemoveAdminGroupButton
-                      groupname={group}
-                      removeGroup={this.removeGroup}
+                    <RemoveEntryOfTableButton
+                      entryname={group}
+                      removeEntry={this.removeEntry}
                       disabled={disabled}
+                      label={t("admin-settings.remove-group-button")}
                     />
                   </td>
                 </tr>
@@ -40,7 +41,7 @@ class AdminGroupTable extends React.Component<Props, State> {
     );
   }
 
-  removeGroup = (groupname: string) => {
+  removeEntry = (groupname: string) => {
     const newGroups = this.props.adminGroups.filter(name => name !== groupname);
     this.props.onChange(true, newGroups, "adminGroups");
   };
diff --git a/scm-ui/src/config/components/table/AdminUserTable.js b/scm-ui/src/config/components/table/AdminUserTable.js
index caf58f2cc0..c622a0e027 100644
--- a/scm-ui/src/config/components/table/AdminUserTable.js
+++ b/scm-ui/src/config/components/table/AdminUserTable.js
@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import { translate } from "react-i18next";
-import RemoveAdminUserButton from "../buttons/RemoveAdminUserButton";
+import { RemoveEntryOfTableButton } from "../../../components/buttons";
 
 type Props = {
   adminUsers: string[],
@@ -25,10 +25,11 @@ class AdminUserTable extends React.Component<Props, State> {
                 <tr key={user}>
                   <td key={user}>{user}</td>
                   <td>
-                    <RemoveAdminUserButton
-                      username={user}
-                      removeUser={this.removeUser}
+                    <RemoveEntryOfTableButton
+                      entryname={user}
+                      removeEntry={this.removeEntry}
                       disabled={disabled}
+                      label={t("admin-settings.remove-user-button")}
                     />
                   </td>
                 </tr>
@@ -40,7 +41,7 @@ class AdminUserTable extends React.Component<Props, State> {
     );
   }
 
-  removeUser = (username: string) => {
+  removeEntry = (username: string) => {
     const newUsers = this.props.adminUsers.filter(name => name !== username);
     this.props.onChange(true, newUsers, "adminUsers");
   };
diff --git a/scm-ui/src/config/components/table/ProxyExcludesTable.js b/scm-ui/src/config/components/table/ProxyExcludesTable.js
index ccee16cea5..4476442c48 100644
--- a/scm-ui/src/config/components/table/ProxyExcludesTable.js
+++ b/scm-ui/src/config/components/table/ProxyExcludesTable.js
@@ -1,7 +1,7 @@
 //@flow
 import React from "react";
 import { translate } from "react-i18next";
-import RemoveProxyExcludeButton from "../buttons/RemoveProxyExcludeButton";
+import { RemoveEntryOfTableButton } from "../../../components/buttons";
 
 type Props = {
   proxyExcludes: string[],
@@ -25,10 +25,11 @@ class ProxyExcludesTable extends React.Component<Props, State> {
                 <tr key={excludes}>
                   <td key={excludes}>{excludes}</td>
                   <td>
-                    <RemoveProxyExcludeButton
-                      proxyExcludeName={excludes}
-                      removeProxyExclude={this.removeProxyExclude}
+                    <RemoveEntryOfTableButton
+                      entryname={excludes}
+                      removeEntry={this.removeEntry}
                       disabled={this.props.disabled}
+                      label={t("proxy-settings.remove-proxy-exclude-button")}
                     />
                   </td>
                 </tr>
@@ -40,7 +41,7 @@ class ProxyExcludesTable extends React.Component<Props, State> {
     );
   }
 
-  removeProxyExclude = (excludename: string) => {
+  removeEntry = (excludename: string) => {
     const newExcludes = this.props.proxyExcludes.filter(
       name => name !== excludename
     );