diff --git a/.changeset/famous-seahorses-smell.md b/.changeset/famous-seahorses-smell.md
new file mode 100644
index 00000000000..3921b616ffa
--- /dev/null
+++ b/.changeset/famous-seahorses-smell.md
@@ -0,0 +1,15 @@
+---
+"@utrecht/link-css": minor
+---
+
+Move the Link `text-underline` effect from `focus` to `focus-visible`. The goal is to not change the `text-underline` appearance during the flow of moving the mouse over the link (`:hover`) and then clicking the link (`:focus` + `:active`).
+
+Add new `focus-visible` tokens for Link:
+
+- `utrecht.link.focus-visible.text-decoration`
+- `utrecht.link.focus-visible.text-decoration-thickness`
+
+The following tokens are now deprecated:
+
+- `utrecht.link.focus.text-decoration`
+- `utrecht.link.focus.text-decoration-thickness`
diff --git a/.changeset/forty-months-dress.md b/.changeset/forty-months-dress.md
new file mode 100644
index 00000000000..95aadb45e09
--- /dev/null
+++ b/.changeset/forty-months-dress.md
@@ -0,0 +1,8 @@
+---
+"@utrecht/focus-ring-css": major
+---
+
+Remove the SCSS variable `$utrecht-focus-visible-fallback` and remove the following mixins:
+
+- `utrecht-focus-ring-reset`
+- `utrecht-focus-pseudo-classes-backwards-compatible`
diff --git a/.changeset/olive-numbers-smile.md b/.changeset/olive-numbers-smile.md
new file mode 100644
index 00000000000..6e726401f6f
--- /dev/null
+++ b/.changeset/olive-numbers-smile.md
@@ -0,0 +1,15 @@
+---
+"@utrecht/skip-link-css": minor
+---
+
+Add new tokens for Skip Link, to replace deprecated tokens:
+
+- `utrecht.skip-link.focus-visible.color`
+- `utrecht.skip-link.focus-visible.background-color`
+- `utrecht.skip-link.focus-visible.text-decoration`
+
+The following Skip Link tokens are now deprecated:
+
+- `utrecht.skip-link.focus.color`
+- `utrecht.skip-link.focus.background-color`
+- `utrecht.skip-link.focus.text-decoration`
diff --git a/.changeset/three-emus-juggle.md b/.changeset/three-emus-juggle.md
new file mode 100644
index 00000000000..f5bdd56a89d
--- /dev/null
+++ b/.changeset/three-emus-juggle.md
@@ -0,0 +1,13 @@
+---
+"@utrecht/map-control-button-css": patch
+"@utrecht/top-task-link-css": patch
+"@utrecht/pagination-css": patch
+"@utrecht/textarea-css": patch
+"@utrecht/textbox-css": patch
+"@utrecht/button-css": patch
+"@utrecht/select-css": patch
+"@utrecht/link-css": patch
+"@utrecht/components": patch
+---
+
+Start using `:focus-visible`, Safari support has caught up.
diff --git a/components/button/src/index.scss b/components/button/src/index.scss
index 4dc08a6637d..19de6679848 100644
--- a/components/button/src/index.scss
+++ b/components/button/src/index.scss
@@ -43,34 +43,12 @@
   @include utrecht-button--focus;
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  .utrecht-button:focus {
-    /* Show focus ring even for disabled :focus-visible buttons. *
-    /* For example: <button disabled tabindex="0"> */
-    @include utrecht-focus-ring;
-  }
-
-  .utrecht-button:focus:not(:disabled, [aria-disabled="true"], .utrecht-button--disabled) {
-    @include utrecht-button--focus;
-    @include utrecht-button--focus-visible;
-  }
-
-  /* override the `:focus` selector above */
-  /* stylelint-disable-next-line no-descending-specificity */
-  .utrecht-button:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  .utrecht-button:focus-visible {
-    @include utrecht-button--focus-visible;
-  }
-
-  .utrecht-button:focus:not(:disabled, [aria-disabled="true"], .utrecht-button--disabled) {
-    @include utrecht-button--focus;
-  }
+.utrecht-button:focus-visible {
+  @include utrecht-button--focus-visible;
+}
+
+.utrecht-button:focus:not(:disabled, [aria-disabled="true"], .utrecht-button--disabled) {
+  @include utrecht-button--focus;
 }
 
 .utrecht-button--hover:not(:disabled, .utrecht-button--disabled),
diff --git a/components/checkbox/src/_mixin.scss b/components/checkbox/src/_mixin.scss
index 9494d3a5b01..fdb84f70a8b 100644
--- a/components/checkbox/src/_mixin.scss
+++ b/components/checkbox/src/_mixin.scss
@@ -56,5 +56,5 @@ $utrecht-support-prince-xml: false !default;
     @include utrecht-checkbox--disabled;
   }
 
-  @include utrecht-focus-pseudo-classes-backwards-compatible;
+  @include utrecht-focus-pseudo-classes;
 }
diff --git a/components/checkbox/src/index.scss b/components/checkbox/src/index.scss
index 98fb53d1819..96e6f0d348c 100644
--- a/components/checkbox/src/index.scss
+++ b/components/checkbox/src/index.scss
@@ -35,5 +35,5 @@
     @include utrecht-checkbox--disabled;
   }
 
-  @include utrecht-focus-pseudo-classes-backwards-compatible;
+  @include utrecht-focus-pseudo-classes;
 }
diff --git a/components/focus-ring/src/_mixin.scss b/components/focus-ring/src/_mixin.scss
index 984bb904ea3..d78d2cc89d0 100644
--- a/components/focus-ring/src/_mixin.scss
+++ b/components/focus-ring/src/_mixin.scss
@@ -4,8 +4,6 @@
  * Copyright (c) 2021 Robbert Broersma
  */
 
