diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 38eb27a2ba..cbcb902726 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -248,13 +248,9 @@ function setImageUrl(context, state, url) {
 
     if (url) {
         imgContainer.innerHTML = '<img class="nowPlayingPageImage" src="' + url + '" />';
-        if (item.Type == 'Audio') {
-            context.querySelector('.nowPlayingPageImage').classList.add('nowPlayingPageImageAudio');
-            context.querySelector('.nowPlayingPageImageContainer').classList.remove('nowPlayingPageImageAudio');
-        } else {
-            context.querySelector('.nowPlayingPageImageContainer').classList.add('nowPlayingPageImagePoster');
-            context.querySelector('.nowPlayingPageImage').classList.remove('nowPlayingPageImageAudio');
-        }
+
+        context.querySelector('.nowPlayingPageImage').classList.toggle('nowPlayingPageImageAudio', item.Type === 'Audio');
+        context.querySelector('.nowPlayingPageImage').classList.toggle('nowPlayingPageImagePoster', item.Type !== 'Audio');
     } else {
         imgContainer.innerHTML = '<div class="nowPlayingPageImageContainerNoAlbum"><button data-action="link" class="cardImageContainer coveredImage ' + cardBuilder.getDefaultBackgroundClass(item.Name) + ' cardContent cardContent-shadow itemAction"><span class="cardImageIcon material-icons album"></span></button></div>';
     }
diff --git a/src/components/remotecontrol/remotecontrol.scss b/src/components/remotecontrol/remotecontrol.scss
index 42cd6a8f16..50656e2d96 100644
--- a/src/components/remotecontrol/remotecontrol.scss
+++ b/src/components/remotecontrol/remotecontrol.scss
@@ -145,7 +145,7 @@
     width: 100%;
     -webkit-box-shadow: 0 0 1.9vh #000;
     box-shadow: 0 0 1.9vh #000;
-    border: 0.1em solid #222;
+    border-radius: 0.2em;
     user-select: none;
     -moz-user-select: none;
     -webkit-user-drag: none;
@@ -321,7 +321,6 @@
         -webkit-justify-content: center;
         justify-content: center;
         font-size: 1.5em;
-        height: 100%;
     }
 
     .nowPlayingPageImageContainer {
@@ -403,18 +402,13 @@
         overflow-y: hidden;
         overflow: hidden;
         margin: 0 auto;
-    }
 
-    .nowPlayingPageImage.nowPlayingPageImageAudio,
-    .nowPlayingPageImageContainer.nowPlayingPageImagePoster {
-        width: auto;
-        max-width: 100%;
-        max-height: 100%;
-    }
-
-    .nowPlayingPageImageContainer.nowPlayingPageImagePoster img {
-        height: 100%;
-        width: auto;
+        &.nowPlayingPageImageAudio,
+        &.nowPlayingPageImagePoster {
+            width: auto;
+            max-width: 100%;
+            max-height: 100%;
+        }
     }
 
     .playlistSectionButton .volumecontrol {