diff --git a/app/dashboard/e2e/actions.ts b/app/dashboard/e2e/actions.ts
index aaf4830d39cb..96b415d85a3d 100644
--- a/app/dashboard/e2e/actions.ts
+++ b/app/dashboard/e2e/actions.ts
@@ -347,12 +347,6 @@ export function locateCollapsibleDirectories(page: test.Page) {
   return locateAssetRows(page).filter({ has: page.locator('[aria-label=Collapse]') })
 }
 
-/** Find a "confirm delete" modal (if any) on the current page. */
-export function locateConfirmDeleteModal(page: test.Page) {
-  // This has no identifying features.
-  return page.getByTestId('confirm-delete-modal')
-}
-
 /** Find a "new label" modal (if any) on the current page. */
 export function locateNewLabelModal(page: test.Page) {
   // This has no identifying features.
@@ -365,12 +359,6 @@ export function locateUpsertSecretModal(page: test.Page) {
   return page.getByTestId('upsert-secret-modal')
 }
 
-/** Find a "new user group" modal (if any) on the current page. */
-export function locateNewUserGroupModal(page: test.Page) {
-  // This has no identifying features.
-  return page.getByTestId('new-user-group-modal')
-}
-
 /** Find a user menu (if any) on the current page. */
 export function locateUserMenu(page: test.Page) {
   return page.getByAltText('User Settings').locator('visible=true')
diff --git a/app/dashboard/e2e/actions/contextMenuActions.ts b/app/dashboard/e2e/actions/contextMenuActions.ts
index e87bd8f50e6c..47de5ea5d854 100644
--- a/app/dashboard/e2e/actions/contextMenuActions.ts
+++ b/app/dashboard/e2e/actions/contextMenuActions.ts
@@ -1,4 +1,5 @@
 /** @file Actions for the context menu. */
+import { TEXT } from '../actions'
 import type * as baseActions from './BaseActions'
 import type BaseActions from './BaseActions'
 import EditorPageActions from './EditorPageActions'
@@ -13,7 +14,8 @@ export interface ContextMenuActions<T extends BaseActions> {
   readonly uploadToCloud: () => T
   readonly rename: () => T
   readonly snapshot: () => T
-  readonly moveToTrash: () => T
+  readonly moveNonFolderToTrash: () => T
+  readonly moveFolderToTrash: () => T
   readonly moveAllToTrash: () => T
   readonly restoreFromTrash: () => T
   readonly restoreAllFromTrash: () => T
@@ -43,97 +45,153 @@ export function contextMenuActions<T extends BaseActions>(
   return {
     open: () =>
       step('Open (context menu)', (page) =>
-        page.getByRole('button', { name: 'Open' }).getByText('Open').click(),
+        page.getByRole('button', { name: TEXT.openShortcut }).getByText(TEXT.openShortcut).click(),
       ),
     uploadToCloud: () =>
       step('Upload to cloud (context menu)', (page) =>
-        page.getByRole('button', { name: 'Upload To Cloud' }).getByText('Upload To Cloud').click(),
+        page
+          .getByRole('button', { name: TEXT.uploadToCloudShortcut })
+          .getByText(TEXT.uploadToCloudShortcut)
+          .click(),
       ),
     rename: () =>
       step('Rename (context menu)', (page) =>
-        page.getByRole('button', { name: 'Rename' }).getByText('Rename').click(),
+        page
+          .getByRole('button', { name: TEXT.renameShortcut })
+          .getByText(TEXT.renameShortcut)
+          .click(),
       ),
     snapshot: () =>
       step('Snapshot (context menu)', (page) =>
-        page.getByRole('button', { name: 'Snapshot' }).getByText('Snapshot').click(),
+        page
+          .getByRole('button', { name: TEXT.snapshotShortcut })
+          .getByText(TEXT.snapshotShortcut)
+          .click(),
       ),
-    moveToTrash: () =>
+    moveNonFolderToTrash: () =>
       step('Move to trash (context menu)', (page) =>
-        page.getByRole('button', { name: 'Move To Trash' }).getByText('Move To Trash').click(),
+        page
+          .getByRole('button', { name: TEXT.moveToTrashShortcut })
+          .getByText(TEXT.moveToTrashShortcut)
+          .click(),
       ),
+    moveFolderToTrash: () =>
+      step('Move folder to trash (context menu)', async (page) => {
+        await page
+          .getByRole('button', { name: TEXT.moveToTrashShortcut })
+          .getByText(TEXT.moveToTrashShortcut)
+          .click()
+        await page.getByRole('button', { name: TEXT.delete }).getByText(TEXT.delete).click()
+      }),
     moveAllToTrash: () =>
       step('Move all to trash (context menu)', (page) =>
         page
-          .getByRole('button', { name: 'Move All To Trash' })
-          .getByText('Move All To Trash')
+          .getByRole('button', { name: TEXT.moveAllToTrashShortcut })
+          .getByText(TEXT.moveAllToTrashShortcut)
           .click(),
       ),
     restoreFromTrash: () =>
       step('Restore from trash (context menu)', (page) =>
         page
-          .getByRole('button', { name: 'Restore From Trash' })
-          .getByText('Restore From Trash')
+          .getByRole('button', { name: TEXT.restoreFromTrashShortcut })
+          .getByText(TEXT.restoreFromTrashShortcut)
           .click(),
       ),
     restoreAllFromTrash: () =>
       step('Restore all from trash (context menu)', (page) =>
         page
-          .getByRole('button', { name: 'Restore All From Trash' })
-          .getByText('Restore All From Trash')
+          .getByRole('button', { name: TEXT.restoreAllFromTrashShortcut })
+          .getByText(TEXT.restoreAllFromTrashShortcut)
           .click(),
       ),
     share: () =>
       step('Share (context menu)', (page) =>
-        page.getByRole('button', { name: 'Share' }).getByText('Share').click(),
+        page
+          .getByRole('button', { name: TEXT.shareShortcut })
+          .getByText(TEXT.shareShortcut)
+          .click(),
       ),
     label: () =>
       step('Label (context menu)', (page) =>
-        page.getByRole('button', { name: 'Label' }).getByText('Label').click(),
+        page
+          .getByRole('button', { name: TEXT.labelShortcut })
+          .getByText(TEXT.labelShortcut)
+          .click(),
       ),
     duplicate: () =>
       step('Duplicate (context menu)', (page) =>
-        page.getByRole('button', { name: 'Duplicate' }).getByText('Duplicate').click(),
+        page
+          .getByRole('button', { name: TEXT.duplicateShortcut })
+          .getByText(TEXT.duplicateShortcut)
+          .click(),
       ),
     duplicateProject: () =>
       step('Duplicate project (context menu)', (page) =>
-        page.getByRole('button', { name: 'Duplicate' }).getByText('Duplicate').click(),
+        page
+          .getByRole('button', { name: TEXT.duplicateShortcut })
+          .getByText(TEXT.duplicateShortcut)
+          .click(),
       ).into(EditorPageActions),
     copy: () =>
       step('Copy (context menu)', (page) =>
-        page.getByRole('button', { name: 'Copy' }).getByText('Copy', { exact: true }).click(),
+        page
+          .getByRole('button', { name: TEXT.copyShortcut })
+          .getByText(TEXT.copyShortcut, { exact: true })
+          .click(),
       ),
     cut: () =>
       step('Cut (context menu)', (page) =>
-        page.getByRole('button', { name: 'Cut' }).getByText('Cut').click(),
+        page.getByRole('button', { name: TEXT.cutShortcut }).getByText(TEXT.cutShortcut).click(),
       ),
     paste: () =>
       step('Paste (context menu)', (page) =>
-        page.getByRole('button', { name: 'Paste' }).getByText('Paste').click(),
+        page
+          .getByRole('button', { name: TEXT.pasteShortcut })
+          .getByText(TEXT.pasteShortcut)
+          .click(),
       ),
     copyAsPath: () =>
       step('Copy as path (context menu)', (page) =>
-        page.getByRole('button', { name: 'Copy As Path' }).getByText('Copy As Path').click(),
+        page
+          .getByRole('button', { name: TEXT.copyAsPathShortcut })
+          .getByText(TEXT.copyAsPathShortcut)
+          .click(),
       ),
     download: () =>
       step('Download (context menu)', (page) =>
-        page.getByRole('button', { name: 'Download' }).getByText('Download').click(),
+        page
+          .getByRole('button', { name: TEXT.downloadShortcut })
+          .getByText(TEXT.downloadShortcut)
+          .click(),
       ),
     // TODO: Specify the files in parameters.
     uploadFiles: () =>
       step('Upload files (context menu)', (page) =>
-        page.getByRole('button', { name: 'Upload Files' }).getByText('Upload Files').click(),
+        page
+          .getByRole('button', { name: TEXT.uploadFilesShortcut })
+          .getByText(TEXT.uploadFilesShortcut)
+          .click(),
       ),
     newFolder: () =>
       step('New folder (context menu)', (page) =>
-        page.getByRole('button', { name: 'New Folder' }).getByText('New Folder').click(),
+        page
+          .getByRole('button', { name: TEXT.newFolderShortcut })
+          .getByText(TEXT.newFolderShortcut)
+          .click(),
       ),
     newSecret: () =>
       step('New secret (context menu)', (page) =>
-        page.getByRole('button', { name: 'New Secret' }).getByText('New Secret').click(),
+        page
+          .getByRole('button', { name: TEXT.newSecretShortcut })
+          .getByText(TEXT.newSecretShortcut)
+          .click(),
       ),
     newDataLink: () =>
       step('New Data Link (context menu)', (page) =>
-        page.getByRole('button', { name: 'New Data Link' }).getByText('New Data Link').click(),
+        page
+          .getByRole('button', { name: TEXT.newDatalinkShortcut })
+          .getByText(TEXT.newDatalinkShortcut)
+          .click(),
       ),
   }
 }
diff --git a/app/dashboard/e2e/api.ts b/app/dashboard/e2e/api.ts
index a9ccef283cf8..d527bad76ae6 100644
--- a/app/dashboard/e2e/api.ts
+++ b/app/dashboard/e2e/api.ts
@@ -704,7 +704,12 @@ async function mockApiInternal({ page, setupAPI }: MockParams) {
         new URL(request.url()).searchParams.entries(),
       ) as never
 
-      const file = addFile(searchParams.file_name)
+      const file = addFile(
+        searchParams.file_name,
+        searchParams.parent_directory_id == null ?
+          {}
+        : { parentId: searchParams.parent_directory_id },
+      )
 
       return { path: '', id: file.id, project: null } satisfies backend.FileInfo
     })
@@ -900,8 +905,7 @@ async function mockApiInternal({ page, setupAPI }: MockParams) {
       const body: backend.CreateDirectoryRequestBody = request.postDataJSON()
       const title = body.title
       const id = backend.DirectoryId(`directory-${uniqueString.uniqueString()}`)
-      const parentId =
-        body.parentId ?? backend.DirectoryId(`directory-${uniqueString.uniqueString()}`)
+      const parentId = body.parentId ?? defaultDirectoryId
       const json: backend.CreatedDirectory = { title, id, parentId }
       addDirectory(title, {
         description: null,
diff --git a/app/dashboard/e2e/delete.spec.ts b/app/dashboard/e2e/delete.spec.ts
index d445f9a186e3..67eec35feaeb 100644
--- a/app/dashboard/e2e/delete.spec.ts
+++ b/app/dashboard/e2e/delete.spec.ts
@@ -1,17 +1,16 @@
 /** @file Test copying, moving, cutting and pasting. */
 import * as test from '@playwright/test'
 
-import * as actions from './actions'
+import { mockAllAndLogin, TEXT } from './actions'
 
 test.test('delete and restore', ({ page }) =>
-  actions
-    .mockAllAndLogin({ page })
+  mockAllAndLogin({ page })
     .createFolder()
     .driveTable.withRows(async (rows) => {
       await test.expect(rows).toHaveCount(1)
     })
     .driveTable.rightClickRow(0)
-    .contextMenu.moveToTrash()
+    .contextMenu.moveFolderToTrash()
     .driveTable.expectPlaceholderRow()
     .goToCategory.trash()
     .driveTable.withRows(async (rows) => {
@@ -27,14 +26,16 @@ test.test('delete and restore', ({ page }) =>
 )
 
 test.test('delete and restore (keyboard)', ({ page }) =>
-  actions
-    .mockAllAndLogin({ page })
+  mockAllAndLogin({ page })
     .createFolder()
     .driveTable.withRows(async (rows) => {
       await test.expect(rows).toHaveCount(1)
     })
     .driveTable.clickRow(0)
     .press('Delete')
+    .do(async (thePage) => {
+      await thePage.getByRole('button', { name: TEXT.delete }).getByText(TEXT.delete).click()
+    })
     .driveTable.expectPlaceholderRow()
     .goToCategory.trash()
     .driveTable.withRows(async (rows) => {
diff --git a/app/dashboard/e2e/driveView.spec.ts b/app/dashboard/e2e/driveView.spec.ts
index bdb80e765f8a..7b65bf794977 100644
--- a/app/dashboard/e2e/driveView.spec.ts
+++ b/app/dashboard/e2e/driveView.spec.ts
@@ -37,7 +37,7 @@ test.test('drive view', ({ page }) =>
     })
     // Project context menu
     .driveTable.rightClickRow(0)
-    .contextMenu.moveToTrash()
+    .contextMenu.moveNonFolderToTrash()
     .driveTable.withRows(async (rows) => {
       await test.expect(rows).toHaveCount(1)
     }),
diff --git a/app/dashboard/e2e/labelsPanel.spec.ts b/app/dashboard/e2e/labelsPanel.spec.ts
index 24350aa7907b..1249f05d7fb7 100644
--- a/app/dashboard/e2e/labelsPanel.spec.ts
+++ b/app/dashboard/e2e/labelsPanel.spec.ts
@@ -59,6 +59,6 @@ test.test('labels', async ({ page }) => {
 
   const labelsPanel = locateLabelsPanel(page)
   await labelsPanel.getByRole('button').and(labelsPanel.getByLabel(TEXT.delete)).click()
-  await page.getByRole('button', { name: 'Delete' }).getByText('Delete').click()
+  await page.getByRole('button', { name: TEXT.delete }).getByText(TEXT.delete).click()
   test.expect(await locateLabelsPanelLabels(page).count()).toBeGreaterThanOrEqual(1)
 })
diff --git a/app/dashboard/src/components/dashboard/column/SharedWithColumn.tsx b/app/dashboard/src/components/dashboard/column/SharedWithColumn.tsx
index ccf6a4b2af0a..f50b0eead9db 100644
--- a/app/dashboard/src/components/dashboard/column/SharedWithColumn.tsx
+++ b/app/dashboard/src/components/dashboard/column/SharedWithColumn.tsx
@@ -48,6 +48,7 @@ export default function SharedWithColumn(props: SharedWithColumnPropsInternal) {
   const dispatchAssetEvent = eventListProvider.useDispatchAssetEvent()
   const { isFeatureUnderPaywall } = billingHooks.usePaywall({ plan: user.plan })
   const isUnderPaywall = isFeatureUnderPaywall('share')
+  const assetPermissions = asset.permissions ?? []
   const { setModal } = modalProvider.useSetModal()
   const self = permissions.tryFindSelfPermission(user, asset.permissions)
   const plusButtonRef = React.useRef<HTMLButtonElement>(null)
@@ -70,7 +71,12 @@ export default function SharedWithColumn(props: SharedWithColumnPropsInternal) {
 
   return (
     <div className="group flex items-center gap-column-items">
-      {(asset.permissions ?? []).map((other, idx) => (
+      {(category.type === 'trash' ?
+        assetPermissions.filter(
+          (permission) => permission.permission === permissions.PermissionAction.own,
+        )
+      : assetPermissions
+      ).map((other, idx) => (
         <PermissionDisplay
           key={backendModule.getAssetPermissionId(other) + idx}
           action={other.permission}
diff --git a/app/dashboard/src/components/dashboard/column/columnUtils.ts b/app/dashboard/src/components/dashboard/column/columnUtils.ts
index 096ed76a3c02..659e9da16e67 100644
--- a/app/dashboard/src/components/dashboard/column/columnUtils.ts
+++ b/app/dashboard/src/components/dashboard/column/columnUtils.ts
@@ -9,6 +9,7 @@ import PeopleIcon from '#/assets/people.svg'
 import TagIcon from '#/assets/tag.svg'
 import TimeIcon from '#/assets/time.svg'
 
+import type { Category } from '#/layouts/CategorySwitcher/Category'
 import * as backend from '#/services/Backend'
 
 // =============
@@ -82,13 +83,18 @@ export const COLUMN_CSS_CLASS: Readonly<Record<Column, string>> = {
 // =====================
 
 /** Return the full list of columns given the relevant current state. */
-export function getColumnList(user: backend.User, backendType: backend.BackendType) {
+export function getColumnList(
+  user: backend.User,
+  backendType: backend.BackendType,
+  category: Category,
+) {
   const isCloud = backendType === backend.BackendType.remote
   const isEnterprise = user.plan === backend.Plan.enterprise
+  const isTrash = category.type === 'trash'
   const columns = [
     Column.name,
     Column.modified,
-    isCloud && isEnterprise && Column.sharedWith,
+    isCloud && (isEnterprise || isTrash) && Column.sharedWith,
     isCloud && Column.labels,
     isCloud && Column.accessedByProjects,
     isCloud && Column.accessedData,
diff --git a/app/dashboard/src/components/dashboard/columnHeading/SharedWithColumnHeading.tsx b/app/dashboard/src/components/dashboard/columnHeading/SharedWithColumnHeading.tsx
index ca629bc1dd26..e7e8b393c543 100644
--- a/app/dashboard/src/components/dashboard/columnHeading/SharedWithColumnHeading.tsx
+++ b/app/dashboard/src/components/dashboard/columnHeading/SharedWithColumnHeading.tsx
@@ -11,7 +11,7 @@ import { useText } from '#/providers/TextProvider'
 /** A heading for the "Shared with" column. */
 export default function SharedWithColumnHeading(props: AssetColumnHeadingProps) {
   const { state } = props
-  const { hideColumn } = state
+  const { category, hideColumn } = state
   const { getText } = useText()
 
   const { user } = useFullUserSession()
@@ -33,7 +33,11 @@ export default function SharedWithColumnHeading(props: AssetColumnHeadingProps)
       />
 
       <div className="flex items-center gap-1">
-        <Text className="text-sm font-semibold">{getText('sharedWithColumnName')}</Text>
+        <Text className="text-sm font-semibold">
+          {category.type === 'trash' ?
+            getText('rootFolderColumnName')
+          : getText('sharedWithColumnName')}
+        </Text>
 
         {isUnderPaywall && (
           <PaywallDialogButton feature="share" variant="icon" children={false} size="medium" />
diff --git a/app/dashboard/src/layouts/AssetContextMenu.tsx b/app/dashboard/src/layouts/AssetContextMenu.tsx
index f8198d9199d6..c58c45542368 100644
--- a/app/dashboard/src/layouts/AssetContextMenu.tsx
+++ b/app/dashboard/src/layouts/AssetContextMenu.tsx
@@ -320,6 +320,7 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
                 doAction={() => {
                   setModal(
                     <UpsertSecretModal
+                      defaultOpen
                       id={asset.id}
                       name={asset.title}
                       doCreate={async (_name, value) => {
@@ -361,8 +362,18 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
               label={isCloud ? getText('moveToTrashShortcut') : getText('deleteShortcut')}
               doAction={() => {
                 if (isCloud) {
-                  unsetModal()
-                  doDelete()
+                  if (asset.type === backendModule.AssetType.directory) {
+                    setModal(
+                      <ConfirmDeleteModal
+                        defaultOpen
+                        actionText={getText('trashTheAssetTypeTitle', asset.type, asset.title)}
+                        doDelete={doDelete}
+                      />,
+                    )
+                  } else {
+                    unsetModal()
+                    doDelete()
+                  }
                 } else {
                   setModal(
                     <ConfirmDeleteModal
@@ -451,7 +462,7 @@ export default function AssetContextMenu(props: AssetContextMenuProps) {
               }}
             />
           )}
-          {!isOtherUserUsingProject && (
+          {!isRunningProject && !isOtherUserUsingProject && (
             <ContextMenuEntry hidden={hidden} action="cut" doAction={doCut} />
           )}
           {(isCloud ?
diff --git a/app/dashboard/src/layouts/AssetsTable.tsx b/app/dashboard/src/layouts/AssetsTable.tsx
index 9d38ccf7ab32..909e5baed6bb 100644
--- a/app/dashboard/src/layouts/AssetsTable.tsx
+++ b/app/dashboard/src/layouts/AssetsTable.tsx
@@ -336,7 +336,7 @@ export default function AssetsTable(props: AssetsTableProps) {
   const setAssetPanelProps = useSetAssetPanelProps()
 
   const hiddenColumns = columnUtils
-    .getColumnList(user, backend.type)
+    .getColumnList(user, backend.type, category)
     .filter((column) => !enabledColumns.has(column))
   const [sortInfo, setSortInfo] =
     React.useState<sorting.SortInfo<columnUtils.SortableColumn> | null>(null)
@@ -360,9 +360,6 @@ export default function AssetsTable(props: AssetsTableProps) {
 
   const organization = organizationQuery.data
 
-  const isAssetContextMenuVisible =
-    category.type !== 'cloud' || user.plan == null || user.plan === backendModule.Plan.solo
-
   const nameOfProjectToImmediatelyOpenRef = React.useRef(initialProjectName)
   const [localRootDirectory] = localStorageProvider.useLocalStorageState('localRootDirectory')
   const rootDirectoryId = React.useMemo(() => {
@@ -802,6 +799,8 @@ export default function AssetsTable(props: AssetsTableProps) {
   const nodeMapRef = React.useRef<
     ReadonlyMap<backendModule.AssetId, assetTreeNode.AnyAssetTreeNode>
   >(new Map<backendModule.AssetId, assetTreeNode.AnyAssetTreeNode>())
+  const isAssetContextMenuVisible =
+    category.type !== 'cloud' || user.plan == null || user.plan === backendModule.Plan.solo
 
   const queryClient = useQueryClient()
 
@@ -2640,8 +2639,10 @@ export default function AssetsTable(props: AssetsTableProps) {
 
   const columns = React.useMemo(
     () =>
-      columnUtils.getColumnList(user, backend.type).filter((column) => enabledColumns.has(column)),
-    [backend.type, enabledColumns, user],
+      columnUtils
+        .getColumnList(user, backend.type, category)
+        .filter((column) => enabledColumns.has(column)),
+    [backend.type, category, enabledColumns, user],
   )
 
   const headerRow = (
diff --git a/app/dashboard/src/layouts/AssetsTableContextMenu.tsx b/app/dashboard/src/layouts/AssetsTableContextMenu.tsx
index f6f1847ec900..9769677cd243 100644
--- a/app/dashboard/src/layouts/AssetsTableContextMenu.tsx
+++ b/app/dashboard/src/layouts/AssetsTableContextMenu.tsx
@@ -70,31 +70,30 @@ export default function AssetsTableContextMenu(props: AssetsTableContextMenuProp
   // up to date.
   const ownsAllSelectedAssets =
     !isCloud ||
-    Array.from(selectedKeys, (key) => {
+    [...selectedKeys].every((key) => {
       const userPermissions = nodeMapRef.current.get(key)?.item.permissions
-      const selfGroupPermission = userPermissions?.find(
-        backendModule.isUserGroupPermissionAnd(
-          (permission) => user.userGroups?.includes(permission.userGroup.id) ?? false,
-        ),
-      )
-      const selfPermission = userPermissions?.find(
-        backendModule.isUserPermissionAnd((permission) => permission.user.userId === user.userId),
-      )
-
-      return (
-        (selfPermission ?? selfGroupPermission)?.permission === permissions.PermissionAction.own
-      )
-    }).every((isOwner) => isOwner)
+      const selfPermission = permissions.tryFindSelfPermission(user, userPermissions ?? null)
+      return selfPermission?.permission === permissions.PermissionAction.own
+    })
 
   // This is not a React component even though it contains JSX.
   // eslint-disable-next-line no-restricted-syntax
   const doDeleteAll = () => {
-    if (isCloud) {
+    const deleteAll = () => {
       unsetModal()
+      setSelectedKeys(EMPTY_SET)
 
       for (const key of selectedKeys) {
         void doDelete(key, false)
       }
+    }
+    if (
+      isCloud &&
+      [...selectedKeys].every(
+        (key) => nodeMapRef.current.get(key)?.item.type !== backendModule.AssetType.directory,
+      )
+    ) {
+      deleteAll()
     } else {
       const [firstKey] = selectedKeys
       const soleAssetName =
@@ -107,13 +106,7 @@ export default function AssetsTableContextMenu(props: AssetsTableContextMenuProp
               getText('deleteSelectedAssetActionText', soleAssetName)
             : getText('deleteSelectedAssetsActionText', selectedKeys.size)
           }
-          doDelete={() => {
-            setSelectedKeys(EMPTY_SET)
-
-            for (const key of selectedKeys) {
-              void doDelete(key, false)
-            }
-          }}
+          doDelete={deleteAll}
         />,
       )
     }
diff --git a/app/dashboard/src/layouts/GlobalContextMenu.tsx b/app/dashboard/src/layouts/GlobalContextMenu.tsx
index 515180101fcf..54f4be3e7b8c 100644
--- a/app/dashboard/src/layouts/GlobalContextMenu.tsx
+++ b/app/dashboard/src/layouts/GlobalContextMenu.tsx
@@ -66,7 +66,7 @@ export default function GlobalContextMenu(props: GlobalContextMenuProps) {
       )}
       <ContextMenuEntry
         hidden={hidden}
-        action={'uploadFiles'}
+        action="uploadFiles"
         doAction={() => {
           if (filesInputRef.current?.isConnected === true) {
             filesInputRef.current.click()
diff --git a/app/dashboard/src/layouts/UserBar.tsx b/app/dashboard/src/layouts/UserBar.tsx
index 763e2eeb3fda..46c5bfb4600f 100644
--- a/app/dashboard/src/layouts/UserBar.tsx
+++ b/app/dashboard/src/layouts/UserBar.tsx
@@ -1,6 +1,4 @@
 /** @file A toolbar containing chat and the user menu. */
-import * as React from 'react'
-
 import ChatIcon from '#/assets/chat.svg'
 import DefaultUserIcon from '#/assets/default_user.svg'
 
@@ -20,6 +18,7 @@ import Button from '#/components/styled/Button'
 import FocusArea from '#/components/styled/FocusArea'
 
 import InviteUsersModal from '#/modals/InviteUsersModal'
+import { Plan } from '#/services/Backend'
 
 // =================
 // === Constants ===
@@ -52,10 +51,15 @@ export default function UserBar(props: UserBarProps) {
   const { getText } = textProvider.useText()
   const { isFeatureUnderPaywall } = billing.usePaywall({ plan: user.plan })
 
-  const shouldShowUpgradeButton = user.isOrganizationAdmin
+  const shouldShowUpgradeButton =
+    user.isOrganizationAdmin && user.plan !== Plan.enterprise && user.plan !== Plan.team
   const shouldShowPaywallButton = isFeatureUnderPaywall('inviteUser')
-  const shouldShowShareButton = onShareClick != null
-  const shouldShowInviteButton = !shouldShowShareButton && !shouldShowPaywallButton
+  // FIXME[sb]: Re-enable when they are wanted again.
+  // eslint-disable-next-line no-restricted-syntax
+  const shouldShowShareButton = (false as boolean) && onShareClick != null
+  const shouldShowInviteButton =
+    // eslint-disable-next-line no-restricted-syntax
+    (false as boolean) && !shouldShowShareButton && !shouldShowPaywallButton
 
   return (
     <FocusArea active={!invisible} direction="horizontal">
diff --git a/app/dashboard/src/modals/CaptureKeyboardShortcutModal.tsx b/app/dashboard/src/modals/CaptureKeyboardShortcutModal.tsx
index 7114cf4549eb..6ff805e61189 100644
--- a/app/dashboard/src/modals/CaptureKeyboardShortcutModal.tsx
+++ b/app/dashboard/src/modals/CaptureKeyboardShortcutModal.tsx
@@ -67,7 +67,6 @@ export default function CaptureKeyboardShortcutModal(props: CaptureKeyboardShort
   return (
     <Modal centered className="bg-dim">
       <form
-        data-testid="confirm-delete-modal"
         ref={(element) => {
           element?.focus()
         }}
diff --git a/app/dashboard/src/modals/ConfirmDeleteModal.tsx b/app/dashboard/src/modals/ConfirmDeleteModal.tsx
index b549e14a3785..8c3f8b7ac004 100644
--- a/app/dashboard/src/modals/ConfirmDeleteModal.tsx
+++ b/app/dashboard/src/modals/ConfirmDeleteModal.tsx
@@ -26,13 +26,7 @@ export default function ConfirmDeleteModal(props: ConfirmDeleteModalProps) {
   return (
     <Dialog title={getText('areYouSure')} modalProps={defaultOpen == null ? {} : { defaultOpen }}>
       {({ close }) => (
-        <Form
-          schema={z.object({})}
-          method="dialog"
-          data-testid="confirm-delete-modal"
-          tabIndex={-1}
-          onSubmit={doDelete}
-        >
+        <Form schema={z.object({})} method="dialog" tabIndex={-1} onSubmit={doDelete}>
           <Text className="relative">{getText('confirmPrompt', actionText)}</Text>
           <ButtonGroup className="relative">
             <Form.Submit variant="delete" className="relative">
diff --git a/app/dashboard/src/modals/NewUserGroupModal.tsx b/app/dashboard/src/modals/NewUserGroupModal.tsx
index 4bb4b62b3cb7..2114ae1500a9 100644
--- a/app/dashboard/src/modals/NewUserGroupModal.tsx
+++ b/app/dashboard/src/modals/NewUserGroupModal.tsx
@@ -74,7 +74,6 @@ export default function NewUserGroupModal(props: NewUserGroupModalProps) {
       )}
     >
       <form
-        data-testid="new-user-group-modal"
         tabIndex={-1}
         className="pointer-events-auto relative flex w-new-label-modal flex-col gap-modal rounded-default p-modal-wide pb-3 pt-modal before:absolute before:inset before:h-full before:w-full before:rounded-default before:bg-selected-frame before:backdrop-blur-default"
         style={positionEvent == null ? {} : { left: positionEvent.pageX, top: positionEvent.pageY }}
diff --git a/app/dashboard/src/modals/UpsertSecretModal.tsx b/app/dashboard/src/modals/UpsertSecretModal.tsx
index e19306f3352d..c006d69aa811 100644
--- a/app/dashboard/src/modals/UpsertSecretModal.tsx
+++ b/app/dashboard/src/modals/UpsertSecretModal.tsx
@@ -11,12 +11,13 @@ import type { SecretId } from '#/services/Backend'
 export interface UpsertSecretModalProps {
   readonly id: SecretId | null
   readonly name: string | null
+  readonly defaultOpen?: boolean
   readonly doCreate: (name: string, value: string) => Promise<void> | void
 }
 
 /** A modal for creating and editing a secret. */
 export default function UpsertSecretModal(props: UpsertSecretModalProps) {
-  const { id, name: nameRaw, doCreate } = props
+  const { id, name: nameRaw, defaultOpen, doCreate } = props
   const { getText } = useText()
 
   const isCreatingSecret = id == null
@@ -25,6 +26,7 @@ export default function UpsertSecretModal(props: UpsertSecretModalProps) {
   return (
     <Dialog
       title={isCreatingSecret ? getText('newSecret') : getText('editSecret')}
+      modalProps={defaultOpen == null ? {} : { defaultOpen }}
       isDismissable={false}
     >
       <Form
diff --git a/app/dashboard/src/services/RemoteBackend.ts b/app/dashboard/src/services/RemoteBackend.ts
index 4ba85cbd1ab5..05ae4a3b05b3 100644
--- a/app/dashboard/src/services/RemoteBackend.ts
+++ b/app/dashboard/src/services/RemoteBackend.ts
@@ -64,7 +64,7 @@ function responseIsSuccessful(response: Response) {
 /** Whether the given directory is a special directory that cannot be written to. */
 export function isSpecialReadonlyDirectoryId(id: backend.AssetId) {
   return (
-    id !== remoteBackendPaths.USERS_DIRECTORY_ID && id !== remoteBackendPaths.TEAMS_DIRECTORY_ID
+    id === remoteBackendPaths.USERS_DIRECTORY_ID || id === remoteBackendPaths.TEAMS_DIRECTORY_ID
   )
 }
 
diff --git a/app/ide-desktop/common/src/text/english.json b/app/ide-desktop/common/src/text/english.json
index a4d9ba561ae9..150c74e6e66c 100644
--- a/app/ide-desktop/common/src/text/english.json
+++ b/app/ide-desktop/common/src/text/english.json
@@ -379,6 +379,7 @@
   "thisFolderIsEmpty": "This folder is empty.",
   "yourTrashIsEmpty": "Your trash is empty.",
   "deleteTheAssetTypeTitle": "delete the $0 '$1'",
+  "trashTheAssetTypeTitle": "move the $0 '$1' to Trash",
   "notImplemetedYet": "Not implemented yet.",
   "newLabelButtonLabel": "new label",
   "settingUsername": "Setting username...",
@@ -658,6 +659,7 @@
   "accessedByProjectsColumnName": "Accessed by projects",
   "accessedDataColumnName": "Accessed data",
   "docsColumnName": "Docs",
+  "rootFolderColumnName": "Root folder",
 
   "settingsShortcut": "Settings",
   "closeTabShortcut": "Close Tab",
diff --git a/app/ide-desktop/common/src/text/index.ts b/app/ide-desktop/common/src/text/index.ts
index 012acd4ffd42..5a143e69eec9 100644
--- a/app/ide-desktop/common/src/text/index.ts
+++ b/app/ide-desktop/common/src/text/index.ts
@@ -43,6 +43,7 @@ interface PlaceholderOverrides {
   readonly deleteUserGroupActionText: [groupName: string]
   readonly removeUserFromUserGroupActionText: [userName: string, groupName: string]
   readonly confirmPrompt: [action: string]
+  readonly trashTheAssetTypeTitle: [assetType: string, assetName: string]
   readonly deleteTheAssetTypeTitle: [assetType: string, assetName: string]
   readonly couldNotInviteUser: [userEmail: string]
   readonly filesWithoutConflicts: [fileCount: number]