-$utrecht-focus-visible-fallback: true !default;
-
 @mixin utrecht-focus-ring {
   /* - The browser default focus ring should apply when these CSS custom properties are not set.
    * - Make the `box-shadow` value available, so components that have their own `box-shadow`
@@ -21,12 +19,6 @@ $utrecht-focus-visible-fallback: true !default;
   outline-width: var(--utrecht-focus-outline-width, revert);
 }
 
-@mixin utrecht-focus-ring-reset {
-  /* undo focus ring */
-  box-shadow: none;
-  outline-style: revert;
-}
-
 /* stylelint-disable-next-line block-no-empty */
 @mixin utrecht-focus {
 }
@@ -43,14 +35,3 @@ $utrecht-focus-visible-fallback: true !default;
     @include utrecht-focus-visible;
   }
 }
-
-// When support is needed for Safari versions that do not support :focus-visible,
-// use this mixin instead of the `utrecht-focus-pseudo-classes` mixin.
-@mixin utrecht-focus-pseudo-classes-backwards-compatible {
-  &:focus {
-    @include utrecht-focus-ring;
-  }
-  &:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-}
diff --git a/components/link/src/_mixin.scss b/components/link/src/_mixin.scss
index e21139c1d3f..5f863dc3ea7 100644
--- a/components/link/src/_mixin.scss
+++ b/components/link/src/_mixin.scss
@@ -90,16 +90,6 @@ however browsers don't seem to have implemented great looking supixel tweening y
   text-underline-offset: var(--utrecht-link-text-underline-offset);
 }
 
-@mixin utrecht-link--icon-left {
-  background-image: var(--utrecht-link-icon-left-background-image, none);
-  background-position: 0 0.25em;
-  background-repeat: no-repeat;
-  color: var(--utrecht-link-color, LinkText);
-  font-weight: var(--utrecht-typography-weight-scale-bold-font-weight);
-  padding-inline-start: var(--utrecht-space-block-md);
-  text-decoration-line: none;
-}
-
 @mixin utrecht-link--visited {
   --_utrecht-link-forced-colors-color: visitedtext;
   --_utrecht-link-state-color: var(--utrecht-link-visited-color);
@@ -122,8 +112,6 @@ however browsers don't seem to have implemented great looking supixel tweening y
 
 @mixin utrecht-link--focus {
   --_utrecht-link-state-color: var(--utrecht-link-focus-color);
-  --_utrecht-link-state-text-decoration: var(--utrecht-link-focus-text-decoration);
-  --_utrecht-link-state-text-decoration-thickness: var(--utrecht-link-focus-text-decoration-thickness);
 
   background-color: var(--utrecht-link-focus-background-color, transparent);
   text-decoration-skip: none;
@@ -152,6 +140,21 @@ however browsers don't seem to have implemented great looking supixel tweening y
    */
   @include utrecht-focus-visible;
 
+  /*
+   * The following tokens are deprecated, but we keep them for backwards compatibility for now:
+   * 
+   * `--utrecht-link-focus-text-decoration`
+   * `--utrecht-link-focus-text-decoration-thickness`
+   */
+  --_utrecht-link-state-text-decoration: var(
+    --utrecht-link-focus-visible-text-decoration,
+    var(--utrecht-link-focus-text-decoration)
+  );
+  --_utrecht-link-state-text-decoration-thickness: var(
+    --utrecht-link-focus-visible-text-decoration-thickness,
+    var(--utrecht-link-focus-text-decoration-thickness)
+  );
+
   z-index: var(--utrecht-stack-focus-z-index, 1);
 }
 
@@ -220,25 +223,11 @@ however browsers don't seem to have implemented great looking supixel tweening y
     @include utrecht-link--active;
   }
 
-  // The workaround for missing `:focus-visible` support makes the code quite complex,
-  // keep the ideal version around to restore it easily when browser support improves.
-
-  @if $utrecht-focus-visible-fallback {
-    &:any-link:focus {
-      @include utrecht-link--focus;
-      @include utrecht-link--focus-visible;
-    }
-
-    &:any-link:focus:not(:focus-visible) {
-      @include utrecht-focus-ring-reset;
-    }
-  } @else {
-    &:any-link:focus {
-      @include utrecht-link--focus;
-    }
-
-    &:any-link:focus-visible {
-      @include utrecht-link--focus-visible;
-    }
+  &:any-link:focus {
+    @include utrecht-link--focus;
+  }
+
+  &:any-link:focus-visible {
+    @include utrecht-link--focus-visible;
   }
 }
diff --git a/components/link/src/html/_mixin.scss b/components/link/src/html/_mixin.scss
index e84ba12388d..a8ced432611 100644
--- a/components/link/src/html/_mixin.scss
+++ b/components/link/src/html/_mixin.scss
@@ -22,26 +22,12 @@
     @include utrecht-link--active;
   }
 
