diff --git a/packages/design-system/src/components/OcAvatar/OcAvatar.vue b/packages/design-system/src/components/OcAvatar/OcAvatar.vue
index 90668d7f7b..34e1a0d65e 100644
--- a/packages/design-system/src/components/OcAvatar/OcAvatar.vue
+++ b/packages/design-system/src/components/OcAvatar/OcAvatar.vue
@@ -125,7 +125,6 @@ const randomBackgroundColor = (seed: number, colors: string[]) => {
 
 <style lang="scss">
 .oc-avatar {
-  font-weight: normal;
   align-items: center;
   justify-content: center;
   text-align: center;
diff --git a/packages/design-system/src/components/OcBottomDrawer/OcBottomDrawer.vue b/packages/design-system/src/components/OcBottomDrawer/OcBottomDrawer.vue
index da67680928..e5cc4acae8 100644
--- a/packages/design-system/src/components/OcBottomDrawer/OcBottomDrawer.vue
+++ b/packages/design-system/src/components/OcBottomDrawer/OcBottomDrawer.vue
@@ -25,7 +25,7 @@
                 >
                   <oc-icon name="arrow-left" fill-type="line" />
                 </oc-button>
-                <span class="oc-text-bold" v-text="title" />
+                <span class="font-semibold" v-text="title" />
                 <oc-button
                   appearance="raw"
                   class="raw-hover-surface oc-bottom-drawer-close-button"
diff --git a/packages/design-system/src/components/OcBottomDrawer/__snapshots__/OcBottomDrawer.spec.ts.snap b/packages/design-system/src/components/OcBottomDrawer/__snapshots__/OcBottomDrawer.spec.ts.snap
index a20b387abd..1516d9b5a0 100644
--- a/packages/design-system/src/components/OcBottomDrawer/__snapshots__/OcBottomDrawer.spec.ts.snap
+++ b/packages/design-system/src/components/OcBottomDrawer/__snapshots__/OcBottomDrawer.spec.ts.snap
@@ -8,7 +8,7 @@ exports[`OcBottomDrawer > renders when toggle is clicked 1`] = `
         <div class="oc-card">
           <div class="oc-card-header px-4 pt-4">
             <div class="flex justify-between items-center">
-              <!--v-if--> <span class="oc-text-bold">Bottom Drawer</span> <button type="button" aria-label="Close the context menu" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-secondary oc-button-raw oc-button-secondary-raw raw-hover-surface oc-bottom-drawer-close-button">
+              <!--v-if--> <span class="font-semibold">Bottom Drawer</span> <button type="button" aria-label="Close the context menu" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-secondary oc-button-raw oc-button-secondary-raw raw-hover-surface oc-bottom-drawer-close-button">
                 <!--v-if-->
                 <!-- @slot Content of the button --> <span class="oc-icon oc-icon-m box-content"><svg data-testid="inline-svg-stub" src="icons/close-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
diff --git a/packages/design-system/src/components/OcBreadcrumb/OcBreadcrumb.vue b/packages/design-system/src/components/OcBreadcrumb/OcBreadcrumb.vue
index b121a99fde..ce7d2fa193 100644
--- a/packages/design-system/src/components/OcBreadcrumb/OcBreadcrumb.vue
+++ b/packages/design-system/src/components/OcBreadcrumb/OcBreadcrumb.vue
@@ -33,7 +33,7 @@
           :to="item.isTruncationPlaceholder ? lastHiddenItem.to : item.to"
           class="first:text-base text-xl"
         >
-          <span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">{{ item.text }}</span>
+          <span class="oc-breadcrumb-item-text hover:underline">{{ item.text }}</span>
         </router-link>
         <oc-button
           v-else-if="item.onClick"
@@ -46,7 +46,7 @@
           <span
             :class="[
               'oc-breadcrumb-item-text',
-              'oc-breadcrumb-item-navigable',
+              'hover:underline',
               {
                 'oc-breadcrumb-item-text-last': index === displayItems.length - 1
               }
@@ -325,10 +325,6 @@ const dropItemStyling = (
     }
   }
 
-  &-item-navigable:hover {
-    text-decoration: underline;
-  }
-
   &-mobile-current,
   &-mobile-navigation {
     @media (min-width: $oc-breakpoint-small-default) {
diff --git a/packages/design-system/src/components/OcBreadcrumb/__snapshots__/OcBreadcrumb.spec.ts.snap b/packages/design-system/src/components/OcBreadcrumb/__snapshots__/OcBreadcrumb.spec.ts.snap
index df5e3be7f5..96efaefb65 100644
--- a/packages/design-system/src/components/OcBreadcrumb/__snapshots__/OcBreadcrumb.spec.ts.snap
+++ b/packages/design-system/src/components/OcBreadcrumb/__snapshots__/OcBreadcrumb.spec.ts.snap
@@ -4,22 +4,22 @@ exports[`OcBreadcrumb > displays all items 1`] = `
 "<nav id="oc-breadcrumbs-2" class="oc-breadcrumb oc-breadcrumb-default" aria-label="Breadcrumbs">
   <ol class="oc-breadcrumb-list flex m-0 p-0">
     <li data-key="0" class="oc-breadcrumb-list-item flex items-center">
-      <router-link-stub tag="a" to="[object Object]" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">First folder</span></router-link-stub>
+      <router-link-stub tag="a" to="[object Object]" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text hover:underline">First folder</span></router-link-stub>
       <oc-icon-stub accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1"></oc-icon-stub>
       <!--v-if-->
     </li>
     <li data-key="1" aria-hidden="true" class="oc-breadcrumb-list-item flex items-center oc-invisible-sr">
-      <router-link-stub tag="a" to="[object Object]" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">...</span></router-link-stub>
+      <router-link-stub tag="a" to="[object Object]" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text hover:underline">...</span></router-link-stub>
       <oc-icon-stub accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1"></oc-icon-stub>
       <!--v-if-->
     </li>
     <li data-key="2" class="oc-breadcrumb-list-item flex items-center">
-      <oc-button-stub appearance="raw" colorrole="secondary" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="flex first:text-base text-xl"><span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">Subfolder</span></oc-button-stub>
+      <oc-button-stub appearance="raw" colorrole="secondary" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="flex first:text-base text-xl"><span class="oc-breadcrumb-item-text hover:underline">Subfolder</span></oc-button-stub>
       <oc-icon-stub accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1"></oc-icon-stub>
       <!--v-if-->
     </li>
     <li data-key="3" class="oc-breadcrumb-list-item flex items-center">
-      <router-link-stub tag="a" to="[object Object]" aria-current="page" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">Deep</span></router-link-stub>
+      <router-link-stub tag="a" to="[object Object]" aria-current="page" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text hover:underline">Deep</span></router-link-stub>
       <oc-icon-stub accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1"></oc-icon-stub>
       <!--v-if-->
     </li>
@@ -40,22 +40,22 @@ exports[`OcBreadcrumb > sets correct variation 1`] = `
 "<nav id="oc-breadcrumbs-1" class="oc-breadcrumb oc-breadcrumb-lead" aria-label="Breadcrumbs">
   <ol class="oc-breadcrumb-list flex m-0 p-0">
     <li data-key="0" class="oc-breadcrumb-list-item flex items-center">
-      <router-link-stub tag="a" to="[object Object]" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">First folder</span></router-link-stub>
+      <router-link-stub tag="a" to="[object Object]" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text hover:underline">First folder</span></router-link-stub>
       <oc-icon-stub accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1"></oc-icon-stub>
       <!--v-if-->
     </li>
     <li data-key="1" aria-hidden="true" class="oc-breadcrumb-list-item flex items-center oc-invisible-sr">
-      <router-link-stub tag="a" to="[object Object]" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">...</span></router-link-stub>
+      <router-link-stub tag="a" to="[object Object]" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text hover:underline">...</span></router-link-stub>
       <oc-icon-stub accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1"></oc-icon-stub>
       <!--v-if-->
     </li>
     <li data-key="2" class="oc-breadcrumb-list-item flex items-center">
-      <oc-button-stub appearance="raw" colorrole="secondary" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="flex first:text-base text-xl"><span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">Subfolder</span></oc-button-stub>
+      <oc-button-stub appearance="raw" colorrole="secondary" disabled="false" gapsize="medium" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="flex first:text-base text-xl"><span class="oc-breadcrumb-item-text hover:underline">Subfolder</span></oc-button-stub>
       <oc-icon-stub accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1"></oc-icon-stub>
       <!--v-if-->
     </li>
     <li data-key="3" class="oc-breadcrumb-list-item flex items-center">
-      <router-link-stub tag="a" to="[object Object]" aria-current="page" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text oc-breadcrumb-item-navigable">Deep</span></router-link-stub>
+      <router-link-stub tag="a" to="[object Object]" aria-current="page" class="first:text-base text-xl"><span class="oc-breadcrumb-item-text hover:underline">Deep</span></router-link-stub>
       <oc-icon-stub accessiblelabel="" color="var(--oc-role-on-surface)" filltype="line" name="arrow-right-s" size="medium" type="span" class="mx-1"></oc-icon-stub>
       <!--v-if-->
     </li>
diff --git a/packages/design-system/src/components/OcButton/OcButton.vue b/packages/design-system/src/components/OcButton/OcButton.vue
index eaa76744fd..a5ff4ba7f5 100644
--- a/packages/design-system/src/components/OcButton/OcButton.vue
+++ b/packages/design-system/src/components/OcButton/OcButton.vue
@@ -198,7 +198,6 @@ const onClick = (event: MouseEvent) => {
   &-raw,
   &-raw-inverse {
     border-style: none;
-    font-weight: normal;
     min-height: 0;
 
     background-color: transparent;
@@ -252,9 +251,7 @@ const onClick = (event: MouseEvent) => {
   border: 0;
   box-sizing: border-box;
   display: inline-flex;
-  font-weight: 400;
   text-align: left;
-  text-decoration: none;
 
   &-justify-content {
     &-left {
diff --git a/packages/design-system/src/components/OcDefinitionList/OcDefinitionList.vue b/packages/design-system/src/components/OcDefinitionList/OcDefinitionList.vue
index 81779fe124..879866ef1f 100644
--- a/packages/design-system/src/components/OcDefinitionList/OcDefinitionList.vue
+++ b/packages/design-system/src/components/OcDefinitionList/OcDefinitionList.vue
@@ -34,6 +34,9 @@ const { items } = defineProps<Props>()
   .details-list dd {
     @apply ml-4;
   }
+  .details-list dt {
+    @apply font-semibold;
+  }
   .details-list dd:last-of-type,
   .details-list dt:last-of-type {
     @apply mb-0;
@@ -50,7 +53,6 @@ const { items } = defineProps<Props>()
     align-items: center;
   }
   dt {
-    font-weight: bold;
     white-space: nowrap;
   }
 }
diff --git a/packages/design-system/src/components/OcFilterChip/OcFilterChip.vue b/packages/design-system/src/components/OcFilterChip/OcFilterChip.vue
index dcc76dc943..8680bd8a44 100644
--- a/packages/design-system/src/components/OcFilterChip/OcFilterChip.vue
+++ b/packages/design-system/src/components/OcFilterChip/OcFilterChip.vue
@@ -162,7 +162,6 @@ defineExpose({ hideDrop })
     box-sizing: border-box;
     display: inline-flex;
     gap: var(--oc-space-xsmall);
-    text-decoration: none;
     max-width: 150px;
     height: 100%;
   }
diff --git a/packages/design-system/src/components/OcInfoDrop/OcInfoDrop.vue b/packages/design-system/src/components/OcInfoDrop/OcInfoDrop.vue
index 741ea04d69..56fc708f65 100644
--- a/packages/design-system/src/components/OcInfoDrop/OcInfoDrop.vue
+++ b/packages/design-system/src/components/OcInfoDrop/OcInfoDrop.vue
@@ -24,7 +24,11 @@
             :is="item.headline ? 'dt' : 'dd'"
             v-for="(item, index) in listItems"
             :key="index"
-            :class="{ 'ml-0': !item.headline, 'first:mt-0': item.headline }"
+            :class="{
+              'ml-0': !item.headline,
+              'first:mt-0': item.headline,
+              'font-bold': item.headline
+            }"
           >
             {{ $gettext(item.text) }}
           </component>
@@ -124,14 +128,5 @@ export default {
   .info-header {
     align-items: center;
   }
-  .info-title {
-    font-weight: normal;
-  }
-  .info-list {
-    font-weight: bold;
-    dd {
-      font-weight: normal;
-    }
-  }
 }
 </style>
diff --git a/packages/design-system/src/components/OcList/OcList.vue b/packages/design-system/src/components/OcList/OcList.vue
index 78bf1d39dc..23fef7c301 100644
--- a/packages/design-system/src/components/OcList/OcList.vue
+++ b/packages/design-system/src/components/OcList/OcList.vue
@@ -50,7 +50,6 @@ ul.oc-list {
   &-raw {
     list-style-type: none;
     a {
-      text-decoration: none !important;
       &:hover {
         color: inherit;
       }
diff --git a/packages/design-system/src/components/OcModal/OcModal.vue b/packages/design-system/src/components/OcModal/OcModal.vue
index 3ae0de5c40..2b51f5a401 100644
--- a/packages/design-system/src/components/OcModal/OcModal.vue
+++ b/packages/design-system/src/components/OcModal/OcModal.vue
@@ -355,10 +355,6 @@ export default {
     display: flex;
     flex-flow: row wrap;
     background-color: var(--oc-role-surface-container);
-
-    > h2 {
-      font-weight: bold;
-    }
   }
 
   &-body {
diff --git a/packages/design-system/src/components/OcPagination/OcPagination.vue b/packages/design-system/src/components/OcPagination/OcPagination.vue
index 5e5026a9ac..d8cc6d35c0 100644
--- a/packages/design-system/src/components/OcPagination/OcPagination.vue
+++ b/packages/design-system/src/components/OcPagination/OcPagination.vue
@@ -134,7 +134,7 @@ const pageClass = (page: Page) => {
   const classes = ['oc-pagination-list-item-page', 'py-1', 'px-2']
 
   if (isCurrentPage(page)) {
-    classes.push('oc-pagination-list-item-current')
+    classes.push(...['oc-pagination-list-item-current', 'font-bold'])
   } else if (page === '...') {
     classes.push('oc-pagination-list-item-ellipsis')
   } else {
@@ -171,14 +171,12 @@ const bindPageLink = (page: Page) => {
         &:not(span):hover {
           background-color: var(--oc-role-secondary);
           color: var(--oc-role-on-secondary);
-          text-decoration: none;
         }
       }
 
       &-current {
         background-color: var(--oc-role-secondary);
         color: var(--oc-role-on-secondary);
-        font-weight: bold;
       }
 
       &-prev,
diff --git a/packages/design-system/src/components/OcTable/OcTable.vue b/packages/design-system/src/components/OcTable/OcTable.vue
index 5629a3dc0a..202c7d847b 100644
--- a/packages/design-system/src/components/OcTable/OcTable.vue
+++ b/packages/design-system/src/components/OcTable/OcTable.vue
@@ -11,7 +11,7 @@
             v-if="field.sortable"
             :aria-label="getSortLabel(field.name)"
             appearance="raw"
-            class="oc-button-sort oc-width-1-1"
+            class="oc-button-sort oc-width-1-1 hover:underline"
             gap-size="small"
             no-hover
             @click="handleSort(field)"
@@ -553,9 +553,6 @@ const handleSort = (field: FieldType) => {
 .oc-button-sort {
   display: flex;
   justify-content: start;
-  &:hover {
-    text-decoration: underline;
-  }
   .oc-icon {
     &:hover {
       background-color: var(--oc-role-surface-container);
diff --git a/packages/design-system/src/components/OcTableTh/OcTableTh.vue b/packages/design-system/src/components/OcTableTh/OcTableTh.vue
index b20f6cb997..2dc633266a 100644
--- a/packages/design-system/src/components/OcTableTh/OcTableTh.vue
+++ b/packages/design-system/src/components/OcTableTh/OcTableTh.vue
@@ -25,11 +25,17 @@ export interface Props {
 const { alignH = 'left', alignV = 'middle', width = 'auto', wrap } = defineProps<Props>()
 defineEmits(['click'])
 </script>
+<style>
+@reference 'tailwindcss';
 
+@layer components {
+  .oc-th {
+    @apply font-medium;
+  }
+}
+</style>
 <style lang="scss">
 .oc-th {
-  font-weight: inherit;
-
   &[aria-sort] {
     cursor: pointer;
   }
diff --git a/packages/design-system/src/components/OcTag/OcTag.vue b/packages/design-system/src/components/OcTag/OcTag.vue
index 63188638a4..9314245103 100644
--- a/packages/design-system/src/components/OcTag/OcTag.vue
+++ b/packages/design-system/src/components/OcTag/OcTag.vue
@@ -114,7 +114,6 @@ function $_ocTag_click(event: MouseEvent) {
   box-sizing: border-box;
   display: inline-flex;
   gap: var(--oc-space-xsmall);
-  text-decoration: none;
 
   &-m {
     min-height: 2.125rem;
diff --git a/packages/design-system/src/styles/layers.css b/packages/design-system/src/styles/layers.css
index b58020cab0..56159f8ea4 100644
--- a/packages/design-system/src/styles/layers.css
+++ b/packages/design-system/src/styles/layers.css
@@ -98,6 +98,10 @@
     @apply p-1.5 leading-4;
   }
 
+  .oc-select optgroup {
+    @apply font-bold;
+  }
+
   .oc-textarea {
     @apply py-1 px-2
   }
diff --git a/packages/design-system/src/styles/theme/helper.scss b/packages/design-system/src/styles/theme/helper.scss
index c7a552814b..16db6c4b3c 100644
--- a/packages/design-system/src/styles/theme/helper.scss
+++ b/packages/design-system/src/styles/theme/helper.scss
@@ -122,11 +122,6 @@
     gap: var(--oc-space-small);
     justify-content: flex-start;
     width: 100%;
-
-    &:focus,
-    &:hover {
-      text-decoration: none;
-    }
   }
 }
 
@@ -136,6 +131,5 @@
     display: inline-flex;
     gap: 10px;
     vertical-align: top;
-    text-decoration: none;
   }
 }
\ No newline at end of file
diff --git a/packages/design-system/src/styles/theme/oc-form.scss b/packages/design-system/src/styles/theme/oc-form.scss
index d49ae718c0..9ed1121850 100644
--- a/packages/design-system/src/styles/theme/oc-form.scss
+++ b/packages/design-system/src/styles/theme/oc-form.scss
@@ -144,17 +144,6 @@ $internal-form-checkbox-indeterminate-image: "data:image/svg+xml;charset=UTF-8,%
 
 .oc-select { text-transform: none; }
 
-/*
- * 1. Change font properties to `inherit` in all browsers
- * 2. Don't inherit the `font-weight` and use `bold` instead.
- * NOTE: Both declarations don't work in Chrome, Safari and Opera.
- */
-
-.oc-select optgroup {
-  /* 2 */
-  font-weight: bold;
-}
-
 /*
  * Remove the default vertical scrollbar in IE 10+.
  */
diff --git a/packages/design-system/src/styles/theme/oc-text.scss b/packages/design-system/src/styles/theme/oc-text.scss
index b626528707..a8360f2f2f 100644
--- a/packages/design-system/src/styles/theme/oc-text.scss
+++ b/packages/design-system/src/styles/theme/oc-text.scss
@@ -15,7 +15,6 @@ html * {
 
 a {
   color: var(--oc-role-secondary);
-  text-decoration: none;
 
   &:hover {
     color: var(--oc-role-on-surface);
diff --git a/packages/web-app-activities/src/views/ActivityList.vue b/packages/web-app-activities/src/views/ActivityList.vue
index f2eaf6da3b..aa141d2c11 100644
--- a/packages/web-app-activities/src/views/ActivityList.vue
+++ b/packages/web-app-activities/src/views/ActivityList.vue
@@ -2,7 +2,7 @@
   <oc-list class="activity-list">
     <li v-for="(activityItems, date) in activitiesDateCategorized" :key="date" class="mb-6">
       <h2
-        class="oc-text-bold oc-text-muted activity-list-date text-base"
+        class="font-semibold oc-text-muted activity-list-date text-base"
         v-text="getDateHeadline(date)"
       />
       <oc-list class="ml-2 mt-2 timeline">
diff --git a/packages/web-app-admin-settings/src/components/Groups/SideBar/DetailsPanel.vue b/packages/web-app-admin-settings/src/components/Groups/SideBar/DetailsPanel.vue
index 7cecc33d25..acde531edb 100644
--- a/packages/web-app-admin-settings/src/components/Groups/SideBar/DetailsPanel.vue
+++ b/packages/web-app-admin-settings/src/components/Groups/SideBar/DetailsPanel.vue
@@ -13,7 +13,7 @@
       class="selected-group-details p-1"
       :aria-label="$gettext('Overview of the information about the selected group')"
     >
-      <span class="pr-2 oc-font-semibold" v-text="$gettext('Group name')" />
+      <span class="pr-2 font-semibold" v-text="$gettext('Group name')" />
       <span v-text="group.displayName" />
     </p>
   </div>
diff --git a/packages/web-app-admin-settings/src/components/Groups/SideBar/MembersPanel.vue b/packages/web-app-admin-settings/src/components/Groups/SideBar/MembersPanel.vue
index c752c69107..235f3d1c95 100644
--- a/packages/web-app-admin-settings/src/components/Groups/SideBar/MembersPanel.vue
+++ b/packages/web-app-admin-settings/src/components/Groups/SideBar/MembersPanel.vue
@@ -3,10 +3,10 @@
     <oc-text-input v-model="filterTerm" class="mr-2 mt-4" :label="$gettext('Filter members')" />
     <div ref="membersListRef" data-testid="space-members">
       <div v-if="!filteredGroupMembers.length">
-        <h3 class="oc-text-bold text-base" v-text="$gettext('No members found')" />
+        <h3 class="font-semibold text-base" v-text="$gettext('No members found')" />
       </div>
       <div v-if="filteredGroupMembers.length" class="mb-4" data-testid="group-members">
-        <h3 class="oc-text-bold text-base" v-text="$gettext('Members')" />
+        <h3 class="font-semibold text-base" v-text="$gettext('Members')" />
         <members-role-section :group-members="filteredGroupMembers" />
       </div>
     </div>
diff --git a/packages/web-app-admin-settings/src/components/Spaces/SideBar/MembersPanel.vue b/packages/web-app-admin-settings/src/components/Spaces/SideBar/MembersPanel.vue
index 864d116140..bf93f02509 100644
--- a/packages/web-app-admin-settings/src/components/Spaces/SideBar/MembersPanel.vue
+++ b/packages/web-app-admin-settings/src/components/Spaces/SideBar/MembersPanel.vue
@@ -3,7 +3,7 @@
     <oc-text-input v-model="filterTerm" class="mr-2 mt-4" :label="$gettext('Filter members')" />
     <div ref="membersListRef" data-testid="space-members">
       <div v-if="!filteredPermissions.length">
-        <h3 class="oc-text-bold text-base" v-text="$gettext('No members found')" />
+        <h3 class="font-semibold text-base" v-text="$gettext('No members found')" />
       </div>
       <div v-for="(role, i) in availableRoles" :key="i">
         <div
@@ -11,12 +11,12 @@
           class="mb-4"
           :data-testid="`space-members-role-${role.displayName}`"
         >
-          <h3 class="oc-text-bold text-base" v-text="role.displayName" />
+          <h3 class="font-semibold text-base" v-text="role.displayName" />
           <members-role-section :permissions="getPermissionsForRole(role)" />
         </div>
       </div>
       <div v-if="permissionsWithoutRole.length" class="space-members-custom">
-        <h3 class="oc-text-bold text-base" v-text="$gettext('Custom role')" />
+        <h3 class="font-semibold text-base" v-text="$gettext('Custom role')" />
         <members-role-section :permissions="permissionsWithoutRole" />
       </div>
     </div>
diff --git a/packages/web-app-admin-settings/src/components/Users/SideBar/DetailsPanel.vue b/packages/web-app-admin-settings/src/components/Users/SideBar/DetailsPanel.vue
index 48bbad16bd..df3d485905 100644
--- a/packages/web-app-admin-settings/src/components/Users/SideBar/DetailsPanel.vue
+++ b/packages/web-app-admin-settings/src/components/Users/SideBar/DetailsPanel.vue
@@ -151,16 +151,4 @@ export default defineComponent({
   background-color: var(--oc-role-surface-container);
   border-radius: 5px;
 }
-
-.details-table {
-  text-align: left;
-
-  tr {
-    height: 1.5rem;
-  }
-
-  th {
-    font-weight: 600;
-  }
-}
 </style>
diff --git a/packages/web-app-admin-settings/tests/unit/components/Groups/SideBar/__snapshots__/MembersPanel.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/components/Groups/SideBar/__snapshots__/MembersPanel.spec.ts.snap
index c200c06872..4fc9dcdcc7 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Groups/SideBar/__snapshots__/MembersPanel.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/components/Groups/SideBar/__snapshots__/MembersPanel.spec.ts.snap
@@ -5,7 +5,7 @@ exports[`MembersPanel > should display an empty result if no matching members fo
   <oc-text-input-stub label="Filter members" id="oc-textinput-3" type="text" modelvalue="no-match" clearbuttonenabled="false" clearbuttonaccessiblelabel="" disabled="false" errormessagedebouncedtime="500" fixmessageline="false" readonly="false" requiredmark="false" passwordpolicy="[object Object]" class="mr-2 mt-4"></oc-text-input-stub>
   <div data-testid="space-members">
     <div>
-      <h3 class="oc-text-bold text-base">No members found</h3>
+      <h3 class="font-semibold text-base">No members found</h3>
     </div>
     <!--v-if-->
   </div>
@@ -18,7 +18,7 @@ exports[`MembersPanel > should render all members accordingly to their role assi
   <div data-testid="space-members">
     <!--v-if-->
     <div class="mb-4" data-testid="group-members">
-      <h3 class="oc-text-bold text-base">Members</h3>
+      <h3 class="font-semibold text-base">Members</h3>
       <members-role-section-stub groupmembers="undefined"></members-role-section-stub>
     </div>
   </div>
diff --git a/packages/web-app-admin-settings/tests/unit/components/Spaces/SideBar/__snapshots__/MembersPanel.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/components/Spaces/SideBar/__snapshots__/MembersPanel.spec.ts.snap
index a8bdba7cfb..7c09cc5711 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Spaces/SideBar/__snapshots__/MembersPanel.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/components/Spaces/SideBar/__snapshots__/MembersPanel.spec.ts.snap
@@ -14,7 +14,7 @@ exports[`MembersPanel > should display an empty result if no matching members fo
   </div>
   <div data-testid="space-members">
     <div>
-      <h3 class="oc-text-bold text-base">No members found</h3>
+      <h3 class="font-semibold text-base">No members found</h3>
     </div>
     <div>
       <!--v-if-->
@@ -46,19 +46,19 @@ exports[`MembersPanel > should render all members accordingly to their role assi
     <!--v-if-->
     <div>
       <div class="mb-4" data-testid="space-members-role-Managers">
-        <h3 class="oc-text-bold text-base">Managers</h3>
+        <h3 class="font-semibold text-base">Managers</h3>
         <members-role-section-stub permissions="undefined"></members-role-section-stub>
       </div>
     </div>
     <div>
       <div class="mb-4" data-testid="space-members-role-Editors">
-        <h3 class="oc-text-bold text-base">Editors</h3>
+        <h3 class="font-semibold text-base">Editors</h3>
         <members-role-section-stub permissions="undefined"></members-role-section-stub>
       </div>
     </div>
     <div>
       <div class="mb-4" data-testid="space-members-role-Viewers">
-        <h3 class="oc-text-bold text-base">Viewers</h3>
+        <h3 class="font-semibold text-base">Viewers</h3>
         <members-role-section-stub permissions="undefined"></members-role-section-stub>
       </div>
     </div>
diff --git a/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
index 0eb0f6eaad..fc8f86c3f2 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
@@ -23,7 +23,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
         <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-shrink oc-th oc-table-header-cell oc-table-header-cell-icon" style="top: 0px;">
           <div><span class="oc-table-thead-content header-text"></span></div>
         </th>
-        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-th oc-table-header-cell oc-table-header-cell-name" style="top: 0px;" aria-sort="ascending"><button type="button" aria-label="Sort by name" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-th oc-table-header-cell oc-table-header-cell-name" style="top: 0px;" aria-sort="ascending"><button type="button" aria-label="Sort by name" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
             <!--v-if-->
             <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Name</span> <span class="oc-icon oc-icon-s box-content p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -35,7 +35,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
       return svg;
     }" aria-hidden="true" focusable="false"></svg></span>
           </button></th>
-        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-status" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by status" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-status" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by status" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
             <!--v-if-->
             <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Status</span> <span class="oc-icon oc-icon-s box-content oc-invisible-sr p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -50,7 +50,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
         <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-manager" style="top: 0px;">
           <div><span class="oc-table-thead-content header-text">Manager</span></div>
         </th>
-        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-members" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by members" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-members" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by members" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
             <!--v-if-->
             <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Members</span> <span class="oc-icon oc-icon-s box-content oc-invisible-sr p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -62,7 +62,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
       return svg;
     }" aria-hidden="true" focusable="false"></svg></span>
           </button></th>
-        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-totalQuota" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by totalQuota" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-totalQuota" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by totalQuota" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
             <!--v-if-->
             <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Total quota</span> <span class="oc-icon oc-icon-s box-content oc-invisible-sr p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -74,7 +74,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
       return svg;
     }" aria-hidden="true" focusable="false"></svg></span>
           </button></th>
-        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-usedQuota" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by usedQuota" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-usedQuota" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by usedQuota" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
             <!--v-if-->
             <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Used quota</span> <span class="oc-icon oc-icon-s box-content oc-invisible-sr p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -86,7 +86,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
       return svg;
     }" aria-hidden="true" focusable="false"></svg></span>
           </button></th>
-        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-remainingQuota" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by remainingQuota" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-remainingQuota" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by remainingQuota" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
             <!--v-if-->
             <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Remaining quota</span> <span class="oc-icon oc-icon-s box-content oc-invisible-sr p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -98,7 +98,7 @@ exports[`SpacesList > should render all spaces in a table 1`] = `
       return svg;
     }" aria-hidden="true" focusable="false"></svg></span>
           </button></th>
-        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-mdate" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by mdate" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+        <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-mdate" style="top: 0px;" aria-sort="none"><button type="button" aria-label="Sort by mdate" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
             <!--v-if-->
             <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Modified</span> <span class="oc-icon oc-icon-s box-content oc-invisible-sr p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
diff --git a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
index f7a211deef..383bfe85b7 100644
--- a/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
+++ b/packages/web-app-admin-settings/tests/unit/views/__snapshots__/Users.spec.ts.snap
@@ -120,19 +120,19 @@ exports[`Users view > list view > renders list initially 1`] = `
                     <div><span class="oc-table-thead-content header-text"></span></div>
                   </th>
                   <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-onPremisesSamAccountName" style="top: 0px;" aria-sort="ascending">
-                    <oc-button-stub arialabel="Sort by onPremisesSamAccountName" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1"></oc-button-stub>
+                    <oc-button-stub arialabel="Sort by onPremisesSamAccountName" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1 hover:underline"></oc-button-stub>
                   </th>
                   <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-displayName" style="top: 0px;" aria-sort="none">
-                    <oc-button-stub arialabel="Sort by displayName" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1"></oc-button-stub>
+                    <oc-button-stub arialabel="Sort by displayName" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1 hover:underline"></oc-button-stub>
                   </th>
                   <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-mail" style="top: 0px;" aria-sort="none">
-                    <oc-button-stub arialabel="Sort by mail" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1"></oc-button-stub>
+                    <oc-button-stub arialabel="Sort by mail" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1 hover:underline"></oc-button-stub>
                   </th>
                   <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-role" style="top: 0px;" aria-sort="none">
-                    <oc-button-stub arialabel="Sort by role" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1"></oc-button-stub>
+                    <oc-button-stub arialabel="Sort by role" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1 hover:underline"></oc-button-stub>
                   </th>
                   <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-accountEnabled" style="top: 0px;" aria-sort="none">
-                    <oc-button-stub arialabel="Sort by accountEnabled" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1"></oc-button-stub>
+                    <oc-button-stub arialabel="Sort by accountEnabled" appearance="raw" colorrole="secondary" disabled="false" gapsize="small" justifycontent="center" showspinner="false" size="medium" submit="button" type="button" nohover="true" class="oc-button-sort oc-width-1-1 hover:underline"></oc-button-stub>
                   </th>
                   <th class="oc-table-cell oc-table-cell-align-right oc-table-cell-align-middle oc-table-cell-width-auto oc-th oc-table-header-cell oc-table-header-cell-actions pr-4" style="top: 0px;">
                     <div><span class="oc-table-thead-content header-text">Actions</span></div>
diff --git a/packages/web-app-app-store/src/components/AppImageGallery.vue b/packages/web-app-app-store/src/components/AppImageGallery.vue
index bc39b1e0e2..e164d826fe 100644
--- a/packages/web-app-app-store/src/components/AppImageGallery.vue
+++ b/packages/web-app-app-store/src/components/AppImageGallery.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-image-wrapper">
     <div v-if="app.badge" class="app-image-ribbon" :class="[`app-image-ribbon-${app.badge.color}`]">
-      <span class="text-xs">{{ app.badge.label }}</span>
+      <span class="text-xs font-bold">{{ app.badge.label }}</span>
     </div>
     <div class="app-image">
       <oc-image v-if="currentImage?.url" :src="currentImage?.url" />
@@ -118,7 +118,6 @@ export default defineComponent({
       position: absolute;
       top: 1.8rem;
       right: -2.2rem;
-      font-weight: bold;
       text-align: center;
       transform: rotate(45deg);
       -webkit-transform: rotate(45deg);
diff --git a/packages/web-app-app-store/src/components/AppTile.vue b/packages/web-app-app-store/src/components/AppTile.vue
index 86caca3789..5dd3daa257 100644
--- a/packages/web-app-app-store/src/components/AppTile.vue
+++ b/packages/web-app-app-store/src/components/AppTile.vue
@@ -76,7 +76,6 @@ export default defineComponent({
 
   .app-tile-title {
     .mark-highlight {
-      font-weight: unset !important;
       color: var(--oc-role-on-surface);
     }
   }
diff --git a/packages/web-app-epub-reader/src/App.vue b/packages/web-app-epub-reader/src/App.vue
index e11da5dcd1..4cfbf15ca6 100644
--- a/packages/web-app-epub-reader/src/App.vue
+++ b/packages/web-app-epub-reader/src/App.vue
@@ -7,7 +7,13 @@
         class="epub-reader-chapters-list-item py-2"
         :class="{ active: currentChapter.id === chapter.id }"
       >
-        <oc-button class="oc-text-truncate" appearance="raw" no-hover @click="showChapter(chapter)">
+        <oc-button
+          class="oc-text-truncate"
+          :class="{ 'font-semibold': currentChapter.id === chapter.id }"
+          appearance="raw"
+          no-hover
+          @click="showChapter(chapter)"
+        >
           <span v-oc-tooltip="chapter.label" class="oc-text-truncate mr-2" v-text="chapter.label" />
         </oc-button>
       </li>
@@ -283,12 +289,6 @@ export default defineComponent({
     &-item:not(:last-child) {
       border-bottom: 0.5px solid var(--oc-role-outline-variant);
     }
-
-    &-item.active {
-      .oc-button {
-        font-weight: var(--oc-font-weight-semibold);
-      }
-    }
   }
 
   &-controls-font-size {
diff --git a/packages/web-app-epub-reader/tests/unit/__snapshots__/app.spec.ts.snap b/packages/web-app-epub-reader/tests/unit/__snapshots__/app.spec.ts.snap
index cebbe74abc..e93c39973d 100644
--- a/packages/web-app-epub-reader/tests/unit/__snapshots__/app.spec.ts.snap
+++ b/packages/web-app-epub-reader/tests/unit/__snapshots__/app.spec.ts.snap
@@ -3,7 +3,7 @@
 exports[`Epub reader app > renders correctly 1`] = `
 "<div class="epub-reader flex">
   <ul class="oc-list epub-reader-chapters-list pl-2 oc-visible@l">
-    <li class="epub-reader-chapters-list-item py-2 active"><button type="button" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-text-truncate">
+    <li class="epub-reader-chapters-list-item py-2 active"><button type="button" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-text-truncate font-semibold">
         <!--v-if-->
         <!-- @slot Content of the button --> <span class="oc-text-truncate mr-2">Chapter 1</span>
       </button></li>
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 7027a86872..666c5e3162 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -487,10 +487,6 @@ const folderIconResource = computed(() => {
   }
 }
 
-.create-list-file-item-extension {
-  font-weight: 400 !important;
-}
-
 .expanded-list {
   min-width: 280px !important;
 }
diff --git a/packages/web-app-files/src/components/Search/List.vue b/packages/web-app-files/src/components/Search/List.vue
index a8e3e5214e..e0e0f5b93f 100644
--- a/packages/web-app-files/src/components/Search/List.vue
+++ b/packages/web-app-files/src/components/Search/List.vue
@@ -520,12 +520,19 @@ export default defineComponent({
   }
 })
 </script>
+<style>
+@reference 'tailwindcss';
+
+@layer utilities {
+  .files-search-resource-highlights mark {
+    @apply font-semibold;
+  }
+}
+</style>
 <style lang="scss">
 .files-search-resource-highlights {
   mark {
     background: #fff74c;
-    font-style: normal;
-    font-weight: var(--oc-font-weight-semibold);
   }
 }
 </style>
diff --git a/packages/web-app-files/src/components/SideBar/Audio/AudioMetaPanel.vue b/packages/web-app-files/src/components/SideBar/Audio/AudioMetaPanel.vue
index 512b9345d0..98223effa2 100644
--- a/packages/web-app-files/src/components/SideBar/Audio/AudioMetaPanel.vue
+++ b/packages/web-app-files/src/components/SideBar/Audio/AudioMetaPanel.vue
@@ -108,7 +108,6 @@ export default defineComponent({
   grid-template-columns: auto minmax(0, 1fr);
 
   dt {
-    font-weight: bold;
     white-space: nowrap;
   }
 }
diff --git a/packages/web-app-files/src/components/SideBar/Exif/ExifPanel.vue b/packages/web-app-files/src/components/SideBar/Exif/ExifPanel.vue
index 8f53b453f5..0534ae0b78 100644
--- a/packages/web-app-files/src/components/SideBar/Exif/ExifPanel.vue
+++ b/packages/web-app-files/src/components/SideBar/Exif/ExifPanel.vue
@@ -167,7 +167,6 @@ export default defineComponent({
   grid-template-columns: auto minmax(0, 1fr);
 
   dt {
-    font-weight: bold;
     white-space: nowrap;
   }
 }
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index a18f2e7ff9..c9314a49b2 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="oc-files-file-link" class="oc-position-relative">
     <div class="flex items-center">
-      <h3 class="oc-text-bold text-base m-0" v-text="$gettext('Public links')" />
+      <h3 class="font-semibold text-base m-0" v-text="$gettext('Public links')" />
       <oc-contextual-helper v-if="helpersEnabled" class="pl-1" v-bind="viaLinkHelp" />
     </div>
     <p v-if="!directLinks.length" class="files-links-empty mt-4" v-text="noLinksLabel" />
@@ -52,7 +52,7 @@
     </div>
     <div v-if="indirectLinks.length" class="files-links-indirect mt-4">
       <hr class="my-4" />
-      <h4 class="oc-text-bold text-base m-0">
+      <h4 class="font-semibold text-base m-0">
         {{ indirectLinksHeading }}
         <oc-contextual-helper v-if="helpersEnabled" class="pl-1" v-bind="indirectLinkHelp" />
       </h4>
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index 92b4f21eb4..37a5c705a4 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -2,7 +2,7 @@
   <div id="oc-files-sharing-sidebar" class="oc-position-relative">
     <div class="flex justify-between items-center">
       <div class="flex">
-        <h3 v-translate class="oc-text-bold text-base m-0">Share with people</h3>
+        <h3 v-translate class="font-semibold text-base m-0">Share with people</h3>
         <oc-contextual-helper v-if="helpersEnabled" class="pl-1" v-bind="inviteCollaboratorHelp" />
       </div>
       <copy-private-link :resource="resource" />
@@ -20,7 +20,7 @@
     />
     <template v-if="hasSharees">
       <div id="files-collaborators-headline" class="flex items-center justify-between">
-        <h4 class="oc-text-bold my-0" v-text="sharedWithLabel" />
+        <h4 class="font-semibold my-0" v-text="sharedWithLabel" />
       </div>
       <portal-target
         name="app.files.sidebar.sharing.shared-with.top"
@@ -65,7 +65,7 @@
     </template>
     <template v-if="showSpaceMembers">
       <div class="flex items-center justify-between">
-        <h4 class="oc-text-bold my-2" v-text="spaceMemberLabel" />
+        <h4 class="font-semibold my-2" v-text="spaceMemberLabel" />
       </div>
       <ul
         id="space-collaborators-list"
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Shared/RoleItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Shared/RoleItem.vue
index 8d14e6b1ec..c0882a8325 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Shared/RoleItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Shared/RoleItem.vue
@@ -1,7 +1,7 @@
 <template>
   <span :id="`files-role-${(role as ShareRole).id}`" class="roles-select-role-item">
     <span
-      class="oc-text-bold oc-display-block oc-width-1-1 leading-4"
+      class="font-semibold oc-display-block oc-width-1-1 leading-4"
       v-text="$gettext((role as ShareRole).displayName)"
     />
     <span
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
index 0ee68436df..79e39755e0 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
@@ -2,7 +2,7 @@
   <div id="oc-files-sharing-sidebar" class="oc-position-relative">
     <div class="flex">
       <div v-if="canShare({ space: resource, resource })" class="flex py-2">
-        <h3 class="oc-text-bold text-base m-0" v-text="$gettext('Add members')" />
+        <h3 class="font-semibold text-base m-0" v-text="$gettext('Add members')" />
         <oc-contextual-helper v-if="helpersEnabled" class="pl-1" v-bind="spaceAddMemberHelp" />
       </div>
       <copy-private-link :resource="resource" class="ml-auto" />
@@ -20,7 +20,7 @@
         class="flex items-center justify-between oc-position-relative"
       >
         <div class="flex">
-          <h4 class="oc-text-bold my-0" v-text="$gettext('Members')" />
+          <h4 class="font-semibold my-0" v-text="$gettext('Members')" />
           <oc-button
             v-oc-tooltip="$gettext('Filter members')"
             class="open-filter-btn ml-2"
diff --git a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
index 5a38e07a8f..c84184a3c9 100644
--- a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
+++ b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
@@ -6,7 +6,7 @@
           <div class="version-details">
             <span
               v-oc-tooltip="formatVersionDate(item)"
-              class="version-date oc-font-semibold"
+              class="version-date font-semibold"
               data-testid="file-versions-file-last-modified-date"
               >{{ formatVersionDateRelative(item) }}</span
             >
diff --git a/packages/web-app-files/src/components/Spaces/SpaceHeader.vue b/packages/web-app-files/src/components/Spaces/SpaceHeader.vue
index f313a1a054..01eb638bef 100644
--- a/packages/web-app-files/src/components/Spaces/SpaceHeader.vue
+++ b/packages/web-app-files/src/components/Spaces/SpaceHeader.vue
@@ -65,7 +65,7 @@
           <oc-spinner v-else size="small" :aria-label="$gettext('Loading members')" />
         </oc-button>
       </div>
-      <p v-if="space.description" class="mt-0 oc-text-bold">{{ space.description }}</p>
+      <p v-if="space.description" class="mt-0 font-semibold">{{ space.description }}</p>
       <div
         v-if="readmesLoading.includes(space.id)"
         class="space-header-readme-loading flex items-center justify-center"
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.ts.snap b/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.ts.snap
index eb4e5937ba..a7b0b3a255 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/__snapshots__/FileShares.spec.ts.snap
@@ -4,14 +4,14 @@ exports[`FileShares > collaborators list > renders sharedWithLabel and sharee li
 "<div data-v-5d17c3fa="" id="oc-files-sharing-sidebar" class="oc-position-relative">
   <div data-v-5d17c3fa="" class="flex justify-between items-center">
     <div data-v-5d17c3fa="" class="flex">
-      <h3 data-v-5d17c3fa="" class="oc-text-bold text-base m-0" data-msgid="Share with people" data-current-language="en">Share with people</h3>
+      <h3 data-v-5d17c3fa="" class="font-semibold text-base m-0" data-msgid="Share with people" data-current-language="en">Share with people</h3>
       <oc-contextual-helper-stub data-v-5d17c3fa="" title="Share with people" endtext="" list="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]" readmorelink="https://docs.opencloud.eu/docs/user/sharing" text="Use the input field to search for users and groups. Select them to share the item." class="pl-1"></oc-contextual-helper-stub>
     </div>
     <copy-private-link-stub data-v-5d17c3fa="" resource="undefined"></copy-private-link-stub>
   </div>
   <invite-collaborator-form-stub data-v-5d17c3fa="" savebuttonlabel="Share" invitelabel="" class="my-2"></invite-collaborator-form-stub>
   <div data-v-5d17c3fa="" id="files-collaborators-headline" class="flex items-center justify-between">
-    <h4 data-v-5d17c3fa="" class="oc-text-bold my-0">Shared with</h4>
+    <h4 data-v-5d17c3fa="" class="font-semibold my-0">Shared with</h4>
   </div>
   <portal-target data-v-5d17c3fa="" name="app.files.sidebar.sharing.shared-with.top" slot-props="[object Object]" multiple="true"></portal-target>
   <ul data-v-5d17c3fa="" id="files-collaborators-list" class="oc-list oc-list-divider m-0" aria-label="Share receivers">
@@ -41,14 +41,14 @@ exports[`FileShares > current space > loads space members if a space is given an
 "<div data-v-5d17c3fa="" id="oc-files-sharing-sidebar" class="oc-position-relative">
   <div data-v-5d17c3fa="" class="flex justify-between items-center">
     <div data-v-5d17c3fa="" class="flex">
-      <h3 data-v-5d17c3fa="" class="oc-text-bold text-base m-0" data-msgid="Share with people" data-current-language="en">Share with people</h3>
+      <h3 data-v-5d17c3fa="" class="font-semibold text-base m-0" data-msgid="Share with people" data-current-language="en">Share with people</h3>
       <oc-contextual-helper-stub data-v-5d17c3fa="" title="Share with people" endtext="" list="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]" readmorelink="https://docs.opencloud.eu/docs/user/sharing" text="Use the input field to search for users and groups. Select them to share the item." class="pl-1"></oc-contextual-helper-stub>
     </div>
     <copy-private-link-stub data-v-5d17c3fa="" resource="undefined"></copy-private-link-stub>
   </div>
   <invite-collaborator-form-stub data-v-5d17c3fa="" savebuttonlabel="Share" invitelabel="" class="my-2"></invite-collaborator-form-stub>
   <div data-v-5d17c3fa="" id="files-collaborators-headline" class="flex items-center justify-between">
-    <h4 data-v-5d17c3fa="" class="oc-text-bold my-0">Shared with</h4>
+    <h4 data-v-5d17c3fa="" class="font-semibold my-0">Shared with</h4>
   </div>
   <portal-target data-v-5d17c3fa="" name="app.files.sidebar.sharing.shared-with.top" slot-props="[object Object]" multiple="true"></portal-target>
   <ul data-v-5d17c3fa="" id="files-collaborators-list" class="oc-list oc-list-divider mb-6" aria-label="Share receivers">
@@ -59,7 +59,7 @@ exports[`FileShares > current space > loads space members if a space is given an
   </ul>
   <!--v-if-->
   <div data-v-5d17c3fa="" class="flex items-center justify-between">
-    <h4 data-v-5d17c3fa="" class="oc-text-bold my-2">Space members</h4>
+    <h4 data-v-5d17c3fa="" class="font-semibold my-2">Space members</h4>
   </div>
   <ul data-v-5d17c3fa="" id="space-collaborators-list" class="oc-list oc-list-divider oc-overflow-hidden m-0" aria-label="Space members">
     <li data-v-5d17c3fa="">
diff --git a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap
index 41db3e4c00..d388d7fc14 100644
--- a/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/views/spaces/__snapshots__/Projects.spec.ts.snap
@@ -25,7 +25,7 @@ exports[`Projects view > different files view states > lists all available proje
                 <div><span class="oc-table-thead-content"><div class="resource-table-select-all"><span><input id="resource-table-select-all" type="checkbox" name="checkbox" class="oc-checkbox oc-rounded oc-checkbox-l m-0.5" aria-label="Select all"> <!--v-if--></span></div></span>
       </div>
       </th>
-      <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-th oc-table-header-cell oc-table-header-cell-name" style="top: 0px;" aria-sort="ascending"><button type="button" aria-label="Sort by name" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+      <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-th oc-table-header-cell oc-table-header-cell-name" style="top: 0px;" aria-sort="ascending"><button type="button" aria-label="Sort by name" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
           <!--v-if-->
           <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Name</span> <span class="oc-icon oc-icon-s box-content p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
diff --git a/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap b/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
index 0d58247a1b..363385e3ec 100644
--- a/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/views/trash/__snapshots__/Overview.spec.ts.snap
@@ -20,7 +20,7 @@ exports[`TrashOverview > view states > should render trash list 1`] = `
       <table class="oc-table oc-table-hover oc-table-sticky has-item-context-menu trash-table files-table" id="files-space-table" selection="">
         <thead class="oc-thead">
           <tr class="oc-table-header-row">
-            <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-th oc-table-header-cell oc-table-header-cell-name pl-4" style="top: 0px;" aria-sort="ascending"><button type="button" aria-label="Sort by name" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1">
+            <th class="oc-table-cell oc-table-cell-align-left oc-table-cell-align-middle oc-table-cell-width-expand oc-th oc-table-header-cell oc-table-header-cell-name pl-4" style="top: 0px;" aria-sort="ascending"><button type="button" aria-label="Sort by name" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-s oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-button-sort oc-width-1-1 hover:underline">
                 <!--v-if-->
                 <!-- @slot Content of the button --> <span class="oc-table-thead-content header-text">Name</span> <span class="oc-icon oc-icon-s box-content p-1 oc-rounded"><svg data-testid="inline-svg-stub" src="icons/arrow-down-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
diff --git a/packages/web-app-search/src/portals/SearchBar.vue b/packages/web-app-search/src/portals/SearchBar.vue
index 8798cea6b3..68dfb18ffa 100644
--- a/packages/web-app-search/src/portals/SearchBar.vue
+++ b/packages/web-app-search/src/portals/SearchBar.vue
@@ -586,7 +586,6 @@ export default defineComponent({
     width: 450px;
     overflow-y: auto;
     max-height: calc(100vh - 60px);
-    text-decoration: none;
 
     @media (max-width: 969px) {
       width: 300px;
diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 0ff6d5e62a..c969b09301 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -252,11 +252,5 @@ export default defineComponent({
       color: var(--oc-role-on-chrome) !important;
     }
   }
-
-  .oc-resource-icon:hover,
-  .oc-resource-name:hover {
-    cursor: default;
-    text-decoration: none;
-  }
 }
 </style>
diff --git a/packages/web-pkg/src/components/ContextActions/ContextActionMenu.vue b/packages/web-pkg/src/components/ContextActions/ContextActionMenu.vue
index 0cba26ba2c..00d2e187bb 100644
--- a/packages/web-pkg/src/components/ContextActions/ContextActionMenu.vue
+++ b/packages/web-pkg/src/components/ContextActions/ContextActionMenu.vue
@@ -101,7 +101,6 @@ export default defineComponent({
     button,
     span {
       display: inline-flex;
-      font-weight: normal !important;
       justify-content: flex-start;
       vertical-align: top;
       width: 100%;
diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
index 7edb2b6a30..deeaaa2ba5 100644
--- a/packages/web-pkg/src/components/CreateLinkModal.vue
+++ b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -11,7 +11,7 @@
     <div v-else class="flex items-center">
       <oc-icon class="mr-2" :name="selectedTypeIcon" fill-type="line" />
       <div class="flex flex-col">
-        <span class="oc-text-bold" v-text="selectedTypeDisplayName" />
+        <span class="font-semibold" v-text="selectedTypeDisplayName" />
         <span class="text-sm" v-text="selectedTypeDescription" />
       </div>
     </div>
diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 4df5f46fbe..47e3b9c37c 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -475,9 +475,5 @@ export default defineComponent({
 
 #create-shortcut-modal-contextmenu {
   width: 458px;
-
-  .oc-resource-name {
-    text-decoration: none !important;
-  }
 }
 </style>
diff --git a/packages/web-pkg/src/components/FilesList/ResourceListItem.vue b/packages/web-pkg/src/components/FilesList/ResourceListItem.vue
index 24e88aad20..8a2ca7b53e 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceListItem.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceListItem.vue
@@ -56,7 +56,7 @@
           class="parent-folder oc-text-truncate px-0.5 mr-2 -ml-0.5"
         >
           <oc-icon v-bind="parentFolderLinkIconAttrs" class="mr-1" />
-          <span class="text oc-text-truncate text-sm" v-text="parentFolderName" />
+          <span class="text oc-text-truncate text-sm hover:underline" v-text="parentFolderName" />
         </component>
       </div>
     </div>
@@ -243,10 +243,6 @@ export default defineComponent({
   &-details {
     display: block;
 
-    a {
-      text-decoration: none;
-    }
-
     a:hover,
     a:focus {
       outline-offset: 0;
@@ -265,7 +261,6 @@ export default defineComponent({
       .text {
         &:hover {
           color: var(--oc-role-on-surface);
-          text-decoration: underline;
         }
       }
     }
diff --git a/packages/web-pkg/src/components/FilesList/ResourceName.vue b/packages/web-pkg/src/components/FilesList/ResourceName.vue
index 2e95084c95..583e970727 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceName.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceName.vue
@@ -1,7 +1,7 @@
 <template>
   <span
     v-oc-tooltip="tooltip"
-    class="oc-resource-name"
+    class="oc-resource-name hover:underline"
     :class="[{ 'oc-display-inline-block': !truncateName }]"
     :data-test-resource-path="fullPath"
     :data-test-resource-name="fullName"
@@ -156,11 +156,6 @@ export default defineComponent({
   &-name {
     display: flex;
     min-width: 0;
-
-    &:hover {
-      text-decoration: underline;
-      text-decoration-color: var(--oc-role-on-surface);
-    }
   }
 
   &-basename,
diff --git a/packages/web-pkg/src/components/Filters/ItemFilterInline.vue b/packages/web-pkg/src/components/Filters/ItemFilterInline.vue
index 461026eebf..b9abb94031 100644
--- a/packages/web-pkg/src/components/Filters/ItemFilterInline.vue
+++ b/packages/web-pkg/src/components/Filters/ItemFilterInline.vue
@@ -84,7 +84,6 @@ export default defineComponent({
   border: 1px solid var(--oc-role-outline);
 
   button {
-    text-decoration: none;
     height: 24px;
   }
 
diff --git a/packages/web-pkg/src/components/LinkRoleDropdown.vue b/packages/web-pkg/src/components/LinkRoleDropdown.vue
index 514af14423..94e5019181 100644
--- a/packages/web-pkg/src/components/LinkRoleDropdown.vue
+++ b/packages/web-pkg/src/components/LinkRoleDropdown.vue
@@ -44,7 +44,7 @@
             <oc-icon :name="getLinkRoleByType(type).icon" class="pl-2 pr-4" />
             <span>
               <span
-                class="role-dropdown-list-option-label oc-text-bold oc-display-block oc-width-1-1 leading-4"
+                class="role-dropdown-list-option-label font-semibold oc-display-block oc-width-1-1 leading-4"
                 v-text="$gettext(getLinkRoleByType(type).displayName)"
               />
               <span class="text-sm leading-4">{{
diff --git a/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue b/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
index 5048fe2768..934c22847c 100644
--- a/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
+++ b/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
@@ -8,7 +8,7 @@
         class="file_info__icon mr-2 oc-position-relative"
       />
       <div class="file_info__body oc-text-overflow">
-        <h3 data-testid="files-info-name" class="oc-font-semibold m-0 text-base">
+        <h3 data-testid="files-info-name" class="font-semibold m-0 text-base">
           <resource-name
             :name="name"
             :extension="resource.extension"
diff --git a/packages/web-pkg/src/components/SideBar/Spaces/SpaceInfo.vue b/packages/web-pkg/src/components/SideBar/Spaces/SpaceInfo.vue
index c250ea9fff..e504dd2f7b 100644
--- a/packages/web-pkg/src/components/SideBar/Spaces/SpaceInfo.vue
+++ b/packages/web-pkg/src/components/SideBar/Spaces/SpaceInfo.vue
@@ -11,7 +11,7 @@
       <div>
         <h3
           data-testid="space-info-name"
-          class="oc-font-semibold m-0 text-base"
+          class="font-semibold m-0 text-base"
           v-text="resource.name"
         />
         <span data-testid="space-info-subtitle" v-text="resource.description" />
diff --git a/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceListItem.spec.ts.snap b/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceListItem.spec.ts.snap
index f8f3189bc7..b0e61b77ff 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceListItem.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceListItem.spec.ts.snap
@@ -15,7 +15,7 @@ exports[`OcResource > displays parent folder name default if calculated name is
   </button>
   <div class="oc-resource-details oc-text-overflow pl-2"><button target="_self" type="button" class="oc-button oc-rounded oc-button-m oc-button-justify-content-left oc-button-gap-undefined oc-button-secondary oc-button-raw oc-button-secondary-raw no-hover oc-resource-link oc-text-overflow" draggable="false">
       <!--v-if-->
-      <!-- @slot Content of the button --> <span class="oc-resource-name" data-test-resource-path="example.pdf" data-test-resource-name="example.pdf" data-test-resource-type="file"><span class="oc-text-truncate"><span class="oc-resource-basename">example</span></span><span class="oc-resource-extension">.pdf</span></span>
+      <!-- @slot Content of the button --> <span class="oc-resource-name hover:underline" data-test-resource-path="example.pdf" data-test-resource-name="example.pdf" data-test-resource-type="file"><span class="oc-text-truncate"><span class="oc-resource-basename">example</span></span><span class="oc-resource-extension">.pdf</span></span>
     </button>
     <div class="oc-resource-indicators"><span style="cursor: default;" class="parent-folder oc-text-truncate px-0.5 mr-2 -ml-0.5"><span class="oc-icon oc-icon-s box-content mr-1"><svg data-testid="inline-svg-stub" src="icons/folder-2-line.svg" transform-source="(svg) => {
       if (__props.accessibleLabel !== &quot;&quot;) {
@@ -25,7 +25,7 @@ exports[`OcResource > displays parent folder name default if calculated name is
         svg.insertBefore(title, svg.firstChild);
       };
       return svg;
-    }" aria-hidden="true" focusable="false"></svg></span> <span class="text oc-text-truncate text-sm">Example parent folder name</span></span></div>
+    }" aria-hidden="true" focusable="false"></svg></span> <span class="text oc-text-truncate text-sm hover:underline">Example parent folder name</span></span></div>
   </div>
 </div>"
 `;
diff --git a/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceName.spec.ts.snap b/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceName.spec.ts.snap
index 99858fcea3..62518f9f5e 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceName.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/FilesList/__snapshots__/ResourceName.spec.ts.snap
@@ -1,25 +1,25 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`OcResourceName > does not show the name as HTML title if the path is being displayed 1`] = `
-"<span class="oc-resource-name" data-test-resource-path="folder" data-test-resource-name="folder" data-test-resource-type="folder"><span class="oc-text-truncate"><span class="oc-resource-basename">folder</span></span>
+"<span class="oc-resource-name hover:underline" data-test-resource-path="folder" data-test-resource-name="folder" data-test-resource-type="folder"><span class="oc-text-truncate"><span class="oc-resource-basename">folder</span></span>
 <!--v-if--></span>"
 `;
 
-exports[`OcResourceName > does not truncate a very long name when disabled 1`] = `"<span class="oc-resource-name oc-display-inline-block" data-test-resource-path="super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" data-test-resource-name=".super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" data-test-resource-type="file" title=".super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt"><span class="oc-resource-basename oc-text-break">.super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end</span><span class="oc-resource-extension">.txt</span></span>"`;
+exports[`OcResourceName > does not truncate a very long name when disabled 1`] = `"<span class="oc-resource-name hover:underline oc-display-inline-block" data-test-resource-path="super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" data-test-resource-name=".super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" data-test-resource-type="file" title=".super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt"><span class="oc-resource-basename oc-text-break">.super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end</span><span class="oc-resource-extension">.txt</span></span>"`;
 
 exports[`OcResourceName > doesn't add extension to hidden folder 1`] = `
-"<span class="oc-resource-name" data-test-resource-path=".hidden" data-test-resource-name=".hidden" data-test-resource-type="folder" title=".hidden"><span class="oc-text-truncate"><span class="oc-resource-basename">.hidden</span></span>
+"<span class="oc-resource-name hover:underline" data-test-resource-path=".hidden" data-test-resource-name=".hidden" data-test-resource-type="folder" title=".hidden"><span class="oc-text-truncate"><span class="oc-resource-basename">.hidden</span></span>
 <!--v-if--></span>"
 `;
 
 exports[`OcResourceName > renders folder names with dots completely in the basename 1`] = `
-"<span class="oc-resource-name" data-test-resource-path="folder.with.dots" data-test-resource-name="folder.with.dots" data-test-resource-type="folder" title="folder.with.dots"><span class="oc-text-truncate"><span class="oc-resource-basename">folder.with.dots</span></span>
+"<span class="oc-resource-name hover:underline" data-test-resource-path="folder.with.dots" data-test-resource-name="folder.with.dots" data-test-resource-type="folder" title="folder.with.dots"><span class="oc-text-truncate"><span class="oc-resource-basename">folder.with.dots</span></span>
 <!--v-if--></span>"
 `;
 
 exports[`OcResourceName > shows the name as HTML title if the path is not displayed 1`] = `
-"<span class="oc-resource-name" data-test-resource-path="folder" data-test-resource-name="folder" data-test-resource-type="folder" title="folder"><span class="oc-text-truncate"><span class="oc-resource-basename">folder</span></span>
+"<span class="oc-resource-name hover:underline" data-test-resource-path="folder" data-test-resource-name="folder" data-test-resource-type="folder" title="folder"><span class="oc-text-truncate"><span class="oc-resource-basename">folder</span></span>
 <!--v-if--></span>"
 `;
 
-exports[`OcResourceName > truncates very long name per default 1`] = `"<span class="oc-resource-name" data-test-resource-path="super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" data-test-resource-name=".super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" data-test-resource-type="file" title=".super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt"><span class="oc-text-truncate"><span class="oc-resource-basename">.super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end</span></span><span class="oc-resource-extension">.txt</span></span>"`;
+exports[`OcResourceName > truncates very long name per default 1`] = `"<span class="oc-resource-name hover:underline" data-test-resource-path="super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" data-test-resource-name=".super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt" data-test-resource-type="file" title=".super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end.txt"><span class="oc-text-truncate"><span class="oc-resource-basename">.super-long-file-name-which-will-be-truncated-when-exceeding-the-screen-space-while-still-preserving-the-file-extension-at-the-end</span></span><span class="oc-resource-extension">.txt</span></span>"`;
diff --git a/packages/web-pkg/tests/unit/components/sidebar/Spaces/__snapshots__/SpaceInfo.spec.ts.snap b/packages/web-pkg/tests/unit/components/sidebar/Spaces/__snapshots__/SpaceInfo.spec.ts.snap
index 82a69e54c2..5efb554757 100644
--- a/packages/web-pkg/tests/unit/components/sidebar/Spaces/__snapshots__/SpaceInfo.spec.ts.snap
+++ b/packages/web-pkg/tests/unit/components/sidebar/Spaces/__snapshots__/SpaceInfo.spec.ts.snap
@@ -7,7 +7,7 @@ exports[`SpaceInfo > shows space info 1`] = `
       <oc-icon-stub accessiblelabel="" color="" filltype="fill" name="layout-grid" size="medium" type="span" class="oc-display-block"></oc-icon-stub>
     </div>
     <div>
-      <h3 data-testid="space-info-name" class="oc-font-semibold m-0 text-base"> space</h3> <span data-testid="space-info-subtitle"></span>
+      <h3 data-testid="space-info-name" class="font-semibold m-0 text-base"> space</h3> <span data-testid="space-info-subtitle"></span>
     </div>
   </div>
 </div>"
diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index 85b6d6f4fd..72f3b12e6a 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -134,16 +134,21 @@ export default defineComponent({
   }
 })
 </script>
+<style>
+@reference 'tailwindcss';
+
+@layer utilities {
+  #web .mark-highlight {
+    @apply font-semibold;
+  }
+}
+</style>
 <style lang="scss">
 #web {
   background-color: var(--oc-role-chrome);
   height: 100dvh;
   max-height: 100dvh;
   overflow-y: hidden;
-
-  .mark-highlight {
-    font-weight: 600;
-  }
 }
 
 iframe {
diff --git a/packages/web-runtime/src/components/Account/AccountTable.vue b/packages/web-runtime/src/components/Account/AccountTable.vue
index 1aa43caf41..385fe3804e 100644
--- a/packages/web-runtime/src/components/Account/AccountTable.vue
+++ b/packages/web-runtime/src/components/Account/AccountTable.vue
@@ -96,10 +96,6 @@ export default defineComponent({
       display: block !important;
       width: 100% !important;
     }
-
-    h2 {
-      font-weight: var(--oc-font-weight-default);
-    }
   }
 }
 
diff --git a/packages/web-runtime/src/components/Modals/AppTokenModal.vue b/packages/web-runtime/src/components/Modals/AppTokenModal.vue
index a4449d7473..3002a68794 100644
--- a/packages/web-runtime/src/components/Modals/AppTokenModal.vue
+++ b/packages/web-runtime/src/components/Modals/AppTokenModal.vue
@@ -41,7 +41,7 @@
     />
     <div class="mt-4 mb-2 flex items-center oc-rounded">
       <div class="created-token-container">
-        <div class="created-token oc-rounded p-2">
+        <div class="created-token oc-rounded p-2 font-bold">
           {{ createdToken }}
           <oc-button
             v-oc-tooltip="$gettext('Copy app token to clipboard')"
@@ -121,7 +121,6 @@ const createAppToken = async () => {
 
 <style lang="scss" scoped>
 .created-token {
-  font-weight: bold;
   background-color: var(--oc-role-surface-container-high);
   display: flex;
   justify-content: space-between;
diff --git a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
index f191c88be2..9a47b208a3 100644
--- a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
+++ b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
@@ -116,10 +116,6 @@ export default defineComponent({
   &.active {
     overflow: hidden;
   }
-  &:focus,
-  &:hover {
-    text-decoration: none !important;
-  }
 
   &:focus:not(.active),
   &:hover:not(.active) {
diff --git a/packages/web-runtime/src/components/Topbar/NotificationBell.vue b/packages/web-runtime/src/components/Topbar/NotificationBell.vue
index e5f88f07d3..ce56dbdd29 100644
--- a/packages/web-runtime/src/components/Topbar/NotificationBell.vue
+++ b/packages/web-runtime/src/components/Topbar/NotificationBell.vue
@@ -12,7 +12,7 @@
       v-if="notificationCount"
       :key="notificationCount"
       :class="{ shake: animate }"
-      class="badge p-1 text-xs leading-2"
+      class="badge p-1 text-xs leading-2 font-light"
       v-text="notificationCountLabel"
     />
   </oc-button>
@@ -73,8 +73,6 @@ export default {
     min-width: var(--oc-space-small);
     height: var(--oc-space-small);
     text-align: center;
-
-    font-weight: 300;
     background: rgb(249, 54, 54);
     color: white;
     box-shadow: 0px 0px 2px 1px rgba(0, 0, 0, 0.5);
diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
index e018dbfb0d..3812caec0e 100644
--- a/tests/e2e/support/objects/app-files/resource/actions.ts
+++ b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -72,7 +72,7 @@ const globalSearchDirFilterDropdown =
 const globalSearchBarFilterAllFiles = '//*[@data-test-id="all-files"]'
 const globalSearchBarFilterCurrentFolder = '//*[@data-test-id="current-folder"]'
 const searchList =
-  '//div[@id="files-global-search-options"]//li[contains(@class,"preview")]//span[@class="oc-resource-name"]'
+  '//div[@id="files-global-search-options"]//li[contains(@class,"preview")]//span[contains(@class,"oc-resource-name")]'
 const globalSearchOptions = '#files-global-search-options'
 const loadingSpinner = '#files-global-search-options .loading'
 const filesViewOptionButton = '#files-view-options-btn'