diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css
index d80d7a3c3a..6dbd3b7160 100644
--- a/src/components/remotecontrol/remotecontrol.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -171,12 +171,16 @@
     z-index: 0;
 }
 
-.mobilePlayer.playlistSectionButtonTransparent {
+.layout-mobile .playlistSectionButtonTransparent {
     background: rgba(0, 0, 0, 0) !important;
 }
 
-.mobilePlayer.playlistSection .playlist,
-.mobilePlayer.playlistSection .contextMenu {
+.layout-mobile .btnShuffle {
+    display: unset !important;
+}
+
+.layout-mobile .playlistSection .playlist,
+.layout-mobile .playlistSection .contextMenu {
     position: absolute;
     top: 12.2em;
     bottom: 4.2em;
@@ -188,7 +192,7 @@
     z-index: 1000;
 }
 
-.mobilePlayer.playlistSectionButton {
+.layout-mobile .playlistSectionButton {
     position: fixed;
     bottom: 0;
     left: 0;
@@ -198,21 +202,21 @@
     padding-right: 7.3%;
 }
 
-.playlistSectionButton:not(.mobilePlayer) {
+.playlistSectionButton:not(>.layout-mobile) {
     background: unset !important;
 }
 
-.nowPlayingPlaylist:not(.mobilePlayer) {
+.nowPlayingPlaylist:not(>.layout-mobile) {
     background: unset !important;
 }
 
-.mobilePlayer.playlistSectionButton .btnTogglePlaylist {
+.layout-mobile .playlistSectionButton .btnTogglePlaylist {
     font-size: larger;
     margin: 0;
     padding-left: 0;
 }
 
-.mobilePlayer.playlistSectionButton .btnSavePlaylist {
+.layout-mobile .playlistSectionButton .btnSavePlaylist {
     margin: 0;
     padding-right: 0;
     -webkit-box-flex: 1;
@@ -224,7 +228,7 @@
     border-radius: 0;
 }
 
-.mobilePlayer.playlistSectionButton .btnToggleContextMenu {
+.layout-mobile .playlistSectionButton .btnToggleContextMenu {
     font-size: larger;
     margin: 0;
     padding-right: 0;
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 0cf8e2f95c..c31d57a747 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -852,10 +852,6 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 context.querySelector('.btnTogglePlaylist').classList.remove('hide');
                 context.querySelector('.nowPlayingInfoButtons').insertAdjacentHTML('afterbegin', repeatButtonHtml);
                 context.querySelector('.nowPlayingInfoButtons').insertAdjacentHTML('beforeend', shuffleButtonHtml);
-                let childs = context.querySelectorAll('*');
-                for (let child of childs) {
-                    child.classList.add('mobilePlayer');
-                }
             }
 
             bindEvents(context);