-  // The workaround for missing `:focus-visible` support makes the code quite complex,
-  // keep the ideal version around to restore it easily when browser support improves.
-
-  @if $utrecht-focus-visible-fallback {
-    a:focus {
-      @include utrecht-link--focus;
-      @include utrecht-link--focus-visible;
-    }
-
-    a:focus:not(:focus-visible) {
-      @include utrecht-focus-ring-reset;
-    }
-  } @else {
-    a:focus {
-      @include utrecht-link--focus;
-    }
+  a:focus {
+    @include utrecht-link--focus;
+  }
 
-    a:focus-visible {
-      @include utrecht-link--focus-visible;
-    }
+  a:focus-visible {
+    @include utrecht-link--focus-visible;
   }
 
   a[rel~="external" i] {
diff --git a/components/link/src/index.scss b/components/link/src/index.scss
index 7cc23ef9d93..440e032dccd 100644
--- a/components/link/src/index.scss
+++ b/components/link/src/index.scss
@@ -18,10 +18,6 @@
   @include utrecht-link--any-link;
 }
 
-.utrecht-link--icon-left {
-  @include utrecht-link--icon-left;
-}
-
 .utrecht-link--visited {
   @include utrecht-link--visited;
 }
@@ -40,33 +36,16 @@
   @include utrecht-link--focus-visible;
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  /* `:focus` should only apply to links with `href`, not on disabled links */
-  .utrecht-link--html-span:focus,
-  .utrecht-link--html-a:any-link:focus {
-    @include utrecht-link--focus;
-    @include utrecht-link--focus-visible;
-  }
-
-  .utrecht-link--html-span:focus:not(:focus-visible),
-  .utrecht-link--html-a:any-link:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  /* The `:focus-visible` styling for the focus should apply disabled links too, in case of `tabindex="0"` */
-  .utrecht-link--html-span:focus-visible,
-  .utrecht-link--html-a:focus-visible {
-    @include utrecht-link--focus-visible;
-  }
-
-  /* `:focus` should only apply to links with `href`, not on disabled links */
-  .utrecht-link--html-span:focus,
-  .utrecht-link--html-a:any-link:focus {
-    @include utrecht-link--focus;
-  }
+/* The `:focus-visible` styling for the focus should apply disabled links too, in case of `tabindex="0"` */
+.utrecht-link--html-span:focus-visible,
+.utrecht-link--html-a:focus-visible {
+  @include utrecht-link--focus-visible;
+}
+
+/* `:focus` should only apply to links with `href`, not on disabled links */
+.utrecht-link--html-span:focus,
+.utrecht-link--html-a:any-link:focus {
+  @include utrecht-link--focus;
 }
 
 .utrecht-link--html-span:active,
diff --git a/components/link/src/story-template.jsx b/components/link/src/story-template.jsx
index 8474c39b609..74a4313cdbe 100644
--- a/components/link/src/story-template.jsx
+++ b/components/link/src/story-template.jsx
@@ -87,7 +87,6 @@ export const defaultArgs = {
   telephone: false,
   textContent: '',
   visited: false,
-  iconleft: false,
 };
 
 export const exampleArgs = {
@@ -112,7 +111,6 @@ export const Link = ({
   telephone = defaultArgs.telephone,
   textContent = defaultArgs.textContent,
   visited = defaultArgs.visited,
-  iconleft = defaultArgs.iconleft,
   ...restProps
 }) => (
   <a
@@ -129,7 +127,6 @@ export const Link = ({
       'utrecht-link--placeholder': placeholder,
       'utrecht-link--telephone': telephone,
       'utrecht-link--visited': visited,
-      'utrecht-link--icon-left': iconleft,
     })}
     rel={external ? 'external noopener noreferrer' : null}
     aria-label={ariaLabel || null}
diff --git a/components/link/src/tokens.json b/components/link/src/tokens.json
index f697f0156e9..78a22545514 100644
--- a/components/link/src/tokens.json
+++ b/components/link/src/tokens.json
@@ -76,6 +76,34 @@
           },
           "type": "color"
         },
