diff --git a/webclient/components/AppSearchBar.vue b/webclient/components/AppSearchBar.vue
index a920342c4..265aec150 100644
--- a/webclient/components/AppSearchBar.vue
+++ b/webclient/components/AppSearchBar.vue
@@ -158,7 +158,7 @@ watchEffect(() => {
       <!--
     <li class="search-comment filter">
       Suche einschränken auf:
-      <a class="bt btn-link btn-sm">Räume</a>
+      <NuxtLink class="bt btn-link btn-sm">Räume</NuxtLink>
     </li> -->
 
       <template v-for="(e, i) in s.entries" :key="e.id">
diff --git a/webclient/components/DetailsBuildingOverviewSection.vue b/webclient/components/DetailsBuildingOverviewSection.vue
index e584a5ad5..a2aef28a2 100644
--- a/webclient/components/DetailsBuildingOverviewSection.vue
+++ b/webclient/components/DetailsBuildingOverviewSection.vue
@@ -17,7 +17,7 @@ const runtimeConfig = useRuntimeConfig();
 <template>
   <section v-if="props.buildings" class="px-5 print:!hidden">
     <h2 class="text-zinc-800 pb-3 text-lg font-semibold">{{ t("title") }}</h2>
-    <!--  <a class="no-underline" href="#">Übersichtskarte <ArrowRightIcon class="w-4 h-4" /> -->
+    <!--  <NuxtLink class="no-underline" href="#">Übersichtskarte <ArrowRightIcon class="w-4 h-4" /></NuxtLink>-->
     <div class="text-zinc-600 grid grid-cols-1 gap-3 md:grid-cols-2 xl:grid-cols-3">
       <template v-for="(b, i) in props.buildings.entries" :key="b.id">
         <NuxtLink
diff --git a/webclient/components/FeedbackModal.vue b/webclient/components/FeedbackModal.vue
index af4ec17a1..e69cf25b0 100644
--- a/webclient/components/FeedbackModal.vue
+++ b/webclient/components/FeedbackModal.vue
@@ -61,7 +61,7 @@ const feedback = useFeedback();
       <p>{{ t("success.thank_you") }}</p>
       <p>
         {{ t("success.response_at") }}
-        <a id="feedback-success-url" tabindex="1" class="btn-link" :href="successUrl">{{ t("success.this_issue") }}</a>
+        <Btn variant="linkButton" :href="successUrl">{{ t("success.this_issue") }}</Btn>
       </p>
     </template>
   </TokenBasedModal>
diff --git a/webclient/components/PreferencesPopup.vue b/webclient/components/PreferencesPopup.vue
index 304237f06..0750fe157 100644
--- a/webclient/components/PreferencesPopup.vue
+++ b/webclient/components/PreferencesPopup.vue
@@ -22,7 +22,7 @@ watchEffect(() => router.push(switchLocalePath(locale.value)));
       >
         <span class="absolute -inset-1.5" />
         <span class="sr-only">Open preferences menu</span>
-        <AdjustmentsHorizontalIcon class="text-black h-6 w-6" />
+        <AdjustmentsHorizontalIcon class="text-zinc-900 h-6 w-6" />
       </MenuButton>
     </div>
     <Transition
diff --git a/webclient/pages/index.vue b/webclient/pages/index.vue
index 3ce2bd907..5775eea0f 100644
--- a/webclient/pages/index.vue
+++ b/webclient/pages/index.vue
@@ -30,7 +30,7 @@ const openPanels = ref<(boolean | undefined)[]>([]);
   </div>
   <div class="flex flex-col justify-between gap-3 pt-8">
     <div class="text-zinc-600 !text-lg font-semibold">{{ t("sites") }}</div>
-    <!-- <a href="#" class="flex flex-row"><MapPinIcon class="h-4 w-4" /> {{ t("overview_map") }}</a> -->
+    <!-- <NuxtLink to="#" class="flex flex-row"><MapPinIcon class="h-4 w-4" /> {{ t("overview_map") }}</NuxtLink> -->
   </div>
   <div v-if="data" class="mt-5">
     <div class="grid grid-cols-1 gap-4 md:grid-cols-2">