diff --git a/app/assets/stylesheets/wcag.scss b/app/assets/stylesheets/wcag.scss
index c42886e905d..a54ad3df530 100644
--- a/app/assets/stylesheets/wcag.scss
+++ b/app/assets/stylesheets/wcag.scss
@@ -8,15 +8,16 @@
 }
 
 html.discourse-no-touch {
-  .btn-default:not(.btn-flat),
-  .btn-icon:not(.btn-flat) {
+  .btn-default:not(.btn-flat, .btn-danger, .btn-primary),
+  .btn-icon:not(.btn-flat, .btn-danger, .btn-primary) {
     &.btn-default {
       .d-icon {
         color: var(--primary-medium);
       }
     }
     &:hover,
-    &.btn-hover {
+    &.btn-hover,
+    &:focus {
       .d-icon {
         color: var(--secondary);
       }
@@ -27,7 +28,7 @@ html.discourse-no-touch {
   }
   .btn-icon.ok,
   .btn-icon.cancel,
-  .btn-danger {
+  .btn-danger:not(.btn-flat) {
     .d-icon {
       color: var(--secondary);
     }
@@ -42,6 +43,10 @@ html.discourse-no-touch {
       }
     }
   }
+
+  .select-kit.single-select .select-kit-header:focus {
+    border-color: var(--primary-medium);
+  }
 }
 
 html {