diff --git a/core/themes/claro/css/base/variables.pcss.css b/core/themes/claro/css/base/variables.pcss.css
index f4d5ef10be596011352c8d1a620828643365df4d..01a44956c43a2c9b96c1aaf1a8f8465e85807bc8 100644
--- a/core/themes/claro/css/base/variables.pcss.css
+++ b/core/themes/claro/css/base/variables.pcss.css
@@ -121,7 +121,7 @@
    * Details.
    */
   --details-bg-color: rgba(243, 244, 249, 0.4);
-  --details-border-color: rgba(216, 217, 224, 0.8);
+  --details-border-color: var(--color-lightdiamond);
   --details-summary-shadow-color: var(--color-focus);
   --details-summary-focus-border-size: var(--focus-border-size);
   --details-desktop-wrapper-padding-start: calc(var(--space-m) + var(--space-s) + var(--space-xs));
diff --git a/core/themes/claro/css/components/accordion.css b/core/themes/claro/css/components/accordion.css
index 5446d79ea8ecfb26946b865460f98ab8592e50b5..8caaa5bc98d168a461ed6700cb8520aea116022b 100644
--- a/core/themes/claro/css/components/accordion.css
+++ b/core/themes/claro/css/components/accordion.css
@@ -12,7 +12,7 @@
 
 .accordion {
   color: #222330;
-  border: 1px solid rgba(216, 217, 224, 0.8);
+  border: 1px solid #dedfe4;
   border-radius: 2px;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
diff --git a/core/themes/claro/css/components/details.css b/core/themes/claro/css/components/details.css
index bc5c407c88b9322fab916d6a75fdaaf46a8cef99..21bfd8b2e137465b10d2811ab99e09bcbcc892fe 100644
--- a/core/themes/claro/css/components/details.css
+++ b/core/themes/claro/css/components/details.css
@@ -40,7 +40,7 @@
   margin-top: 1rem;
   margin-bottom: 1rem;
   color: #222330;
-  border: 1px solid rgba(216, 217, 224, 0.8);
+  border: 1px solid #dedfe4;
   border-radius: 2px;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
@@ -405,7 +405,7 @@
 .claro-details__wrapper--accordion,
 .claro-details__wrapper--accordion-item,
 .claro-details__wrapper--vertical-tabs-item {
-  border-top: 1px solid rgba(216, 217, 224, 0.8);
+  border-top: 1px solid #dedfe4;
   background-color: rgba(243, 244, 249, 0.4);
 }
 
diff --git a/core/themes/claro/css/components/entity-meta.css b/core/themes/claro/css/components/entity-meta.css
index 2f82300aa2b0dda8801d783254455155d6138df4..bb7fbcabb3f002a43cffb7f36a5dd98f8791f20b 100644
--- a/core/themes/claro/css/components/entity-meta.css
+++ b/core/themes/claro/css/components/entity-meta.css
@@ -13,7 +13,7 @@
 .entity-meta__header {
   padding: 0.5rem 1rem 1rem;
   color: #222330;
-  border: 1px solid rgba(216, 217, 224, 0.8);
+  border: 1px solid #dedfe4;
   border-radius: 2px;
   background-color: #fff;
 }
diff --git a/core/themes/claro/css/components/fieldset.css b/core/themes/claro/css/components/fieldset.css
index 99532d3592646ae2bd85e6ea9d24922560cc93b6..d20f091b24c5afc568ed00415e32ef7ef3f2899c 100644
--- a/core/themes/claro/css/components/fieldset.css
+++ b/core/themes/claro/css/components/fieldset.css
@@ -15,7 +15,7 @@
   margin: 1rem 0;
   padding: 0;
   color: #222330;
-  border: 1px solid rgba(216, 217, 224, 0.8);
+  border: 1px solid #dedfe4;
   border-radius: 2px;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
diff --git a/core/themes/claro/css/components/system-status-report.css b/core/themes/claro/css/components/system-status-report.css
index ffea095601eb075c348a047e3d7d205a507f2a5b..22139afbbeb1516c133c669fbc7cf4b2edb23473 100644
--- a/core/themes/claro/css/components/system-status-report.css
+++ b/core/themes/claro/css/components/system-status-report.css
@@ -39,7 +39,7 @@
 
 .system-status-report .claro-details {
   border: none;
-  border-bottom: 1px solid rgba(216, 217, 224, 0.8);
+  border-bottom: 1px solid #dedfe4;
   box-shadow: none;
 }
 
diff --git a/core/themes/claro/css/components/vertical-tabs.css b/core/themes/claro/css/components/vertical-tabs.css
index 6cd8d3a600202a6d2b642b68a67ceedfd2930527..046a05cc3313a311e1d49c7ebfc13c02c8ddc841 100644
--- a/core/themes/claro/css/components/vertical-tabs.css
+++ b/core/themes/claro/css/components/vertical-tabs.css
@@ -214,7 +214,7 @@
 .vertical-tabs__menu-item.is-selected .vertical-tabs__menu-link {
   z-index: 3; /* The selected menu link should be on a higher level than the white masking line that hides the gray separator. */
   color: #003cc5;
-  border-color: rgba(216, 217, 224, 0.8) transparent;
+  border-color: #dedfe4 transparent;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
@@ -279,7 +279,7 @@
   margin-top: 0.75rem;
   margin-bottom: 0.75rem;
   color: #222330;
-  border: 1px solid rgba(216, 217, 224, 0.8);
+  border: 1px solid #dedfe4;
   border-radius: 2px;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
diff --git a/core/themes/claro/css/components/views-exposed-form.css b/core/themes/claro/css/components/views-exposed-form.css
index 6f9980ca24ed9c10e30b9f9a41c754ccc4482750..d9db37fdaf72d5e1083b6ce9af0073015722686a 100644
--- a/core/themes/claro/css/components/views-exposed-form.css
+++ b/core/themes/claro/css/components/views-exposed-form.css
@@ -31,7 +31,7 @@
   margin-top: 1.5rem;
   margin-bottom: 1.5rem;
   padding: 0.5rem 1.5rem 1.5rem 1.5rem;
-  border: 1px solid rgba(216, 217, 224, 0.8);
+  border: 1px solid #dedfe4;
   border-radius: 2px;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
diff --git a/core/themes/claro/css/theme/media-library.css b/core/themes/claro/css/theme/media-library.css
index 99fea79f7fa2f736c06910a0fc2219fdb0b7d510..f4168f8484b2d34294dca23b7bdf14009893aca1 100644
--- a/core/themes/claro/css/theme/media-library.css
+++ b/core/themes/claro/css/theme/media-library.css
@@ -147,7 +147,7 @@
 .media-library-menu__link.active {
   z-index: 2; /* The selected menu link should be on a higher level than the white masking line that hides the gray separator. */
   color: #003cc5;
-  border-color: rgba(216, 217, 224, 0.8) transparent;
+  border-color: #dedfe4 transparent;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
@@ -181,12 +181,12 @@
 
 .media-library-menu + .media-library-content {
   z-index: 0;
-  border-left: 1px solid rgba(216, 217, 224, 0.8); /* LTR */
+  border-left: 1px solid #dedfe4; /* LTR */
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
 
 [dir="rtl"] .media-library-menu + .media-library-content {
-  border-right: 1px solid rgba(216, 217, 224, 0.8);
+  border-right: 1px solid #dedfe4;
   border-left: 0;
 }
 
@@ -229,7 +229,7 @@
 
 .media-library-add-form__input-wrapper {
   padding: 0.5rem 1.5rem 1.5rem 1.5rem;
-  border: 1px solid rgba(216, 217, 224, 0.8);
+  border: 1px solid #dedfe4;
   border-radius: 2px;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);