diff --git a/src/components/Sidebars/FileSideBar/FileSidebar.tsx b/src/components/Sidebars/FileSideBar/FileSidebar.tsx
index 6f1502549..de5ac5b1d 100644
--- a/src/components/Sidebars/FileSideBar/FileSidebar.tsx
+++ b/src/components/Sidebars/FileSideBar/FileSidebar.tsx
@@ -2,8 +2,12 @@ import React, { useEffect, useState } from 'react'
 import { FileInfoNode, FileInfoTree } from 'electron/main/filesystem/types'
 import { FixedSizeList } from 'react-window'
 import { isFileNodeDirectory } from '@shared/utils'
-import { YStack } from 'tamagui'
+import { XStack, YStack } from 'tamagui'
+import { HiOutlinePencilAlt } from 'react-icons/hi'
+import { VscNewFolder } from 'react-icons/vsc'
 import { useFileContext } from '@/contexts/FileContext'
+import { useModalOpeners } from '@/contexts/ModalContext'
+import { useContentContext } from '@/contexts/ContentContext'
 import FileItemRows from './FileItemRows'
 
 const getFilesAndIndentationsForSidebar = (
@@ -34,6 +38,8 @@ const FileSidebar: React.FC<FileExplorerProps> = ({ lheight }) => {
   // const { state, actions } = useThemeManager()
   const [listHeight, setListHeight] = useState(lheight ?? window.innerHeight - 50)
   const { vaultFilesTree, expandedDirectories, renameFile, setSelectedDirectory } = useFileContext()
+  const { setIsNewDirectoryModalOpen } = useModalOpeners()
+  const { createUntitledNote } = useContentContext()
 
   const handleDrop = async (e: React.DragEvent) => {
     e.preventDefault()
@@ -67,6 +73,26 @@ const FileSidebar: React.FC<FileExplorerProps> = ({ lheight }) => {
   const itemCount = filesAndIndentations.length
   return (
     <YStack className="h-full grow px-1 pt-2" backgroundColor="$gray3">
+      <XStack className="mb-1 items-center justify-start gap-1 px-1">
+        <YStack
+          alignItems="center"
+          justifyContent="center"
+          hoverStyle={{ backgroundColor: '$gray7' }}
+          className="size-5 cursor-pointer rounded opacity-60 hover:opacity-90"
+          onPress={() => createUntitledNote()}
+        >
+          <HiOutlinePencilAlt className="text-gray-300" color="gray" size={16} title="New Note" />
+        </YStack>
+        <YStack
+          alignItems="center"
+          justifyContent="center"
+          hoverStyle={{ backgroundColor: '$gray7' }}
+          className="size-5 cursor-pointer rounded opacity-60 hover:opacity-90"
+          onPress={() => setIsNewDirectoryModalOpen(true)}
+        >
+          <VscNewFolder className="text-gray-300" color="gray" size={16} title="New Directory" />
+        </YStack>
+      </XStack>
       <div onDrop={handleDrop} onDragOver={handleDragOver} onClick={handleClick}>
         <FixedSizeList
           height={listHeight}
diff --git a/src/components/Sidebars/IconsSidebar.tsx b/src/components/Sidebars/IconsSidebar.tsx
index 06242499f..ca8546ce7 100644
--- a/src/components/Sidebars/IconsSidebar.tsx
+++ b/src/components/Sidebars/IconsSidebar.tsx
@@ -2,14 +2,13 @@ import React, { useState } from 'react'
 
 import { GrNewWindow } from 'react-icons/gr'
 import { MdSettings } from 'react-icons/md'
-import { VscNewFolder } from 'react-icons/vsc'
-import { HiOutlinePencilAlt } from 'react-icons/hi'
+// New folder and new note icons removed from nav (moved to Files sidebar)
 
 import { Files, MessageCircle, Search, Moon, SunMoon } from '@tamagui/lucide-icons'
 import { YStack } from 'tamagui'
 import { useModalOpeners } from '../../contexts/ModalContext'
 import { useChatContext } from '@/contexts/ChatContext'
-import { useContentContext } from '@/contexts/ContentContext'
+// Removed new note action from nav; handled in Files sidebar
 import { useThemeManager } from '@/contexts/ThemeContext'
 import InitialSetupSinglePage from '../Settings/InitialSettingsSinglePage'
 
@@ -22,8 +21,7 @@ const IconsSidebar: React.FC<IconsSidebarProps> = ({ getShortcutDescription }) =
   const [showVaultSetup, setShowVaultSetup] = useState(false)
 
   const { state, actions } = useThemeManager() // State => theme, actions => toggle, set, syncWithSystem
-  const { isSettingsModalOpen, setIsSettingsModalOpen, setIsNewDirectoryModalOpen } = useModalOpeners()
-  const { createUntitledNote } = useContentContext()
+  const { isSettingsModalOpen, setIsSettingsModalOpen } = useModalOpeners()
 
   const handleAllInitialSettingsAreReady = () => {
     setShowVaultSetup(false)
@@ -92,44 +90,7 @@ const IconsSidebar: React.FC<IconsSidebarProps> = ({ getShortcutDescription }) =
           />
         </YStack>
       </div>
-      <div
-        className="flex h-8 w-full cursor-pointer items-center justify-center border-none bg-transparent "
-        onClick={() => createUntitledNote()}
-      >
-        <YStack
-          alignItems="center"
-          hoverStyle={{
-            backgroundColor: '$gray7',
-          }}
-          className="flex size-4/5 items-center justify-center rounded"
-        >
-          <HiOutlinePencilAlt
-            className="text-gray-200"
-            color="gray"
-            size={22}
-            title={getShortcutDescription('open-new-note') || 'New Note'}
-          />
-        </YStack>
-      </div>
-      <div
-        className="mt-[2px] flex h-8 w-full cursor-pointer items-center justify-center border-none bg-transparent "
-        onClick={() => setIsNewDirectoryModalOpen(true)}
-      >
-        <YStack
-          alignItems="center"
-          hoverStyle={{
-            backgroundColor: '$gray7',
-          }}
-          className="flex size-4/5 items-center justify-center rounded"
-        >
-          <VscNewFolder
-            className="text-gray-200"
-            color="gray"
-            size={18}
-            title={getShortcutDescription('open-new-directory-modal') || 'New Directory'}
-          />
-        </YStack>
-      </div>
+      {/* New Note and New Directory actions moved into Files sidebar header */}
 
       <div className="grow border-yellow-300" />
       <div className="flex h-8 w-full cursor-pointer items-center justify-center border-none bg-transparent">