diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b177b63c3..1ef64a0147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Changes
 
+- Add loading animation for save and edit buttons in toolbar @pgrunewald
 - Move Body class depending on content type to `App` component in order to make it available everywhere @sneridagh
 - Add root class name to `Tags` component @sneridagh
 
diff --git a/src/components/manage/Add/Add.jsx b/src/components/manage/Add/Add.jsx
index e9912c9b96..97a83bc28a 100644
--- a/src/components/manage/Add/Add.jsx
+++ b/src/components/manage/Add/Add.jsx
@@ -10,6 +10,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { keys } from 'lodash';
 import { defineMessages, injectIntl } from 'react-intl';
+import { Button } from 'semantic-ui-react';
 import { Portal } from 'react-portal';
 import { DragDropContext } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
@@ -193,11 +194,12 @@ class Add extends Component {
               hideDefaultViewButtons
               inner={
                 <>
-                  <button
+                  <Button
                     id="toolbar-save"
                     className="save"
                     aria-label={this.props.intl.formatMessage(messages.save)}
                     onClick={() => this.form.current.onSubmit()}
+                    loading={this.props.createRequest.loading}
                   >
                     <Icon
                       name={saveSVG}
@@ -205,8 +207,8 @@ class Add extends Component {
                       size="30px"
                       title={this.props.intl.formatMessage(messages.save)}
                     />
-                  </button>
-                  <button className="cancel" onClick={() => this.onCancel()}>
+                  </Button>
+                  <Button className="cancel" onClick={() => this.onCancel()}>
                     <Icon
                       name={clearSVG}
                       className="circled"
@@ -216,7 +218,7 @@ class Add extends Component {
                       size="30px"
                       title={this.props.intl.formatMessage(messages.cancel)}
                     />
-                  </button>
+                  </Button>
                 </>
               }
             />
diff --git a/src/components/manage/Edit/Edit.jsx b/src/components/manage/Edit/Edit.jsx
index f28be5ff34..a6c031174c 100644
--- a/src/components/manage/Edit/Edit.jsx
+++ b/src/components/manage/Edit/Edit.jsx
@@ -9,6 +9,7 @@ import Helmet from 'react-helmet';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { defineMessages, injectIntl } from 'react-intl';
+import { Button } from 'semantic-ui-react';
 import { Portal } from 'react-portal';
 import { DragDropContext } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
@@ -199,11 +200,12 @@ class Edit extends Component {
             hideDefaultViewButtons
             inner={
               <>
-                <button
+                <Button
                   id="toolbar-save"
                   className="save"
                   aria-label={this.props.intl.formatMessage(messages.save)}
                   onClick={() => this.form.current.onSubmit()}
+                  loading={this.props.updateRequest.loading}
                 >
                   <Icon
                     name={saveSVG}
@@ -211,8 +213,8 @@ class Edit extends Component {
                     size="30px"
                     title={this.props.intl.formatMessage(messages.save)}
                   />
-                </button>
-                <button
+                </Button>
+                <Button
                   className="cancel"
                   aria-label={this.props.intl.formatMessage(messages.cancel)}
                   onClick={() => this.onCancel()}
@@ -223,7 +225,7 @@ class Edit extends Component {
                     size="30px"
                     title={this.props.intl.formatMessage(messages.cancel)}
                   />
-                </button>
+                </Button>
               </>
             }
           />
diff --git a/theme/themes/pastanaga/extras/toolbar.less b/theme/themes/pastanaga/extras/toolbar.less
index 67f378726e..32548cfd0f 100644
--- a/theme/themes/pastanaga/extras/toolbar.less
+++ b/theme/themes/pastanaga/extras/toolbar.less
@@ -124,6 +124,13 @@
         &:focus {
           outline: none;
         }
+
+        &.ui {
+          margin-right: 0;
+          svg.icon {
+            margin: 0;
+          }
+        }
       }
     }