diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css
index cbd2f1fa0..508c8d674 100644
--- a/src/components/remotecontrol/remotecontrol.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -203,7 +203,7 @@
 .playlistIndexIndicatorImage {
     -webkit-background-size: initial initial !important;
     background-size: initial !important;
-    background-image: url(assets/img/equalizer.gif) !important;
+    background-image: url(../../assets/img/equalizer.gif) !important;
 }
 
 .hideVideoButtons .videoButton {
diff --git a/src/controllers/playback/nowplayingpage.js b/src/controllers/playback/nowplaying.js
similarity index 100%
rename from src/controllers/playback/nowplayingpage.js
rename to src/controllers/playback/nowplaying.js
diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css
index 6e580ebea..806482d5e 100644
--- a/src/themes/appletv/theme.css
+++ b/src/themes/appletv/theme.css
@@ -35,7 +35,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(assets/img/banner-dark.png)
+    background-image: url(../../assets/img/banner-dark.png)
 }
 
 html {
diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css
index 0c13a696b..5469076a4 100644
--- a/src/themes/blueradiance/theme.css
+++ b/src/themes/blueradiance/theme.css
@@ -34,7 +34,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(assets/img/banner-light.png)
+    background-image: url(../../assets/img/banner-light.png)
 }
 
 .dialog,
diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css
index fee28f50f..d32b47279 100644
--- a/src/themes/dark/theme.css
+++ b/src/themes/dark/theme.css
@@ -26,7 +26,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(assets/img/banner-light.png)
+    background-image: url(../../assets/img/banner-light.png)
 }
 
 .backgroundContainer,
diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css
index 0d96abc53..0824134df 100644
--- a/src/themes/light/theme.css
+++ b/src/themes/light/theme.css
@@ -39,7 +39,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(assets/img/banner-light.png)
+    background-image: url(../../assets/img/banner-light.png)
 }
 
 .backgroundContainer,
diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css
index c8d7aa465..ebd290e94 100644
--- a/src/themes/purplehaze/theme.css
+++ b/src/themes/purplehaze/theme.css
@@ -34,7 +34,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(assets/img/banner-light.png)
+    background-image: url(../../assets/img/banner-light.png)
 }
 
 .dialog,
diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css
index 290164080..5020414cb 100644
--- a/src/themes/wmc/theme.css
+++ b/src/themes/wmc/theme.css
@@ -40,7 +40,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(assets/img/banner-light.png)
+    background-image: url(../../assets/img/banner-light.png)
 }
 
 .backgroundContainer,