+        "text-decoration": {
+          "$extensions": {
+            "nl.nldesignsystem.css.property": {
+              "syntax": ["inherit", "none", "underline"],
+              "inherits": true
+            },
+            "nl.nldesignsystem.fallback": ["utrecht.link.text-decoration"],
+            "nl.nldesignsystem.figma.supports-token": true,
+            "nl.nldesignsystem.deprecated": true,
+            "nl.nldesignsystem.redirect": "utrecht.link.focus-visible.text-decoration"
+          },
+          "type": "textDecoration"
+        },
+        "text-decoration-thickness": {
+          "$extensions": {
+            "nl.nldesignsystem.css.property": {
+              "syntax": "<length>",
+              "inherits": true
+            },
+            "nl.nldesignsystem.fallback": ["utrecht.link.text-decoration-thickness"],
+            "nl.nldesignsystem.figma.supports-token": false,
+            "nl.nldesignsystem.deprecated": true,
+            "nl.nldesignsystem.redirect": "utrecht.link.focus-visible.text-decoration-thickness"
+          },
+          "type": "other"
+        }
+      },
+      "focus-visible": {
         "text-decoration": {
           "$extensions": {
             "nl.nldesignsystem.css.property": {
diff --git a/components/mapcontrolbutton/src/index.scss b/components/mapcontrolbutton/src/index.scss
index ed241043e01..0c683306528 100644
--- a/components/mapcontrolbutton/src/index.scss
+++ b/components/mapcontrolbutton/src/index.scss
@@ -46,30 +46,14 @@
   --utrecht-icon-color: var(--utrecht-mapcontrolbutton-focus-color, var(--utrecht-mapcontrolbutton-color));
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  .utrecht-mapcontrolbutton:focus:not(:disabled, [aria-disabled="true"], .utrecht-mapcontrolbutton--disabled) {
-    @extend .utrecht-mapcontrolbutton--focus;
-    @extend .utrecht-mapcontrolbutton--focus-visible;
-  }
-
-  /* override the `:focus` selector above */
-  /* stylelint-disable-next-line no-descending-specificity */
-  .utrecht-mapcontrolbutton:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  .utrecht-mapcontrolbutton:focus:not(:disabled, [aria-disabled="true"], .utrecht-mapcontrolbutton--disabled) {
-    @extend .utrecht-mapcontrolbutton--focus;
-  }
+.utrecht-mapcontrolbutton:focus:not(:disabled, [aria-disabled="true"], .utrecht-mapcontrolbutton--disabled) {
+  @extend .utrecht-mapcontrolbutton--focus;
+}
 
-  /* override the `:focus` selector above */
-  /* stylelint-disable-next-line no-descending-specificity */
-  .utrecht-mapcontrolbutton:focus-visible {
-    @extend .utrecht-mapcontrolbutton--focus-visible;
-  }
+/* override the `:focus` selector above */
+/* stylelint-disable-next-line no-descending-specificity */
+.utrecht-mapcontrolbutton:focus-visible {
+  @extend .utrecht-mapcontrolbutton--focus-visible;
 }
 
 .utrecht-mapcontrolbutton--hover:not(:disabled),
diff --git a/components/menulijst/src/index.scss b/components/menulijst/src/index.scss
index 1af3ddb39d6..c8ccb099667 100644
--- a/components/menulijst/src/index.scss
+++ b/components/menulijst/src/index.scss
@@ -43,24 +43,10 @@
   @include utrecht-focus-visible;
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  .utrecht-menulijst__link:focus {
-    @extend .utrecht-menulijst__link--focus;
-    @extend .utrecht-menulijst__link--focus-visible;
-  }
-
-  .utrecht-menulijst__link:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  .utrecht-menulijst__link:focus {
-    @extend .utrecht-menulijst__link--focus;
-  }
+.utrecht-menulijst__link:focus {
+  @extend .utrecht-menulijst__link--focus;
+}
 
-  .utrecht-menulijst__link:focus-visible {
-    @extend .utrecht-menulijst__link--focus-visible;
-  }
+.utrecht-menulijst__link:focus-visible {
+  @extend .utrecht-menulijst__link--focus-visible;
 }
diff --git a/components/navigatie sidenav/src/index.scss b/components/navigatie sidenav/src/index.scss
index 34bd2c23fe3..fb8f17bf5c1 100644
--- a/components/navigatie sidenav/src/index.scss	
+++ b/components/navigatie sidenav/src/index.scss	
@@ -210,24 +210,10 @@
   }
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  .utrecht-sidenav__link:focus {
-    @extend .utrecht-sidenav__link--focus;
-    @extend .utrecht-sidenav__link--focus-visible;
-  }
-
-  .utrecht-sidenav__link:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  .utrecht-sidenav__link:focus {
-    @extend .utrecht-sidenav__link--focus;
-  }
+.utrecht-sidenav__link:focus {
+  @extend .utrecht-sidenav__link--focus;
+}
 
-  .utrecht-sidenav__link:focus-visible {
-    @extend .utrecht-sidenav__link--focus-visible;
-  }
+.utrecht-sidenav__link:focus-visible {
+  @extend .utrecht-sidenav__link--focus-visible;
 }
diff --git a/components/navigatie topnav/src/index.scss b/components/navigatie topnav/src/index.scss
index 1ee3e9da90e..108077c9cf0 100644
--- a/components/navigatie topnav/src/index.scss	
+++ b/components/navigatie topnav/src/index.scss	
@@ -68,24 +68,10 @@
   @include utrecht-focus-visible;
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  .utrecht-topnav__link:focus {
-    @extend .utrecht-topnav__link--focus;
-    @extend .utrecht-topnav__link--focus-visible;
-  }
-
-  .utrecht-topnav__link:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  .utrecht-topnav__link:focus {
-    @extend .utrecht-topnav__link--focus;
-  }
+.utrecht-topnav__link:focus {
+  @extend .utrecht-topnav__link--focus;
+}
 
-  .utrecht-topnav__link:focus-visible {
-    @extend .utrecht-topnav__link--focus-visible;
-  }
+.utrecht-topnav__link:focus-visible {
+  @extend .utrecht-topnav__link--focus-visible;
 }
diff --git a/components/pagination/src/_mixin.scss b/components/pagination/src/_mixin.scss
index 1bea17e5a83..59fd5a90b4f 100644
--- a/components/pagination/src/_mixin.scss
+++ b/components/pagination/src/_mixin.scss
@@ -97,28 +97,12 @@
   color: var(--utrecht-pagination-page-link-hover-color, var(--utrecht-pagination-page-link-color));
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  .utrecht-pagination__page-link:focus,
-  .utrecht-pagination__relative-link:focus {
-    @include utrecht-focus;
-    @include utrecht-focus-ring;
-  }
-
-  .utrecht-pagination__page-link:focus:not(:focus-visible),
-  .utrecht-pagination__relative-link:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  .utrecht-pagination__page-link:focus,
-  .utrecht-pagination__relative-link:focus {
-    @include utrecht-focus;
-  }
+.utrecht-pagination__page-link:focus,
+.utrecht-pagination__relative-link:focus {
+  @include utrecht-focus;
+}
 
-  .utrecht-pagination__page-link:focus-visible,
-  .utrecht-pagination__relative-link:focus-visible {
-    @include utrecht-focus-visible;
-  }
+.utrecht-pagination__page-link:focus-visible,
+.utrecht-pagination__relative-link:focus-visible {
+  @include utrecht-focus-visible;
 }
diff --git a/components/pagination/src/index.scss b/components/pagination/src/index.scss
index 2fa82611273..f53d515d995 100644
--- a/components/pagination/src/index.scss
+++ b/components/pagination/src/index.scss
@@ -52,28 +52,12 @@
   @include utrecht-pagination__page-link--hover;
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  .utrecht-pagination__page-link:focus,
-  .utrecht-pagination__relative-link:focus {
-    @include utrecht-focus;
-    @include utrecht-focus-ring;
-  }
-
-  .utrecht-pagination__page-link:focus:not(:focus-visible),
-  .utrecht-pagination__relative-link:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  .utrecht-pagination__page-link:focus,
-  .utrecht-pagination__relative-link:focus {
-    @include utrecht-focus;
-  }
+.utrecht-pagination__page-link:focus,
+.utrecht-pagination__relative-link:focus {
+  @include utrecht-focus;
+}
 
-  .utrecht-pagination__page-link:focus-visible,
-  .utrecht-pagination__relative-link:focus-visible {
-    @include utrecht-focus-visible;
-  }
+.utrecht-pagination__page-link:focus-visible,
+.utrecht-pagination__relative-link:focus-visible {
+  @include utrecht-focus-visible;
 }
diff --git a/components/select/src/_mixin.scss b/components/select/src/_mixin.scss
index 51b3d247491..857b25d46b3 100644
--- a/components/select/src/_mixin.scss
+++ b/components/select/src/_mixin.scss
@@ -152,26 +152,12 @@ $utrecht-support-prince-xml: false !default;
 }
 
 @mixin utrecht-select--html-select {
-  // The workaround for missing `:focus-visible` support makes the code quite complex,
-  // keep the ideal version around to restore it easily when browser support improves.
-
-  @if $utrecht-focus-visible-fallback {
-    &:focus {
-      @include utrecht-select--focus;
-      @include utrecht-select--focus-visible;
-    }
-
-    &:focus:not(:focus-visible) {
-      @include utrecht-focus-ring-reset;
-    }
-  } @else {
-    &:focus {
-      @include utrecht-select--focus;
-    }
+  &:focus {
+    @include utrecht-select--focus;
+  }
 
-    &:focus-visible {
-      @include utrecht-select--focus-visible;
-    }
+  &:focus-visible {
+    @include utrecht-select--focus-visible;
   }
 
   /* <select> does not have a `readonly` attribute */
diff --git a/components/skip-link/src/_mixin.scss b/components/skip-link/src/_mixin.scss
index bd1f9ef9979..b8fc819702c 100644
--- a/components/skip-link/src/_mixin.scss
+++ b/components/skip-link/src/_mixin.scss
@@ -29,10 +29,18 @@
   text-decoration: var(--utrecht-skip-link-text-decoration);
 }
 
+/* stylelint-disable-next-line block-no-empty */
 @mixin utrecht-skip-link--focus {
+}
+
+@mixin utrecht-skip-link--focus-visible {
   @include utrecht-focus-ring;
 
-  text-decoration: var(--utrecht-skip-link-focus-text-decoration);
+  /* `var(--utrecht-skip-link-focus-text-decoration)` is deprecated, but for now we keep it for backwards compatibility */
+  text-decoration: var(
+    --utrecht-skip-link-focus-visible-text-decoration,
+    var(--utrecht-skip-link-focus-text-decoration)
+  );
 }
 
 @mixin utrecht-skip-link--hidden {
diff --git a/components/skip-link/src/index.scss b/components/skip-link/src/index.scss
index 9e707fea4e7..13ea3dedb53 100644
--- a/components/skip-link/src/index.scss
+++ b/components/skip-link/src/index.scss
@@ -26,8 +26,14 @@
   @include utrecht-skip-link--visible;
 }
 
-.utrecht-skip-link--focus,
-.utrecht-skip-link:focus,
+/*
+ * @deprecated `utrecht-skip-link--focus` is deprecated, use `utrecht-skip-link--focus-visible` instead.
+ */
+.utrecht-skip-link--focus {
+  @include utrecht-skip-link--focus-visible;
+}
+
+.utrecht-skip-link--focus-visible,
 .utrecht-skip-link:focus-visible {
-  @include utrecht-skip-link--focus;
+  @include utrecht-skip-link--focus-visible;
 }
diff --git a/components/skip-link/src/tokens.json b/components/skip-link/src/tokens.json
index 17524db6370..7af22d6e69a 100644
--- a/components/skip-link/src/tokens.json
+++ b/components/skip-link/src/tokens.json
@@ -103,6 +103,44 @@
         "type": "other"
       },
       "focus": {
+        "background-color": {
+          "$extensions": {
+            "nl.nldesignsystem.css.property": {
+              "syntax": "<color>",
+              "inherits": true
+            },
+            "nl.nldesignsystem.figma.supports-token": true,
+            "nl.nldesignsystem.deprecated": true,
+            "nl.nldesignsystem.redirect": "utrecht.skip-link.focus-visible.background-color"
+          },
+          "type": "color"
+        },
+        "color": {
+          "$extensions": {
+            "nl.nldesignsystem.css.property": {
+              "syntax": "<color>",
+              "inherits": true
+            },
+            "nl.nldesignsystem.figma.supports-token": true,
+            "nl.nldesignsystem.deprecated": true,
+            "nl.nldesignsystem.redirect": "utrecht.skip-link.focus-visible.color"
+          },
+          "type": "color"
+        },
+        "text-decoration": {
+          "$extensions": {
+            "nl.nldesignsystem.css.property": {
+              "syntax": ["inherit", "none", "underline"],
+              "inherits": true
+            },
+            "nl.nldesignsystem.figma.supports-token": true,
+            "nl.nldesignsystem.deprecated": true,
+            "nl.nldesignsystem.redirect": "utrecht.skip-link.focus-visible.text-decoration"
+          },
+          "type": "textDecoration"
+        }
+      },
+      "focus-visible": {
         "background-color": {
           "$extensions": {
             "nl.nldesignsystem.css.property": {
diff --git a/components/textarea/src/_mixin.scss b/components/textarea/src/_mixin.scss
index be4b9c0dcf9..8d32494f55b 100644
--- a/components/textarea/src/_mixin.scss
+++ b/components/textarea/src/_mixin.scss
@@ -182,26 +182,12 @@ $utrecht-support-prince-xml: false !default;
 }
 
 @mixin utrecht-textarea--html-textarea {
-  // The workaround for missing `:focus-visible` support makes the code quite complex,
-  // keep the ideal version around to restore it easily when browser support improves.
-
-  @if $utrecht-focus-visible-fallback {
-    &:focus {
-      @include utrecht-textarea--focus;
-      @include utrecht-textarea--focus-visible;
-    }
-
-    &:focus:not(:focus-visible) {
-      @include utrecht-focus-ring-reset;
-    }
-  } @else {
-    &:focus {
-      @include utrecht-textarea--focus;
-    }
+  &:focus {
+    @include utrecht-textarea--focus;
+  }
 
-    &:focus-visible {
-      @include utrecht-textarea--focus-visible;
-    }
+  &:focus-visible {
+    @include utrecht-textarea--focus-visible;
   }
 
   &:invalid,
diff --git a/components/textbox/src/_mixin.scss b/components/textbox/src/_mixin.scss
index eb793706173..605867f63eb 100644
--- a/components/textbox/src/_mixin.scss
+++ b/components/textbox/src/_mixin.scss
@@ -238,26 +238,12 @@ $utrecht-support-prince-xml: false !default;
 }
 
 @mixin utrecht-textbox--html-input {
-  // The workaround for missing `:focus-visible` support makes the code quite complex,
-  // keep the ideal version around to restore it easily when browser support improves.
-
-  @if $utrecht-focus-visible-fallback {
-    &:focus {
-      @include utrecht-textbox--focus;
-      @include utrecht-textbox--focus-visible;
-    }
-
-    &:focus:not(:focus-visible) {
-      @include utrecht-focus-ring-reset;
-    }
-  } @else {
-    &:focus {
-      @include utrecht-textbox--focus;
-    }
+  &:focus {
+    @include utrecht-textbox--focus;
+  }
 
-    &:focus-visible {
-      @include utrecht-textbox--focus-visible;
-    }
+  &:focus-visible {
+    @include utrecht-textbox--focus-visible;
   }
 
   &:invalid,
diff --git a/components/toptask-link/src/index.scss b/components/toptask-link/src/index.scss
index c40224a801b..b55989b99fa 100644
--- a/components/toptask-link/src/index.scss
+++ b/components/toptask-link/src/index.scss
@@ -43,29 +43,14 @@
   color: var(--utrecht-toptask-link-focus-color, var(--utrecht-toptask-link-color));
 }
 
-// The workaround for missing `:focus-visible` support makes the code quite complex,
-// keep the ideal version around to restore it easily when browser support improves.
-
-@if $utrecht-focus-visible-fallback {
-  .utrecht-toptask-link:focus {
-    @extend .utrecht-toptask-link--focus;
-    @extend .utrecht-toptask-link--focus-visible;
-  }
-
-  /* override the `:focus` selector above */
-  /* stylelint-disable-next-line no-descending-specificity */
-  .utrecht-toptask-link:focus:not(:focus-visible) {
-    @include utrecht-focus-ring-reset;
-  }
-} @else {
-  .utrecht-toptask-link:focus-visible {
-    @extend .utrecht-toptask-link-containern--focus-visible;
-  }
+.utrecht-toptask-link:focus-visible {
+  @extend .utrecht-toptask-link--focus-visible;
+}
 
-  .utrecht-toptask-link:focus {
-    @extend .utrecht-toptask-link--focus;
-  }
+.utrecht-toptask-link:focus {
+  @extend .utrecht-toptask-link--focus;
 }
+
 .utrecht-toptask-link__title {
   display: block;
 }
diff --git a/packages/docusaurus/docs/componenten/typografie/link.mdx b/packages/docusaurus/docs/componenten/typografie/link.mdx
index d69566f285e..0b3a09a29c4 100644
--- a/packages/docusaurus/docs/componenten/typografie/link.mdx
+++ b/packages/docusaurus/docs/componenten/typografie/link.mdx
@@ -79,10 +79,6 @@ Links helpen je gebruiker te navigeren door je app of pagina.
   ]}
 ></StoryTabs>
 
-### Met icoon links
-
-<StoryTabs tabs={[{ id: "css", label: "CSS", story: "css-link--icon-left" }]}></StoryTabs>
-
 ### Voor wisselen taal link
 
 Als de taal een andere is dan het huidige document
diff --git a/packages/storybook-css/src/ColorSample.stories.tsx b/packages/storybook-css/src/ColorSample.stories.tsx
index 3c0d2f068f4..b6b827d4c84 100644
--- a/packages/storybook-css/src/ColorSample.stories.tsx
+++ b/packages/storybook-css/src/ColorSample.stories.tsx
@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react';
 import readme from '@utrecht/color-sample-css/README.md?raw';
 import tokensDefinition from '@utrecht/color-sample-css/src/tokens.json';
-import { ColorSample } from '@utrecht/component-library-react/dist/css-module';
+import { ColorSample } from '@utrecht/component-library-react';
 import tokens from '@utrecht/design-tokens/dist/index.json';
 import { designTokenStory } from './design-token-story';
 
diff --git a/packages/storybook-css/src/Combobox.tsx b/packages/storybook-css/src/Combobox.tsx
index ae1f1444013..7504e81778e 100644
--- a/packages/storybook-css/src/Combobox.tsx
+++ b/packages/storybook-css/src/Combobox.tsx
@@ -7,7 +7,7 @@ import {
   ListboxOption,
   ListboxOptionGroup,
   Textbox,
-} from '@utrecht/component-library-react/dist/css-module/index';
+} from '@utrecht/component-library-react';
 import clsx from 'clsx';
 import React, { PropsWithChildren, ReactNode } from 'react';
 
diff --git a/packages/storybook-css/src/DataPlaceholder.stories.tsx b/packages/storybook-css/src/DataPlaceholder.stories.tsx
index 379d1890e3b..6f07b9ca7c4 100644
--- a/packages/storybook-css/src/DataPlaceholder.stories.tsx
+++ b/packages/storybook-css/src/DataPlaceholder.stories.tsx
@@ -1,8 +1,8 @@
 /* @license CC0-1.0 */
 
 import type { Meta, StoryObj } from '@storybook/react';
-import { DataPlaceholder } from '@utrecht/component-library-react';
 import type { DataPlaceholderProps } from '@utrecht/component-library-react';
+import { DataPlaceholder } from '@utrecht/component-library-react';
 import {
   DataList,
   DataListItem,
@@ -13,7 +13,7 @@ import {
   Heading3,
   Heading4,
   Paragraph,
-} from '@utrecht/component-library-react/dist/css-module';
+} from '@utrecht/component-library-react';
 import readme from '@utrecht/data-placeholder-css/README.md?raw';
 import tokensDefinition from '@utrecht/data-placeholder-css/src/tokens.json';
 import tokens from '@utrecht/design-tokens/dist/index.json';
diff --git a/packages/storybook-css/src/IndexCharNav.stories.tsx b/packages/storybook-css/src/IndexCharNav.stories.tsx
index f02e9ef9397..427eb5ef97a 100644
--- a/packages/storybook-css/src/IndexCharNav.stories.tsx
+++ b/packages/storybook-css/src/IndexCharNav.stories.tsx
@@ -2,7 +2,7 @@
 
 import { Meta, StoryObj } from '@storybook/react';
 import type { IndexCharNavProps } from '@utrecht/component-library-react';
-import { IndexCharNav } from '@utrecht/component-library-react/dist/css-module';
+import { IndexCharNav } from '@utrecht/component-library-react';
 import tokens from '@utrecht/design-tokens/dist/index.json';
 import readme from '@utrecht/index-char-nav-css/README.md?raw';
 import tokensDefinition from '@utrecht/index-char-nav-css/src/tokens.json';
diff --git a/packages/storybook-css/src/Logo.stories.tsx b/packages/storybook-css/src/Logo.stories.tsx
index 07675c40c5f..09ff0bf5875 100644
--- a/packages/storybook-css/src/Logo.stories.tsx
+++ b/packages/storybook-css/src/Logo.stories.tsx
@@ -1,7 +1,7 @@
 /* @license CC0-1.0 */
 
 import { Meta, StoryObj } from '@storybook/react';
-import { Logo, LogoImage } from '@utrecht/component-library-react/dist/css-module';
+import { Logo, LogoImage } from '@utrecht/component-library-react';
 import tokens from '@utrecht/design-tokens/dist/index.json';
 import readme from '@utrecht/logo-css/README.md?raw';
 import tokensDefinition from '@utrecht/logo-css/src/tokens.json';
diff --git a/packages/storybook-css/src/NavBar.stories.tsx b/packages/storybook-css/src/NavBar.stories.tsx
index 77d06e63387..81d021659e8 100644
--- a/packages/storybook-css/src/NavBar.stories.tsx
+++ b/packages/storybook-css/src/NavBar.stories.tsx
@@ -1,7 +1,7 @@
 /* @license CC0-1.0 */
 
 import { Meta, StoryObj } from '@storybook/react';
-import { NavBar, NavList, NavListLink } from '@utrecht/component-library-react/dist/css-module';
+import { NavBar, NavList, NavListLink } from '@utrecht/component-library-react';
 import tokens from '@utrecht/design-tokens/dist/index.json';
 import readme from '@utrecht/nav-bar-css/README.md?raw';
 import tokensDefinition from '@utrecht/nav-bar-css/src/tokens.json';
diff --git a/packages/storybook-css/src/SkipLink.stories.tsx b/packages/storybook-css/src/SkipLink.stories.tsx
index 500d29f6f21..32e9c852082 100644
--- a/packages/storybook-css/src/SkipLink.stories.tsx
+++ b/packages/storybook-css/src/SkipLink.stories.tsx
@@ -17,10 +17,10 @@ interface SkipLinkStoryProps extends SkipLinkProps {
   visibleOnFocus?: boolean;
 }
 
-const SkipLinkStory = ({ focus, visibility, visibleOnFocus, ...restProps }: SkipLinkStoryProps) => (
+const SkipLinkStory = ({ focusVisible, visibility, visibleOnFocus, ...restProps }: SkipLinkStoryProps) => (
   <SkipLink
     className={clsx({
-      'utrecht-skip-link--focus': focus,
+      'utrecht-skip-link--focus-visible': focusVisible,
       'utrecht-skip-link--visible-on-focus': visibleOnFocus,
       'utrecht-skip-link--hidden': visibility === 'hidden',
       'utrecht-skip-link--visible': visibility === 'visible',
@@ -49,6 +49,12 @@ const meta = {
         required: true,
       },
     },
+    focusVisible: {
+      description: 'Simulate :focus-visible',
+      type: {
+        name: 'boolean',
+      },
+    },
     visibility: {
       description: 'Visibilty',
       type: 'select',
@@ -62,7 +68,7 @@ const meta = {
   args: {
     children: '',
     href: '',
-    focus: false,
+    focusVisible: false,
     visibility: '',
     visibleOnFocus: false,
   },
@@ -94,7 +100,7 @@ type Story = StoryObj<typeof meta>;
 export const Default: Story = {
   args: {
     href: '#main',
-    focus: true,
+    focusVisible: true,
     children: 'Skip to main content',
     visibility: 'visible',
   },
@@ -110,7 +116,7 @@ export const Default: Story = {
 export const VisibleOnFocus: Story = {
   args: {
     href: '#main',
-    focus: true,
+    focusVisible: true,
     children: 'Skip to main content',
     visibleOnFocus: true,
   },
@@ -129,7 +135,7 @@ export const VisibleOnFocus: Story = {
 export const RightToLeft: Story = {
   args: {
     href: '#main',
-    focus: true,
+    focusVisible: true,
     children: 'تخطي إلى المحتوى الرئيسي',
     visibility: 'visible',
   },
diff --git a/packages/storybook-css/src/Subscript.stories.tsx b/packages/storybook-css/src/Subscript.stories.tsx
index 9a8f324418a..ceddf9ba4d4 100644
--- a/packages/storybook-css/src/Subscript.stories.tsx
+++ b/packages/storybook-css/src/Subscript.stories.tsx
@@ -3,7 +3,7 @@
 /* eslint-disable react/no-unescaped-entities */
 
 import { Meta, StoryObj } from '@storybook/react';
-import { Paragraph, Subscript } from '@utrecht/component-library-react/dist/css-module';
+import { Paragraph, Subscript } from '@utrecht/component-library-react';
 import tokens from '@utrecht/design-tokens/dist/index.json';
 import readme from '@utrecht/subscript-css/README.md?raw';
 import tokensDefinition from '@utrecht/subscript-css/src/tokens.json';
diff --git a/packages/storybook-css/src/Superscript.stories.tsx b/packages/storybook-css/src/Superscript.stories.tsx
index a3ed4d1b152..023a1bf7f98 100644
--- a/packages/storybook-css/src/Superscript.stories.tsx
+++ b/packages/storybook-css/src/Superscript.stories.tsx
@@ -1,7 +1,7 @@
 /* @license CC0-1.0 */
 
 import { Meta, StoryObj } from '@storybook/react';
-import { Paragraph, Superscript } from '@utrecht/component-library-react/dist/css-module';
+import { Paragraph, Superscript } from '@utrecht/component-library-react';
 import tokens from '@utrecht/design-tokens/dist/index.json';
 import readme from '@utrecht/superscript-css/README.md?raw';
 import tokensDefinition from '@utrecht/superscript-css/src/tokens.json';
diff --git a/proprietary/design-tokens/src/background-image-icon.scss b/proprietary/design-tokens/src/background-image-icon.scss
index 7eb352e68d5..10db7a7aacb 100644
--- a/proprietary/design-tokens/src/background-image-icon.scss
+++ b/proprietary/design-tokens/src/background-image-icon.scss
@@ -7,7 +7,6 @@
 .utrecht-theme,
 .utrecht-theme ::backdrop {
   --utrecht-menulijst-item-background-image: url("./pijltje.svg");
-  --utrecht-link-icon-left-background-image: url("./pijltje.svg");
   --utrecht-search-bar-input-background-image: url("./icoon-zoek-rood.svg");
   --utrecht-select-background-image: url("./arrow-dropdown.svg");
   --utrecht-link-list-marker-background-image: url("./pijltje-zwart.svg");
diff --git a/proprietary/design-tokens/src/component/utrecht/link.tokens.json b/proprietary/design-tokens/src/component/utrecht/link.tokens.json
index c14dcf3b93a..e5c7b206548 100644
--- a/proprietary/design-tokens/src/component/utrecht/link.tokens.json
+++ b/proprietary/design-tokens/src/component/utrecht/link.tokens.json
@@ -12,7 +12,9 @@
         "color": { "value": "{utrecht.link.color}" }
       },
       "focus": {
-        "color": { "value": "{utrecht.color.blue.40}" },
+        "color": { "value": "{utrecht.color.blue.40}" }
+      },
+      "focus-visible": {
         "text-decoration": { "value": "none" }
       },
       "hover": {
diff --git a/proprietary/design-tokens/src/component/utrecht/skip-link.tokens.json b/proprietary/design-tokens/src/component/utrecht/skip-link.tokens.json
index 032b2454360..e3aacda9897 100644
--- a/proprietary/design-tokens/src/component/utrecht/skip-link.tokens.json
+++ b/proprietary/design-tokens/src/component/utrecht/skip-link.tokens.json
@@ -10,8 +10,10 @@
       "text-decoration": { "value": "{utrecht.link.text-decoration}" },
       "focus": {
         "color": { "value": "{utrecht.topnav.link.focus.color}" },
-        "background-color": { "value": "{utrecht.topnav.link.focus.background-color}" },
-        "text-decoration": { "value": "{utrecht.link.focus.text-decoration}" }
+        "background-color": { "value": "{utrecht.topnav.link.focus.background-color}" }
+      },
+      "focus-visible": {
+        "text-decoration": { "value": "{utrecht.link.focus-visible.text-decoration}" }
       }
     }
   }