diff --git a/css/components/search.scss b/css/components/search.scss
index 2f9f007..2485f0f 100644
--- a/css/components/search.scss
+++ b/css/components/search.scss
@@ -81,6 +81,10 @@
         margin-left: 5px;
         margin-bottom: 1rem !important;
     }
+
+    .list-item__anchor:hover {
+        border: none !important;
+    }
 }
 
 // Short viewports (keyboard up): reclaim fixed chrome so the result list keeps a usable
diff --git a/css/layouts/header.scss b/css/layouts/header.scss
index 5efd3bd..7474f9e 100644
--- a/css/layouts/header.scss
+++ b/css/layouts/header.scss
@@ -456,6 +456,10 @@ header {
 			.header-menu__content {
 				width: 350px !important;
 			}
+
+			button {
+				background-color: transparent !important;
+			}
 		}
 	}
 }
diff --git a/src/nmcfiles.ts b/src/nmcfiles.ts
index 8834c21..6393f8a 100644
--- a/src/nmcfiles.ts
+++ b/src/nmcfiles.ts
@@ -125,12 +125,39 @@ function setupUploadButtonFix(): void {
 	observer.observe(document.body, { childList: true, subtree: true })
 }
 
+/**
+ * Move Files settings from the fixed footer into the main navigation list.
+ */
+function setupFilesSettingsNavigationPosition(): void {
+	const move = (): void => {
+		const settingsItem = document.querySelector<HTMLElement>('[data-cy-files-navigation-settings-button]')
+		const deletedFilesItem = document.querySelector<HTMLElement>('[data-cy-files-navigation-item="trashbin"]')
+		const navigationList = deletedFilesItem?.closest('ul.app-navigation-list')
+
+		if (!settingsItem || !deletedFilesItem || !navigationList) return
+		if (settingsItem.parentElement === navigationList && deletedFilesItem.nextElementSibling === settingsItem) return
+
+		deletedFilesItem.after(settingsItem)
+	}
+
+	move()
+
+	const observer = new MutationObserver(move)
+	observer.observe(document.body, { childList: true, subtree: true })
+}
+
 if (document.readyState === 'loading') {
 	document.addEventListener('DOMContentLoaded', setupUploadButtonFix)
 } else {
 	setupUploadButtonFix()
 }
 
+if (document.readyState === 'loading') {
+	document.addEventListener('DOMContentLoaded', setupFilesSettingsNavigationPosition)
+} else {
+	setupFilesSettingsNavigationPosition()
+}
+
 /**
  * Move the text editor link bubble tooltip to document.body to escape
  * the CSS stacking context and appear above the app navigation.