diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
index 2a1689d7dd2a6..117ac6505f2ef 100644
--- a/mscore/musescore.cpp
+++ b/mscore/musescore.cpp
@@ -288,7 +288,10 @@ const std::list<const char*> MuseScore::_allFileOperationEntries {
     "file-save-online",
     "print",
     "undo",
-    "redo"
+    "redo",
+    "",
+    "zoom-options",
+    "view-mode"
 };
 
 const std::list<const char*> MuseScore::_allPlaybackControlEntries {
@@ -1006,46 +1009,63 @@ bool MuseScore::isInstalledExtension(QString extensionId)
 
 void MuseScore::populateFileOperations()
 {
-    // Save the current zoom and view-mode combobox states. if any.
-    const auto magState = mag ? std::make_pair(mag->currentIndex(), mag->currentText()) : std::make_pair(-1, QString());
-    const auto viewModeComboIndex = viewModeCombo ? viewModeCombo->currentIndex() : -1;
+      fileTools->clear();
 
-    fileTools->clear();
+      bool leftToRightLayout = qApp->layoutDirection() == Qt::LayoutDirection::LeftToRight;
 
-    if (qApp->layoutDirection() == Qt::LayoutDirection::LeftToRight) {
-        for (auto s : _fileOperationEntries) {
-            if (!*s) {
-                fileTools->addSeparator();
-            } else {
-                fileTools->addWidget(new AccessibleToolButton(fileTools, getAction(s)));
-            }
-        }
-    } else {
-        _fileOperationEntries.reverse();
-        for (auto s : _fileOperationEntries) {
-            if (!*s) {
-                fileTools->addSeparator();
-            } else {
-                fileTools->addWidget(new AccessibleToolButton(fileTools, getAction(s)));
+      if (!leftToRightLayout)
+            _fileOperationEntries.reverse();
+
+
+      for (auto s : _fileOperationEntries) {
+
+            if (!*s)
+                  fileTools->addSeparator();
+            else if (!strcmp("view-mode", s))
+                  addViewModeWidget();
+            else if (!strcmp("zoom-options", s))
+                  addZoomOptionsWidget();
+            else
+                  fileTools->addWidget(new AccessibleToolButton(fileTools, getAction(s)));
             }
-        }
-        _fileOperationEntries.reverse();
-    }
 
-    // Currently not customizable in ToolbarEditor
-    fileTools->addSeparator();
-    mag = new MagBox;
+      if (!leftToRightLayout)
+            _fileOperationEntries.reverse();
+}
 
-    // Restore the saved zoom combobox index and text, if any.
-    if (magState.first != -1) {
+// zoom-options is treated as a special case as it's not a QToolButton
+// but, rather, a MagBox (a sub-class of QComboBox)
+void MuseScore::addZoomOptionsWidget()
+{
+      // Save the current zoom state, if any.
+      const auto magState = mag ? std::make_pair(mag->currentIndex(), mag->currentText()) : std::make_pair(-1, QString());
+      QWidget* spacer1 = new QWidget();
+      spacer1->setMinimumWidth(1);
+      spacer1->setMaximumWidth(1);
+      fileTools->addWidget(spacer1);
+      mag = new MagBox;
+    
+       // Restore the saved zoom combobox index and text, if any.
+      if (magState.first != -1) {
         mag->setCurrentIndex(magState.first);
         mag->setCurrentText(magState.second);
-    }
-
-    connect(mag, SIGNAL(magChanged(MagIdx)), SLOT(magChanged(MagIdx)));
-    fileTools->addWidget(mag);
-
-    viewModeCombo = new QComboBox(this);
+      }
+    
+      connect(mag, SIGNAL(magChanged(MagIdx)), SLOT(magChanged(MagIdx)));
+      fileTools->addWidget(mag);
+      QWidget* spacer2 = new QWidget();
+      spacer2->setMinimumWidth(1);
+      spacer2->setMaximumWidth(1);
+      fileTools->addWidget(spacer2);
+}
+
+// view-mode is treated as a special case as it's not a QToolButton
+// but, rather, a QComboBox
+void MuseScore::addViewModeWidget()
+      {
+    // Save the current view-mode combobox state, if any.
+    const auto viewModeComboIndex = viewModeCombo ? viewModeCombo->currentIndex() : -1;
+      viewModeCombo = new QComboBox(this);
 #if defined(Q_OS_MAC)
     viewModeCombo->setFocusPolicy(Qt::StrongFocus);
 #else
@@ -4690,6 +4710,12 @@ void MuseScore::changeState(ScoreState val)
         getAction("split-measure")->setEnabled(cs && cs->masterScore()->excerpts().size() == 0);
     }
 
+    // currentWorkspace can be nullptr in some contexts, so check to avoid crash
+    Workspace* currentWorkspace = WorkspacesManager::currentWorkspace();
+    if (currentWorkspace) {
+            getAction("edit-toolbars")->setEnabled(currentWorkspace->canCustomizeToolbars());
+    }
+    
     // disabling top level menu entries does not
     // work for MAC
 
diff --git a/mscore/musescore.h b/mscore/musescore.h
index b217d24075e0f..523055ec5c83d 100644
--- a/mscore/musescore.h
+++ b/mscore/musescore.h
@@ -835,6 +835,8 @@ public slots:
     std::list<const char*>* fileOperationEntries() { return &_fileOperationEntries; }
     void setFileOperationEntries(std::list<const char*> l) { _fileOperationEntries = l; }
     void populateFileOperations();
+    void addViewModeWidget();
+    void addZoomOptionsWidget();
 
     static const std::list<const char*>& allPlaybackControlEntries() { return _allPlaybackControlEntries; }
     std::list<const char*>* playbackControlEntries() { return &_playbackControlEntries; }
diff --git a/mscore/toolbarEditor.cpp b/mscore/toolbarEditor.cpp
index 1f2dadeade542..a75d7d02c6361 100644
--- a/mscore/toolbarEditor.cpp
+++ b/mscore/toolbarEditor.cpp
@@ -13,6 +13,7 @@
 #include "toolbarEditor.h"
 #include "musescore.h"
 #include "workspace.h"
+#include "shortcut.h"
 #include "icons.h"
 
 namespace Ms {
@@ -64,8 +65,8 @@ ToolbarEditor::ToolbarEditor(QWidget* parent)
 
     up->setIcon(*icons[int(Icons::arrowUp_ICON)]);
     down->setIcon(*icons[int(Icons::arrowDown_ICON)]);
-    add->setIcon(*icons[int(Icons::goPrevious_ICON)]);
-    remove->setIcon(*icons[int(Icons::goNext_ICON)]);
+    add->setIcon(*icons[int(Icons::goNext_ICON)]);
+    remove->setIcon(*icons[int(Icons::goPrevious_ICON)]);
 
     MuseScore::restoreGeometry(this);
 }
@@ -76,16 +77,18 @@ ToolbarEditor::ToolbarEditor(QWidget* parent)
 
 void ToolbarEditor::init()
 {
-    QString name = WorkspacesManager::currentWorkspace()->name();
-    bool writable = !WorkspacesManager::currentWorkspace()->readOnly();
-    if (!writable) {
-        name += " " + tr("(not changeable)");
-    }
-    add->setEnabled(writable);
-    remove->setEnabled(writable);
-    up->setEnabled(writable);
-    down->setEnabled(writable);
-    workspaceName->setText(name);
+    Workspace* currentWorkspace = WorkspacesManager::currentWorkspace();
+    QString name = currentWorkspace->name();
+    QString mainTitle = tr("Customize Toolbars");
+    setWindowTitle(mainTitle + " (" + name + ")");
+
+    // defensive - don't expect to be here if workspace is not customizable
+    bool canBeCustomized = currentWorkspace->canCustomizeToolbars();
+
+    add->setEnabled(canBeCustomized);
+    remove->setEnabled(canBeCustomized);
+    up->setEnabled(canBeCustomized);
+    down->setEnabled(canBeCustomized);
 
     // Syncs the editor with the current toolbars
     new_toolbars->at(0) = mscore->noteInputMenuEntries();
@@ -100,7 +103,7 @@ void ToolbarEditor::init()
 
 void ToolbarEditor::accepted()
 {
-    if (WorkspacesManager::currentWorkspace()->readOnly()) {
+    if (!WorkspacesManager::currentWorkspace()->canCustomizeToolbars()) {
         return;
     }
     // Updates the toolbars
@@ -113,6 +116,54 @@ void ToolbarEditor::accepted()
     WorkspacesManager::currentWorkspace()->setDirty(true);
 }
 
+
+//---------------------------------------------------------
+//   listItem
+//---------------------------------------------------------
+QListWidgetItem* ToolbarEditor::listItem(const char* id)
+      {
+      QListWidgetItem* item = _listItem(id);
+
+      if (!item)
+            return nullptr;
+
+      // add a sensible height for cases where there is no icon
+      // to avoid row looking squashed
+      item->setSizeHint(QSize(item->sizeHint().width(), 26));
+
+      item->setData(Qt::UserRole, QVariant::fromValue((void*)id));
+      return item;
+      }
+
+QListWidgetItem* ToolbarEditor::_listItem(const char* id)
+      {
+      if (QString(id).isEmpty())
+            return new QListWidgetItem(tr("Separator"));
+
+      if (!strcmp("view-mode", id))
+            return new QListWidgetItem(tr("View mode"));
+
+      if (!strcmp("zoom-options", id))
+            return new QListWidgetItem(tr("Zoom options"));
+
+      QAction* action = getAction(id);
+
+      if (action) {
+            QString itemName = Shortcut::getShortcut(id)->text();
+
+            // in this case we can't use the menu name (it's too short
+            // as it's used for the button label). So use the shortcut
+            // description instead
+            if (strncmp(id, "voice-", 6) == 0)
+                  itemName = Shortcut::getShortcut(id)->descr();
+
+            return new QListWidgetItem(action->icon(), itemName);
+      }
+
+      qDebug()<<"ToolbarEditor does not recognize id for toolbar item: "<<QString(id);
+      return nullptr;
+      }
+
 //---------------------------------------------------------
 //   populateLists
 //---------------------------------------------------------
@@ -120,47 +171,47 @@ void ToolbarEditor::accepted()
 void ToolbarEditor::populateLists(const std::list<const char*>& all, std::list<const char*>* current)
 {
     actionList->clear();
-    availableList->clear();
-    for (auto i : *current) {
-        QAction* a = getAction(i);
-        QListWidgetItem* item;
-        QString actionName = QString(i);
-        if (a) {
-            item = new QListWidgetItem(a->icon(), actionName);
-        } else if (actionName.isEmpty()) {
-            item = new QListWidgetItem(tr("Separator"));
-        } else {
-            item = new QListWidgetItem(actionName);
-        }
-        item->setData(Qt::UserRole, QVariant::fromValue((void*)i));
+    for (auto currentId : *current) {
+        QListWidgetItem* item = listItem(currentId);
+        if (!item)
+            continue;
+
         actionList->addItem(item);
     }
-    for (auto i : all) {
+
+    refreshAvailableList(all, current);
+}
+
+
+void ToolbarEditor::refreshAvailableList(const std::list<const char*>& all, std::list<const char*>* current)
+{
+    availableList->clear();
+
+    for (auto id : all) {
         bool found = false;
-        for (auto k : *current) {
-            if (strcmp(k, i) == 0) {
+
+        for (auto allId : *current) {
+            if (strcmp(allId, id) == 0) {
                 found = true;
                 break;
             }
-        }
-        if (!found) {
-            QAction* a = getAction(i);
-            QListWidgetItem* item = 0;
-            QString actionName = QString(i);
-            if (a) {
-                item = new QListWidgetItem(a->icon(), actionName);
-            } else if (!actionName.isEmpty()) {
-                item = new QListWidgetItem(QString(i));
-            }
-            if (item) {
-                item->setData(Qt::UserRole, QVariant::fromValue((void*)i));
-                availableList->addItem(item);
-            }
-        }
     }
-    QListWidgetItem* item = new QListWidgetItem(tr("Separator"));
-    item->setData(Qt::UserRole, QVariant::fromValue((void*)""));
-    availableList->addItem(item);
+
+        if (found)
+            continue;
+
+        if (QString(id).isEmpty())
+            continue;
+
+        QListWidgetItem* item = listItem(id);
+        if (!item)
+            continue;
+
+        availableList->addItem(item);
+    }
+
+    // add the Separator item
+    availableList->addItem(listItem(""));
 }
 
 //---------------------------------------------------------
@@ -178,26 +229,26 @@ bool ToolbarEditor::isSpacer(QListWidgetItem* item) const
 
 void ToolbarEditor::addAction()
 {
-    int cr = availableList->currentRow();
-    if (cr == -1) {
+    int currentRow = availableList->currentRow();
+
+    if (currentRow == -1)
         return;
-    }
-    QListWidgetItem* item = availableList->item(cr);
-
-    if (isSpacer(item)) {
-        QListWidgetItem* nitem = new QListWidgetItem(item->text());
-        nitem->setData(Qt::UserRole, QVariant::fromValue((void*)""));
-        item = nitem;
-    } else {
-        item = availableList->takeItem(cr);
-    }
-    cr = actionList->currentRow();
-    if (cr == -1) {
+
+    QListWidgetItem* item = availableList->item(currentRow);
+
+    if (isSpacer(item))
+        item = listItem("");
+    else
+        item = availableList->takeItem(currentRow);
+
+    currentRow = actionList->currentRow();
+
+    if (currentRow == -1)
         actionList->addItem(item);
-    } else {
-        actionList->insertItem(cr, item);
-    }
-    updateNewToolbar(toolbarList->currentRow());
+    else
+        actionList->insertItem(currentRow, item);
+
+      updateNewToolbar(toolbarList->currentRow());
 }
 
 //---------------------------------------------------------
@@ -206,15 +257,28 @@ void ToolbarEditor::addAction()
 
 void ToolbarEditor::removeAction()
 {
-    int cr = actionList->currentRow();
-    if (cr == -1) {
+    int actionListRow = actionList->currentRow();
+
+    if (actionListRow == -1)
         return;
-    }
-    QListWidgetItem* item = actionList->takeItem(cr);
-    if (!isSpacer(item)) {
-        availableList->addItem(item);
-    }
+
+    QListWidgetItem* item = actionList->takeItem(actionListRow);
     updateNewToolbar(toolbarList->currentRow());
+
+    if (isSpacer(item))
+        return;
+
+    int toolbarListRow = toolbarList->currentRow();
+    switch (toolbarListRow) {
+        case 0:
+            refreshAvailableList(MuseScore::allNoteInputMenuEntries(), new_toolbars->at(toolbarListRow));
+            break;
+        case 1:
+            refreshAvailableList(MuseScore::allFileOperationEntries(), new_toolbars->at(toolbarListRow));
+            break;
+        case 2:
+            refreshAvailableList(MuseScore::allPlaybackControlEntries(), new_toolbars->at(toolbarListRow));
+    }
 }
 
 //---------------------------------------------------------
diff --git a/mscore/toolbarEditor.h b/mscore/toolbarEditor.h
index e84eecf11cfc7..a0baa36c8b32a 100644
--- a/mscore/toolbarEditor.h
+++ b/mscore/toolbarEditor.h
@@ -28,6 +28,9 @@ class ToolbarEditor : public QDialog, public Ui::ToolbarEditor
     void updateNewToolbar(int toolbar_to_update);
 
     void populateLists(const std::list<const char*>&, std::list<const char*>*);
+    void refreshAvailableList(const std::list<const char*>&, std::list<const char*>*);
+    QListWidgetItem* listItem(const char* id);
+    QListWidgetItem* _listItem(const char* id);
     bool isSpacer(QListWidgetItem*) const;
 
     virtual void hideEvent(QHideEvent*);
diff --git a/mscore/toolbarEditor.ui b/mscore/toolbarEditor.ui
index 367bd3991ebd4..524940e644541 100644
--- a/mscore/toolbarEditor.ui
+++ b/mscore/toolbarEditor.ui
@@ -11,11 +11,11 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Edit Toolbar</string>
+   <string>Customize Toolbars</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <widget class="QLabel" name="toolbarLabel">
+   <item row="0" column="2">
+    <widget class="QLabel" name="availableActionsLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -23,25 +23,22 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Toolbar</string>
+      <string>Available actions</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QLabel" name="actionsLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="3" column="0" colspan="5">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="text">
-      <string>Actions</string>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="1" column="4">
-    <widget class="QLabel" name="availableActionsLabel">
+   <item row="0" column="4">
+    <widget class="QLabel" name="actionsLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -49,73 +46,52 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>Available Actions</string>
+      <string>Actions</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" rowspan="2" colspan="2">
-    <widget class="QListWidget" name="toolbarList">
-     <property name="currentRow">
-      <number>-1</number>
+   <item row="1" column="2" rowspan="2">
+    <widget class="QListWidget" name="availableList">
+     <property name="toolTip">
+      <string>Actions available to show on toolbar</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="2" rowspan="2">
-    <widget class="QListWidget" name="actionList"/>
-   </item>
-   <item row="2" column="4" rowspan="2">
-    <widget class="QListWidget" name="availableList"/>
-   </item>
-   <item row="0" column="0" colspan="5">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="workspaceLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Workspace:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="workspaceName">
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="3">
+   <item row="1" column="3">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QToolButton" name="add">
+       <property name="toolTip">
+        <string>Add action to toolbar</string>
+       </property>
        <property name="text">
         <string notr="true"/>
        </property>
        <property name="icon">
         <iconset resource="musescore.qrc">
-         <normaloff>:/data/icons/go-previous.svg</normaloff>:/data/icons/go-previous.svg</iconset>
+         <normaloff>:/data/icons/go-next.svg</normaloff>:/data/icons/go-next.svg</iconset>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="remove">
+       <property name="toolTip">
+        <string>Remove action from toolbar</string>
+       </property>
        <property name="text">
         <string notr="true"/>
        </property>
        <property name="icon">
         <iconset resource="musescore.qrc">
-         <normaloff>:/data/icons/go-next.svg</normaloff>:/data/icons/go-next.svg</iconset>
+         <normaloff>:/data/icons/go-previous.svg</normaloff>:/data/icons/go-previous.svg</iconset>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="up">
+       <property name="toolTip">
+        <string>Move action up</string>
+       </property>
        <property name="text">
         <string notr="true"/>
        </property>
@@ -127,6 +103,9 @@
      </item>
      <item>
       <widget class="QToolButton" name="down">
+       <property name="toolTip">
+        <string>Move action down</string>
+       </property>
        <property name="text">
         <string/>
        </property>
@@ -138,20 +117,39 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0" colspan="5">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="1" column="0" rowspan="2" colspan="2">
+    <widget class="QListWidget" name="toolbarList">
+     <property name="toolTip">
+      <string>Toolbar to customize</string>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     <property name="currentRow">
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="toolbarLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Toolbar</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="4" rowspan="2">
+    <widget class="QListWidget" name="actionList">
+     <property name="toolTip">
+      <string>Actions shown on toolbar</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>workspaceName</tabstop>
   <tabstop>toolbarList</tabstop>
   <tabstop>actionList</tabstop>
   <tabstop>add</tabstop>
diff --git a/mscore/workspace.cpp b/mscore/workspace.cpp
index c9fa176095063..ea98208a2cde6 100644
--- a/mscore/workspace.cpp
+++ b/mscore/workspace.cpp
@@ -240,6 +240,8 @@ void MuseScore::changeWorkspace(Workspace* p, bool first)
         preferencesChanged(true);
     }
 
+    getAction("edit-toolbars")->setEnabled(WorkspacesManager::currentWorkspace()->canCustomizeToolbars());
+
     connect(getPaletteWorkspace(), &PaletteWorkspace::userPaletteChanged,
             WorkspacesManager::currentWorkspace(), QOverload<>::of(&Workspace::setDirty), Qt::UniqueConnection);
 
@@ -247,6 +249,7 @@ void MuseScore::changeWorkspace(Workspace* p, bool first)
     emit mscore->workspacesChanged();
 }
 
+
 //---------------------------------------------------------
 //   updateIcons
 //---------------------------------------------------------
@@ -1139,6 +1142,12 @@ void Workspace::setDirty(bool val)
     _saveTimer.start();
 }
 
+
+bool Workspace::canCustomizeToolbars()
+{
+      return saveToolbars && !_readOnly;
+}
+
 //---------------------------------------------------------
 //   save
 //---------------------------------------------------------
diff --git a/mscore/workspace.h b/mscore/workspace.h
index 1b14b43c67689..150ae564b0950 100644
--- a/mscore/workspace.h
+++ b/mscore/workspace.h
@@ -90,6 +90,7 @@ public slots:
     void read(XmlReader&);
     void read();
     bool readOnly() const { return _readOnly; }
+    bool canCustomizeToolbars();
     void setReadOnly(bool val) { _readOnly = val; }
     void reset();
 
diff --git a/mscore/workspacedialog.cpp b/mscore/workspacedialog.cpp
index 649e42843c046..a5e39ad5451d8 100644
--- a/mscore/workspacedialog.cpp
+++ b/mscore/workspacedialog.cpp
@@ -149,6 +149,9 @@ void WorkspaceDialog::accepted()
     newWorkspace->setSaveMenuBar(menubarCheck->isChecked());
     preferences.setUseLocalPreferences(prefsCheck->isChecked());
 
+    //enable or disable customize toolbars menu to reflect current status
+    getAction("edit-toolbars")->setEnabled(newWorkspace->canCustomizeToolbars());
+
     //save newly created/edited workspace
     newWorkspace->save();
 
diff --git a/share/workspaces/Advanced.xml b/share/workspaces/Advanced.xml
index 0d379f67a54a1..fb8d4362be363 100644
--- a/share/workspaces/Advanced.xml
+++ b/share/workspaces/Advanced.xml
@@ -3334,6 +3334,9 @@
       <action>print</action>
       <action>undo</action>
       <action>redo</action>
+      <action></action>
+      <action>zoom-options</action>
+      <action>view-mode</action>
       </Toolbar>
     <Toolbar name="playbackControl">
       <action>midi-on</action>
diff --git a/share/workspaces/Basic.xml b/share/workspaces/Basic.xml
index d5e5f182d0da3..4e83ca146a9fb 100644
--- a/share/workspaces/Basic.xml
+++ b/share/workspaces/Basic.xml
@@ -926,7 +926,10 @@
       <action>print</action>
       <action>undo</action>
       <action>redo</action>
-      </Toolbar>
+      <action></action>
+      <action>zoom-options</action>
+      <action>view-mode</action>
+    </Toolbar>
     <Toolbar name="playbackControl">
       <action>midi-on</action>
       <action></action>