diff --git a/web/app/cad/dom/components/HeadsUpToolbar.jsx b/web/app/cad/dom/components/HeadsUpToolbar.jsx
index 75ec0512..94b22924 100644
--- a/web/app/cad/dom/components/HeadsUpToolbar.jsx
+++ b/web/app/cad/dom/components/HeadsUpToolbar.jsx
@@ -1,21 +1,21 @@
 import React from 'react';
-
-import {toIdAndOverrides} from '../../actions/actionRef';
 import connect from 'ui/connect';
 import Toolbar from 'ui/components/Toolbar';
 import {ConnectedActionButton, ToolbarActionButtons} from './PlugableToolbar';
 import ls from './HeadsUpToolbar.less';
+import {combine} from '../../../../../modules/lstream';
 
-export const HeadsUpToolbar = connect(streams => streams.ui.toolbars.headsUp.map(actions => ({actions})))(
-  function HeadsUpToolbar({actions}) {
+export const HeadsUpToolbar = connect(streams => combine(
+    streams.ui.toolbars.headsUp, 
+    streams.ui.toolbars.headsUpQuickActions).map(([actions, quickActions]) => ({actions, quickActions})))(
+  function HeadsUpToolbar({actions, quickActions}) {
     return <Toolbar flat>
       <div className={ls.mainActions}>
         <ToolbarActionButtons actions={actions} />
       </div>
 
       <div className={ls.quickButtons}>
-        <ConnectedActionButton size='small' actionId='Save' />
-        <ConnectedActionButton size='small' actionId='StlExport' />
+        {quickActions.map(actionId => <ConnectedActionButton size='small' key={actionId} actionId={actionId} />)}
       </div>
     </Toolbar>
   }
diff --git a/web/app/cad/dom/components/PlugableToolbar.jsx b/web/app/cad/dom/components/PlugableToolbar.jsx
index dbe9056e..40b51558 100644
--- a/web/app/cad/dom/components/PlugableToolbar.jsx
+++ b/web/app/cad/dom/components/PlugableToolbar.jsx
@@ -18,9 +18,9 @@ function ConfigurableToolbar({actions, size, ...props}) {
 }
 
 export function ToolbarActionButtons({actions, size}) {
-  return actions.map(actionRef => {
+  return actions.map((actionRef, i) => {
     if (actionRef === '-') {
-      return <ToolbarSplitter />;
+      return <ToolbarSplitter key={'ToolbarSplitter' + i}/>;
     }
     let [id, overrides] = toIdAndOverrides(actionRef);
     return <ConnectedActionButton actionId={id} key={id} size={size} {...overrides} />
diff --git a/web/app/cad/dom/uiPlugin.js b/web/app/cad/dom/uiPlugin.js
index c18ab93e..8471ed45 100644
--- a/web/app/cad/dom/uiPlugin.js
+++ b/web/app/cad/dom/uiPlugin.js
@@ -9,6 +9,7 @@ export function defineStreams({streams}) {
     },
     toolbars: {
       headsUp: state([]),
+      headsUpQuickActions: state([]),
       sketcherGeneral: state([]),
       sketcherConstraints: state([]),
       sketcherControl: state([]),
diff --git a/web/app/cad/part/uiConfigPlugin.js b/web/app/cad/part/uiConfigPlugin.js
index 90b80639..c5fd8bf8 100644
--- a/web/app/cad/part/uiConfigPlugin.js
+++ b/web/app/cad/part/uiConfigPlugin.js
@@ -16,6 +16,7 @@ export function activate({services, streams}) {
   ];
 
   streams.ui.toolbars.headsUp.value = ['PLANE', 'EditFace', 'EXTRUDE', 'CUT', 'REVOLVE', '-', 'FILLET', '-', 'INTERSECTION', 'SUBTRACT', 'UNION'];
+  streams.ui.toolbars.headsUpQuickActions.value = ['Save', 'StlExport'];
   
   services.action.registerActions(CoreActions);
   services.action.registerActions(OperationActions);