From 53b5833ed9d3ec3bd5e7add2a206dbd32265634b Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Mon, 17 Mar 2025 11:13:31 +0000
Subject: [PATCH 01/18] Optimize File Icons in file-tree to Match Those in
 file-list

---
 services/repository/files/tree.go          |  5 ++
 web_src/js/components/ViewFileTreeItem.vue | 78 ++++++++++------------
 2 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
index 9142416347c0c..36bb3d85c9d6b 100644
--- a/services/repository/files/tree.go
+++ b/services/repository/files/tree.go
@@ -6,6 +6,7 @@ package files
 import (
 	"context"
 	"fmt"
+	"html/template"
 	"net/url"
 	"path"
 	"sort"
@@ -14,8 +15,10 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/reqctx"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/templates"
 	"code.gitea.io/gitea/modules/util"
 )
 
@@ -142,6 +145,7 @@ func entryModeString(entryMode git.EntryMode) string {
 type TreeViewNode struct {
 	EntryName    string          `json:"entryName"`
 	EntryMode    string          `json:"entryMode"`
+	FileIcon     template.HTML   `json:"fileIcon"`
 	FullPath     string          `json:"fullPath"`
 	SubmoduleURL string          `json:"submoduleUrl,omitempty"`
 	Children     []*TreeViewNode `json:"children,omitempty"`
@@ -155,6 +159,7 @@ func newTreeViewNodeFromEntry(ctx context.Context, commit *git.Commit, parentDir
 	node := &TreeViewNode{
 		EntryName: entry.Name(),
 		EntryMode: entryModeString(entry.Mode()),
+		FileIcon:  templates.NewRenderUtils(reqctx.FromContext(ctx)).RenderFileIcon(entry),
 		FullPath:  path.Join(parentDir, entry.Name()),
 	}
 
diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue
index 4dffc86a1b122..4106013e3cf2e 100644
--- a/web_src/js/components/ViewFileTreeItem.vue
+++ b/web_src/js/components/ViewFileTreeItem.vue
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
 import {SvgIcon} from '../svg.ts';
-import {ref} from 'vue';
+import {onMounted, ref} from 'vue';
 
 type Item = {
   entryName: string;
   entryMode: string;
+  fileIcon: string;
   fullPath: string;
   submoduleUrl?: string;
   children?: Item[];
@@ -17,9 +18,15 @@ const props = defineProps<{
   selectedItem?: string,
 }>();
 
+const elRoot = ref<HTMLElement | null>(null);
 const isLoading = ref(false);
 const children = ref(props.item.children);
 const collapsed = ref(!props.item.children);
+const isDirectory = ref(!(
+  props.item.entryMode === 'commit' ||
+  props.item.entryMode === 'symlink' ||
+  props.item.entryMode !== 'tree'
+));
 
 const doLoadChildren = async () => {
   collapsed.value = !collapsed.value;
@@ -45,59 +52,40 @@ const doLoadFileContent = () => {
 const doGotoSubModule = () => {
   location.href = props.item.submoduleUrl;
 };
+
+const doItemAction = () => {
+  if (props.item.entryMode === 'symlink' || props.item.entryMode === 'tree') {
+    doLoadFileContent();
+  } else if (props.item.entryMode === 'commit') {
+    doGotoSubModule();
+  } else {
+    doLoadDirContent();
+  }
+};
+
+onMounted(async () => {
+  elRoot.value.querySelector('.item-icon svg')?.classList?.add('preview-square');
+});
 </script>
 
 <!--title instead of tooltip above as the tooltip needs too much work with the current methods, i.e. not being loaded or staying open for "too long"-->
 <template>
   <div
-    v-if="item.entryMode === 'commit'" class="tree-item type-submodule"
-    :title="item.entryName"
-    @click.stop="doGotoSubModule"
-  >
-    <!-- submodule -->
-    <div class="item-content">
-      <SvgIcon class="text primary" name="octicon-file-submodule"/>
-      <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
-    </div>
-  </div>
-  <div
-    v-else-if="item.entryMode === 'symlink'" class="tree-item type-symlink"
-    :class="{'selected': selectedItem === item.fullPath}"
-    :title="item.entryName"
-    @click.stop="doLoadFileContent"
-  >
-    <!-- symlink -->
-    <div class="item-content">
-      <SvgIcon name="octicon-file-symlink-file"/>
-      <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
-    </div>
-  </div>
-  <div
-    v-else-if="item.entryMode !== 'tree'" class="tree-item type-file"
-    :class="{'selected': selectedItem === item.fullPath}"
-    :title="item.entryName"
-    @click.stop="doLoadFileContent"
-  >
-    <!-- file -->
-    <div class="item-content">
-      <SvgIcon name="octicon-file"/>
-      <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
-    </div>
-  </div>
-  <div
-    v-else class="tree-item type-directory"
-    :class="{'selected': selectedItem === item.fullPath}"
+    ref="elRoot"
+    class="tree-item"
+    :class="{'selected': selectedItem === item.fullPath, 'type-directory': isDirectory}"
     :title="item.entryName"
-    @click.stop="doLoadDirContent"
+    @click.stop="doItemAction"
   >
-    <!-- directory -->
-    <div class="item-toggle">
+    <div v-if="isDirectory" class="item-toggle">
+      <!-- directory -->
       <SvgIcon v-if="isLoading" name="octicon-sync" class="job-status-rotate"/>
       <SvgIcon v-else :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'" @click.stop="doLoadChildren"/>
     </div>
     <div class="item-content">
-      <SvgIcon class="text primary" :name="collapsed ? 'octicon-file-directory-fill' : 'octicon-file-directory-open-fill'"/>
-      <span class="gt-ellipsis">{{ item.entryName }}</span>
+      <SvgIcon v-if="isDirectory" class="text primary" :name="collapsed ? 'octicon-file-directory-fill' : 'octicon-file-directory-open-fill'"/>
+      <span v-else class="item-icon" v-html="item.fileIcon"/>
+      <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
     </div>
   </div>
 
@@ -153,4 +141,8 @@ const doGotoSubModule = () => {
   text-overflow: ellipsis;
   min-width: 0;
 }
+
+.item-content .item-icon {
+  display: contents;
+}
 </style>

From b478654c44acd012ec7eeb0bc19cb3f351871054 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Tue, 18 Mar 2025 07:14:10 +0000
Subject: [PATCH 02/18] on the diff page also remains consistent

---
 routers/web/repo/commit.go                 |  2 +-
 routers/web/repo/compare.go                | 14 +++++++-------
 routers/web/repo/pull.go                   | 13 +++++++------
 routers/web/repo/treelist.go               |  8 +++++++-
 web_src/js/components/DiffFileTreeItem.vue | 11 ++---------
 web_src/js/utils/filetree.ts               |  1 +
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index bbdcf9875eee8..68c03ad11feef 100644
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -370,7 +370,7 @@ func Diff(ctx *context.Context) {
 			return
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, nil)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, commit, diffTree, nil)
 	}
 
 	statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, commitID, db.ListOptionsAll)
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index 6cea95e387a5a..ae15a5f3ad92e 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -638,6 +638,12 @@ func PrepareCompareDiff(
 	ctx.Data["Diff"] = diff
 	ctx.Data["DiffNotAvailable"] = diffShortStat.NumFiles == 0
 
+	headCommit, err := ci.HeadGitRepo.GetCommit(headCommitID)
+	if err != nil {
+		ctx.ServerError("GetCommit", err)
+		return false
+	}
+
 	if !fileOnly {
 		diffTree, err := gitdiff.GetDiffTree(ctx, ci.HeadGitRepo, false, beforeCommitID, headCommitID)
 		if err != nil {
@@ -645,13 +651,7 @@ func PrepareCompareDiff(
 			return false
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, nil)
-	}
-
-	headCommit, err := ci.HeadGitRepo.GetCommit(headCommitID)
-	if err != nil {
-		ctx.ServerError("GetCommit", err)
-		return false
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, headCommit, diffTree, nil)
 	}
 
 	baseGitRepo := ctx.Repo.GitRepo
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index e12798f93d200..a4c8311dcd319 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -816,6 +816,12 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		}
 	}
 
+	commit, err := gitRepo.GetCommit(endCommitID)
+	if err != nil {
+		ctx.ServerError("GetCommit", err)
+		return
+	}
+
 	if !fileOnly {
 		// note: use mergeBase is set to false because we already have the merge base from the pull request info
 		diffTree, err := gitdiff.GetDiffTree(ctx, gitRepo, false, startCommitID, endCommitID)
@@ -834,7 +840,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 			}
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, filesViewedState)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, commit, diffTree, filesViewedState)
 	}
 
 	ctx.Data["Diff"] = diff
@@ -845,11 +851,6 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		ctx.ServerError("GetCommit", err)
 		return
 	}
