diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 95a496e69..38213cef2 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -70,6 +70,7 @@ action.source-group=Group
 action.enable=Enable
 action.disable=Disable
 action.get-latest=Get latest changes
+action.download=Download
 
 action.add-new-role=Add new role
 action.roles=Roles
diff --git a/ui/src/app/admin/component/ConfigurationForm.js b/ui/src/app/admin/component/ConfigurationForm.js
index 3f30f6445..ff890a6a2 100644
--- a/ui/src/app/admin/component/ConfigurationForm.js
+++ b/ui/src/app/admin/component/ConfigurationForm.js
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import Button from 'react-bootstrap/Button';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faSpinner, faSave } from '@fortawesome/free-solid-svg-icons';
+import { faSpinner, faSave, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { Highlighter, Menu, MenuItem, Token, Typeahead } from 'react-bootstrap-typeahead';
 import Translate from '../../i18n/components/translate';
 import { ToggleButton } from '../../form/component/ToggleButton';
@@ -150,6 +150,7 @@ export function ConfigurationForm({ configuration = {}, errors = [], schema, onS
                                     <th>Category</th>
                                     <th>Type</th>
                                     <th>Value</th>
+                                    <th>Action</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -165,6 +166,12 @@ export function ConfigurationForm({ configuration = {}, errors = [], schema, onS
                                                 <Form.Control type="text" placeholder="Value" />
                                             </FloatingLabel>
                                         </td>
+                                        <td>
+                                            <Button variant="danger">
+                                                <FontAwesomeIcon icon={faTrash} size="lg" />
+                                                Remove
+                                            </Button>
+                                        </td>
                                     </tr>
                                 ))}
                             </tbody>
diff --git a/ui/src/app/admin/container/ConfigurationList.js b/ui/src/app/admin/container/ConfigurationList.js
index 15351312c..fcad47048 100644
--- a/ui/src/app/admin/container/ConfigurationList.js
+++ b/ui/src/app/admin/container/ConfigurationList.js
@@ -49,17 +49,13 @@ export function ConfigurationList({ configurations, onDelete }) {
                                                     <td className="align-middle">{c.name}</td>
                                                     <td className="text-end">
                                                         <React.Fragment>
-                                                            <Link to={`../configurations/${c.resourceId}/edit`} className={`btn btn-link text-primary`}>
+                                                            <Link to={`../configurations/${c.resourceId}/edit`} className={`btn btn-primary`}>
                                                                 <FontAwesomeIcon icon={faDownload} size="lg" />
-                                                                <span className="sr-only">
-                                                                    <Translate value="action.download">Download</Translate>
-                                                                </span>
+                                                                &nbsp; <Translate value="action.download">Download</Translate>
                                                             </Link>
-                                                            <Button variant="link" className="text-danger" onClick={() => block(() => remove(c.resourceId))}>
+                                                            <Button variant="danger" className="ms-2" onClick={() => block(() => remove(c.resourceId))}>
                                                                 <FontAwesomeIcon icon={faTrash} size="lg" />
-                                                                <span className="sr-only">
-                                                                    <Translate value="action.delete">Delete</Translate>
-                                                                </span>
+                                                                &nbsp; <Translate value="action.delete">Delete</Translate>
                                                             </Button>
                                                         </React.Fragment>
                                                     </td>