diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js
index a26143ea12..e1b147c937 100644
--- a/src/components/toast/toast.js
+++ b/src/components/toast/toast.js
@@ -21,7 +21,7 @@ export default function (options) {
     }
 
     const elem = document.createElement('div');
-    elem.classList.add('../toast/toast');
+    elem.classList.add('toast');
     elem.innerHTML = options.text;
 
     document.body.appendChild(elem);
diff --git a/src/elements/emby-button/emby-button.js b/src/elements/emby-button/emby-button.js
index e86901b9a3..b986fcba11 100644
--- a/src/elements/emby-button/emby-button.js
+++ b/src/elements/emby-button/emby-button.js
@@ -11,7 +11,7 @@ class EmbyButton extends HTMLButtonElement {
             return;
         }
 
-        this.classList.add('../../elements/emby-button/emby-button');
+        this.classList.add('emby-button');
         // TODO replace all instances of element-showfocus with this method
         if (layoutManager.tv) {
             // handles all special css for tv layout
diff --git a/src/elements/emby-button/paper-icon-button-light.js b/src/elements/emby-button/paper-icon-button-light.js
index c5cf564687..ff817a31b4 100644
--- a/src/elements/emby-button/paper-icon-button-light.js
+++ b/src/elements/emby-button/paper-icon-button-light.js
@@ -5,14 +5,14 @@ import 'webcomponents.js/webcomponents-lite';
 const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
 
 EmbyButtonPrototype.createdCallback = function () {
-    this.classList.add('../../elements/emby-button/paper-icon-button-light');
+    this.classList.add('paper-icon-button-light');
 
     if (layoutManager.tv) {
         this.classList.add('show-focus');
     }
 };
 
-document.registerElement('../../elements/emby-button/paper-icon-button-light', {
+document.registerElement('paper-icon-button-light', {
     prototype: EmbyButtonPrototype,
     extends: 'button'
 });
diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js
index 07e7d651bd..77f4b7d580 100644
--- a/src/elements/emby-itemscontainer/emby-itemscontainer.js
+++ b/src/elements/emby-itemscontainer/emby-itemscontainer.js
@@ -483,7 +483,7 @@ import 'webcomponents.js/webcomponents-lite';
         focusManager.autoFocus(itemsContainer);
     }
 
-    document.registerElement('../../elements/emby-itemscontainer/emby-itemscontainer', {
+    document.registerElement('emby-itemscontainer', {
         prototype: ItemsContainerPrototype,
         extends: 'div'
     });
diff --git a/src/elements/emby-scroller/emby-scroller.js b/src/elements/emby-scroller/emby-scroller.js
index 037b8faacd..396f1284e8 100644
--- a/src/elements/emby-scroller/emby-scroller.js
+++ b/src/elements/emby-scroller/emby-scroller.js
@@ -12,7 +12,7 @@ import './emby-scroller.css';
     const ScrollerPrototype = Object.create(HTMLDivElement.prototype);
 
     ScrollerPrototype.createdCallback = function () {
-        this.classList.add('../../elements/emby-scroller/emby-scroller');
+        this.classList.add('emby-scroller');
     };
 
     function initCenterFocus(elem, scrollerInstance) {
@@ -193,7 +193,7 @@ import './emby-scroller.css';
         }
     };
 
-    document.registerElement('../../elements/emby-scroller/emby-scroller', {
+    document.registerElement('emby-scroller', {
         prototype: ScrollerPrototype,
         extends: 'div'
     });