diff --git a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2
index baac847d54..260d4c3670 100644
Binary files a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 and b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 differ
diff --git a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
index b2c1f72eaf..da5a97585c 100644
--- a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
+++ b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
@@ -7,6 +7,7 @@ export default /** @type {const} */ ([
   'auto_delete',
   'book_5',
   'brush',
+  'close',
   'code',
   'content_copy',
   'create_new_folder',
diff --git a/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx b/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
index 59e06b00ef..bcac7c4ba9 100644
--- a/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
@@ -6,11 +6,13 @@ import React from 'react'
 import { useCommandProvider } from '@/features/ide-react/hooks/use-command-provider'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
 import FileTreeActionButton from './file-tree-action-button'
+import { useRailContext } from '../../contexts/rail-context'
 
 export default function FileTreeActionButtons() {
   const { t } = useTranslation()
   const { fileTreeReadOnly } = useFileTreeData()
   const { write } = usePermissionsContext()
+  const { handlePaneCollapse } = useRailContext()
 
   const {
     canCreate,
@@ -102,6 +104,12 @@ export default function FileTreeActionButtons() {
           iconType="delete"
         />
       )}
+      <FileTreeActionButton
+        id="close"
+        description={t('close')}
+        onClick={handlePaneCollapse}
+        iconType="close"
+      />
     </div>
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx b/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx
index 94ac2f42af..47d45c6c46 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx
@@ -2,6 +2,7 @@ import { useTranslation } from 'react-i18next'
 import { useRailContext } from '../contexts/rail-context'
 import OLIconButton from '@/features/ui/components/ol/ol-icon-button'
 import React from 'react'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 
 export default function RailPanelHeader({
   title,
@@ -18,13 +19,19 @@ export default function RailPanelHeader({
 
       <div className="rail-panel-header-actions">
         {actions}
-        <OLIconButton
-          onClick={handlePaneCollapse}
-          className="rail-panel-header-button-subdued"
-          icon="close"
-          accessibilityLabel={t('close')}
-          size="sm"
-        />
+        <OLTooltip
+          id="close-rail-panel"
+          description={t('close')}
+          overlayProps={{ placement: 'bottom' }}
+        >
+          <OLIconButton
+            onClick={handlePaneCollapse}
+            className="rail-panel-header-button-subdued"
+            icon="close"
+            accessibilityLabel={t('close')}
+            size="sm"
+          />
+        </OLTooltip>
       </div>
     </header>
   )
diff --git a/services/web/frontend/js/shared/components/panel-heading.tsx b/services/web/frontend/js/shared/components/panel-heading.tsx
index 356fbaa904..08952a5fd1 100644
--- a/services/web/frontend/js/shared/components/panel-heading.tsx
+++ b/services/web/frontend/js/shared/components/panel-heading.tsx
@@ -2,6 +2,7 @@ import { FC } from 'react'
 import SplitTestBadge from '@/shared/components/split-test-badge'
 import MaterialIcon from '@/shared/components/material-icon'
 import { useTranslation } from 'react-i18next'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 
 export const PanelHeading: FC<
   React.PropsWithChildren<{
@@ -26,15 +27,20 @@ export const PanelHeading: FC<
       </div>
 
       {children}
-
-      <button
-        type="button"
-        className="btn panel-heading-close-button"
-        aria-label={t('close')}
-        onClick={handleClose}
+      <OLTooltip
+        id="close-panel"
+        description={t('close')}
+        overlayProps={{ placement: 'bottom' }}
       >
-        <MaterialIcon type="close" />
-      </button>
+        <button
+          type="button"
+          className="btn panel-heading-close-button"
+          aria-label={t('close')}
+          onClick={handleClose}
+        >
+          <MaterialIcon type="close" />
+        </button>
+      </OLTooltip>
     </div>
   )
 }