diff --git a/templates/repo/home_content.tmpl b/templates/repo/home_content.tmpl
index 291ceb50cd..e2d7827466 100644
--- a/templates/repo/home_content.tmpl
+++ b/templates/repo/home_content.tmpl
@@ -6,7 +6,7 @@
 	<div class="repo-button-row-left">
 		{{if not $isTreePathRoot}}
 			<button class="show-tree-sidebar-button ui compact basic button icon not-mobile {{if .RepoPreferences.ShowFileViewTreeSidebar}}tw-hidden{{end}}" title="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}">
-				{{svg "octicon-sidebar-collapse" 20 "icon"}}
+				{{svg "octicon-sidebar-collapse"}}
 			</button>
 		{{end}}
 		{{template "repo/home_branch_dropdown" (dict "ctxData" .)}}
diff --git a/templates/repo/view_file_tree_sidebar.tmpl b/templates/repo/view_file_tree_sidebar.tmpl
index 48b8edfaa5..4a5f829e5a 100644
--- a/templates/repo/view_file_tree_sidebar.tmpl
+++ b/templates/repo/view_file_tree_sidebar.tmpl
@@ -1,13 +1,12 @@
-<div class="view-file-tree-sidebar-top">
-	<div class="sidebar-header">
-		<button class="hide-tree-sidebar-button ui compact basic button icon" title="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
-			{{svg "octicon-sidebar-expand" 20 "icon"}}
-		</button>
-		<b> Files</b>
-	</div>
-	<!--// TODO: Dynamically move components such as refSelector and createPR here-->
+<div class="flex-text-block">
+	<button class="hide-tree-sidebar-button ui compact tiny icon button" data-tooltip-content="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
+		{{svg "octicon-sidebar-expand"}}
+	</button>
+	<b>Files</b>
 </div>
-<div class="view-file-tree-sidebar-bottom">
+
+<!--// TODO: Dynamically move components such as refSelector and createPR here-->
+<div class="view-file-tree-sidebar-bottom tw-overflow-auto">
 	<div id="view-file-tree" class="is-loading"
 		data-api-base-url="{{.RepoLink}}"
 		data-tree-path="{{$.TreePath}}"
diff --git a/web_src/css/repo/home.css b/web_src/css/repo/home.css
index 2a3764820b..11fc7a263c 100644
--- a/web_src/css/repo/home.css
+++ b/web_src/css/repo/home.css
@@ -77,29 +77,6 @@
   z-index: 8;
 }
 
-.repo-grid-tree-sidebar .view-file-tree-sidebar-top {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25em;
-}
-
-.repo-grid-tree-sidebar .view-file-tree-sidebar-top .button {
-  padding: 6px 10px !important;
-  height: 30px;
-  flex-shrink: 0;
-  margin: 0;
-}
-
-.repo-grid-tree-sidebar .view-file-tree-sidebar-top .sidebar-ref {
-  display: flex;
-  gap: 0.25em;
-}
-
-.repo-grid-tree-sidebar .view-file-tree-sidebar-bottom {
-  flex: 1;
-  overflow: auto;
-}
-
 .repo-grid-tree-sidebar .repo-button-row {
   margin-top: 0 !important;
 }
diff --git a/web_src/js/features/repo-view-file-tree-sidebar.ts b/web_src/js/features/repo-view-file-tree-sidebar.ts
index 98ebfee24f..dd1e8d6b4a 100644
--- a/web_src/js/features/repo-view-file-tree-sidebar.ts
+++ b/web_src/js/features/repo-view-file-tree-sidebar.ts
@@ -12,6 +12,8 @@ async function toggleSidebar(sidebarEl: HTMLElement, visibility: boolean) {
   toggleElem(sidebarEl, visibility);
   toggleElem(showBtnEl, !visibility);
 
+  // FIXME: need to remove "full height" style from parent element
+
   if (!sidebarEl.hasAttribute('data-is-signed')) return;
 
   // save to session