diff --git a/src/main/frontend/app/components/file-structure/editor-file-structure.tsx b/src/main/frontend/app/components/file-structure/editor-file-structure.tsx
index 54f9f050..1476efd9 100644
--- a/src/main/frontend/app/components/file-structure/editor-file-structure.tsx
+++ b/src/main/frontend/app/components/file-structure/editor-file-structure.tsx
@@ -7,6 +7,9 @@ import '/styles/editor-files.css'
 import AltArrowRightIcon from '../../../icons/solar/Alt Arrow Right.svg?react'
 import AltArrowDownIcon from '../../../icons/solar/Alt Arrow Down.svg?react'
 import CodeIcon from '../../../icons/solar/Code.svg?react'
+import CodeFileIcon from '../../../icons/solar/Code File.svg?react'
+import TrashBinIcon from '../../../icons/solar/Trash Bin.svg?react'
+import Pen from '../../../icons/solar/Pen.svg?react'
 import { useShortcut } from '~/hooks/use-shortcut'
 import type { ContextMenuState } from './use-file-tree-context-menu'
 
@@ -114,6 +117,15 @@ export default function EditorFileStructure() {
     [selectedItemId, buildContextForItem],
   )
 
+  const triggerItemAction = useCallback(
+    (itemId: TreeItemIndex, action: (menuState: ContextMenuState) => void) => {
+      void buildContextForItem(itemId).then((menuState) => {
+        if (menuState) action(menuState)
+      })
+    },
+    [buildContextForItem],
+  )
+
   useShortcut({
     'explorer.new-file': () => triggerExplorerAction(editorContextMenu.handleNewFile, false),
     'explorer.new-folder': () => triggerExplorerAction(editorContextMenu.handleNewFolder, false),
@@ -285,6 +297,7 @@ export default function EditorFileStructure() {
     context: TreeItemRenderContext
   }) => {
     const Icon = item.isFolder ? (context.isExpanded ? FolderOpenIcon : FolderIcon) : CodeIcon
+    const isRoot = (item.data as { projectRoot?: boolean }).projectRoot ?? false
 
     const searchLower = searchTerm.toLowerCase()
     const titleLower = title.toLowerCase()
@@ -310,28 +323,103 @@ export default function EditorFileStructure() {
 
     const isHighlighted = highlightedItemId === item.index
 
+    const actionBtnClass = 'cursor-pointer rounded p-0.5 hover:bg-hover flex-shrink-0'
+
     return (
       <div
-        className="flex h-full w-full cursor-pointer items-center"
+        className="group/row flex h-full w-full items-center"
         onContextMenu={(e) => editorContextMenu.openContextMenu(e, item.index)}
       >
         {Icon && <Icon className="fill-foreground w-4 flex-shrink-0" />}
         <span
-          className={`ml-1 overflow-hidden text-nowrap text-ellipsis ${
+          className={`ml-1 min-w-0 flex-1 overflow-hidden text-nowrap text-ellipsis ${
             isHighlighted ? 'outline-foreground-active rounded-sm px-1 outline-2' : ''
           }`}
         >
           {highlightedTitle}
         </span>
+        <div className="ml-1 hidden items-center gap-0.5 group-hover/row:flex">
+          {item.isFolder && (
+            <button
+              className={actionBtnClass}
+              title="New File"
+              onClick={(mouseEvent) => {
+                mouseEvent.stopPropagation()
+                triggerItemAction(item.index, editorContextMenu.handleNewFile)
+              }}
+            >
+              <CodeFileIcon className="fill-foreground h-3.5 w-3.5" />
+            </button>
+          )}
+          {item.isFolder && (
+            <button
+              className={actionBtnClass}
+              title="New Folder"
+              onClick={(mouseEvent) => {
+                mouseEvent.stopPropagation()
+                triggerItemAction(item.index, editorContextMenu.handleNewFolder)
+              }}
+            >
+              <FolderIcon className="fill-foreground h-3.5 w-3.5" />
+            </button>
+          )}
+          {!isRoot && (
+            <button
+              className={actionBtnClass}
+              title="Rename"
+              onClick={(mouseEvent) => {
+                mouseEvent.stopPropagation()
+                triggerItemAction(item.index, editorContextMenu.handleRename)
+              }}
+            >
+              <Pen className="stroke-foreground h-3.5 w-3.5" />
+            </button>
+          )}
+          {!isRoot && (
+            <button
+              className={actionBtnClass}
+              title="Delete"
+              onClick={(mouseEvent) => {
+                mouseEvent.stopPropagation()
+                triggerItemAction(item.index, editorContextMenu.handleDelete)
+              }}
+            >
+              <TrashBinIcon className="fill-foreground h-3.5 w-3.5" />
+            </button>
+          )}
+        </div>
       </div>
     )
   }
 
   if (!dataProvider) return <LoadingSpinner message="Loading files..." className="p-8" />
 
+  const toolbarBtnClass = 'cursor-pointer rounded p-1 hover:bg-hover text-foreground'
+
   return (
     <>
-      <Search onChange={(e) => setSearchTerm(e.target.value)} />
+      <div className="border-border flex items-center justify-between border-b px-2 py-1">
+        <span className="text-foreground/50 text-xs font-semibold tracking-wider uppercase">Explorer</span>
+        <div className="flex items-center gap-0.5">
+          <button
+            className={toolbarBtnClass}
+            title="New File"
+            onClick={() => triggerExplorerAction(editorContextMenu.handleNewFile, false)}
+          >
+            <CodeFileIcon className="fill-foreground h-4 w-4" />
+          </button>
+          <button
+            className={toolbarBtnClass}
+            title="New Folder"
+            onClick={() => triggerExplorerAction(editorContextMenu.handleNewFolder, false)}
+          >
+            <FolderIcon className="fill-foreground h-4 w-4" />
+          </button>
+        </div>
+      </div>
+      <div className="mt-2">
+        <Search onChange={(changeEvent) => setSearchTerm(changeEvent.target.value)} />
+      </div>
       <div
         className="h-full overflow-auto pr-2"
         onContextMenu={(e) => {
diff --git a/src/main/frontend/app/routes/editor/editor.tsx b/src/main/frontend/app/routes/editor/editor.tsx
index a33647d1..bb85b71d 100644
--- a/src/main/frontend/app/routes/editor/editor.tsx
+++ b/src/main/frontend/app/routes/editor/editor.tsx
@@ -671,19 +671,19 @@ export default function CodeEditor() {
       <>
         <div className="flex h-12 items-center justify-between pr-4">
           <SidebarHeader side={SidebarSide.LEFT} title="Files" />
-          <div className="border-border ml-auto flex overflow-hidden rounded border text-sm">
-            <button
-              onClick={() => setLeftTab('files')}
-              className={clsx(
-                'cursor-pointer px-3 py-1 transition-colors',
-                leftTab === 'files'
-                  ? 'bg-selected text-foreground font-medium'
-                  : 'hover:bg-foreground-active text-muted-foreground',
-              )}
-            >
-              Files
-            </button>
-            {isGitRepo && (
+          {isGitRepo && (
+            <div className="border-border ml-auto flex overflow-hidden rounded border text-sm">
+              <button
+                onClick={() => setLeftTab('files')}
+                className={clsx(
+                  'cursor-pointer px-3 py-1 transition-colors',
+                  leftTab === 'files'
+                    ? 'bg-selected text-foreground font-medium'
+                    : 'hover:bg-foreground-active text-muted-foreground',
+                )}
+              >
+                Files
+              </button>
               <button
                 onClick={() => setLeftTab('git')}
                 className={clsx(
@@ -695,8 +695,8 @@ export default function CodeEditor() {
               >
                 Git
               </button>
-            )}
-          </div>
+            </div>
+          )}
         </div>
         {leftTab === 'files' && <EditorFileStructure />}
         {leftTab !== 'files' && isGitRepo && (
diff --git a/src/main/frontend/icons/solar/Pen.svg b/src/main/frontend/icons/solar/Pen.svg
new file mode 100644
index 00000000..42c3852a
--- /dev/null
+++ b/src/main/frontend/icons/solar/Pen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" color="#000000" fill="none" viewBox="0 0 24 24"><path d="M22 10.5V12C22 16.714 22 19.0711 20.5355 20.5355C19.0711 22 16.714 22 12 22C7.28595 22 4.92893 22 3.46447 20.5355C2 19.0711 2 16.714 2 12C2 7.28595 2 4.92893 3.46447 3.46447C4.92893 2 7.28595 2 12 2H13.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"></path><path d="M16.652 3.45506L17.3009 2.80624C18.3759 1.73125 20.1188 1.73125 21.1938 2.80624C22.2687 3.88124 22.2687 5.62415 21.1938 6.69914L20.5449 7.34795M16.652 3.45506C16.652 3.45506 16.7331 4.83379 17.9497 6.05032C19.1662 7.26685 20.5449 7.34795 20.5449 7.34795M16.652 3.45506L10.6872 9.41993C10.2832 9.82394 10.0812 10.0259 9.90743 10.2487C9.70249 10.5114 9.52679 10.7957 9.38344 11.0965C9.26191 11.3515 9.17157 11.6225 8.99089 12.1646L8.41242 13.9M20.5449 7.34795L14.5801 13.3128C14.1761 13.7168 13.9741 13.9188 13.7513 14.0926C13.4886 14.2975 13.2043 14.4732 12.9035 14.6166C12.6485 14.7381 12.3775 14.8284 11.8354 15.0091L10.1 15.5876M10.1 15.5876L8.97709 15.9619C8.71035 16.0508 8.41626 15.9814 8.21744 15.7826C8.01862 15.5837 7.9492 15.2897 8.03811 15.0229L8.41242 13.9M10.1 15.5876L8.41242 13.9" stroke="currentColor" stroke-width="1.5"></path></svg>