diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0dd6a53512..61838888e4 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -22,6 +22,7 @@
  - [LogicalPhallacy](https://github.com/LogicalPhallacy)
  - [thornbill](https://github.com/thornbill)
  - [redSpoutnik](https://github.com/redSpoutnik)
+ - [DrPandemic](https://github.com/drpandemic)
 
 # Emby Contributors
 
diff --git a/src/components/emby-checkbox/emby-checkbox.css b/src/components/emby-checkbox/emby-checkbox.css
index dc12b2de82..ed70747db2 100644
--- a/src/components/emby-checkbox/emby-checkbox.css
+++ b/src/components/emby-checkbox/emby-checkbox.css
@@ -63,29 +63,6 @@
     justify-content: center;
 }
 
-/* Commenting this out - set by theme */
-/*.emby-checkbox:checked + span + span + .checkboxOutline {
-    border-color: #52B54B;
-}*/
-
-.emby-checkbox-focushelper {
-    position: absolute;
-    top: -0.915em;
-    left: -0.915em;
-    width: 3.66em;
-    height: 3.66em;
-    display: inline-block;
-    box-sizing: border-box;
-    margin: 3px 0 0 0;
-    border-radius: 50%;
-    background-color: transparent;
-}
-
-/* Commenting this out - set by theme */
-/*.emby-checkbox:focus + span + .emby-checkbox-focushelper {
-    background-color: rgba(82, 181, 75, 0.26);
-}*/
-
 .checkboxIcon {
     font-size: 1.6em;
     color: #fff;
@@ -95,18 +72,18 @@
     display: none;
 }
 
-.emby-checkbox:checked + span + span + .checkboxOutline > .checkboxIcon-checked {
+.emby-checkbox:checked + span + .checkboxOutline > .checkboxIcon-checked {
     /* background-color set by theme */
     /*background-color: #52B54B;*/
     display: flex !important;
 }
 
-.emby-checkbox:checked + span + span + .checkboxOutline > .checkboxIcon-unchecked {
+.emby-checkbox:checked + span + .checkboxOutline > .checkboxIcon-unchecked {
     /* background-color set by theme */
     display: none !important;
 }
 
-.emby-checkbox:checked[disabled] + span + span + .checkboxOutline > .checkboxIcon {
+.emby-checkbox:checked[disabled] + span + .checkboxOutline > .checkboxIcon {
     background-color: rgba(0, 0, 0, 0.26);
 }
 
diff --git a/src/components/emby-checkbox/emby-checkbox.js b/src/components/emby-checkbox/emby-checkbox.js
index 9afb67bc02..6144f6892b 100644
--- a/src/components/emby-checkbox/emby-checkbox.js
+++ b/src/components/emby-checkbox/emby-checkbox.js
@@ -61,7 +61,7 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b
         var uncheckedIcon = this.getAttribute('data-uncheckedicon') || '';
         var checkHtml = '<i class="md-icon checkboxIcon checkboxIcon-checked">' + checkedIcon + '</i>';
         var uncheckedHtml = '<i class="md-icon checkboxIcon checkboxIcon-unchecked">' + uncheckedIcon + '</i>';
-        labelElement.insertAdjacentHTML('beforeend', '<span class="emby-checkbox-focushelper"></span><span class="' + outlineClass + '">' + checkHtml + uncheckedHtml + '</span>');
+        labelElement.insertAdjacentHTML('beforeend', '<span class="' + outlineClass + '">' + checkHtml + uncheckedHtml + '</span>');
 
         labelTextElement.classList.add('checkboxLabel');
 
diff --git a/src/components/themes/appletv/theme.css b/src/components/themes/appletv/theme.css
index 65b6745e98..43f1034ade 100644
--- a/src/components/themes/appletv/theme.css
+++ b/src/components/themes/appletv/theme.css
@@ -286,11 +286,19 @@ html {
     border: .07em solid rgba(0, 0, 0, .158)
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:checked+span+.checkboxOutline,
 .emby-select-withcolor:focus {
     border-color: #00a4dc
 }
 
+.emby-checkbox:focus+span+.checkboxOutline {
+    border-color: #fff;
+}
+
+.emby-checkbox:focus:not(:checked)+span+.checkboxOutline {
+    border-color: #00a4dc;
+}
+
 .emby-select-withcolor>option {
     color: #000;
     background: #fff
@@ -301,11 +309,7 @@ html {
     color: #fff
 }
 
-.emby-checkbox:focus+span+.emby-checkbox-focushelper {
-    background-color: rgba(0,164,220, .26)
-}
-
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:checked+span+.checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc
 }
diff --git a/src/components/themes/blueradiance/theme.css b/src/components/themes/blueradiance/theme.css
index ab59bcea96..840c0e23e0 100644
--- a/src/components/themes/blueradiance/theme.css
+++ b/src/components/themes/blueradiance/theme.css
@@ -279,15 +279,19 @@ html {
     color: #fff !important
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline {
+.emby-checkbox:checked+span+.checkboxOutline {
     border-color: #00a4dc
 }
 
-.emby-checkbox:focus+span+.emby-checkbox-focushelper {
-    background-color: rgba(0,164,220, .26)
+.emby-checkbox:focus+span+.checkboxOutline {
+    border-color: #fff;
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:focus:not(:checked)+span+.checkboxOutline {
+    border-color: #00a4dc;
+}
+
+.emby-checkbox:checked+span+.checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc
 }
diff --git a/src/components/themes/dark/theme.css b/src/components/themes/dark/theme.css
index 40490c1a86..0c777940bb 100644
--- a/src/components/themes/dark/theme.css
+++ b/src/components/themes/dark/theme.css
@@ -264,15 +264,19 @@ html {
     color: #fff !important
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline {
+.emby-checkbox:checked+span+.checkboxOutline {
     border-color: #00a4dc
 }
 
-.emby-checkbox:focus+span+.emby-checkbox-focushelper {
-    background-color: rgba(0,164,220, .26)
+.emby-checkbox:focus+span+.checkboxOutline {
+    border-color: #fff;
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:focus:not(:checked)+span+.checkboxOutline {
+    border-color: #00a4dc;
+}
+
+.emby-checkbox:checked+span+.checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc
 }
diff --git a/src/components/themes/emby/theme.css b/src/components/themes/emby/theme.css
index 8d83bed178..ba8bc144ae 100644
--- a/src/components/themes/emby/theme.css
+++ b/src/components/themes/emby/theme.css
@@ -264,15 +264,19 @@ html {
     color: #fff !important
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline {
+.emby-checkbox:checked+span+.checkboxOutline {
     border-color: #52b54b
 }
 
-.emby-checkbox:focus+span+.emby-checkbox-focushelper {
-    background-color: rgba(82, 181, 75, .26)
+.emby-checkbox:focus+span+.checkboxOutline {
+    border-color: #fff;
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:focus:not(:checked)+span+.checkboxOutline {
+    border-color: #52b54b;
+}
+
+.emby-checkbox:checked+span+.checkboxOutline,
 .itemProgressBarForeground {
     background-color: #52b54b
 }
diff --git a/src/components/themes/light/theme.css b/src/components/themes/light/theme.css
index 4a0c1f2ecb..3fbab8dd22 100644
--- a/src/components/themes/light/theme.css
+++ b/src/components/themes/light/theme.css
@@ -272,11 +272,19 @@ html {
     border: .07em solid rgba(0, 0, 0, .158)
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:checked+span+.checkboxOutline,
 .emby-select-withcolor:focus {
     border-color: #00a4dc
 }
 
+.emby-checkbox:focus+span+.checkboxOutline {
+    border-color: #000;
+}
+
+.emby-checkbox:focus:not(:checked)+span+.checkboxOutline {
+    border-color: #00a4dc;
+}
+
 .emby-select-withcolor>option {
     color: #000;
     background: #fff
@@ -287,11 +295,7 @@ html {
     color: #fff
 }
 
-.emby-checkbox:focus+span+.emby-checkbox-focushelper {
-    background-color: rgba(0,164,220, .26)
-}
-
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:checked+span+.checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc
 }
diff --git a/src/components/themes/purple-haze/theme.css b/src/components/themes/purple-haze/theme.css
index 2e7f61c42a..edcf051fcf 100644
--- a/src/components/themes/purple-haze/theme.css
+++ b/src/components/themes/purple-haze/theme.css
@@ -308,15 +308,19 @@ progress::-webkit-progress-value {
     color: #fff !important
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline {
+.emby-checkbox:checked+span+.checkboxOutline {
     border-color: #48C3C8
 }
 
-.emby-checkbox:focus+span+.emby-checkbox-focushelper {
-    background-color: rgba(0,164,220, .26)
+.emby-checkbox:focus+span+.checkboxOutline {
+    border-color: #fff;
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:focus:not(:checked)+span+.checkboxOutline {
+    border-color: #48C3C8;
+}
+
+.emby-checkbox:checked+span+.checkboxOutline,
 .itemProgressBarForeground {
     background-color: #48C3C8
 }
diff --git a/src/components/themes/wmc/theme.css b/src/components/themes/wmc/theme.css
index bb6d6d70ba..081345c77c 100644
--- a/src/components/themes/wmc/theme.css
+++ b/src/components/themes/wmc/theme.css
@@ -266,11 +266,19 @@ html {
     border: .07em solid rgba(255, 255, 255, .135)
 }
 
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:checked+span+.checkboxOutline,
 .emby-select-withcolor:focus {
     border-color: #00a4dc
 }
 
+.emby-checkbox:focus+span+.checkboxOutline {
+    border-color: #fff;
+}
+
+.emby-checkbox:focus:not(:checked)+span+.checkboxOutline {
+    border-color: #00a4dc;
+}
+
 .emby-select-withcolor>option {
     color: #000;
     background: #fff
@@ -281,11 +289,7 @@ html {
     color: #fff
 }
 
-.emby-checkbox:focus+span+.emby-checkbox-focushelper {
-    background-color: rgba(0,164,220, .26)
-}
-
-.emby-checkbox:checked+span+span+.checkboxOutline,
+.emby-checkbox:checked+span+.checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc
 }