diff --git a/client/src/app/tabs/bpmn/BpmnEditor.js b/client/src/app/tabs/bpmn/BpmnEditor.js
index b2368a963e..695ddba0a9 100644
--- a/client/src/app/tabs/bpmn/BpmnEditor.js
+++ b/client/src/app/tabs/bpmn/BpmnEditor.js
@@ -239,7 +239,7 @@ export class BpmnEditor extends CachedComponent {
           <Button onClick={ this.saveDiagram }>Save Diagram</Button>
         </Fill>
 
-        <Fill name="toolbar" group="commandstack">
+        <Fill name="toolbar" group="command">
           <Button disabled={ !this.state.undo } onClick={ this.undo }>Undo</Button>
           <Button disabled={ !this.state.redo } onClick={ this.redo }>Redo</Button>
         </Fill>
diff --git a/client/src/app/tabs/dmn/DmnEditor.js b/client/src/app/tabs/dmn/DmnEditor.js
index 5dccf8c9c7..f179d7c7de 100644
--- a/client/src/app/tabs/dmn/DmnEditor.js
+++ b/client/src/app/tabs/dmn/DmnEditor.js
@@ -289,11 +289,20 @@ class DmnEditor extends CachedComponent {
     return (
       <div className={ css.DmnEditor }>
 
-        <Fill name="toolbar">
+        <Fill name="toolbar" group="command">
           <Button disabled={ !this.state.undo } onClick={ this.undo }>Undo</Button>
           <Button disabled={ !this.state.redo } onClick={ this.redo }>Redo</Button>
         </Fill>
 
+        <Fill name="toolbar" group="image-export">
+          <Button onClick={ () => console.log('Export Image') }>Export Image</Button>
+        </Fill>
+
+        <Fill name="toolbar" group="deploy">
+          <Button>Deploy Current Diagram</Button>
+          <Button>Configure Deployment Endpoint</Button>
+        </Fill>
+
         <div className="diagram" ref={ this.ref }></div>
       </div>
     );