8 files changed, 38 insertions, 31 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
index 5c5e8cf5887..5c6934e67a2 100644
--- a/core/src/OC/dialogs.js
+++ b/core/src/OC/dialogs.js
@@ -9,7 +9,7 @@ import _ from 'underscore'
 import $ from 'jquery'
 
 import IconMove from '@mdi/svg/svg/folder-move.svg?raw'
-import IconCopy from '@mdi/svg/svg/folder-multiple.svg?raw'
+import IconCopy from '@mdi/svg/svg/folder-multiple-outline.svg?raw'
 
 import OC from './index.js'
 import { DialogBuilder, FilePickerType, getFilePickerBuilder, spawnDialog } from '@nextcloud/dialogs'
diff --git a/core/src/components/AppMenuIcon.vue b/core/src/components/AppMenuIcon.vue
index f2cee75e644..089a2016e58 100644
--- a/core/src/components/AppMenuIcon.vue
+++ b/core/src/components/AppMenuIcon.vue
@@ -18,7 +18,7 @@ import type { INavigationEntry } from '../types/navigation'
 import { n } from '@nextcloud/l10n'
 import { computed } from 'vue'
 
-import IconDot from 'vue-material-design-icons/Circle.vue'
+import IconDot from 'vue-material-design-icons/CircleOutline.vue'
 
 const props = defineProps<{
 	app: INavigationEntry
diff --git a/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue b/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue
index 1860c54e1ff..171eada8a06 100644
--- a/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue
+++ b/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue
@@ -32,7 +32,7 @@
 					{{ t('core', 'Search everywhere') }}
 				</template>
 				<template #icon>
-					<NcIconSvgWrapper :path="mdiCloudSearch" />
+					<NcIconSvgWrapper :path="mdiCloudSearchOutline" />
 				</template>
 			</NcButton>
 		</div>
@@ -41,7 +41,7 @@
 
 <script lang="ts" setup>
 import type { ComponentPublicInstance } from 'vue'
-import { mdiCloudSearch, mdiClose } from '@mdi/js'
+import { mdiCloudSearchOutline, mdiClose } from '@mdi/js'
 import { translate as t } from '@nextcloud/l10n'
 import { useIsMobile } from '@nextcloud/vue/composables/useIsMobile'
 import { useElementSize } from '@vueuse/core'
diff --git a/core/src/components/UnifiedSearch/UnifiedSearchModal.vue b/core/src/components/UnifiedSearch/UnifiedSearchModal.vue
index 744c8e604fa..002606f058b 100644
--- a/core/src/components/UnifiedSearch/UnifiedSearchModal.vue
+++ b/core/src/components/UnifiedSearch/UnifiedSearchModal.vue
@@ -159,8 +159,8 @@ import debounce from 'debounce'
 import { unifiedSearchLogger } from '../../logger'
 
 import IconArrowRight from 'vue-material-design-icons/ArrowRight.vue'
-import IconAccountGroup from 'vue-material-design-icons/AccountGroup.vue'
-import IconCalendarRange from 'vue-material-design-icons/CalendarRange.vue'
+import IconAccountGroup from 'vue-material-design-icons/AccountGroupOutline.vue'
+import IconCalendarRange from 'vue-material-design-icons/CalendarRangeOutline.vue'
 import IconDotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
 import IconFilter from 'vue-material-design-icons/Filter.vue'
 import IconListBox from 'vue-material-design-icons/ListBox.vue'
diff --git a/core/src/components/login/PasswordLessLoginForm.vue b/core/src/components/login/PasswordLessLoginForm.vue
index bbca2ebf31d..bc4d25bf70f 100644
--- a/core/src/components/login/PasswordLessLoginForm.vue
+++ b/core/src/components/login/PasswordLessLoginForm.vue
@@ -57,7 +57,7 @@ import {
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
 
-import InformationIcon from 'vue-material-design-icons/Information.vue'
+import InformationIcon from 'vue-material-design-icons/InformationOutline.vue'
 import LoginButton from './LoginButton.vue'
 import LockOpenIcon from 'vue-material-design-icons/LockOpen.vue'
 import logger from '../../logger'
diff --git a/core/src/views/AccountMenu.vue b/core/src/views/AccountMenu.vue
index cac02129bac..784a939eaf4 100644
--- a/core/src/views/AccountMenu.vue
+++ b/core/src/views/AccountMenu.vue
@@ -197,27 +197,13 @@ export default defineComponent({
 }
 
 .account-menu {
-	:deep(button) {
-		// Normally header menus are slightly translucent when not active
-		// this is generally ok but for the avatar this is weird so fix the opacity
-		opacity: 1 !important;
-
-		// The avatar is just the "icon" of the button
-		// So we add the focus-visible manually
-		&:focus-visible {
-			.account-menu__avatar {
-				border: var(--border-width-input-focused) solid var(--color-background-plain-text);
-			}
-		}
-	}
-
-	// Ensure we do not waste space, as the header menu sets a default width of 350px
-	:deep(.header-menu__content) {
-		width: fit-content !important;
-	}
-
 	&__avatar {
+		--account-menu-outline: var(--border-width-input) solid color-mix(in srgb, var(--color-background-plain-text), transparent 75%);
+		outline: var(--account-menu-outline);
+		position: fixed;
+
 		&:hover {
+			--account-menu-outline: none;
 			// Add hover styles similar to the focus-visible style
 			border: var(--border-width-input-focused) solid var(--color-background-plain-text);
 		}
@@ -235,5 +221,25 @@ export default defineComponent({
 			flex: 0 1;
 		}
 	}
+
+	// Ensure we do not waste space, as the header menu sets a default width of 350px
+	:deep(.header-menu__content) {
+		width: fit-content !important;
+	}
+
+	:deep(button) {
+		// Normally header menus are slightly translucent when not active
+		// this is generally ok but for the avatar this is weird so fix the opacity
+		opacity: 1 !important;
+
+		// The avatar is just the "icon" of the button
+		// So we add the focus-visible manually
+		&:focus-visible {
+			.account-menu__avatar {
+				--account-menu-outline: none;
+				border: var(--border-width-input-focused) solid var(--color-background-plain-text);
+			}
+		}
+	}
 }
 </style>
diff --git a/core/src/views/ContactsMenu.vue b/core/src/views/ContactsMenu.vue
index 292e2bbcd29..9cf18b40ac7 100644
--- a/core/src/views/ContactsMenu.vue
+++ b/core/src/views/ContactsMenu.vue
@@ -62,17 +62,18 @@
 </template>
 
 <script>
+import { generateUrl } from '@nextcloud/router'
+import { getCurrentUser } from '@nextcloud/auth'
+import { t } from '@nextcloud/l10n'
 import axios from '@nextcloud/axios'
-import Contacts from 'vue-material-design-icons/Contacts.vue'
 import debounce from 'debounce'
-import { getCurrentUser } from '@nextcloud/auth'
-import { generateUrl } from '@nextcloud/router'
+
+import Contacts from 'vue-material-design-icons/ContactsOutline.vue'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import NcHeaderMenu from '@nextcloud/vue/components/NcHeaderMenu'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
-import { translate as t } from '@nextcloud/l10n'
 
 import Contact from '../components/ContactsMenu/Contact.vue'
 import logger from '../logger.js'
diff --git a/core/src/views/PublicPageUserMenu.vue b/core/src/views/PublicPageUserMenu.vue
index ff6f4090b2a..7bd6521e7aa 100644
--- a/core/src/views/PublicPageUserMenu.vue
+++ b/core/src/views/PublicPageUserMenu.vue
@@ -48,7 +48,7 @@ import { t } from '@nextcloud/l10n'
 import NcAvatar from '@nextcloud/vue/components/NcAvatar'
 import NcHeaderMenu from '@nextcloud/vue/components/NcHeaderMenu'
 import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
-import IconAccount from 'vue-material-design-icons/Account.vue'
+import IconAccount from 'vue-material-design-icons/AccountOutline.vue'
 
 import AccountMenuEntry from '../components/AccountMenu/AccountMenuEntry.vue'