diff --git a/core/themes/claro/css/components/tables.css b/core/themes/claro/css/components/tables.css
index 3e19f5e0c9..dbc29b7e87 100644
--- a/core/themes/claro/css/components/tables.css
+++ b/core/themes/claro/css/components/tables.css
@@ -106,14 +106,14 @@ th {
 [dir="rtl"] .sortable-heading > a::after {
   right: auto;
   left: 1rem;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
 }
 
 @media (forced-colors: active) {
   [dir="rtl"] .sortable-heading > a::after {
     background: linktext;
-    -webkit-mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
-    mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
+    -webkit-mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
+    mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
   }
 }
 
diff --git a/core/themes/claro/css/components/tables.pcss.css b/core/themes/claro/css/components/tables.pcss.css
index 49297999b5..da4bebb55d 100644
--- a/core/themes/claro/css/components/tables.pcss.css
+++ b/core/themes/claro/css/components/tables.pcss.css
@@ -72,23 +72,23 @@ th {
   margin-top: -0.5rem;
   content: "";
   opacity: 0.5;
-  background: url(../../images/icons/000f33/sort--inactive--ltr.svg) no-repeat 50% 50%;
+  background: url(../../images/icons/000f33/sort--inactive.svg) no-repeat 50% 50%;
   background-size: contain;
 
   @media (forced-colors: active) {
     opacity: 1;
     background: linktext;
-    mask: url(../../images/icons/000f33/sort--inactive--ltr.svg) no-repeat 50% 50%;
+    mask: url(../../images/icons/000f33/sort--inactive.svg) no-repeat 50% 50%;
   }
 }
 [dir="rtl"] .sortable-heading > a::after {
   right: auto;
   left: 1rem;
-  background-image: url(../../images/icons/000f33/sort--inactive--rtl.svg);
+  background-image: url(../../images/icons/000f33/sort--inactive.svg);
 
   @media (forced-colors: active) {
     background: linktext;
-    mask: url(../../images/icons/000f33/sort--inactive--rtl.svg) no-repeat 50% 50%;
+    mask: url(../../images/icons/000f33/sort--inactive.svg) no-repeat 50% 50%;
   }
 }
 /* Sortable cell's link focus/hover state. */
diff --git a/core/themes/claro/css/components/tablesort-indicator.css b/core/themes/claro/css/components/tablesort-indicator.css
index e06f773421..6e97e6b189 100644
--- a/core/themes/claro/css/components/tablesort-indicator.css
+++ b/core/themes/claro/css/components/tablesort-indicator.css
@@ -12,13 +12,15 @@
 
 .tablesort {
   position: absolute;
-  top: 50%;
-  right: 1rem;
-  width: 0.875rem; /* 14px */
-  height: 1rem; /* 16px */
-  margin-top: -0.5rem; /* -8px */
+  inset-block-start: 50%;
+  inset-inline-end: 1rem;
+  width: 0.875rem;
+  height: var(--space-m);
+  margin-block-start: -0.5rem;
   opacity: 0.5;
-  background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 0 50%;
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
+  background-repeat: no-repeat;
+  background-position: 0 50%;
   background-size: auto;
 }
 
@@ -34,48 +36,26 @@
   }
 }
 
