diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css
index 7db407e2c5..48e6fe807e 100644
--- a/src/assets/css/dashboard.css
+++ b/src/assets/css/dashboard.css
@@ -77,7 +77,6 @@ progress[aria-valuenow]::before {
     height: 4em;
 }
 
-.controlGroupButton,
 a[data-role=button] {
     background: #292929 !important;
     background-clip: padding-box;
@@ -94,7 +93,6 @@ a[data-role=button] {
     text-decoration: none !important;
 }
 
-div[data-role=controlgroup] .controlGroupButton,
 div[data-role=controlgroup] a[data-role=button] {
     display: inline-block !important;
     margin: 0 !important;
@@ -104,7 +102,6 @@ div[data-role=controlgroup] a[data-role=button] {
     border-radius: 0;
 }
 
-div[data-role=controlgroup] .controlGroupButton:first-child,
 div[data-role=controlgroup] a[data-role=button]:first-child {
     -webkit-border-bottom-left-radius: 0.3125em;
     border-bottom-left-radius: 0.3125em;
@@ -112,7 +109,6 @@ div[data-role=controlgroup] a[data-role=button]:first-child {
     border-top-left-radius: 0.3125em;
 }
 
-div[data-role=controlgroup] .controlGroupButton:last-child,
 div[data-role=controlgroup] a[data-role=button]:last-child {
     -webkit-border-bottom-right-radius: 0.3125em;
     border-bottom-right-radius: 0.3125em;
@@ -120,13 +116,11 @@ div[data-role=controlgroup] a[data-role=button]:last-child {
     border-top-right-radius: 0.3125em;
 }
 
-div[data-role=controlgroup] .controlGroupButton + .controlGroupButton,
 div[data-role=controlgroup] a[data-role=button] + a[data-role=button] {
     border-left-width: 0 !important;
     margin: 0 0 0 -0.4em !important;
 }
 
-div[data-role=controlgroup] .controlGroupButton.ui-btn-active,
 div[data-role=controlgroup] a.ui-btn-active {
     background: #00a4dc !important;
     color: #292929 !important;
diff --git a/src/elements/emby-checkbox/emby-checkbox.css b/src/elements/emby-checkbox/emby-checkbox.css
index e839e44f61..b33a216140 100644
--- a/src/elements/emby-checkbox/emby-checkbox.css
+++ b/src/elements/emby-checkbox/emby-checkbox.css
@@ -22,10 +22,6 @@
     display: flex;
 }
 
-.checkboxContainer-noText {
-    margin-bottom: 0;
-}
-
 .checkboxListContainer {
     margin-bottom: 1.8em;
 }
@@ -67,10 +63,6 @@
     justify-content: center;
 }
 
-.checkboxContainer-noText .checkboxOutline {
-    top: auto;
-}
-
 .checkboxIcon {
     font-size: 1.6em;
     color: #fff;
@@ -81,19 +73,16 @@
     display: none;
 }
 
-.emby-checkbox:checked + .checkboxOutline > .checkboxIcon-checked,
 .emby-checkbox:checked + span + .checkboxOutline > .checkboxIcon-checked {
     /* background color set by theme */
     display: flex !important;
 }
 
-.emby-checkbox:checked + .checkboxOutline > .checkboxIcon-unchecked,
 .emby-checkbox:checked + span + .checkboxOutline > .checkboxIcon-unchecked {
     /* background color set by theme */
     display: none !important;
 }
 
-.emby-checkbox:checked[disabled] + .checkboxOutline > .checkboxIcon,
 .emby-checkbox:checked[disabled] + span + .checkboxOutline > .checkboxIcon {
     background-color: rgba(0, 0, 0, 0.26);
 }
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index 6976d1df8a..0af079ec06 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -65,9 +65,7 @@ import 'webcomponents.js/webcomponents-lite';
         const uncheckedHtml = '<span class="material-icons checkboxIcon checkboxIcon-unchecked ' + uncheckedIcon + '"></span>';
         labelElement.insertAdjacentHTML('beforeend', '<span class="' + outlineClass + '">' + checkHtml + uncheckedHtml + '</span>');
 
-        if (labelTextElement) {
-            labelTextElement.classList.add('checkboxLabel');
-        }
+        labelTextElement.classList.add('checkboxLabel');
 
         this.addEventListener('keydown', onKeyDown);
 
diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css
index a4fd330307..535e18ff99 100644
--- a/src/themes/appletv/theme.css
+++ b/src/themes/appletv/theme.css
@@ -294,18 +294,15 @@ html {
     border: 0.07em solid rgba(0, 0, 0, 0.158);
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline,
 .emby-select-withcolor:focus {
     border-color: #00a4dc;
 }
 
-.emby-checkbox:focus + .checkboxOutline,
 .emby-checkbox:focus + span + .checkboxOutline {
     border-color: #fff;
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline {
     background-color: #00a4dc;
 }
@@ -324,7 +321,6 @@ html {
     margin: 0.4rem 0.5rem 0.4rem 0.5rem;
 }
 
-.emby-checkbox:focus:not(:checked) + .checkboxOutline,
 .emby-checkbox:focus:not(:checked) + span + .checkboxOutline {
     border-color: #00a4dc;
 }
diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css
index 5bcb48ad5b..f8ef781beb 100644
--- a/src/themes/blueradiance/theme.css
+++ b/src/themes/blueradiance/theme.css
@@ -308,23 +308,19 @@ html {
     color: #fff !important;
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline {
     border-color: #00a4dc;
 }
 
-.emby-checkbox:focus + .checkboxOutline,
 .emby-checkbox:focus + span + .checkboxOutline {
     border-color: #fff;
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc;
 }
 
-.emby-checkbox:focus:not(:checked) + .checkboxOutline,
 .emby-checkbox:focus:not(:checked) + span + .checkboxOutline {
     border-color: #00a4dc;
 }
diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css
index 9236b0e148..d1f0ead9e7 100644
--- a/src/themes/dark/theme.css
+++ b/src/themes/dark/theme.css
@@ -289,23 +289,19 @@ html {
     color: #fff !important;
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline {
     border-color: #00a4dc;
 }
 
-.emby-checkbox:focus + .checkboxOutline,
 .emby-checkbox:focus + span + .checkboxOutline {
     border-color: #fff;
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc;
 }
 
-.emby-checkbox:focus:not(:checked) + .checkboxOutline,
 .emby-checkbox:focus:not(:checked) + span + .checkboxOutline {
     border-color: #00a4dc;
 }
diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css
index 1d299d5e8b..a241c80567 100644
--- a/src/themes/light/theme.css
+++ b/src/themes/light/theme.css
@@ -293,24 +293,20 @@ html {
     border: 0.07em solid rgba(0, 0, 0, 0.158);
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline,
 .emby-select-withcolor:focus {
     border-color: #00a4dc;
 }
 
-.emby-checkbox:focus + .checkboxOutline,
 .emby-checkbox:focus + span + .checkboxOutline {
     border-color: #000;
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc;
 }
 
-.emby-checkbox:focus:not(:checked) + .checkboxOutline,
 .emby-checkbox:focus:not(:checked) + span + .checkboxOutline {
     border-color: #00a4dc;
 }
diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css
index 616ada26da..ad85d39583 100644
--- a/src/themes/purplehaze/theme.css
+++ b/src/themes/purplehaze/theme.css
@@ -105,13 +105,11 @@ progress::-webkit-progress-value {
     background: #ff77f1;
 }
 
-div[data-role=controlgroup] .controlGroupButton.ui-btn-active,
 div[data-role=controlgroup] a.ui-btn-active {
     background: #55828b !important;
     color: #e1e5f2 !important;
 }
 
-.controlGroupButton,
 a[data-role=button] {
     background: rgba(2, 43, 58, 0.521) !important;
 }
@@ -398,23 +396,19 @@ a[data-role=button] {
     color: #fff !important;
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline {
     background-color: #030322;
     border: 0.14em solid rgb(72, 195, 200);
 }
 
-.emby-checkbox:checked + .checkboxOutline > .minimalCheckboxIcon-checked,
 .emby-checkbox:checked + span + .checkboxOutline > .checkboxIcon-checked {
     color: rgb(12, 232, 214);
 }
 
-.emby-checkbox:focus + .checkboxOutline,
 .emby-checkbox:focus + span + .checkboxOutline {
     border-color: #ff77f1;
 }
 
-.emby-checkbox:focus:not(:checked) + .checkboxOutline,
 .emby-checkbox:focus:not(:checked) + span + .checkboxOutline {
     border: 0.14em solid #ff77f1;
 }
diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css
index 371f8efd7b..3367821be1 100644
--- a/src/themes/wmc/theme.css
+++ b/src/themes/wmc/theme.css
@@ -276,24 +276,20 @@ html {
     border: 0.07em solid rgba(255, 255, 255, 0.135);
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline,
 .emby-select-withcolor:focus {
     border-color: #00a4dc;
 }
 
-.emby-checkbox:focus + .checkboxOutline,
 .emby-checkbox:focus + span + .checkboxOutline {
     border-color: #fff;
 }
 
-.emby-checkbox:checked + .checkboxOutline,
 .emby-checkbox:checked + span + .checkboxOutline,
 .itemProgressBarForeground {
     background-color: #00a4dc;
 }
 
-.emby-checkbox:focus:not(:checked) + .checkboxOutline,
 .emby-checkbox:focus:not(:checked) + span + .checkboxOutline {
     border-color: #00a4dc;
 }