diff --git a/app/assets/stylesheets/wcag.scss b/app/assets/stylesheets/wcag.scss
index 4cd894b1875..9d360984441 100644
--- a/app/assets/stylesheets/wcag.scss
+++ b/app/assets/stylesheets/wcag.scss
@@ -50,7 +50,6 @@ html {
   }
 
   // Composer
-
   #reply-control .reply-to .reply-details .d-icon {
     opacity: 1;
     color: var(--primary-low-mid);
@@ -65,6 +64,11 @@ html {
         }
       }
     }
+    .btn-icon:not(.btn-flat, .btn-danger, .btn-primary):focus {
+      .d-icon {
+        color: currentColor;
+      }
+    }
   }
 
   // Site header