diff --git a/client/src/views/files/FoldersPage.vue b/client/src/views/files/FoldersPage.vue
index 0d809fe4841..523ba7961df 100644
--- a/client/src/views/files/FoldersPage.vue
+++ b/client/src/views/files/FoldersPage.vue
@@ -8,14 +8,14 @@
     >
       <ms-action-bar id="folders-ms-action-bar">
         <div v-if="selectedFilesCount === 0">
-          <file-controls-button
+          <ms-action-bar-button
             id="button-new-folder"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.createFolder'"
             :icon="folderOpen"
             @click="createFolder()"
           />
-          <file-controls-button
+          <ms-action-bar-button
             id="button-import"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.import'"
@@ -24,41 +24,41 @@
           />
         </div>
         <div v-else-if="selectedFilesCount === 1">
-          <file-controls-button
+          <ms-action-bar-button
             id="button-rename"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.fileContextMenu.actionRename'"
             :icon="pencil"
             @click="renameEntries(getSelectedEntries())"
           />
-          <file-controls-button
+          <ms-action-bar-button
             id="button-moveto"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.fileContextMenu.actionMoveTo'"
             :icon="arrowRedo"
             @click="moveEntriesTo(getSelectedEntries())"
           />
-          <file-controls-button
+          <ms-action-bar-button
             id="button-makeacopy"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.fileContextMenu.actionMakeACopy'"
             :icon="copy"
             @click="copyEntries(getSelectedEntries())"
           />
-          <file-controls-button
+          <ms-action-bar-button
             id="button-delete"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.fileContextMenu.actionDelete'"
             :icon="trashBin"
             @click="deleteEntries(getSelectedEntries())"
           />
-          <file-controls-button
+          <ms-action-bar-button
             id="button-details"
             :button-label="'FoldersPage.fileContextMenu.actionDetails'"
             :icon="informationCircle"
             @click="showDetails(getSelectedEntries())"
           />
-          <file-controls-button
+          <ms-action-bar-button
             id="button-copy-link"
             :button-label="'FoldersPage.fileContextMenu.actionCopyLink'"
             :icon="link"
@@ -66,21 +66,21 @@
           />
         </div>
         <div v-else>
-          <file-controls-button
+          <ms-action-bar-button
             id="button-moveto"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.fileContextMenu.actionMoveTo'"
             :icon="arrowRedo"
             @click="moveEntriesTo(getSelectedEntries())"
           />
-          <file-controls-button
+          <ms-action-bar-button
             id="button-makeacopy"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.fileContextMenu.actionMakeACopy'"
             :icon="copy"
             @click="copyEntries(getSelectedEntries())"
           />
-          <file-controls-button
+          <ms-action-bar-button
             id="button-delete"
             v-show="ownRole !== parsec.WorkspaceRole.Reader"
             :button-label="'FoldersPage.fileContextMenu.actionDelete'"
@@ -209,7 +209,7 @@ import {
   DocumentImport,
   DisplayState,
   MsActionBar,
-  FileControlsButton,
+  MsActionBarButton,
   MsGridListToggle,
   MsSorter,
   MsSorterChangeEvent,
diff --git a/client/src/views/users/UsersPage.vue b/client/src/views/users/UsersPage.vue
index ec5b360c4e8..83df6323f99 100644
--- a/client/src/views/users/UsersPage.vue
+++ b/client/src/views/users/UsersPage.vue
@@ -9,7 +9,7 @@
       <!-- contextual menu -->
       <ms-action-bar id="activate-users-ms-action-bar">
         <div v-show="users.selectedCount() === 0 && isAdmin">
-          <file-controls-button
+          <ms-action-bar-button
             :icon="personAdd"
             id="button-invite-user"
             :button-label="'UsersPage.inviteUser'"
@@ -18,7 +18,7 @@
         </div>
         <!-- revoke or view common workspace -->
         <div v-show="users.selectedCount() >= 1 && isAdmin">
-          <file-controls-button
+          <ms-action-bar-button
             :icon="personRemove"
             class="danger"
             id="button-revoke-user"
@@ -27,7 +27,7 @@
           />
         </div>
         <div v-show="users.selectedCount() === 1">
-          <file-controls-button
+          <ms-action-bar-button
             :icon="informationCircle"
             id="button-common-workspaces"
             :button-label="'UsersPage.userContextMenu.actionDetails'"
@@ -125,7 +125,7 @@ import {
   NoActiveUser,
   DisplayState,
   MsActionBar,
-  FileControlsButton,
+  MsActionBarButton,
   MsGridListToggle,
   MsSearchInput,
   MsSorter,
diff --git a/client/src/views/workspaces/WorkspacesPage.vue b/client/src/views/workspaces/WorkspacesPage.vue
index 097c616b53e..5ed696535a6 100644
--- a/client/src/views/workspaces/WorkspacesPage.vue
+++ b/client/src/views/workspaces/WorkspacesPage.vue
@@ -8,7 +8,7 @@
     >
       <ms-action-bar id="workspaces-ms-action-bar">
         <!-- contextual menu -->
-        <file-controls-button
+        <ms-action-bar-button
           v-show="clientProfile != UserProfile.Outsider"
           id="button-new-workspace"
           :button-label="'WorkspacesPage.createWorkspace'"
@@ -163,7 +163,7 @@ import {
   NoWorkspace,
   DisplayState,
   MsActionBar,
-  FileControlsButton,
+  MsActionBarButton,
   MsGridListToggle,
   MsSorter,
   MsSorterChangeEvent,