diff --git a/libs/styles/iconography.css b/libs/styles/iconography.css
index 83ca16ac01..511eec89e5 100644
--- a/libs/styles/iconography.css
+++ b/libs/styles/iconography.css
@@ -50,6 +50,12 @@ dealing w/ groups of media and associated text
 
 .lockup-area > * { line-height: 0; }
 
+.lockup-area a { text-decoration: none; }
+
+.lockup-area a:hover,
+.lockup-area a:focus,
+.lockup-area a:active { text-decoration: underline; }
+
 .center .lockup-area { justify-content: center; }
 .right .lockup-area { justify-content: flex-end; }
 
diff --git a/libs/styles/styles.css b/libs/styles/styles.css
index c34d26f241..c0214d1fe7 100644
--- a/libs/styles/styles.css
+++ b/libs/styles/styles.css
@@ -809,28 +809,41 @@ a {
   text-decoration: underline;
 }
 
-a:hover {
+a:hover, 
+a:focus, 
+a:active {
   color: var(--link-hover-color);
   text-decoration-style: double;
 }
 
 /* Links Quiet */
 a.quiet,
-a.quiet:hover {
+a.quiet:hover,
+a.quiet:focus,
+a.quiet:active {
   text-decoration: none;
 }
 
 /* Links Static */
 a.static,
-a.static:hover {
+a.static:hover,
+a.static:focus,
+a.static:active  {
   color: var(--text-color);
-  text-decoration: underline;
 }
 
 .dark a.static,
-.dark a.static:hover {
+.dark a.static:hover,
+.dark a.static:focus,
+.dark a.static:active {
   color: var(--color-white);
-  text-decoration: underline;
+}
+
+:is(h1, h2, h3, h4, h5, h6) a,
+:is(h1, h2, h3, h4, h5, h6) a:hover,
+:is(h1, h2, h3, h4, h5, h6) a:focus,
+:is(h1, h2, h3, h4, h5, h6) a:active {
+  color: currentColor;
 }
 
 /* Buttons */
@@ -840,7 +853,6 @@ a.static:hover {
 
 .static-links a:not([class*="button"]) {
   color: inherit;
-  text-decoration: underline;
 }
 
 .copy-link {