-[dir="rtl"] .tablesort {
-  right: auto;
-  left: 1rem; /* 16px */
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
-}
-
-@media (forced-colors: active) {
-  [dir="rtl"] .tablesort {
-    background: linktext;
-    -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
-    mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
-    -webkit-mask-repeat: no-repeat;
-    mask-repeat: no-repeat;
-    -webkit-mask-position: 0 50%;
-    mask-position: 0 50%;
-  }
-}
-
-.tablesort--asc,
-[dir="rtl"] .tablesort--asc {
+.tablesort--asc {
   opacity: 1;
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M5 .44L.719 4.718 1.78 5.78 4.25 3.313v7.937h1.5V3.312l2.469 2.47L9.28 4.718 5 .439z' fill='%23003ecc'/%3e%3c/svg%3e");
 }
 
 @media (forced-colors: active) {
-  .tablesort--asc,
-  [dir="rtl"] .tablesort--asc {
+  .tablesort--asc {
     background: linktext;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M5 .44L.719 4.718 1.78 5.78 4.25 3.313v7.937h1.5V3.312l2.469 2.47L9.28 4.718 5 .439z' fill='%23003ecc'/%3e%3c/svg%3e");
     mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M5 .44L.719 4.718 1.78 5.78 4.25 3.313v7.937h1.5V3.312l2.469 2.47L9.28 4.718 5 .439z' fill='%23003ecc'/%3e%3c/svg%3e");
   }
 }
 
-.tablesort--desc,
-[dir="rtl"] .tablesort--desc {
+.tablesort--desc {
   opacity: 1;
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M4.25.75v7.938l-2.469-2.47L.72 7.282 5 11.561l4.281-4.28L8.22 6.22 5.75 8.687V.75h-1.5z' fill='%23003ecc'/%3e%3c/svg%3e");
 }
 
 @media (forced-colors: active) {
-  .tablesort--desc,
-  [dir="rtl"] .tablesort--desc {
+  .tablesort--desc {
     background: linktext;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M4.25.75v7.938l-2.469-2.47L.72 7.282 5 11.561l4.281-4.28L8.22 6.22 5.75 8.687V.75h-1.5z' fill='%23003ecc'/%3e%3c/svg%3e");
     mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M4.25.75v7.938l-2.469-2.47L.72 7.282 5 11.561l4.281-4.28L8.22 6.22 5.75 8.687V.75h-1.5z' fill='%23003ecc'/%3e%3c/svg%3e");
diff --git a/core/themes/claro/css/components/tablesort-indicator.pcss.css b/core/themes/claro/css/components/tablesort-indicator.pcss.css
index d87dc60b4f..22d373e892 100644
--- a/core/themes/claro/css/components/tablesort-indicator.pcss.css
+++ b/core/themes/claro/css/components/tablesort-indicator.pcss.css
@@ -5,36 +5,25 @@
 
 .tablesort {
   position: absolute;
-  top: 50%;
-  right: 1rem;
-  width: 0.875rem; /* 14px */
-  height: 1rem; /* 16px */
-  margin-top: -0.5rem; /* -8px */
+  inset-block-start: 50%;
+  inset-inline-end: 1rem;
+  width: 14px;
+  height: var(--space-m);
+  margin-block-start: -8px;
   opacity: 0.5;
-  background: url(../../images/icons/000f33/sort--inactive--ltr.svg) no-repeat 0 50%;
+  background-image: url(../../images/icons/000f33/sort--inactive.svg);
+  background-repeat: no-repeat;
+  background-position: 0 50%;
   background-size: auto;
 
   @media (forced-colors: active) {
     background: linktext;
-    mask-image: url(../../images/icons/000f33/sort--inactive--ltr.svg);
+    mask-image: url(../../images/icons/000f33/sort--inactive.svg);
     mask-repeat: no-repeat;
     mask-position: 0 50%;
   }
 }
-[dir="rtl"] .tablesort {
-  right: auto;
-  left: 1rem; /* 16px */
-  background-image: url(../../images/icons/000f33/sort--inactive--rtl.svg);
-
-  @media (forced-colors: active) {
-    background: linktext;
-    mask-image: url(../../images/icons/000f33/sort--inactive--rtl.svg);
-    mask-repeat: no-repeat;
-    mask-position: 0 50%;
-  }
-}
-.tablesort--asc,
-[dir="rtl"] .tablesort--asc {
+.tablesort--asc {
   opacity: 1;
   background-image: url(../../images/icons/003ecc/sort--asc.svg);
 
@@ -43,8 +32,7 @@
     mask-image: url(../../images/icons/003ecc/sort--asc.svg);
   }
 }
-.tablesort--desc,
-[dir="rtl"] .tablesort--desc {
+.tablesort--desc {
   opacity: 1;
   background-image: url(../../images/icons/003ecc/sort--desc.svg);
 
diff --git a/core/themes/claro/images/icons/000f33/sort--inactive--rtl.svg b/core/themes/claro/images/icons/000f33/sort--inactive--rtl.svg
deleted file mode 100644
index f78854f620..0000000000
--- a/core/themes/claro/images/icons/000f33/sort--inactive--rtl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="8"><path d="M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z" fill="#000f33"/></svg>
\ No newline at end of file
diff --git a/core/themes/claro/images/icons/000f33/sort--inactive--ltr.svg b/core/themes/claro/images/icons/000f33/sort--inactive.svg
similarity index 100%
rename from core/themes/claro/images/icons/000f33/sort--inactive--ltr.svg
rename to core/themes/claro/images/icons/000f33/sort--inactive.svg