-	commit, err := gitRepo.GetCommit(endCommitID)
-	if err != nil {
-		ctx.ServerError("GetCommit", err)
-		return
-	}
 
 	if ctx.IsSigned && ctx.Doer != nil {
 		if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, issue, ctx.Doer); err != nil {
diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
index ab74741e6183a..c3fb0100978b8 100644
--- a/routers/web/repo/treelist.go
+++ b/routers/web/repo/treelist.go
@@ -4,11 +4,14 @@
 package repo
 
 import (
+	"html/template"
 	"net/http"
 
 	pull_model "code.gitea.io/gitea/models/pull"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/reqctx"
+	"code.gitea.io/gitea/modules/templates"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/gitdiff"
 	files_service "code.gitea.io/gitea/services/repository/files"
@@ -59,6 +62,7 @@ func isExcludedEntry(entry *git.TreeEntry) bool {
 type FileDiffFile struct {
 	Name        string
 	NameHash    string
+	FileIcon 		template.HTML
 	IsSubmodule bool
 	IsViewed    bool
 	Status      string
@@ -66,17 +70,19 @@ type FileDiffFile struct {
 
 // transformDiffTreeForUI transforms a DiffTree into a slice of FileDiffFile for UI rendering
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
-func transformDiffTreeForUI(diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
+func transformDiffTreeForUI(ctx *context.Context, commit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
 
 	for _, file := range diffTree.Files {
 		nameHash := git.HashFilePathForWebUI(file.HeadPath)
 		isSubmodule := file.HeadMode == git.EntryModeCommit
 		isViewed := filesViewedState[file.HeadPath] == pull_model.Viewed
+		entry, _ := commit.GetTreeEntryByPath(file.HeadPath)
 
 		files = append(files, FileDiffFile{
 			Name:        file.HeadPath,
 			NameHash:    nameHash,
+			FileIcon:		 templates.NewRenderUtils(reqctx.FromContext(ctx)).RenderFileIcon(entry),
 			IsSubmodule: isSubmodule,
 			IsViewed:    isViewed,
 			Status:      file.Status,
diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
index 5ee0e5bcaa181..cc92e998daa80 100644
--- a/web_src/js/components/DiffFileTreeItem.vue
+++ b/web_src/js/components/DiffFileTreeItem.vue
@@ -2,7 +2,7 @@
 import {SvgIcon, type SvgName} from '../svg.ts';
 import {diffTreeStore} from '../modules/stores.ts';
 import {ref} from 'vue';
-import type {Item, File, FileStatus} from '../utils/filetree.ts';
+import type {Item, FileStatus} from '../utils/filetree.ts';
 
 defineProps<{
   item: Item,
@@ -22,13 +22,6 @@ function getIconForDiffStatus(pType: FileStatus) {
   };
   return diffTypes[pType];
 }
-
-function fileIcon(file: File) {
-  if (file.IsSubmodule) {
-    return 'octicon-file-submodule';
-  }
-  return 'octicon-file';
-}
 </script>
 
 <template>
@@ -39,7 +32,7 @@ function fileIcon(file: File) {
     :title="item.name" :href="'#diff-' + item.file.NameHash"
   >
     <!-- file -->
-    <SvgIcon :name="fileIcon(item.file)"/>
+    <span class="item-icon" v-html="item.file.FileIcon"/>
     <span class="gt-ellipsis tw-flex-1">{{ item.name }}</span>
     <SvgIcon
       :name="getIconForDiffStatus(item.file.Status).name"
diff --git a/web_src/js/utils/filetree.ts b/web_src/js/utils/filetree.ts
index 35f9f58189faa..77ff41af3f685 100644
--- a/web_src/js/utils/filetree.ts
+++ b/web_src/js/utils/filetree.ts
@@ -5,6 +5,7 @@ export type FileStatus = 'added' | 'modified' | 'deleted' | 'renamed' | 'copied'
 export type File = {
   Name: string;
   NameHash: string;
+  FileIcon: string;
   Status: FileStatus;
   IsViewed: boolean;
   IsSubmodule: boolean;

From 888296b2b2ec5eb36b4a9b4803b3f4872369892c Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Wed, 19 Mar 2025 02:41:49 +0000
Subject: [PATCH 03/18] fix

---
 modules/fileicon/basic.go                  | 14 +++++++++++++-
 modules/fileicon/material.go               |  8 ++++++--
 modules/templates/util_render.go           |  7 +++++++
 templates/admin/repo/unadopted.tmpl        |  2 +-
 templates/repo/diff/box.tmpl               |  2 ++
 templates/repo/view.tmpl                   |  4 ++++
 templates/repo/view_list.tmpl              |  2 +-
 templates/user/settings/repos.tmpl         |  2 +-
 web_src/js/components/DiffFileTreeItem.vue | 11 +++++++----
 web_src/js/components/ViewFileTreeItem.vue |  5 ++++-
 10 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go
index 040a8e87de063..56f15a9048862 100644
--- a/modules/fileicon/basic.go
+++ b/modules/fileicon/basic.go
@@ -10,6 +10,18 @@ import (
 	"code.gitea.io/gitea/modules/svg"
 )
 
+func BasicThemeFolderIconName(isOpen bool) string {
+	if isOpen {
+		return "octicon-file-directory-open-fill"
+	} else {
+		return "octicon-file-directory-fill"
+	}
+}
+
+func BasicThemeFolderIcon(isOpen bool) template.HTML {
+	return svg.RenderHTML(BasicThemeFolderIconName(isOpen))
+}
+
 func BasicThemeIcon(entry *git.TreeEntry) template.HTML {
 	svgName := "octicon-file"
 	switch {
@@ -19,7 +31,7 @@ func BasicThemeIcon(entry *git.TreeEntry) template.HTML {
 			svgName = "octicon-file-directory-symlink"
 		}
 	case entry.IsDir():
-		svgName = "octicon-file-directory-fill"
+		svgName = BasicThemeFolderIconName(false)
 	case entry.IsSubModule():
 		svgName = "octicon-file-submodule"
 	}
diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go
index aa31cd8d7c855..fe08a1ae77bf5 100644
--- a/modules/fileicon/material.go
+++ b/modules/fileicon/material.go
@@ -85,6 +85,10 @@ func (m *MaterialIconProvider) renderFileIconSVG(ctx reqctx.RequestContext, name
 	return template.HTML(svg)
 }
 
+func (m *MaterialIconProvider) FolderIcon(ctx reqctx.RequestContext, isOpen bool) template.HTML {
+	return svg.RenderHTML("material-folder-generic", 16, BasicThemeFolderIconName(isOpen))
+}
+
 func (m *MaterialIconProvider) FileIcon(ctx reqctx.RequestContext, entry *git.TreeEntry) template.HTML {
 	if m.rules == nil {
 		return BasicThemeIcon(entry)
@@ -102,14 +106,14 @@ func (m *MaterialIconProvider) FileIcon(ctx reqctx.RequestContext, entry *git.Tr
 	if name == "folder" {
 		// the material icon pack's "folder" icon doesn't look good, so use our built-in one
 		// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
-		return svg.RenderHTML("material-folder-generic", 16, "octicon-file-directory-fill")
+		return m.FolderIcon(ctx, false)
 	}
 	if iconSVG, ok := m.svgs[name]; ok && iconSVG != "" {
 		// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
 		extraClass := "octicon-file"
 		switch {
 		case entry.IsDir():
-			extraClass = "octicon-file-directory-fill"
+			extraClass = BasicThemeFolderIconName(false)
 		case entry.IsSubModule():
 			extraClass = "octicon-file-submodule"
 		}
diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
index 27316bbfecf5d..22e5c0cd6bdf4 100644
--- a/modules/templates/util_render.go
+++ b/modules/templates/util_render.go
@@ -181,6 +181,13 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
 		textColor, itemColor, itemHTML)
 }
 
+func (ut *RenderUtils) RenderFolderIcon(isOpen bool) template.HTML {
+	if setting.UI.FileIconTheme == "material" {
+		return fileicon.DefaultMaterialIconProvider().FolderIcon(ut.ctx, isOpen)
+	}
+	return fileicon.BasicThemeFolderIcon(isOpen)
+}
+
 func (ut *RenderUtils) RenderFileIcon(entry *git.TreeEntry) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
 		return fileicon.DefaultMaterialIconProvider().FileIcon(ut.ctx, entry)
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 6f26fa529159a..fa6f10324fba4 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -21,7 +21,7 @@
 					<div class="ui aligned divided list">
 						{{range $dirI, $dir := .Dirs}}
 							<div class="item tw-flex tw-items-center">
-								<span class="tw-flex-1"> {{svg "octicon-file-directory-fill"}} {{$dir}}</span>
+								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderFolderIcon false}} {{$dir}}</span>
 								<div>
 									<button class="ui button primary show-modal tw-p-2" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</button>
 									<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 19f2efecb7774..8b276f530226f 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -15,6 +15,8 @@
 					const diffTreeIcon = `.octicon-sidebar-${diffTreeVisible ? 'expand' : 'collapse'}`;
 					diffTreeBtn.querySelector(diffTreeIcon).classList.remove('tw-hidden');
 					diffTreeBtn.setAttribute('data-tooltip-content', diffTreeBtn.getAttribute(diffTreeVisible ? 'data-hide-text' : 'data-show-text'));
+					window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIcon false}};
+					window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIcon true}};
 				</script>
 			{{end}}
 			{{if not .DiffNotAvailable}}
diff --git a/templates/repo/view.tmpl b/templates/repo/view.tmpl
index c3d562003dcbc..eaa0ce56bcf18 100644
--- a/templates/repo/view.tmpl
+++ b/templates/repo/view.tmpl
@@ -1,4 +1,8 @@
 {{template "base/head" .}}
+<script type="module">
+window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIcon false}};
+window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIcon true}};
+</script>
 <div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if or .TreeNames .IsBlame}}fluid padded{{end}}">
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 4745110dd2176..04d89e4f7e885 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -6,7 +6,7 @@
 	</div>
 	{{if .HasParentPath}}
 	<a class="repo-file-line parent-link silenced" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">
-		{{svg "octicon-file-directory-fill"}} ..
+		{{ctx.RenderUtils.RenderFolderIcon false}} ..
 	</a>
 	{{end}}
 	{{range $item := .Files}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 4aed8070de04b..71df9216e04c8 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -30,7 +30,7 @@
 											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
 										{{end}}
 									{{else}}
-										<span class="icon tw-inline-block tw-pt-2">{{svg "octicon-file-directory-fill"}}</span>
+										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderFolderIcon false}}</span>
 										<span class="name tw-inline-block tw-pt-2">{{$.ContextUser.Name}}/{{$dir}}</span>
 										<div class="tw-float-right">
 											{{if $.allowAdopt}}
diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
index cc92e998daa80..e4979edea14e6 100644
--- a/web_src/js/components/DiffFileTreeItem.vue
+++ b/web_src/js/components/DiffFileTreeItem.vue
@@ -8,6 +8,7 @@ defineProps<{
   item: Item,
 }>();
 
+const {pageData} = window.config;
 const store = diffTreeStore();
 const collapsed = ref(false);
 
@@ -44,10 +45,8 @@ function getIconForDiffStatus(pType: FileStatus) {
     <div class="item-directory" :title="item.name" @click.stop="collapsed = !collapsed">
       <!-- directory -->
       <SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/>
-      <SvgIcon
-        class="text primary"
-        :name="collapsed ? 'octicon-file-directory-fill' : 'octicon-file-directory-open-fill'"
-      />
+      <span v-if="collapsed" class="item-icon" v-html="pageData.folderIcon"/>
+      <span v-else class="item-icon" v-html="pageData.openFolderIcon"/>
       <span class="gt-ellipsis">{{ item.name }}</span>
     </div>
 
@@ -89,6 +88,10 @@ a:hover {
   user-select: none;
 }
 
+.item-directory .item-icon {
+  display: contents;
+}
+
 .item-file,
 .item-directory {
   display: flex;
diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue
index 4106013e3cf2e..368a59ecf5751 100644
--- a/web_src/js/components/ViewFileTreeItem.vue
+++ b/web_src/js/components/ViewFileTreeItem.vue
@@ -11,6 +11,8 @@ type Item = {
   children?: Item[];
 };
 
+const {pageData} = window.config;
+
 const props = defineProps<{
   item: Item,
   navigateViewContent:(treePath: string) => void,
@@ -83,7 +85,8 @@ onMounted(async () => {
       <SvgIcon v-else :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'" @click.stop="doLoadChildren"/>
     </div>
     <div class="item-content">
-      <SvgIcon v-if="isDirectory" class="text primary" :name="collapsed ? 'octicon-file-directory-fill' : 'octicon-file-directory-open-fill'"/>
+      <span v-if="isDirectory && collapsed" class="item-icon" v-html="pageData.folderIcon"/>
+      <span v-else-if="isDirectory && !collapsed" class="item-icon" v-html="pageData.openFolderIcon"/>
       <span v-else class="item-icon" v-html="item.fileIcon"/>
       <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
     </div>

From 451a37c6834eac66680385ba1555d9b82573b43a Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Wed, 19 Mar 2025 03:54:24 +0000
Subject: [PATCH 04/18] fix lint error

---
 modules/fileicon/basic.go                  | 3 +--
 routers/web/repo/treelist.go               | 4 ++--
 web_src/js/components/DiffFileTreeItem.vue | 3 +++
 web_src/js/components/ViewFileTreeItem.vue | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go
index 56f15a9048862..062a1fd2e6e5b 100644
--- a/modules/fileicon/basic.go
+++ b/modules/fileicon/basic.go
@@ -13,9 +13,8 @@ import (
 func BasicThemeFolderIconName(isOpen bool) string {
 	if isOpen {
 		return "octicon-file-directory-open-fill"
-	} else {
-		return "octicon-file-directory-fill"
 	}
+	return "octicon-file-directory-fill"
 }
 
 func BasicThemeFolderIcon(isOpen bool) template.HTML {
diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
index c3fb0100978b8..178197b832f7f 100644
--- a/routers/web/repo/treelist.go
+++ b/routers/web/repo/treelist.go
@@ -62,7 +62,7 @@ func isExcludedEntry(entry *git.TreeEntry) bool {
 type FileDiffFile struct {
 	Name        string
 	NameHash    string
-	FileIcon 		template.HTML
+	FileIcon    template.HTML
 	IsSubmodule bool
 	IsViewed    bool
 	Status      string
@@ -82,7 +82,7 @@ func transformDiffTreeForUI(ctx *context.Context, commit *git.Commit, diffTree *
 		files = append(files, FileDiffFile{
 			Name:        file.HeadPath,
 			NameHash:    nameHash,
-			FileIcon:		 templates.NewRenderUtils(reqctx.FromContext(ctx)).RenderFileIcon(entry),
+			FileIcon:    templates.NewRenderUtils(reqctx.FromContext(ctx)).RenderFileIcon(entry),
 			IsSubmodule: isSubmodule,
 			IsViewed:    isViewed,
 			Status:      file.Status,
diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
index e4979edea14e6..22cc1fa4f3f2b 100644
--- a/web_src/js/components/DiffFileTreeItem.vue
+++ b/web_src/js/components/DiffFileTreeItem.vue
@@ -33,6 +33,7 @@ function getIconForDiffStatus(pType: FileStatus) {
     :title="item.name" :href="'#diff-' + item.file.NameHash"
   >
     <!-- file -->
+    <!-- eslint-disable-next-line vue/no-v-html -->
     <span class="item-icon" v-html="item.file.FileIcon"/>
     <span class="gt-ellipsis tw-flex-1">{{ item.name }}</span>
     <SvgIcon
@@ -45,7 +46,9 @@ function getIconForDiffStatus(pType: FileStatus) {
     <div class="item-directory" :title="item.name" @click.stop="collapsed = !collapsed">
       <!-- directory -->
       <SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/>
+      <!-- eslint-disable-next-line vue/no-v-html -->
       <span v-if="collapsed" class="item-icon" v-html="pageData.folderIcon"/>
+      <!-- eslint-disable-next-line vue/no-v-html -->
       <span v-else class="item-icon" v-html="pageData.openFolderIcon"/>
       <span class="gt-ellipsis">{{ item.name }}</span>
     </div>
diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue
index 368a59ecf5751..67e6e9b5e1e09 100644
--- a/web_src/js/components/ViewFileTreeItem.vue
+++ b/web_src/js/components/ViewFileTreeItem.vue
@@ -85,8 +85,11 @@ onMounted(async () => {
       <SvgIcon v-else :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'" @click.stop="doLoadChildren"/>
     </div>
     <div class="item-content">
+      <!-- eslint-disable-next-line vue/no-v-html -->
       <span v-if="isDirectory && collapsed" class="item-icon" v-html="pageData.folderIcon"/>
+      <!-- eslint-disable-next-line vue/no-v-html -->
       <span v-else-if="isDirectory && !collapsed" class="item-icon" v-html="pageData.openFolderIcon"/>
+      <!-- eslint-disable-next-line vue/no-v-html -->
       <span v-else class="item-icon" v-html="item.fileIcon"/>
       <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
     </div>

From 9269751a39bb63732cf5430e1b0973aa93a138f3 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Wed, 19 Mar 2025 05:54:00 +0000
Subject: [PATCH 05/18] fix tests

---
 services/repository/files/tree_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go
index 8ea54969ceff5..d5db2a5893d21 100644
--- a/services/repository/files/tree_test.go
+++ b/services/repository/files/tree_test.go
@@ -4,6 +4,7 @@
 package files
 
 import (
+	"html/template"
 	"testing"
 
 	"code.gitea.io/gitea/models/unittest"
@@ -68,6 +69,7 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "docs",
 			EntryMode: "tree",
+			FileIcon:  template.HTML(`<svg id="svg-mfi-folder-docs" class="svg git-entry-icon octicon-file-directory-fill" width="16" height="16" aria-hidden="true" viewBox='0 0 32 32'><path fill='#0277bd' d='m13.844 7.536-1.288-1.072A2 2 0 0 0 11.276 6H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h24a2 2 0 0 0 2-2V10a2 2 0 0 0-2-2H15.124a2 2 0 0 1-1.28-.464'/><path fill='#b3e5fc' d='M24 10h-7a1 1 0 0 0-1 1v16a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V16Zm0 16h-6v-2h6Zm4-4H18v-2h10Zm-4.828-5.172V12L28 16.828Z'/></svg>`),
 			FullPath:  "docs",
 		},
 	}, treeNodes)
@@ -78,11 +80,13 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "docs",
 			EntryMode: "tree",
+			FileIcon:  template.HTML(`<svg class="svg git-entry-icon octicon-file-directory-fill" width="16" height="16" aria-hidden="true"><use xlink:href="#svg-mfi-folder-docs"></use></svg>`),
 			FullPath:  "docs",
 			Children: []*TreeViewNode{
 				{
 					EntryName: "README.md",
 					EntryMode: "blob",
+					FileIcon:  template.HTML(`<svg id="svg-mfi-readme" class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true" fill='none' viewBox='0 0 16 16'><path d='M0 0h24v24H0z'/><path fill='#42a5f5' d='M8 1C4.136 1 1 4.136 1 8s3.136 7 7 7 7-3.136 7-7-3.136-7-7-7m1 11H7V7.5h2zm0-6H7V4h2z'/></svg>`),
 					FullPath:  "docs/README.md",
 				},
 			},
@@ -95,6 +99,7 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "README.md",
 			EntryMode: "blob",
+			FileIcon:  template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use xlink:href="#svg-mfi-readme"></use></svg>`),
 			FullPath:  "docs/README.md",
 		},
 	}, treeNodes)

From 68d9e6b920d3580ec6811e0342d1d56872a01c58 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Wed, 19 Mar 2025 07:00:11 +0000
Subject: [PATCH 06/18] fix tests

---
 routers/web/repo/commit.go   |  2 +-
 routers/web/repo/compare.go  | 18 +++++++++---------
 routers/web/repo/pull.go     | 14 +++++++-------
 routers/web/repo/treelist.go |  7 +++++--
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index 68c03ad11feef..f93c4e13e0f12 100644
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -370,7 +370,7 @@ func Diff(ctx *context.Context) {
 			return
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, commit, diffTree, nil)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, parentCommit, commit, diffTree, nil)
 	}
 
 	statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, commitID, db.ListOptionsAll)
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index ae15a5f3ad92e..0986c409074a4 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -644,6 +644,14 @@ func PrepareCompareDiff(
 		return false
 	}
 
+	baseGitRepo := ctx.Repo.GitRepo
+
+	beforeCommit, err := baseGitRepo.GetCommit(beforeCommitID)
+	if err != nil {
+		ctx.ServerError("GetCommit", err)
+		return false
+	}
+
 	if !fileOnly {
 		diffTree, err := gitdiff.GetDiffTree(ctx, ci.HeadGitRepo, false, beforeCommitID, headCommitID)
 		if err != nil {
@@ -651,15 +659,7 @@ func PrepareCompareDiff(
 			return false
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, headCommit, diffTree, nil)
-	}
-
-	baseGitRepo := ctx.Repo.GitRepo
-
-	beforeCommit, err := baseGitRepo.GetCommit(beforeCommitID)
-	if err != nil {
-		ctx.ServerError("GetCommit", err)
-		return false
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, beforeCommit, headCommit, diffTree, nil)
 	}
 
 	commits, err := processGitCommits(ctx, ci.CompareInfo.Commits)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index a4c8311dcd319..9e4139bf8758d 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -822,6 +822,12 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		return
 	}
 
+	baseCommit, err := ctx.Repo.GitRepo.GetCommit(startCommitID)
+	if err != nil {
+		ctx.ServerError("GetCommit", err)
+		return
+	}
+
 	if !fileOnly {
 		// note: use mergeBase is set to false because we already have the merge base from the pull request info
 		diffTree, err := gitdiff.GetDiffTree(ctx, gitRepo, false, startCommitID, endCommitID)
@@ -840,18 +846,12 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 			}
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, commit, diffTree, filesViewedState)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, baseCommit, commit, diffTree, filesViewedState)
 	}
 
 	ctx.Data["Diff"] = diff
 	ctx.Data["DiffNotAvailable"] = diffShortStat.NumFiles == 0
 
-	baseCommit, err := ctx.Repo.GitRepo.GetCommit(startCommitID)
-	if err != nil {
-		ctx.ServerError("GetCommit", err)
-		return
-	}
-
 	if ctx.IsSigned && ctx.Doer != nil {
 		if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, issue, ctx.Doer); err != nil {
 			ctx.ServerError("CanMarkConversation", err)
diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
index 178197b832f7f..a201c4b38953e 100644
--- a/routers/web/repo/treelist.go
+++ b/routers/web/repo/treelist.go
@@ -70,14 +70,17 @@ type FileDiffFile struct {
 
 // transformDiffTreeForUI transforms a DiffTree into a slice of FileDiffFile for UI rendering
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
-func transformDiffTreeForUI(ctx *context.Context, commit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
+func transformDiffTreeForUI(ctx *context.Context, baseCommit *git.Commit, headCommit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
 
 	for _, file := range diffTree.Files {
 		nameHash := git.HashFilePathForWebUI(file.HeadPath)
 		isSubmodule := file.HeadMode == git.EntryModeCommit
 		isViewed := filesViewedState[file.HeadPath] == pull_model.Viewed
-		entry, _ := commit.GetTreeEntryByPath(file.HeadPath)
+		entry, _ := headCommit.GetTreeEntryByPath(file.HeadPath)
+		if entry == nil {
+			entry, _ = baseCommit.GetTreeEntryByPath(file.HeadPath)
+		}
 
 		files = append(files, FileDiffFile{
 			Name:        file.HeadPath,

From e42e4f9ccf1cd24fe769f7a3827d169ff5ff117c Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Wed, 19 Mar 2025 07:06:59 +0000
Subject: [PATCH 07/18] fix tests

---
 routers/web/repo/treelist.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
index a201c4b38953e..3a5bc690fb569 100644
--- a/routers/web/repo/treelist.go
+++ b/routers/web/repo/treelist.go
@@ -70,7 +70,7 @@ type FileDiffFile struct {
 
 // transformDiffTreeForUI transforms a DiffTree into a slice of FileDiffFile for UI rendering
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
-func transformDiffTreeForUI(ctx *context.Context, baseCommit *git.Commit, headCommit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
+func transformDiffTreeForUI(ctx *context.Context, baseCommit, headCommit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
 
 	for _, file := range diffTree.Files {

From d3c7992c8140d72818f9da51b4a0a9c3c1f06cff Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 20 Mar 2025 00:45:08 +0000
Subject: [PATCH 08/18] fix

---
 modules/templates/util_render.go    | 2 +-
 routers/web/repo/treelist.go        | 4 ++--
 templates/admin/repo/unadopted.tmpl | 2 +-
 templates/repo/diff/box.tmpl        | 4 ++--
 templates/repo/view.tmpl            | 4 ++--
 templates/repo/view_list.tmpl       | 2 +-
 templates/user/settings/repos.tmpl  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
index 22e5c0cd6bdf4..95fd124929831 100644
--- a/modules/templates/util_render.go
+++ b/modules/templates/util_render.go
@@ -181,7 +181,7 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
 		textColor, itemColor, itemHTML)
 }
 
-func (ut *RenderUtils) RenderFolderIcon(isOpen bool) template.HTML {
+func (ut *RenderUtils) RenderFolderIconByOpenState(isOpen bool) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
 		return fileicon.DefaultMaterialIconProvider().FolderIcon(ut.ctx, isOpen)
 	}
diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
index 3a5bc690fb569..3e445eb1b08aa 100644
--- a/routers/web/repo/treelist.go
+++ b/routers/web/repo/treelist.go
@@ -72,7 +72,7 @@ type FileDiffFile struct {
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
 func transformDiffTreeForUI(ctx *context.Context, baseCommit, headCommit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
-
+	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
 	for _, file := range diffTree.Files {
 		nameHash := git.HashFilePathForWebUI(file.HeadPath)
 		isSubmodule := file.HeadMode == git.EntryModeCommit
@@ -85,7 +85,7 @@ func transformDiffTreeForUI(ctx *context.Context, baseCommit, headCommit *git.Co
 		files = append(files, FileDiffFile{
 			Name:        file.HeadPath,
 			NameHash:    nameHash,
-			FileIcon:    templates.NewRenderUtils(reqctx.FromContext(ctx)).RenderFileIcon(entry),
+			FileIcon:    renderUtils.RenderFileIcon(entry),
 			IsSubmodule: isSubmodule,
 			IsViewed:    isViewed,
 			Status:      file.Status,
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index fa6f10324fba4..7ea2a86efba7d 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -21,7 +21,7 @@
 					<div class="ui aligned divided list">
 						{{range $dirI, $dir := .Dirs}}
 							<div class="item tw-flex tw-items-center">
-								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderFolderIcon false}} {{$dir}}</span>
+								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderFolderIconByOpenState false}} {{$dir}}</span>
 								<div>
 									<button class="ui button primary show-modal tw-p-2" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</button>
 									<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 8b276f530226f..8682406cdfc74 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -15,8 +15,8 @@
 					const diffTreeIcon = `.octicon-sidebar-${diffTreeVisible ? 'expand' : 'collapse'}`;
 					diffTreeBtn.querySelector(diffTreeIcon).classList.remove('tw-hidden');
 					diffTreeBtn.setAttribute('data-tooltip-content', diffTreeBtn.getAttribute(diffTreeVisible ? 'data-hide-text' : 'data-show-text'));
-					window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIcon false}};
-					window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIcon true}};
+					window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState false}};
+					window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState true}};
 				</script>
 			{{end}}
 			{{if not .DiffNotAvailable}}
diff --git a/templates/repo/view.tmpl b/templates/repo/view.tmpl
index eaa0ce56bcf18..f864d66882fce 100644
--- a/templates/repo/view.tmpl
+++ b/templates/repo/view.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 <script type="module">
-window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIcon false}};
-window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIcon true}};
+window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState false}};
+window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState true}};
 </script>
 <div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 04d89e4f7e885..fd41cce8de3af 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -6,7 +6,7 @@
 	</div>
 	{{if .HasParentPath}}
 	<a class="repo-file-line parent-link silenced" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">
-		{{ctx.RenderUtils.RenderFolderIcon false}} ..
+		{{ctx.RenderUtils.RenderFolderIconByOpenState false}} ..
 	</a>
 	{{end}}
 	{{range $item := .Files}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 71df9216e04c8..d6b73092bed08 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -30,7 +30,7 @@
 											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
 										{{end}}
 									{{else}}
-										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderFolderIcon false}}</span>
+										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderFolderIconByOpenState false}}</span>
 										<span class="name tw-inline-block tw-pt-2">{{$.ContextUser.Name}}/{{$dir}}</span>
 										<div class="tw-float-right">
 											{{if $.allowAdopt}}

From d98cae2d4d7dbfcc707ec857459d29f11f893141 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 20 Mar 2025 01:31:35 +0000
Subject: [PATCH 09/18] fix

---
 services/repository/files/tree.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
index 36bb3d85c9d6b..dcec11001a8bc 100644
--- a/services/repository/files/tree.go
+++ b/services/repository/files/tree.go
@@ -155,11 +155,11 @@ func (node *TreeViewNode) sortLevel() int {
 	return util.Iif(node.EntryMode == "tree" || node.EntryMode == "commit", 0, 1)
 }
 
-func newTreeViewNodeFromEntry(ctx context.Context, commit *git.Commit, parentDir string, entry *git.TreeEntry) *TreeViewNode {
+func newTreeViewNodeFromEntry(ctx context.Context, renderUtils *templates.RenderUtils, commit *git.Commit, parentDir string, entry *git.TreeEntry) *TreeViewNode {
 	node := &TreeViewNode{
 		EntryName: entry.Name(),
 		EntryMode: entryModeString(entry.Mode()),
-		FileIcon:  templates.NewRenderUtils(reqctx.FromContext(ctx)).RenderFileIcon(entry),
+		FileIcon:  renderUtils.RenderFileIcon(entry),
 		FullPath:  path.Join(parentDir, entry.Name()),
 	}
 
@@ -192,11 +192,11 @@ func listTreeNodes(ctx context.Context, commit *git.Commit, tree *git.Tree, tree
 	if err != nil {
 		return nil, err
 	}
-
+	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
 	subPathDirName, subPathRemaining, _ := strings.Cut(subPath, "/")
 	nodes := make([]*TreeViewNode, 0, len(entries))
 	for _, entry := range entries {
-		node := newTreeViewNodeFromEntry(ctx, commit, treePath, entry)
+		node := newTreeViewNodeFromEntry(ctx, renderUtils, commit, treePath, entry)
 		nodes = append(nodes, node)
 		if entry.IsDir() && subPathDirName == entry.Name() {
 			subTreePath := treePath + "/" + node.EntryName

From a8f6d18aceeb9fd665c68c90288a4f509e4cef34 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 20 Mar 2025 03:21:11 +0000
Subject: [PATCH 10/18] fix

---
 services/repository/files/tree.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
index dcec11001a8bc..04f1a761c5715 100644
--- a/services/repository/files/tree.go
+++ b/services/repository/files/tree.go
@@ -155,11 +155,10 @@ func (node *TreeViewNode) sortLevel() int {
 	return util.Iif(node.EntryMode == "tree" || node.EntryMode == "commit", 0, 1)
 }
 
-func newTreeViewNodeFromEntry(ctx context.Context, renderUtils *templates.RenderUtils, commit *git.Commit, parentDir string, entry *git.TreeEntry) *TreeViewNode {
+func newTreeViewNodeFromEntry(ctx context.Context, commit *git.Commit, parentDir string, entry *git.TreeEntry) *TreeViewNode {
 	node := &TreeViewNode{
 		EntryName: entry.Name(),
 		EntryMode: entryModeString(entry.Mode()),
-		FileIcon:  renderUtils.RenderFileIcon(entry),
 		FullPath:  path.Join(parentDir, entry.Name()),
 	}
 
@@ -187,23 +186,23 @@ func sortTreeViewNodes(nodes []*TreeViewNode) {
 	})
 }
 
-func listTreeNodes(ctx context.Context, commit *git.Commit, tree *git.Tree, treePath, subPath string) ([]*TreeViewNode, error) {
+func listTreeNodes(ctx context.Context, renderUtils *templates.RenderUtils, commit *git.Commit, tree *git.Tree, treePath, subPath string) ([]*TreeViewNode, error) {
 	entries, err := tree.ListEntries()
 	if err != nil {
 		return nil, err
 	}
-	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
 	subPathDirName, subPathRemaining, _ := strings.Cut(subPath, "/")
 	nodes := make([]*TreeViewNode, 0, len(entries))
 	for _, entry := range entries {
-		node := newTreeViewNodeFromEntry(ctx, renderUtils, commit, treePath, entry)
+		node := newTreeViewNodeFromEntry(ctx, commit, treePath, entry)
+		node.FileIcon = renderUtils.RenderFileIcon(entry)
 		nodes = append(nodes, node)
 		if entry.IsDir() && subPathDirName == entry.Name() {
 			subTreePath := treePath + "/" + node.EntryName
 			if subTreePath[0] == '/' {
 				subTreePath = subTreePath[1:]
 			}
-			subNodes, err := listTreeNodes(ctx, commit, entry.Tree(), subTreePath, subPathRemaining)
+			subNodes, err := listTreeNodes(ctx, renderUtils, commit, entry.Tree(), subTreePath, subPathRemaining)
 			if err != nil {
 				log.Error("listTreeNodes: %v", err)
 			} else {
@@ -220,5 +219,6 @@ func GetTreeViewNodes(ctx context.Context, commit *git.Commit, treePath, subPath
 	if err != nil {
 		return nil, err
 	}
-	return listTreeNodes(ctx, commit, entry.Tree(), treePath, subPath)
+	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
+	return listTreeNodes(ctx, renderUtils, commit, entry.Tree(), treePath, subPath)
 }

From 4145d5d79b4916342360860d0587067dbd97d024 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 20 Mar 2025 06:26:48 +0000
Subject: [PATCH 11/18] fix

---
 modules/templates/util_render.go           | 10 +++++++++-
 templates/admin/repo/unadopted.tmpl        |  2 +-
 templates/repo/diff/box.tmpl               |  5 +++--
 templates/repo/view.tmpl                   |  4 ++--
 templates/repo/view_list.tmpl              |  2 +-
 templates/user/settings/repos.tmpl         |  2 +-
 web_src/js/components/DiffFileTreeItem.vue |  4 +---
 web_src/js/components/ViewFileTreeItem.vue |  4 +---
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
index 95fd124929831..68bdaca52c94e 100644
--- a/modules/templates/util_render.go
+++ b/modules/templates/util_render.go
@@ -181,7 +181,15 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
 		textColor, itemColor, itemHTML)
 }
 
-func (ut *RenderUtils) RenderFolderIconByOpenState(isOpen bool) template.HTML {
+func (ut *RenderUtils) RenderExpandedFolderIcon() template.HTML {
+	return ut.RenderFolderIconByExpansionState(true)
+}
+
+func (ut *RenderUtils) RenderCollapsedFolderIcon() template.HTML {
+	return ut.RenderFolderIconByExpansionState(false)
+}
+
+func (ut *RenderUtils) RenderFolderIconByExpansionState(isOpen bool) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
 		return fileicon.DefaultMaterialIconProvider().FolderIcon(ut.ctx, isOpen)
 	}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 7ea2a86efba7d..6845065bb3d9b 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -21,7 +21,7 @@
 					<div class="ui aligned divided list">
 						{{range $dirI, $dir := .Dirs}}
 							<div class="item tw-flex tw-items-center">
-								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderFolderIconByOpenState false}} {{$dir}}</span>
+								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderCollapsedFolderIcon}} {{$dir}}</span>
 								<div>
 									<button class="ui button primary show-modal tw-p-2" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</button>
 									<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 8682406cdfc74..e6061b9f7ce46 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -15,8 +15,9 @@
 					const diffTreeIcon = `.octicon-sidebar-${diffTreeVisible ? 'expand' : 'collapse'}`;
 					diffTreeBtn.querySelector(diffTreeIcon).classList.remove('tw-hidden');
 					diffTreeBtn.setAttribute('data-tooltip-content', diffTreeBtn.getAttribute(diffTreeVisible ? 'data-hide-text' : 'data-show-text'));
-					window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState false}};
-					window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState true}};
+
+					window.config.pageData.expandedFolderIcon = {{ctx.RenderUtils.RenderExpandedFolderIcon}};
+					window.config.pageData.collapsedFolderIcon = {{ctx.RenderUtils.RenderCollapsedFolderIcon}};
 				</script>
 			{{end}}
 			{{if not .DiffNotAvailable}}
diff --git a/templates/repo/view.tmpl b/templates/repo/view.tmpl
index f864d66882fce..6ecd25915cd8b 100644
--- a/templates/repo/view.tmpl
+++ b/templates/repo/view.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 <script type="module">
-window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState false}};
-window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState true}};
+window.config.pageData.expandedFolderIcon = {{ctx.RenderUtils.RenderExpandedFolderIcon}};
+window.config.pageData.collapsedFolderIcon = {{ctx.RenderUtils.RenderCollapsedFolderIcon}};
 </script>
 <div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index fd41cce8de3af..f94ec42afff7f 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -6,7 +6,7 @@
 	</div>
 	{{if .HasParentPath}}
 	<a class="repo-file-line parent-link silenced" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">
-		{{ctx.RenderUtils.RenderFolderIconByOpenState false}} ..
+		{{ctx.RenderUtils.RenderCollapsedFolderIcon}} ..
 	</a>
 	{{end}}
 	{{range $item := .Files}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index d6b73092bed08..3c578aa69c8c2 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -30,7 +30,7 @@
 											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
 										{{end}}
 									{{else}}
-										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderFolderIconByOpenState false}}</span>
+										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderCollapsedFolderIcon}}</span>
 										<span class="name tw-inline-block tw-pt-2">{{$.ContextUser.Name}}/{{$dir}}</span>
 										<div class="tw-float-right">
 											{{if $.allowAdopt}}
diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
index 22cc1fa4f3f2b..75fea4f52883b 100644
--- a/web_src/js/components/DiffFileTreeItem.vue
+++ b/web_src/js/components/DiffFileTreeItem.vue
@@ -47,9 +47,7 @@ function getIconForDiffStatus(pType: FileStatus) {
       <!-- directory -->
       <SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/>
       <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-if="collapsed" class="item-icon" v-html="pageData.folderIcon"/>
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-else class="item-icon" v-html="pageData.openFolderIcon"/>
+      <span class="item-icon" v-html="collapsed ? pageData.collapsedFolderIcon : pageData.expandedFolderIcon"/>
       <span class="gt-ellipsis">{{ item.name }}</span>
     </div>
 
diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue
index 67e6e9b5e1e09..4ddd2312b076e 100644
--- a/web_src/js/components/ViewFileTreeItem.vue
+++ b/web_src/js/components/ViewFileTreeItem.vue
@@ -86,9 +86,7 @@ onMounted(async () => {
     </div>
     <div class="item-content">
       <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-if="isDirectory && collapsed" class="item-icon" v-html="pageData.folderIcon"/>
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-else-if="isDirectory && !collapsed" class="item-icon" v-html="pageData.openFolderIcon"/>
+      <span v-if="isDirectory" class="item-icon" v-html="collapsed ? pageData.collapsedFolderIcon : pageData.expandedFolderIcon"/>
       <!-- eslint-disable-next-line vue/no-v-html -->
       <span v-else class="item-icon" v-html="item.fileIcon"/>
       <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>

From 4db35ba36da3a6d443426dfe149de69dd71d24b5 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 20 Mar 2025 08:19:57 +0000
Subject: [PATCH 12/18] fix

---
 modules/fileicon/basic.go         | 16 +++++++++++-----
 modules/fileicon/material.go      | 21 ++++++++++-----------
 modules/git/tree_entry_mode.go    | 20 ++++++++++++++++++++
 modules/git/tree_entry_nogogit.go | 10 +++++-----
 modules/templates/util_render.go  | 14 +++++++++++---
 routers/web/repo/commit.go        |  2 +-
 routers/web/repo/compare.go       |  2 +-
 routers/web/repo/pull.go          |  2 +-
 routers/web/repo/treelist.go      | 16 ++++++++--------
 services/repository/files/tree.go |  2 +-
 templates/repo/view_list.tmpl     |  2 +-
 11 files changed, 70 insertions(+), 37 deletions(-)

diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go
index 062a1fd2e6e5b..7047198a0800c 100644
--- a/modules/fileicon/basic.go
+++ b/modules/fileicon/basic.go
@@ -10,6 +10,12 @@ import (
 	"code.gitea.io/gitea/modules/svg"
 )
 
+type FileIcon struct {
+	Name      string
+	Entry     git.TreeEntry
+	EntryMode git.EntryMode
+}
+
 func BasicThemeFolderIconName(isOpen bool) string {
 	if isOpen {
 		return "octicon-file-directory-open-fill"
@@ -21,17 +27,17 @@ func BasicThemeFolderIcon(isOpen bool) template.HTML {
 	return svg.RenderHTML(BasicThemeFolderIconName(isOpen))
 }
 
-func BasicThemeIcon(entry *git.TreeEntry) template.HTML {
+func BasicThemeIcon(file *FileIcon) template.HTML {
 	svgName := "octicon-file"
 	switch {
-	case entry.IsLink():
+	case file.EntryMode.IsLink():
 		svgName = "octicon-file-symlink-file"
-		if te, err := entry.FollowLink(); err == nil && te.IsDir() {
+		if te, err := file.Entry.FollowLink(); err == nil && te.IsDir() {
 			svgName = "octicon-file-directory-symlink"
 		}
-	case entry.IsDir():
+	case file.EntryMode.IsDir():
 		svgName = BasicThemeFolderIconName(false)
-	case entry.IsSubModule():
+	case file.EntryMode.IsSubModule():
 		svgName = "octicon-file-submodule"
 	}
 	return svg.RenderHTML(svgName)
diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go
index fe08a1ae77bf5..462440f44707c 100644
--- a/modules/fileicon/material.go
+++ b/modules/fileicon/material.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 	"sync"
 
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/options"
@@ -89,20 +88,20 @@ func (m *MaterialIconProvider) FolderIcon(ctx reqctx.RequestContext, isOpen bool
 	return svg.RenderHTML("material-folder-generic", 16, BasicThemeFolderIconName(isOpen))
 }
 
-func (m *MaterialIconProvider) FileIcon(ctx reqctx.RequestContext, entry *git.TreeEntry) template.HTML {
+func (m *MaterialIconProvider) FileIcon(ctx reqctx.RequestContext, file *FileIcon) template.HTML {
 	if m.rules == nil {
-		return BasicThemeIcon(entry)
+		return BasicThemeIcon(file)
 	}
 
-	if entry.IsLink() {
-		if te, err := entry.FollowLink(); err == nil && te.IsDir() {
+	if file.EntryMode.IsLink() {
+		if te, err := file.Entry.FollowLink(); err == nil && te.IsDir() {
 			// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
 			return svg.RenderHTML("material-folder-symlink", 16, "octicon-file-directory-symlink")
 		}
 		return svg.RenderHTML("octicon-file-symlink-file") // TODO: find some better icons for them
 	}
 
-	name := m.findIconNameByGit(entry)
+	name := m.findIconNameByGit(file)
 	if name == "folder" {
 		// the material icon pack's "folder" icon doesn't look good, so use our built-in one
 		// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
@@ -112,9 +111,9 @@ func (m *MaterialIconProvider) FileIcon(ctx reqctx.RequestContext, entry *git.Tr
 		// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
 		extraClass := "octicon-file"
 		switch {
-		case entry.IsDir():
+		case file.EntryMode.IsDir():
 			extraClass = BasicThemeFolderIconName(false)
-		case entry.IsSubModule():
+		case file.EntryMode.IsSubModule():
 			extraClass = "octicon-file-submodule"
 		}
 		return m.renderFileIconSVG(ctx, name, iconSVG, extraClass)
@@ -163,9 +162,9 @@ func (m *MaterialIconProvider) FindIconName(name string, isDir bool) string {
 	return "file"
 }
 
-func (m *MaterialIconProvider) findIconNameByGit(entry *git.TreeEntry) string {
-	if entry.IsSubModule() {
+func (m *MaterialIconProvider) findIconNameByGit(file *FileIcon) string {
+	if file.EntryMode.IsSubModule() {
 		return "folder-git"
 	}
-	return m.FindIconName(entry.Name(), entry.IsDir())
+	return m.FindIconName(file.Name, file.EntryMode.IsDir())
 }
diff --git a/modules/git/tree_entry_mode.go b/modules/git/tree_entry_mode.go
index ec4487549df53..e2024a99aded3 100644
--- a/modules/git/tree_entry_mode.go
+++ b/modules/git/tree_entry_mode.go
@@ -34,6 +34,26 @@ func (e EntryMode) String() string {
 	return strconv.FormatInt(int64(e), 8)
 }
 
+func (e EntryMode) IsSubModule() bool {
+	return e == EntryModeCommit
+}
+
+func (e EntryMode) IsDir() bool {
+	return e == EntryModeTree
+}
+
+func (e EntryMode) IsLink() bool {
+	return e == EntryModeSymlink
+}
+
+func (e EntryMode) IsRegular() bool {
+	return e == EntryModeBlob
+}
+
+func (e EntryMode) IsExecutable() bool {
+	return e == EntryModeExec
+}
+
 // ToEntryMode converts a string to an EntryMode
 func ToEntryMode(value string) EntryMode {
 	v, _ := strconv.ParseInt(value, 8, 32)
diff --git a/modules/git/tree_entry_nogogit.go b/modules/git/tree_entry_nogogit.go
index 81fb638d56fbe..0c0e1835f172d 100644
--- a/modules/git/tree_entry_nogogit.go
+++ b/modules/git/tree_entry_nogogit.go
@@ -59,27 +59,27 @@ func (te *TreeEntry) Size() int64 {
 
 // IsSubModule if the entry is a sub module
 func (te *TreeEntry) IsSubModule() bool {
-	return te.entryMode == EntryModeCommit
+	return te.entryMode.IsSubModule()
 }
 
 // IsDir if the entry is a sub dir
 func (te *TreeEntry) IsDir() bool {
-	return te.entryMode == EntryModeTree
+	return te.entryMode.IsDir()
 }
 
 // IsLink if the entry is a symlink
 func (te *TreeEntry) IsLink() bool {
-	return te.entryMode == EntryModeSymlink
+	return te.entryMode.IsLink()
 }
 
 // IsRegular if the entry is a regular file
 func (te *TreeEntry) IsRegular() bool {
-	return te.entryMode == EntryModeBlob
+	return te.entryMode.IsRegular()
 }
 
 // IsExecutable if the entry is an executable file (not necessarily binary)
 func (te *TreeEntry) IsExecutable() bool {
-	return te.entryMode == EntryModeExec
+	return te.entryMode.IsExecutable()
 }
 
 // Blob returns the blob object the entry
diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
index 68bdaca52c94e..1bd3bbd7c01b3 100644
--- a/modules/templates/util_render.go
+++ b/modules/templates/util_render.go
@@ -196,11 +196,19 @@ func (ut *RenderUtils) RenderFolderIconByExpansionState(isOpen bool) template.HT
 	return fileicon.BasicThemeFolderIcon(isOpen)
 }
 
-func (ut *RenderUtils) RenderFileIcon(entry *git.TreeEntry) template.HTML {
+func (ut *RenderUtils) RenderFileIconByGitTreeEntry(entry *git.TreeEntry) template.HTML {
+	return ut.RenderFileIcon(&fileicon.FileIcon{
+		Name:      entry.Name(),
+		Entry:     *entry,
+		EntryMode: entry.Mode(),
+	})
+}
+
+func (ut *RenderUtils) RenderFileIcon(file *fileicon.FileIcon) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
-		return fileicon.DefaultMaterialIconProvider().FileIcon(ut.ctx, entry)
+		return fileicon.DefaultMaterialIconProvider().FileIcon(ut.ctx, file)
 	}
-	return fileicon.BasicThemeIcon(entry)
+	return fileicon.BasicThemeIcon(file)
 }
 
 // RenderEmoji renders html text with emoji post processors
diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index f93c4e13e0f12..da265cabbd41d 100644
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -370,7 +370,7 @@ func Diff(ctx *context.Context) {
 			return
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, parentCommit, commit, diffTree, nil)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, diffTree, nil)
 	}
 
 	statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, commitID, db.ListOptionsAll)
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index 0986c409074a4..aaa259f7f5141 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -659,7 +659,7 @@ func PrepareCompareDiff(
 			return false
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, beforeCommit, headCommit, diffTree, nil)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, diffTree, nil)
 	}
 
 	commits, err := processGitCommits(ctx, ci.CompareInfo.Commits)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 9e4139bf8758d..d112b1221138e 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -846,7 +846,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 			}
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, baseCommit, commit, diffTree, filesViewedState)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, diffTree, filesViewedState)
 	}
 
 	ctx.Data["Diff"] = diff
diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
index 3e445eb1b08aa..62157274bd9b5 100644
--- a/routers/web/repo/treelist.go
+++ b/routers/web/repo/treelist.go
@@ -9,6 +9,7 @@ import (
 
 	pull_model "code.gitea.io/gitea/models/pull"
 	"code.gitea.io/gitea/modules/base"
+	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/reqctx"
 	"code.gitea.io/gitea/modules/templates"
@@ -70,22 +71,21 @@ type FileDiffFile struct {
 
 // transformDiffTreeForUI transforms a DiffTree into a slice of FileDiffFile for UI rendering
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
-func transformDiffTreeForUI(ctx *context.Context, baseCommit, headCommit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
+func transformDiffTreeForUI(ctx *context.Context, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
 	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
 	for _, file := range diffTree.Files {
 		nameHash := git.HashFilePathForWebUI(file.HeadPath)
 		isSubmodule := file.HeadMode == git.EntryModeCommit
 		isViewed := filesViewedState[file.HeadPath] == pull_model.Viewed
-		entry, _ := headCommit.GetTreeEntryByPath(file.HeadPath)
-		if entry == nil {
-			entry, _ = baseCommit.GetTreeEntryByPath(file.HeadPath)
-		}
 
 		files = append(files, FileDiffFile{
-			Name:        file.HeadPath,
-			NameHash:    nameHash,
-			FileIcon:    renderUtils.RenderFileIcon(entry),
+			Name:     file.HeadPath,
+			NameHash: nameHash,
+			FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
+				Name:      file.HeadPath,
+				EntryMode: file.HeadMode,
+			}),
 			IsSubmodule: isSubmodule,
 			IsViewed:    isViewed,
 			Status:      file.Status,
diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
index 04f1a761c5715..a2c10edc19bf2 100644
--- a/services/repository/files/tree.go
+++ b/services/repository/files/tree.go
@@ -195,7 +195,7 @@ func listTreeNodes(ctx context.Context, renderUtils *templates.RenderUtils, comm
 	nodes := make([]*TreeViewNode, 0, len(entries))
 	for _, entry := range entries {
 		node := newTreeViewNodeFromEntry(ctx, commit, treePath, entry)
-		node.FileIcon = renderUtils.RenderFileIcon(entry)
+		node.FileIcon = renderUtils.RenderFileIconByGitTreeEntry(entry)
 		nodes = append(nodes, node)
 		if entry.IsDir() && subPathDirName == entry.Name() {
 			subTreePath := treePath + "/" + node.EntryName
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index f94ec42afff7f..dde3e3384ffa6 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -15,7 +15,7 @@
 			{{$commit := $item.Commit}}
 			{{$submoduleFile := $item.SubmoduleFile}}
 			<div class="repo-file-cell name muted-links {{if not $commit}}notready{{end}}">
-				{{ctx.RenderUtils.RenderFileIcon $entry}}
+				{{ctx.RenderUtils.RenderFileIconByGitTreeEntry $entry}}
 				{{if $entry.IsSubModule}}
 					{{$submoduleLink := $submoduleFile.SubmoduleWebLink ctx}}
 					{{if $submoduleLink}}

From 9ce6848cc863d06411c6000e1eaad123ca6a18af Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 20 Mar 2025 11:11:42 +0000
Subject: [PATCH 13/18] fix

---
 modules/fileicon/material.go | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go
index 462440f44707c..5261dbbd3c91e 100644
--- a/modules/fileicon/material.go
+++ b/modules/fileicon/material.go
@@ -85,7 +85,12 @@ func (m *MaterialIconProvider) renderFileIconSVG(ctx reqctx.RequestContext, name
 }
 
 func (m *MaterialIconProvider) FolderIcon(ctx reqctx.RequestContext, isOpen bool) template.HTML {
-	return svg.RenderHTML("material-folder-generic", 16, BasicThemeFolderIconName(isOpen))
+	// return svg.RenderHTML("material-folder-generic", 16, BasicThemeFolderIconName(isOpen))
+	iconName := "folder"
+	if isOpen {
+		iconName = "folder-open"
+	}
+	return m.renderIconByName(ctx, iconName, BasicThemeFolderIconName(isOpen))
 }
 
 func (m *MaterialIconProvider) FileIcon(ctx reqctx.RequestContext, file *FileIcon) template.HTML {
@@ -102,20 +107,21 @@ func (m *MaterialIconProvider) FileIcon(ctx reqctx.RequestContext, file *FileIco
 	}
 
 	name := m.findIconNameByGit(file)
-	if name == "folder" {
-		// the material icon pack's "folder" icon doesn't look good, so use our built-in one
-		// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
-		return m.FolderIcon(ctx, false)
+
+	extraClass := "octicon-file"
+	switch {
+	case file.EntryMode.IsDir():
+		extraClass = BasicThemeFolderIconName(false)
+	case file.EntryMode.IsSubModule():
+		extraClass = "octicon-file-submodule"
 	}
+
+	return m.renderIconByName(ctx, name, extraClass)
+}
+
+func (m *MaterialIconProvider) renderIconByName(ctx reqctx.RequestContext, name, extraClass string) template.HTML {
 	if iconSVG, ok := m.svgs[name]; ok && iconSVG != "" {
 		// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
-		extraClass := "octicon-file"
-		switch {
-		case file.EntryMode.IsDir():
-			extraClass = BasicThemeFolderIconName(false)
-		case file.EntryMode.IsSubModule():
-			extraClass = "octicon-file-submodule"
-		}
 		return m.renderFileIconSVG(ctx, name, iconSVG, extraClass)
 	}
 	return svg.RenderHTML("octicon-file")

From 5587b9d1b314e110ca9cb3a8f91defa8324e0136 Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Fri, 21 Mar 2025 01:10:31 +0000
Subject: [PATCH 14/18] fix

---
 services/repository/files/tree_test.go | 33 +++++++++++++++++++-------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go
index d5db2a5893d21..26e738eedd974 100644
--- a/services/repository/files/tree_test.go
+++ b/services/repository/files/tree_test.go
@@ -4,12 +4,14 @@
 package files
 
 import (
-	"html/template"
 	"testing"
 
 	"code.gitea.io/gitea/models/unittest"
+	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/reqctx"
 	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/templates"
 	"code.gitea.io/gitea/services/contexttest"
 
 	"github.com/stretchr/testify/assert"
@@ -62,6 +64,7 @@ func TestGetTreeViewNodes(t *testing.T) {
 	contexttest.LoadUser(t, ctx, 2)
 	contexttest.LoadGitRepo(t, ctx)
 	defer ctx.Repo.GitRepo.Close()
+	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
 
 	treeNodes, err := GetTreeViewNodes(ctx, ctx.Repo.Commit, "", "")
 	assert.NoError(t, err)
@@ -69,8 +72,11 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "docs",
 			EntryMode: "tree",
-			FileIcon:  template.HTML(`<svg id="svg-mfi-folder-docs" class="svg git-entry-icon octicon-file-directory-fill" width="16" height="16" aria-hidden="true" viewBox='0 0 32 32'><path fill='#0277bd' d='m13.844 7.536-1.288-1.072A2 2 0 0 0 11.276 6H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h24a2 2 0 0 0 2-2V10a2 2 0 0 0-2-2H15.124a2 2 0 0 1-1.28-.464'/><path fill='#b3e5fc' d='M24 10h-7a1 1 0 0 0-1 1v16a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V16Zm0 16h-6v-2h6Zm4-4H18v-2h10Zm-4.828-5.172V12L28 16.828Z'/></svg>`),
-			FullPath:  "docs",
+			FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
+				Name:      "docs",
+				EntryMode: git.EntryModeTree,
+			}),
+			FullPath: "docs",
 		},
 	}, treeNodes)
 
@@ -80,14 +86,20 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "docs",
 			EntryMode: "tree",
-			FileIcon:  template.HTML(`<svg class="svg git-entry-icon octicon-file-directory-fill" width="16" height="16" aria-hidden="true"><use xlink:href="#svg-mfi-folder-docs"></use></svg>`),
-			FullPath:  "docs",
+			FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
+				Name:      "docs",
+				EntryMode: git.EntryModeTree,
+			}),
+			FullPath: "docs",
 			Children: []*TreeViewNode{
 				{
 					EntryName: "README.md",
 					EntryMode: "blob",
-					FileIcon:  template.HTML(`<svg id="svg-mfi-readme" class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true" fill='none' viewBox='0 0 16 16'><path d='M0 0h24v24H0z'/><path fill='#42a5f5' d='M8 1C4.136 1 1 4.136 1 8s3.136 7 7 7 7-3.136 7-7-3.136-7-7-7m1 11H7V7.5h2zm0-6H7V4h2z'/></svg>`),
-					FullPath:  "docs/README.md",
+					FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
+						Name:      "README.md",
+						EntryMode: git.EntryModeBlob,
+					}),
+					FullPath: "docs/README.md",
 				},
 			},
 		},
@@ -99,8 +111,11 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "README.md",
 			EntryMode: "blob",
-			FileIcon:  template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use xlink:href="#svg-mfi-readme"></use></svg>`),
-			FullPath:  "docs/README.md",
+			FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
+				Name:      "README.md",
+				EntryMode: git.EntryModeBlob,
+			}),
+			FullPath: "docs/README.md",
 		},
 	}, treeNodes)
 }

From f1f786a6f804fde9e6c3f06b45a8457f38d8fd9b Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Fri, 21 Mar 2025 01:33:01 +0000
Subject: [PATCH 15/18] fix

---
 services/repository/files/tree_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go
index 26e738eedd974..ca6776f6373a4 100644
--- a/services/repository/files/tree_test.go
+++ b/services/repository/files/tree_test.go
@@ -10,8 +10,10 @@ import (
 	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/reqctx"
+	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/templates"
+	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/services/contexttest"
 
 	"github.com/stretchr/testify/assert"
@@ -64,6 +66,7 @@ func TestGetTreeViewNodes(t *testing.T) {
 	contexttest.LoadUser(t, ctx, 2)
 	contexttest.LoadGitRepo(t, ctx)
 	defer ctx.Repo.GitRepo.Close()
+	defer test.MockVariableValue(&setting.UI.FileIconTheme, "basic")()
 	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
 
 	treeNodes, err := GetTreeViewNodes(ctx, ctx.Repo.Commit, "", "")

From 07ed21b52caac67e8ac35005e00b8332c003701f Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 3 Apr 2025 03:15:28 +0000
Subject: [PATCH 16/18] fix

---
 modules/fileicon/material.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go
index e18b69a4fae09..56ea176ec53de 100644
--- a/modules/fileicon/material.go
+++ b/modules/fileicon/material.go
@@ -85,7 +85,6 @@ func (m *MaterialIconProvider) renderFileIconSVG(ctx reqctx.RequestContext, name
 }
 
 func (m *MaterialIconProvider) FolderIcon(ctx reqctx.RequestContext, isOpen bool) template.HTML {
-	// return svg.RenderHTML("material-folder-generic", 16, BasicThemeFolderIconName(isOpen))
 	iconName := "folder"
 	if isOpen {
 		iconName = "folder-open"
@@ -125,7 +124,7 @@ func (m *MaterialIconProvider) renderIconByName(ctx reqctx.RequestContext, name,
 		return m.renderFileIconSVG(ctx, name, iconSVG, extraClass)
 	}
 	// TODO: use an interface or wrapper for git.Entry to make the code testable.
-	return BasicThemeIcon(entry)
+	return svg.RenderHTML("octicon-file")
 }
 
 func (m *MaterialIconProvider) findIconNameWithLangID(s string) string {

From a13e13dea3978144f1fab50e7dc9ec15252e1871 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 6 Apr 2025 14:17:53 +0800
Subject: [PATCH 17/18] fix

---
 modules/fileicon/basic.go                  | 29 ++------
 modules/fileicon/material.go               | 71 +++++++-----------
 modules/fileicon/render.go                 | 50 +++++++++++++
 modules/git/error.go                       | 12 +--
 modules/git/tree_entry.go                  | 42 +++++------
 modules/git/tree_entry_mode.go             | 40 ++--------
 modules/git/tree_entry_nogogit.go          | 10 +--
 modules/templates/util_render.go           | 32 --------
 routers/web/repo/commit.go                 |  2 +-
 routers/web/repo/compare.go                | 20 ++---
 routers/web/repo/pull.go                   | 25 +++----
 routers/web/repo/treelist.go               | 21 ++----
 routers/web/repo/view.go                   | 12 +++
 routers/web/repo/view_readme.go            |  2 +-
 services/repository/files/tree.go          | 43 +++++++----
 services/repository/files/tree_test.go     | 31 +-------
 templates/admin/repo/unadopted.tmpl        |  2 +-
 templates/repo/diff/box.tmpl               |  3 -
 templates/repo/view.tmpl                   |  4 -
 templates/repo/view_list.tmpl              |  5 +-
 templates/user/settings/repos.tmpl         |  2 +-
 web_src/js/components/DiffFileTreeItem.vue | 23 +++---
 web_src/js/components/ViewFileTree.vue     | 10 +++
 web_src/js/components/ViewFileTreeItem.vue | 85 ++++++++++++----------
 web_src/js/utils/filetree.ts               |  1 -
 25 files changed, 268 insertions(+), 309 deletions(-)
 create mode 100644 modules/fileicon/render.go

diff --git a/modules/fileicon/basic.go b/modules/fileicon/basic.go
index 7047198a0800c..040a8e87de063 100644
--- a/modules/fileicon/basic.go
+++ b/modules/fileicon/basic.go
@@ -10,34 +10,17 @@ import (
 	"code.gitea.io/gitea/modules/svg"
 )
 
-type FileIcon struct {
-	Name      string
-	Entry     git.TreeEntry
-	EntryMode git.EntryMode
-}
-
-func BasicThemeFolderIconName(isOpen bool) string {
-	if isOpen {
-		return "octicon-file-directory-open-fill"
-	}
-	return "octicon-file-directory-fill"
-}
-
-func BasicThemeFolderIcon(isOpen bool) template.HTML {
-	return svg.RenderHTML(BasicThemeFolderIconName(isOpen))
-}
-
-func BasicThemeIcon(file *FileIcon) template.HTML {
+func BasicThemeIcon(entry *git.TreeEntry) template.HTML {
 	svgName := "octicon-file"
 	switch {
-	case file.EntryMode.IsLink():
+	case entry.IsLink():
 		svgName = "octicon-file-symlink-file"
-		if te, err := file.Entry.FollowLink(); err == nil && te.IsDir() {
+		if te, err := entry.FollowLink(); err == nil && te.IsDir() {
 			svgName = "octicon-file-directory-symlink"
 		}
-	case file.EntryMode.IsDir():
-		svgName = BasicThemeFolderIconName(false)
-	case file.EntryMode.IsSubModule():
+	case entry.IsDir():
+		svgName = "octicon-file-directory-fill"
+	case entry.IsSubModule():
 		svgName = "octicon-file-submodule"
 	}
 	return svg.RenderHTML(svgName)
diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go
index 56ea176ec53de..557f7ca9e47cb 100644
--- a/modules/fileicon/material.go
+++ b/modules/fileicon/material.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"sync"
 
+	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/options"
-	"code.gitea.io/gitea/modules/reqctx"
 	"code.gitea.io/gitea/modules/svg"
 )
 
@@ -61,13 +61,7 @@ func (m *MaterialIconProvider) loadData() {
 	log.Debug("Loaded material icon rules and SVG images")
 }
 
-func (m *MaterialIconProvider) renderFileIconSVG(ctx reqctx.RequestContext, name, svg, extraClass string) template.HTML {
-	data := ctx.GetData()
-	renderedSVGs, _ := data["_RenderedSVGs"].(map[string]bool)
-	if renderedSVGs == nil {
-		renderedSVGs = make(map[string]bool)
-		data["_RenderedSVGs"] = renderedSVGs
-	}
+func (m *MaterialIconProvider) renderFileIconSVG(p *RenderedIconPool, name, svg, extraClass string) template.HTML {
 	// This part is a bit hacky, but it works really well. It should be safe to do so because all SVG icons are generated by us.
 	// Will try to refactor this in the future.
 	if !strings.HasPrefix(svg, "<svg") {
@@ -75,56 +69,41 @@ func (m *MaterialIconProvider) renderFileIconSVG(ctx reqctx.RequestContext, name
 	}
 	svgID := "svg-mfi-" + name
 	svgCommonAttrs := `class="svg git-entry-icon ` + extraClass + `" width="16" height="16" aria-hidden="true"`
-	posOuterBefore := strings.IndexByte(svg, '>')
-	if renderedSVGs[svgID] && posOuterBefore != -1 {
-		return template.HTML(`<svg ` + svgCommonAttrs + `><use xlink:href="#` + svgID + `"></use></svg>`)
+	if p.IconSVGs[svgID] == "" {
+		p.IconSVGs[svgID] = template.HTML(`<svg id="` + svgID + `" ` + svgCommonAttrs + svg[4:])
 	}
-	svg = `<svg id="` + svgID + `" ` + svgCommonAttrs + svg[4:]
-	renderedSVGs[svgID] = true
-	return template.HTML(svg)
+	return template.HTML(`<svg ` + svgCommonAttrs + `><use xlink:href="#` + svgID + `"></use></svg>`)
 }
 
-func (m *MaterialIconProvider) FolderIcon(ctx reqctx.RequestContext, isOpen bool) template.HTML {
-	iconName := "folder"
-	if isOpen {
-		iconName = "folder-open"
-	}
-	return m.renderIconByName(ctx, iconName, BasicThemeFolderIconName(isOpen))
-}
-
-func (m *MaterialIconProvider) FileIcon(ctx reqctx.RequestContext, file *FileIcon) template.HTML {
+func (m *MaterialIconProvider) FileIcon(p *RenderedIconPool, entry *git.TreeEntry) template.HTML {
 	if m.rules == nil {
-		return BasicThemeIcon(file)
+		return BasicThemeIcon(entry)
 	}
 
-	if file.EntryMode.IsLink() {
-		if te, err := file.Entry.FollowLink(); err == nil && te.IsDir() {
+	if entry.IsLink() {
+		if te, err := entry.FollowLink(); err == nil && te.IsDir() {
 			// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
 			return svg.RenderHTML("material-folder-symlink", 16, "octicon-file-directory-symlink")
 		}
 		return svg.RenderHTML("octicon-file-symlink-file") // TODO: find some better icons for them
 	}
 
-	name := m.findIconNameByGit(file)
-
-	extraClass := "octicon-file"
-	switch {
-	case file.EntryMode.IsDir():
-		extraClass = BasicThemeFolderIconName(false)
-	case file.EntryMode.IsSubModule():
-		extraClass = "octicon-file-submodule"
-	}
-
-	return m.renderIconByName(ctx, name, extraClass)
-}
-
-func (m *MaterialIconProvider) renderIconByName(ctx reqctx.RequestContext, name, extraClass string) template.HTML {
-	if iconSVG, ok := m.svgs[name]; ok && iconSVG != "" {
+	name := m.findIconNameByGit(entry)
+	// the material icon pack's "folder" icon doesn't look good, so use our built-in one
+	// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
+	if iconSVG, ok := m.svgs[name]; ok && name != "folder" && iconSVG != "" {
 		// keep the old "octicon-xxx" class name to make some "theme plugin selector" could still work
-		return m.renderFileIconSVG(ctx, name, iconSVG, extraClass)
+		extraClass := "octicon-file"
+		switch {
+		case entry.IsDir():
+			extraClass = "octicon-file-directory-fill"
+		case entry.IsSubModule():
+			extraClass = "octicon-file-submodule"
+		}
+		return m.renderFileIconSVG(p, name, iconSVG, extraClass)
 	}
 	// TODO: use an interface or wrapper for git.Entry to make the code testable.
-	return svg.RenderHTML("octicon-file")
+	return BasicThemeIcon(entry)
 }
 
 func (m *MaterialIconProvider) findIconNameWithLangID(s string) string {
@@ -168,9 +147,9 @@ func (m *MaterialIconProvider) FindIconName(name string, isDir bool) string {
 	return "file"
 }
 
-func (m *MaterialIconProvider) findIconNameByGit(file *FileIcon) string {
-	if file.EntryMode.IsSubModule() {
+func (m *MaterialIconProvider) findIconNameByGit(entry *git.TreeEntry) string {
+	if entry.IsSubModule() {
 		return "folder-git"
 	}
-	return m.FindIconName(file.Name, file.EntryMode.IsDir())
+	return m.FindIconName(entry.Name(), entry.IsDir())
 }
diff --git a/modules/fileicon/render.go b/modules/fileicon/render.go
new file mode 100644
index 0000000000000..9bca86ad97bf3
--- /dev/null
+++ b/modules/fileicon/render.go
@@ -0,0 +1,50 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package fileicon
+
+import (
+	"html/template"
+	"strings"
+
+	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/setting"
+)
+
+type RenderedIconPool struct {
+	IconSVGs map[string]template.HTML
+}
+
+func NewRenderedIconPool() *RenderedIconPool {
+	return &RenderedIconPool{
+		IconSVGs: make(map[string]template.HTML),
+	}
+}
+
+func (p *RenderedIconPool) RenderToHTML() template.HTML {
+	if len(p.IconSVGs) == 0 {
+		return ""
+	}
+	sb := &strings.Builder{}
+	sb.WriteString(`<div class=tw-hidden>`)
+	for _, icon := range p.IconSVGs {
+		sb.WriteString(string(icon))
+	}
+	sb.WriteString(`</div>`)
+	return template.HTML(sb.String())
+}
+
+func RenderEntryIcon(renderedIconPool *RenderedIconPool, entry *git.TreeEntry) template.HTML {
+	if setting.UI.FileIconTheme == "material" {
+		return DefaultMaterialIconProvider().FileIcon(renderedIconPool, entry)
+	}
+	return BasicThemeIcon(entry)
+}
+
+func RenderEntryIconOpen(renderedIconPool *RenderedIconPool, entry *git.TreeEntry) template.HTML {
+	// TODO: add "open icon" support
+	if setting.UI.FileIconTheme == "material" {
+		return DefaultMaterialIconProvider().FileIcon(renderedIconPool, entry)
+	}
+	return BasicThemeIcon(entry)
+}
diff --git a/modules/git/error.go b/modules/git/error.go
index 10fb37be07c13..6c86d1b04d62c 100644
--- a/modules/git/error.go
+++ b/modules/git/error.go
@@ -32,19 +32,19 @@ func (err ErrNotExist) Unwrap() error {
 	return util.ErrNotExist
 }
 
-// ErrBadLink entry.FollowLink error
-type ErrBadLink struct {
+// ErrSymlinkUnresolved entry.FollowLink error
+type ErrSymlinkUnresolved struct {
 	Name    string
 	Message string
 }
 
-func (err ErrBadLink) Error() string {
+func (err ErrSymlinkUnresolved) Error() string {
 	return fmt.Sprintf("%s: %s", err.Name, err.Message)
 }
 
-// IsErrBadLink if some error is ErrBadLink
-func IsErrBadLink(err error) bool {
-	_, ok := err.(ErrBadLink)
+// IsErrSymlinkUnresolved if some error is ErrSymlinkUnresolved
+func IsErrSymlinkUnresolved(err error) bool {
+	_, ok := err.(ErrSymlinkUnresolved)
 	return ok
 }
 
diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go
index 95131214872e6..a2e1579290dcd 100644
--- a/modules/git/tree_entry.go
+++ b/modules/git/tree_entry.go
@@ -8,6 +8,8 @@ import (
 	"io"
 	"sort"
 	"strings"
+
+	"code.gitea.io/gitea/modules/util"
 )
 
 // Type returns the type of the entry (commit, tree, blob)
@@ -25,7 +27,7 @@ func (te *TreeEntry) Type() string {
 // FollowLink returns the entry pointed to by a symlink
 func (te *TreeEntry) FollowLink() (*TreeEntry, error) {
 	if !te.IsLink() {
-		return nil, ErrBadLink{te.Name(), "not a symlink"}
+		return nil, ErrSymlinkUnresolved{te.Name(), "not a symlink"}
 	}
 
 	// read the link
@@ -56,13 +58,13 @@ func (te *TreeEntry) FollowLink() (*TreeEntry, error) {
 	}
 
 	if t == nil {
-		return nil, ErrBadLink{te.Name(), "points outside of repo"}
+		return nil, ErrSymlinkUnresolved{te.Name(), "points outside of repo"}
 	}
 
 	target, err := t.GetTreeEntryByPath(lnk)
 	if err != nil {
 		if IsErrNotExist(err) {
-			return nil, ErrBadLink{te.Name(), "broken link"}
+			return nil, ErrSymlinkUnresolved{te.Name(), "broken link"}
 		}
 		return nil, err
 	}
@@ -70,33 +72,27 @@ func (te *TreeEntry) FollowLink() (*TreeEntry, error) {
 }
 
 // FollowLinks returns the entry ultimately pointed to by a symlink
-func (te *TreeEntry) FollowLinks() (*TreeEntry, error) {
+func (te *TreeEntry) FollowLinks(optLimit ...int) (*TreeEntry, error) {
 	if !te.IsLink() {
-		return nil, ErrBadLink{te.Name(), "not a symlink"}
+		return nil, ErrSymlinkUnresolved{te.Name(), "not a symlink"}
 	}
+	limit := util.OptionalArg(optLimit, 10)
 	entry := te
-	for i := 0; i < 999; i++ {
-		if entry.IsLink() {
-			next, err := entry.FollowLink()
-			if err != nil {
-				return nil, err
-			}
-			if next.ID == entry.ID {
-				return nil, ErrBadLink{
-					entry.Name(),
-					"recursive link",
-				}
-			}
-			entry = next
-		} else {
+	for i := 0; i < limit; i++ {
+		if !entry.IsLink() {
 			break
 		}
+		next, err := entry.FollowLink()
+		if err != nil {
+			return nil, err
+		}
+		if next.ID == entry.ID {
+			return nil, ErrSymlinkUnresolved{entry.Name(), "recursive link"}
+		}
+		entry = next
 	}
 	if entry.IsLink() {
-		return nil, ErrBadLink{
-			te.Name(),
-			"too many levels of symbolic links",
-		}
+		return nil, ErrSymlinkUnresolved{te.Name(), "too many levels of symbolic links"}
 	}
 	return entry, nil
 }
diff --git a/modules/git/tree_entry_mode.go b/modules/git/tree_entry_mode.go
index e2024a99aded3..1193bec4f18c5 100644
--- a/modules/git/tree_entry_mode.go
+++ b/modules/git/tree_entry_mode.go
@@ -17,16 +17,12 @@ const (
 	// EntryModeNoEntry is possible if the file was added or removed in a commit. In the case of
 	// added the base commit will not have the file in its tree so a mode of 0o000000 is used.
 	EntryModeNoEntry EntryMode = 0o000000
-	// EntryModeBlob
-	EntryModeBlob EntryMode = 0o100644
-	// EntryModeExec
-	EntryModeExec EntryMode = 0o100755
-	// EntryModeSymlink
+
+	EntryModeBlob    EntryMode = 0o100644
+	EntryModeExec    EntryMode = 0o100755
 	EntryModeSymlink EntryMode = 0o120000
-	// EntryModeCommit
-	EntryModeCommit EntryMode = 0o160000
-	// EntryModeTree
-	EntryModeTree EntryMode = 0o040000
+	EntryModeCommit  EntryMode = 0o160000
+	EntryModeTree    EntryMode = 0o040000
 )
 
 // String converts an EntryMode to a string
@@ -34,32 +30,6 @@ func (e EntryMode) String() string {
 	return strconv.FormatInt(int64(e), 8)
 }
 
-func (e EntryMode) IsSubModule() bool {
-	return e == EntryModeCommit
-}
-
-func (e EntryMode) IsDir() bool {
-	return e == EntryModeTree
-}
-
-func (e EntryMode) IsLink() bool {
-	return e == EntryModeSymlink
-}
-
-func (e EntryMode) IsRegular() bool {
-	return e == EntryModeBlob
-}
-
-func (e EntryMode) IsExecutable() bool {
-	return e == EntryModeExec
-}
-
-// ToEntryMode converts a string to an EntryMode
-func ToEntryMode(value string) EntryMode {
-	v, _ := strconv.ParseInt(value, 8, 32)
-	return EntryMode(v)
-}
-
 func ParseEntryMode(mode string) (EntryMode, error) {
 	switch mode {
 	case "000000":
diff --git a/modules/git/tree_entry_nogogit.go b/modules/git/tree_entry_nogogit.go
index 0c0e1835f172d..81fb638d56fbe 100644
--- a/modules/git/tree_entry_nogogit.go
+++ b/modules/git/tree_entry_nogogit.go
@@ -59,27 +59,27 @@ func (te *TreeEntry) Size() int64 {
 
 // IsSubModule if the entry is a sub module
 func (te *TreeEntry) IsSubModule() bool {
-	return te.entryMode.IsSubModule()
+	return te.entryMode == EntryModeCommit
 }
 
 // IsDir if the entry is a sub dir
 func (te *TreeEntry) IsDir() bool {
-	return te.entryMode.IsDir()
+	return te.entryMode == EntryModeTree
 }
 
 // IsLink if the entry is a symlink
 func (te *TreeEntry) IsLink() bool {
-	return te.entryMode.IsLink()
+	return te.entryMode == EntryModeSymlink
 }
 
 // IsRegular if the entry is a regular file
 func (te *TreeEntry) IsRegular() bool {
-	return te.entryMode.IsRegular()
+	return te.entryMode == EntryModeBlob
 }
 
 // IsExecutable if the entry is an executable file (not necessarily binary)
 func (te *TreeEntry) IsExecutable() bool {
-	return te.entryMode.IsExecutable()
+	return te.entryMode == EntryModeExec
 }
 
 // Blob returns the blob object the entry
diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
index 1bd3bbd7c01b3..ae397d87c9f62 100644
--- a/modules/templates/util_render.go
+++ b/modules/templates/util_render.go
@@ -15,8 +15,6 @@ import (
 
 	issues_model "code.gitea.io/gitea/models/issues"
 	"code.gitea.io/gitea/modules/emoji"
-	"code.gitea.io/gitea/modules/fileicon"
-	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/htmlutil"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/markup"
@@ -181,36 +179,6 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
 		textColor, itemColor, itemHTML)
 }
 
-func (ut *RenderUtils) RenderExpandedFolderIcon() template.HTML {
-	return ut.RenderFolderIconByExpansionState(true)
-}
-
-func (ut *RenderUtils) RenderCollapsedFolderIcon() template.HTML {
-	return ut.RenderFolderIconByExpansionState(false)
-}
-
-func (ut *RenderUtils) RenderFolderIconByExpansionState(isOpen bool) template.HTML {
-	if setting.UI.FileIconTheme == "material" {
-		return fileicon.DefaultMaterialIconProvider().FolderIcon(ut.ctx, isOpen)
-	}
-	return fileicon.BasicThemeFolderIcon(isOpen)
-}
-
-func (ut *RenderUtils) RenderFileIconByGitTreeEntry(entry *git.TreeEntry) template.HTML {
-	return ut.RenderFileIcon(&fileicon.FileIcon{
-		Name:      entry.Name(),
-		Entry:     *entry,
-		EntryMode: entry.Mode(),
-	})
-}
-
-func (ut *RenderUtils) RenderFileIcon(file *fileicon.FileIcon) template.HTML {
-	if setting.UI.FileIconTheme == "material" {
-		return fileicon.DefaultMaterialIconProvider().FileIcon(ut.ctx, file)
-	}
-	return fileicon.BasicThemeIcon(file)
-}
-
 // RenderEmoji renders html text with emoji post processors
 func (ut *RenderUtils) RenderEmoji(text string) template.HTML {
 	renderedText, err := markup.PostProcessEmoji(markup.NewRenderContext(ut.ctx), template.HTMLEscapeString(text))
diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index 89c47c5968604..3fd1eacb581eb 100644
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -370,7 +370,7 @@ func Diff(ctx *context.Context) {
 			return
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, diffTree, nil)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, nil)
 	}
 
 	statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, commitID, db.ListOptionsAll)
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index db6683fc13ed5..2c36477e6a85f 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -632,6 +632,16 @@ func PrepareCompareDiff(
 	ctx.Data["Diff"] = diff
 	ctx.Data["DiffNotAvailable"] = diffShortStat.NumFiles == 0
 
+	if !fileOnly {
+		diffTree, err := gitdiff.GetDiffTree(ctx, ci.HeadGitRepo, false, beforeCommitID, headCommitID)
+		if err != nil {
+			ctx.ServerError("GetDiffTree", err)
+			return false
+		}
+
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, nil)
+	}
+
 	headCommit, err := ci.HeadGitRepo.GetCommit(headCommitID)
 	if err != nil {
 		ctx.ServerError("GetCommit", err)
@@ -646,16 +656,6 @@ func PrepareCompareDiff(
 		return false
 	}
 
-	if !fileOnly {
-		diffTree, err := gitdiff.GetDiffTree(ctx, ci.HeadGitRepo, false, beforeCommitID, headCommitID)
-		if err != nil {
-			ctx.ServerError("GetDiffTree", err)
-			return false
-		}
-
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, diffTree, nil)
-	}
-
 	commits, err := processGitCommits(ctx, ci.CompareInfo.Commits)
 	if err != nil {
 		ctx.ServerError("processGitCommits", err)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index e40ed458a349d..c72664f8e9035 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -816,18 +816,6 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		}
 	}
 
-	commit, err := gitRepo.GetCommit(endCommitID)
-	if err != nil {
-		ctx.ServerError("GetCommit", err)
-		return
-	}
-
-	baseCommit, err := ctx.Repo.GitRepo.GetCommit(startCommitID)
-	if err != nil {
-		ctx.ServerError("GetCommit", err)
-		return
-	}
-
 	if !fileOnly {
 		// note: use mergeBase is set to false because we already have the merge base from the pull request info
 		diffTree, err := gitdiff.GetDiffTree(ctx, gitRepo, false, startCommitID, endCommitID)
@@ -846,12 +834,23 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 			}
 		}
 
-		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(ctx, diffTree, filesViewedState)
+		ctx.PageData["DiffFiles"] = transformDiffTreeForUI(diffTree, filesViewedState)
 	}
 
 	ctx.Data["Diff"] = diff
 	ctx.Data["DiffNotAvailable"] = diffShortStat.NumFiles == 0
 
+	baseCommit, err := ctx.Repo.GitRepo.GetCommit(startCommitID)
+	if err != nil {
+		ctx.ServerError("GetCommit", err)
+		return
+	}
+	commit, err := gitRepo.GetCommit(endCommitID)
+	if err != nil {
+		ctx.ServerError("GetCommit", err)
+		return
+	}
+
 	if ctx.IsSigned && ctx.Doer != nil {
 		if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, issue, ctx.Doer); err != nil {
 			ctx.ServerError("CanMarkConversation", err)
diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
index 62157274bd9b5..9c5ec8f206731 100644
--- a/routers/web/repo/treelist.go
+++ b/routers/web/repo/treelist.go
@@ -4,15 +4,12 @@
 package repo
 
 import (
-	"html/template"
 	"net/http"
 
 	pull_model "code.gitea.io/gitea/models/pull"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/reqctx"
-	"code.gitea.io/gitea/modules/templates"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/gitdiff"
 	files_service "code.gitea.io/gitea/services/repository/files"
@@ -63,7 +60,6 @@ func isExcludedEntry(entry *git.TreeEntry) bool {
 type FileDiffFile struct {
 	Name        string
 	NameHash    string
-	FileIcon    template.HTML
 	IsSubmodule bool
 	IsViewed    bool
 	Status      string
@@ -71,21 +67,17 @@ type FileDiffFile struct {
 
 // transformDiffTreeForUI transforms a DiffTree into a slice of FileDiffFile for UI rendering
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
-func transformDiffTreeForUI(ctx *context.Context, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
+func transformDiffTreeForUI(diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
-	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
+
 	for _, file := range diffTree.Files {
 		nameHash := git.HashFilePathForWebUI(file.HeadPath)
 		isSubmodule := file.HeadMode == git.EntryModeCommit
 		isViewed := filesViewedState[file.HeadPath] == pull_model.Viewed
 
 		files = append(files, FileDiffFile{
-			Name:     file.HeadPath,
-			NameHash: nameHash,
-			FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
-				Name:      file.HeadPath,
-				EntryMode: file.HeadMode,
-			}),
+			Name:        file.HeadPath,
+			NameHash:    nameHash,
 			IsSubmodule: isSubmodule,
 			IsViewed:    isViewed,
 			Status:      file.Status,
@@ -96,10 +88,11 @@ func transformDiffTreeForUI(ctx *context.Context, diffTree *gitdiff.DiffTree, fi
 }
 
 func TreeViewNodes(ctx *context.Context) {
-	results, err := files_service.GetTreeViewNodes(ctx, ctx.Repo.Commit, ctx.Repo.TreePath, ctx.FormString("sub_path"))
+	renderedIconPool := fileicon.NewRenderedIconPool()
+	results, err := files_service.GetTreeViewNodes(ctx, renderedIconPool, ctx.Repo.Commit, ctx.Repo.TreePath, ctx.FormString("sub_path"))
 	if err != nil {
 		ctx.ServerError("GetTreeViewNodes", err)
 		return
 	}
-	ctx.JSON(http.StatusOK, map[string]any{"fileTreeNodes": results})
+	ctx.JSON(http.StatusOK, map[string]any{"fileTreeNodes": results, "renderedIconPool": renderedIconPool.IconSVGs})
 }
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 6ed5801d10fa7..77240f043156c 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -29,6 +29,7 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/charset"
+	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/lfs"
 	"code.gitea.io/gitea/modules/log"
@@ -252,6 +253,16 @@ func LastCommit(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplRepoViewList)
 }
 
+func prepareDirectoryFileIcons(ctx *context.Context, files []git.CommitInfo) {
+	renderedIconPool := fileicon.NewRenderedIconPool()
+	fileIcons := map[string]template.HTML{}
+	for _, f := range files {
+		fileIcons[f.Entry.Name()] = fileicon.RenderEntryIcon(renderedIconPool, f.Entry)
+	}
+	ctx.Data["FileIcons"] = fileIcons
+	ctx.Data["FileIconPoolHTML"] = renderedIconPool.RenderToHTML()
+}
+
 func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entries {
 	tree, err := ctx.Repo.Commit.SubTree(ctx.Repo.TreePath)
 	if err != nil {
@@ -293,6 +304,7 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
 		return nil
 	}
 	ctx.Data["Files"] = files
+	prepareDirectoryFileIcons(ctx, files)
 	for _, f := range files {
 		if f.Commit == nil {
 			ctx.Data["HasFilesWithoutLatestCommit"] = true
diff --git a/routers/web/repo/view_readme.go b/routers/web/repo/view_readme.go
index 48befe47f8e0e..606ee7ff797e1 100644
--- a/routers/web/repo/view_readme.go
+++ b/routers/web/repo/view_readme.go
@@ -69,7 +69,7 @@ func findReadmeFileInEntries(ctx *context.Context, entries []*git.TreeEntry, try
 			if readmeFiles[i] == nil || base.NaturalSortLess(readmeFiles[i].Name(), entry.Blob().Name()) {
 				if entry.IsLink() {
 					target, err := entry.FollowLinks()
-					if err != nil && !git.IsErrBadLink(err) {
+					if err != nil && !git.IsErrSymlinkUnresolved(err) {
 						return "", nil, err
 					} else if target != nil && (target.IsExecutable() || target.IsRegular()) {
 						readmeFiles[i] = entry
diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
index a2c10edc19bf2..6818e127ba66e 100644
--- a/services/repository/files/tree.go
+++ b/services/repository/files/tree.go
@@ -13,12 +13,11 @@ import (
 	"strings"
 
 	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/reqctx"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/modules/templates"
 	"code.gitea.io/gitea/modules/util"
 )
 
@@ -143,9 +142,13 @@ func entryModeString(entryMode git.EntryMode) string {
 }
 
 type TreeViewNode struct {
-	EntryName    string          `json:"entryName"`
-	EntryMode    string          `json:"entryMode"`
-	FileIcon     template.HTML   `json:"fileIcon"`
+	EntryName     string        `json:"entryName"`
+	EntryMode     string        `json:"entryMode"`
+	EntryIcon     template.HTML `json:"entryIcon"`
+	EntryIconOpen template.HTML `json:"entryIconOpen,omitempty"`
+
+	SymLinkedToMode string `json:"symLinkedToMode,omitempty"` // TODO: for the EntryMode="symlink"
+
 	FullPath     string          `json:"fullPath"`
 	SubmoduleURL string          `json:"submoduleUrl,omitempty"`
 	Children     []*TreeViewNode `json:"children,omitempty"`
@@ -155,13 +158,28 @@ func (node *TreeViewNode) sortLevel() int {
 	return util.Iif(node.EntryMode == "tree" || node.EntryMode == "commit", 0, 1)
 }
 
-func newTreeViewNodeFromEntry(ctx context.Context, commit *git.Commit, parentDir string, entry *git.TreeEntry) *TreeViewNode {
+func newTreeViewNodeFromEntry(ctx context.Context, renderedIconPool *fileicon.RenderedIconPool, commit *git.Commit, parentDir string, entry *git.TreeEntry) *TreeViewNode {
 	node := &TreeViewNode{
 		EntryName: entry.Name(),
 		EntryMode: entryModeString(entry.Mode()),
 		FullPath:  path.Join(parentDir, entry.Name()),
 	}
 
+	if entry.IsLink() {
+		// TODO: symlink to a folder or a file
+		target, err := entry.FollowLinks()
+		if err == nil {
+			_ = target.IsDir()
+			// if target.IsDir() { } else { }
+		}
+	}
+
+	if node.EntryIcon == "" {
+		node.EntryIcon = fileicon.RenderEntryIcon(renderedIconPool, entry)
+		// TODO: no open icon support yet
+		// node.EntryIconOpen = fileicon.RenderFileIconOpen(renderedIconPool, entry)
+	}
+
 	if node.EntryMode == "commit" {
 		if subModule, err := commit.GetSubModule(node.FullPath); err != nil {
 			log.Error("GetSubModule: %v", err)
@@ -186,23 +204,23 @@ func sortTreeViewNodes(nodes []*TreeViewNode) {
 	})
 }
 
-func listTreeNodes(ctx context.Context, renderUtils *templates.RenderUtils, commit *git.Commit, tree *git.Tree, treePath, subPath string) ([]*TreeViewNode, error) {
+func listTreeNodes(ctx context.Context, renderedIconPool *fileicon.RenderedIconPool, commit *git.Commit, tree *git.Tree, treePath, subPath string) ([]*TreeViewNode, error) {
 	entries, err := tree.ListEntries()
 	if err != nil {
 		return nil, err
 	}
+
 	subPathDirName, subPathRemaining, _ := strings.Cut(subPath, "/")
 	nodes := make([]*TreeViewNode, 0, len(entries))
 	for _, entry := range entries {
-		node := newTreeViewNodeFromEntry(ctx, commit, treePath, entry)
-		node.FileIcon = renderUtils.RenderFileIconByGitTreeEntry(entry)
+		node := newTreeViewNodeFromEntry(ctx, renderedIconPool, commit, treePath, entry)
 		nodes = append(nodes, node)
 		if entry.IsDir() && subPathDirName == entry.Name() {
 			subTreePath := treePath + "/" + node.EntryName
 			if subTreePath[0] == '/' {
 				subTreePath = subTreePath[1:]
 			}
-			subNodes, err := listTreeNodes(ctx, renderUtils, commit, entry.Tree(), subTreePath, subPathRemaining)
+			subNodes, err := listTreeNodes(ctx, renderedIconPool, commit, entry.Tree(), subTreePath, subPathRemaining)
 			if err != nil {
 				log.Error("listTreeNodes: %v", err)
 			} else {
@@ -214,11 +232,10 @@ func listTreeNodes(ctx context.Context, renderUtils *templates.RenderUtils, comm
 	return nodes, nil
 }
 
-func GetTreeViewNodes(ctx context.Context, commit *git.Commit, treePath, subPath string) ([]*TreeViewNode, error) {
+func GetTreeViewNodes(ctx context.Context, renderedIconPool *fileicon.RenderedIconPool, commit *git.Commit, treePath, subPath string) ([]*TreeViewNode, error) {
 	entry, err := commit.GetTreeEntryByPath(treePath)
 	if err != nil {
 		return nil, err
 	}
-	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
-	return listTreeNodes(ctx, renderUtils, commit, entry.Tree(), treePath, subPath)
+	return listTreeNodes(ctx, renderedIconPool, commit, entry.Tree(), treePath, subPath)
 }
diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go
index 15fa5c972e6b3..cbb800da01cdf 100644
--- a/services/repository/files/tree_test.go
+++ b/services/repository/files/tree_test.go
@@ -7,13 +7,8 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models/unittest"
-	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/reqctx"
-	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/modules/templates"
-	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/services/contexttest"
 
 	"github.com/stretchr/testify/assert"
@@ -66,8 +61,6 @@ func TestGetTreeViewNodes(t *testing.T) {
 	contexttest.LoadUser(t, ctx, 2)
 	contexttest.LoadGitRepo(t, ctx)
 	defer ctx.Repo.GitRepo.Close()
-	defer test.MockVariableValue(&setting.UI.FileIconTheme, "basic")()
-	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
 
 	treeNodes, err := GetTreeViewNodes(ctx, ctx.Repo.Commit, "", "")
 	assert.NoError(t, err)
@@ -75,11 +68,7 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "docs",
 			EntryMode: "tree",
-			FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
-				Name:      "docs",
-				EntryMode: git.EntryModeTree,
-			}),
-			FullPath: "docs",
+			FullPath:  "docs",
 		},
 	}, treeNodes)
 
@@ -89,20 +78,12 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "docs",
 			EntryMode: "tree",
-			FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
-				Name:      "docs",
-				EntryMode: git.EntryModeTree,
-			}),
-			FullPath: "docs",
+			FullPath:  "docs",
 			Children: []*TreeViewNode{
 				{
 					EntryName: "README.md",
 					EntryMode: "blob",
-					FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
-						Name:      "README.md",
-						EntryMode: git.EntryModeBlob,
-					}),
-					FullPath: "docs/README.md",
+					FullPath:  "docs/README.md",
 				},
 			},
 		},
@@ -114,11 +95,7 @@ func TestGetTreeViewNodes(t *testing.T) {
 		{
 			EntryName: "README.md",
 			EntryMode: "blob",
-			FileIcon: renderUtils.RenderFileIcon(&fileicon.FileIcon{
-				Name:      "README.md",
-				EntryMode: git.EntryModeBlob,
-			}),
-			FullPath: "docs/README.md",
+			FullPath:  "docs/README.md",
 		},
 	}, treeNodes)
 }
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 6845065bb3d9b..6f26fa529159a 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -21,7 +21,7 @@
 					<div class="ui aligned divided list">
 						{{range $dirI, $dir := .Dirs}}
 							<div class="item tw-flex tw-items-center">
-								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderCollapsedFolderIcon}} {{$dir}}</span>
+								<span class="tw-flex-1"> {{svg "octicon-file-directory-fill"}} {{$dir}}</span>
 								<div>
 									<button class="ui button primary show-modal tw-p-2" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</button>
 									<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index e6061b9f7ce46..19f2efecb7774 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -15,9 +15,6 @@
 					const diffTreeIcon = `.octicon-sidebar-${diffTreeVisible ? 'expand' : 'collapse'}`;
 					diffTreeBtn.querySelector(diffTreeIcon).classList.remove('tw-hidden');
 					diffTreeBtn.setAttribute('data-tooltip-content', diffTreeBtn.getAttribute(diffTreeVisible ? 'data-hide-text' : 'data-show-text'));
-
-					window.config.pageData.expandedFolderIcon = {{ctx.RenderUtils.RenderExpandedFolderIcon}};
-					window.config.pageData.collapsedFolderIcon = {{ctx.RenderUtils.RenderCollapsedFolderIcon}};
 				</script>
 			{{end}}
 			{{if not .DiffNotAvailable}}
diff --git a/templates/repo/view.tmpl b/templates/repo/view.tmpl
index 6ecd25915cd8b..c3d562003dcbc 100644
--- a/templates/repo/view.tmpl
+++ b/templates/repo/view.tmpl
@@ -1,8 +1,4 @@
 {{template "base/head" .}}
-<script type="module">
-window.config.pageData.expandedFolderIcon = {{ctx.RenderUtils.RenderExpandedFolderIcon}};
-window.config.pageData.collapsedFolderIcon = {{ctx.RenderUtils.RenderCollapsedFolderIcon}};
-</script>
 <div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if or .TreeNames .IsBlame}}fluid padded{{end}}">
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 3c6464d342dcc..572987a986ce8 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -6,16 +6,17 @@
 	</div>
 	{{if .HasParentPath}}
 	<a class="repo-file-line parent-link silenced" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">
-		{{ctx.RenderUtils.RenderCollapsedFolderIcon}} ..
+		{{svg "octicon-file-directory-fill"}} ..
 	</a>
 	{{end}}
+	{{$.FileIconPoolHTML}}
 	{{range $item := .Files}}
 		<div class="repo-file-item">
 			{{$entry := $item.Entry}}
 			{{$commit := $item.Commit}}
 			{{$submoduleFile := $item.SubmoduleFile}}
 			<div class="repo-file-cell name muted-links {{if not $commit}}notready{{end}}">
-				{{ctx.RenderUtils.RenderFileIconByGitTreeEntry $entry}}
+				{{index $.FileIcons $entry.Name}}
 				{{if $entry.IsSubModule}}
 					{{$submoduleLink := $submoduleFile.SubmoduleWebLink ctx}}
 					{{if $submoduleLink}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 3c578aa69c8c2..4aed8070de04b 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -30,7 +30,7 @@
 											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
 										{{end}}
 									{{else}}
-										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderCollapsedFolderIcon}}</span>
+										<span class="icon tw-inline-block tw-pt-2">{{svg "octicon-file-directory-fill"}}</span>
 										<span class="name tw-inline-block tw-pt-2">{{$.ContextUser.Name}}/{{$dir}}</span>
 										<div class="tw-float-right">
 											{{if $.allowAdopt}}
diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
index 75fea4f52883b..5ee0e5bcaa181 100644
--- a/web_src/js/components/DiffFileTreeItem.vue
+++ b/web_src/js/components/DiffFileTreeItem.vue
@@ -2,13 +2,12 @@
 import {SvgIcon, type SvgName} from '../svg.ts';
 import {diffTreeStore} from '../modules/stores.ts';
 import {ref} from 'vue';
-import type {Item, FileStatus} from '../utils/filetree.ts';
+import type {Item, File, FileStatus} from '../utils/filetree.ts';
 
 defineProps<{
   item: Item,
 }>();
 
-const {pageData} = window.config;
 const store = diffTreeStore();
 const collapsed = ref(false);
 
@@ -23,6 +22,13 @@ function getIconForDiffStatus(pType: FileStatus) {
   };
   return diffTypes[pType];
 }
+
+function fileIcon(file: File) {
+  if (file.IsSubmodule) {
+    return 'octicon-file-submodule';
+  }
+  return 'octicon-file';
+}
 </script>
 
 <template>
@@ -33,8 +39,7 @@ function getIconForDiffStatus(pType: FileStatus) {
     :title="item.name" :href="'#diff-' + item.file.NameHash"
   >
     <!-- file -->
-    <!-- eslint-disable-next-line vue/no-v-html -->
-    <span class="item-icon" v-html="item.file.FileIcon"/>
+    <SvgIcon :name="fileIcon(item.file)"/>
     <span class="gt-ellipsis tw-flex-1">{{ item.name }}</span>
     <SvgIcon
       :name="getIconForDiffStatus(item.file.Status).name"
@@ -46,8 +51,10 @@ function getIconForDiffStatus(pType: FileStatus) {
     <div class="item-directory" :title="item.name" @click.stop="collapsed = !collapsed">
       <!-- directory -->
       <SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/>
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <span class="item-icon" v-html="collapsed ? pageData.collapsedFolderIcon : pageData.expandedFolderIcon"/>
+      <SvgIcon
+        class="text primary"
+        :name="collapsed ? 'octicon-file-directory-fill' : 'octicon-file-directory-open-fill'"
+      />
       <span class="gt-ellipsis">{{ item.name }}</span>
     </div>
 
@@ -89,10 +96,6 @@ a:hover {
   user-select: none;
 }
 
-.item-directory .item-icon {
-  display: contents;
-}
-
 .item-file,
 .item-directory {
   display: flex;
diff --git a/web_src/js/components/ViewFileTree.vue b/web_src/js/components/ViewFileTree.vue
index 1820c47e7aa71..c5319d54f8cd3 100644
--- a/web_src/js/components/ViewFileTree.vue
+++ b/web_src/js/components/ViewFileTree.vue
@@ -3,6 +3,7 @@ import ViewFileTreeItem from './ViewFileTreeItem.vue';
 import {onMounted, ref} from 'vue';
 import {pathEscapeSegments} from '../utils/url.ts';
 import {GET} from '../modules/fetch.ts';
+import {createElementFromHTML} from "../utils/dom.ts";
 
 const elRoot = ref<HTMLElement | null>(null);
 
@@ -18,6 +19,15 @@ const selectedItem = ref('');
 async function loadChildren(treePath: string, subPath: string = '') {
   const response = await GET(`${props.repoLink}/tree-view/${props.currentRefNameSubURL}/${pathEscapeSegments(treePath)}?sub_path=${encodeURIComponent(subPath)}`);
   const json = await response.json();
+  const poolSvgs = [];
+  for (const [svgId, svgContent] of Object.entries(json.renderedIconPool ?? {})) {
+    if (!document.querySelector(`.global-svg-icon-pool #${svgId}`)) poolSvgs.push(svgContent);
+  }
+  if (poolSvgs.length) {
+    const svgContainer = createElementFromHTML('<div class="global-svg-icon-pool tw-hidden"></div>');
+    svgContainer.innerHTML = poolSvgs.join('');
+    document.body.append(svgContainer);
+  }
   return json.fileTreeNodes ?? null;
 }
 
diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue
index 4ddd2312b076e..69e26dbc33a15 100644
--- a/web_src/js/components/ViewFileTreeItem.vue
+++ b/web_src/js/components/ViewFileTreeItem.vue
@@ -1,18 +1,17 @@
 <script lang="ts" setup>
 import {SvgIcon} from '../svg.ts';
-import {onMounted, ref} from 'vue';
+import {ref} from 'vue';
 
 type Item = {
   entryName: string;
   entryMode: string;
-  fileIcon: string;
+  entryIcon: string;
+  entryIconOpen: string;
   fullPath: string;
   submoduleUrl?: string;
   children?: Item[];
 };
 
-const {pageData} = window.config;
-
 const props = defineProps<{
   item: Item,
   navigateViewContent:(treePath: string) => void,
@@ -20,15 +19,9 @@ const props = defineProps<{
   selectedItem?: string,
 }>();
 
-const elRoot = ref<HTMLElement | null>(null);
 const isLoading = ref(false);
 const children = ref(props.item.children);
 const collapsed = ref(!props.item.children);
-const isDirectory = ref(!(
-  props.item.entryMode === 'commit' ||
-  props.item.entryMode === 'symlink' ||
-  props.item.entryMode !== 'tree'
-));
 
 const doLoadChildren = async () => {
   collapsed.value = !collapsed.value;
@@ -54,42 +47,62 @@ const doLoadFileContent = () => {
 const doGotoSubModule = () => {
   location.href = props.item.submoduleUrl;
 };
-
-const doItemAction = () => {
-  if (props.item.entryMode === 'symlink' || props.item.entryMode === 'tree') {
-    doLoadFileContent();
-  } else if (props.item.entryMode === 'commit') {
-    doGotoSubModule();
-  } else {
-    doLoadDirContent();
-  }
-};
-
-onMounted(async () => {
-  elRoot.value.querySelector('.item-icon svg')?.classList?.add('preview-square');
-});
 </script>
 
 <!--title instead of tooltip above as the tooltip needs too much work with the current methods, i.e. not being loaded or staying open for "too long"-->
 <template>
   <div
-    ref="elRoot"
-    class="tree-item"
-    :class="{'selected': selectedItem === item.fullPath, 'type-directory': isDirectory}"
+    v-if="item.entryMode === 'commit'" class="tree-item type-submodule"
+    :title="item.entryName"
+    @click.stop="doGotoSubModule"
+  >
+    <!-- submodule -->
+    <div class="item-content">
+      <SvgIcon class="text primary" name="octicon-file-submodule"/>
+      <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
+    </div>
+  </div>
+  <div
+    v-else-if="item.entryMode === 'symlink'" class="tree-item type-symlink"
+    :class="{'selected': selectedItem === item.fullPath}"
     :title="item.entryName"
-    @click.stop="doItemAction"
+    @click.stop="doLoadFileContent"
   >
-    <div v-if="isDirectory" class="item-toggle">
-      <!-- directory -->
+    <!-- symlink -->
+    <div class="item-content">
+      <SvgIcon name="octicon-file-symlink-file"/>
+      <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
+    </div>
+  </div>
+  <div
+    v-else-if="item.entryMode !== 'tree'" class="tree-item type-file"
+    :class="{'selected': selectedItem === item.fullPath}"
+    :title="item.entryName"
+    @click.stop="doLoadFileContent"
+  >
+    <!-- file -->
+    <div class="item-content">
+      <!-- eslint-disable-next-line vue/no-v-html -->
+      <span v-html="item.entryIcon"/>
+      <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
+    </div>
+  </div>
+  <div
+    v-else class="tree-item type-directory"
+    :class="{'selected': selectedItem === item.fullPath}"
+    :title="item.entryName"
+    @click.stop="doLoadDirContent"
+  >
+    <!-- directory -->
+    <div class="item-toggle">
+      <!-- FIXME: use a general and global class for this animation -->
       <SvgIcon v-if="isLoading" name="octicon-sync" class="job-status-rotate"/>
       <SvgIcon v-else :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'" @click.stop="doLoadChildren"/>
     </div>
     <div class="item-content">
       <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-if="isDirectory" class="item-icon" v-html="collapsed ? pageData.collapsedFolderIcon : pageData.expandedFolderIcon"/>
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-else class="item-icon" v-html="item.fileIcon"/>
-      <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>
+      <span class="text primary" v-html="(!collapsed && item.entryIconOpen) ? item.entryIconOpen : item.entryIcon"/>
+      <span class="gt-ellipsis">{{ item.entryName }}</span>
     </div>
   </div>
 
@@ -145,8 +158,4 @@ onMounted(async () => {
   text-overflow: ellipsis;
   min-width: 0;
 }
-
-.item-content .item-icon {
-  display: contents;
-}
 </style>
diff --git a/web_src/js/utils/filetree.ts b/web_src/js/utils/filetree.ts
index 77ff41af3f685..35f9f58189faa 100644
--- a/web_src/js/utils/filetree.ts
+++ b/web_src/js/utils/filetree.ts
@@ -5,7 +5,6 @@ export type FileStatus = 'added' | 'modified' | 'deleted' | 'renamed' | 'copied'
 export type File = {
   Name: string;
   NameHash: string;
-  FileIcon: string;
   Status: FileStatus;
   IsViewed: boolean;
   IsSubmodule: boolean;

From 473a3f19f8b61317a033ccb0c00f71073098f287 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 6 Apr 2025 14:33:37 +0800
Subject: [PATCH 18/18] fix tests

---
 modules/fileicon/render.go             |  2 ++
 services/repository/files/tree.go      |  6 +++---
 services/repository/files/tree_test.go | 19 ++++++++++++++++---
 web_src/js/components/ViewFileTree.vue |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/modules/fileicon/render.go b/modules/fileicon/render.go
index 9bca86ad97bf3..1d014693fddcc 100644
--- a/modules/fileicon/render.go
+++ b/modules/fileicon/render.go
@@ -34,6 +34,8 @@ func (p *RenderedIconPool) RenderToHTML() template.HTML {
 	return template.HTML(sb.String())
 }
 
+// TODO: use an interface or struct to replace "*git.TreeEntry", to decouple the fileicon module from git module
+
 func RenderEntryIcon(renderedIconPool *RenderedIconPool, entry *git.TreeEntry) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
 		return DefaultMaterialIconProvider().FileIcon(renderedIconPool, entry)
diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
index 6818e127ba66e..faeb85a046c8f 100644
--- a/services/repository/files/tree.go
+++ b/services/repository/files/tree.go
@@ -166,8 +166,8 @@ func newTreeViewNodeFromEntry(ctx context.Context, renderedIconPool *fileicon.Re
 	}
 
 	if entry.IsLink() {
-		// TODO: symlink to a folder or a file
-		target, err := entry.FollowLinks()
+		// TODO: symlink to a folder or a file, the icon differs
+		target, err := entry.FollowLink()
 		if err == nil {
 			_ = target.IsDir()
 			// if target.IsDir() { } else { }
@@ -177,7 +177,7 @@ func newTreeViewNodeFromEntry(ctx context.Context, renderedIconPool *fileicon.Re
 	if node.EntryIcon == "" {
 		node.EntryIcon = fileicon.RenderEntryIcon(renderedIconPool, entry)
 		// TODO: no open icon support yet
-		// node.EntryIconOpen = fileicon.RenderFileIconOpen(renderedIconPool, entry)
+		// node.EntryIconOpen = fileicon.RenderEntryIconOpen(renderedIconPool, entry)
 	}
 
 	if node.EntryMode == "commit" {
diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go
index cbb800da01cdf..2657c4997778f 100644
--- a/services/repository/files/tree_test.go
+++ b/services/repository/files/tree_test.go
@@ -4,9 +4,11 @@
 package files
 
 import (
+	"html/template"
 	"testing"
 
 	"code.gitea.io/gitea/models/unittest"
+	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/services/contexttest"
@@ -62,40 +64,51 @@ func TestGetTreeViewNodes(t *testing.T) {
 	contexttest.LoadGitRepo(t, ctx)
 	defer ctx.Repo.GitRepo.Close()
 
-	treeNodes, err := GetTreeViewNodes(ctx, ctx.Repo.Commit, "", "")
+	renderedIconPool := fileicon.NewRenderedIconPool()
+	mockIconForFile := func(id string) template.HTML {
+		return template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
+	}
+	mockIconForFolder := func(id string) template.HTML {
+		return template.HTML(`<svg class="svg git-entry-icon octicon-file-directory-fill" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
+	}
+	treeNodes, err := GetTreeViewNodes(ctx, renderedIconPool, ctx.Repo.Commit, "", "")
 	assert.NoError(t, err)
 	assert.Equal(t, []*TreeViewNode{
 		{
 			EntryName: "docs",
 			EntryMode: "tree",
 			FullPath:  "docs",
+			EntryIcon: mockIconForFolder(`svg-mfi-folder-docs`),
 		},
 	}, treeNodes)
 
-	treeNodes, err = GetTreeViewNodes(ctx, ctx.Repo.Commit, "", "docs/README.md")
+	treeNodes, err = GetTreeViewNodes(ctx, renderedIconPool, ctx.Repo.Commit, "", "docs/README.md")
 	assert.NoError(t, err)
 	assert.Equal(t, []*TreeViewNode{
 		{
 			EntryName: "docs",
 			EntryMode: "tree",
 			FullPath:  "docs",
+			EntryIcon: mockIconForFolder(`svg-mfi-folder-docs`),
 			Children: []*TreeViewNode{
 				{
 					EntryName: "README.md",
 					EntryMode: "blob",
 					FullPath:  "docs/README.md",
+					EntryIcon: mockIconForFile(`svg-mfi-readme`),
 				},
 			},
 		},
 	}, treeNodes)
 
-	treeNodes, err = GetTreeViewNodes(ctx, ctx.Repo.Commit, "docs", "README.md")
+	treeNodes, err = GetTreeViewNodes(ctx, renderedIconPool, ctx.Repo.Commit, "docs", "README.md")
 	assert.NoError(t, err)
 	assert.Equal(t, []*TreeViewNode{
 		{
 			EntryName: "README.md",
 			EntryMode: "blob",
 			FullPath:  "docs/README.md",
+			EntryIcon: mockIconForFile(`svg-mfi-readme`),
 		},
 	}, treeNodes)
 }
diff --git a/web_src/js/components/ViewFileTree.vue b/web_src/js/components/ViewFileTree.vue
index c5319d54f8cd3..c692142792754 100644
--- a/web_src/js/components/ViewFileTree.vue
+++ b/web_src/js/components/ViewFileTree.vue
@@ -3,7 +3,7 @@ import ViewFileTreeItem from './ViewFileTreeItem.vue';
 import {onMounted, ref} from 'vue';
 import {pathEscapeSegments} from '../utils/url.ts';
 import {GET} from '../modules/fetch.ts';
-import {createElementFromHTML} from "../utils/dom.ts";
+import {createElementFromHTML} from '../utils/dom.ts';
 
 const elRoot = ref<HTMLElement | null>(null);