diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss
index 97b7a83f0..cd9b1643f 100644
--- a/app/assets/stylesheets/components/table.scss
+++ b/app/assets/stylesheets/components/table.scss
@@ -219,14 +219,40 @@
   a {
 
     display: block;
-    border-top: 11px solid transparent;
-    border-bottom: 8px solid transparent;
-    margin: -11px 0 -8px 0;
+    position: relative;
+
+    &:before {
+      content: "";
+      display: block;
+
+      position: absolute;
+
+      top: -$gutter-half;
+      right: 0;
+      bottom: -$gutter-half + 4px;
+      left: -$gutter-half;
+
+      background: transparent;
+    }
 
     &:hover {
       color: $link-hover-colour;
     }
 
+    &:active,
+    &:focus {
+
+      color: $black;
+
+      &:before {
+        border-color: $yellow;
+        border-style: solid;
+        border-width: 15px 3px 15px 15px;
+        right: -3px;
+      }
+
+    }
+
   }
 
 }
diff --git a/app/assets/stylesheets/components/tick-cross.scss b/app/assets/stylesheets/components/tick-cross.scss
index 58fc81273..7189a4be8 100644
--- a/app/assets/stylesheets/components/tick-cross.scss
+++ b/app/assets/stylesheets/components/tick-cross.scss
@@ -64,14 +64,39 @@
       right: -135px;
 
       a {
-        border-top: 11px solid transparent;
-        border-bottom: 10px solid transparent;
-        border-left: 15px solid transparent;
+
+        &:before {
+          content: "";
+          display: block;
+
+          position: absolute;
+
+          top: -$gutter-half - 1;
+          right: 0;
+          bottom: -$gutter-half;
+          left: -$gutter-half;
+
+          background: transparent;
+        }
 
         &:hover {
           color: $link-hover-colour;
         }
 
+        &:active,
+        &:focus {
+
+          color: $black;
+
+          &:before {
+            border-color: $yellow;
+            border-style: solid;
+            border-width: 15px 3px 15px 15px;
+            right: -3px;
+          }
+
+        }
+
       }
 
     }