diff --git a/src/web-remote/style.css b/src/web-remote/style.css
index eae1ad6f..cb27b410 100644
--- a/src/web-remote/style.css
+++ b/src/web-remote/style.css
@@ -393,12 +393,12 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 .player-volume-glyph.decrease {
-    background-image: url("./assets/volume.svg");
+    background-image: url("./assets/volume-down.svg");
     opacity: 0.5;
 }
 
 .player-volume-glyph.increase {
-    background-image: url("./assets/volume-2.svg");
+    background-image: url("./assets/volume-up.svg");
     opacity: 0.5;
 }
 
diff --git a/src/web-remote/views/index.ejs b/src/web-remote/views/index.ejs
index af238f6c..b022410f 100644
--- a/src/web-remote/views/index.ejs
+++ b/src/web-remote/views/index.ejs
@@ -29,20 +29,20 @@
 
                     </div>
                     <div class="miniplayer-controls">
+                        <button class="md-btn playback-button--small shuffle" @click="shuffle()"
+                            v-if="player.currentMediaItem.shuffleMode == 0"></button>
+                        <button class="md-btn playback-button--small shuffle active" @click="shuffle()" v-else></button>
+                        <button class="md-btn playback-button previous" @click="previous()"></button>
+                        <button class="md-btn playback-button pause" @click="pause()"
+                            v-if="player.currentMediaItem.status"></button>
+                        <button class="md-btn playback-button play" @click="play()" v-else></button>
+                        <button class="md-btn playback-button next" @click="next()"></button>
                         <button class="md-btn playback-button--small repeat" @click="repeat()"
                             v-if="player.currentMediaItem.repeatMode == 0"></button>
                         <button class="md-btn playback-button--small repeat active" @click="repeat()"
                             v-else-if="player.currentMediaItem.repeatMode == 2"></button>
                         <button class="md-btn playback-button--small repeat repeatOne" @click="repeat()"
                             v-else-if="player.currentMediaItem.repeatMode == 1"></button>
-                        <button class="md-btn playback-button previous" @click="previous()"></button>
-                        <button class="md-btn playback-button pause" @click="pause()"
-                            v-if="player.currentMediaItem.status"></button>
-                        <button class="md-btn playback-button play" @click="play()" v-else></button>
-                        <button class="md-btn playback-button next" @click="next()"></button>
-                        <button class="md-btn playback-button--small shuffle" @click="shuffle()"
-                            v-if="player.currentMediaItem.shuffleMode == 0"></button>
-                        <button class="md-btn playback-button--small shuffle active" @click="shuffle()" v-else></button>
                     </div>
                 </div>
             </template>
@@ -151,21 +151,20 @@
                             </div>
                         </div>
                         <div class="md-footer playback-buttons">
+                            <button class="md-btn playback-button--small shuffle" @click="shuffle()"
+                                v-if="player.currentMediaItem.shuffleMode == 0"></button>
+                            <button class="md-btn playback-button--small shuffle active" @click="shuffle()" v-else></button>
+                            <button class="md-btn playback-button previous" @click="previous()"></button>
+                            <button class="md-btn playback-button pause" @click="pause()"
+                                v-if="player.currentMediaItem.status"></button>
+                            <button class="md-btn playback-button play" @click="play()" v-else></button>
+                            <button class="md-btn playback-button next" @click="next()"></button>
                             <button class="md-btn playback-button--small repeat" @click="repeat()"
                                 v-if="player.currentMediaItem.repeatMode == 0"></button>
                             <button class="md-btn playback-button--small repeat active" @click="repeat()"
                                 v-else-if="player.currentMediaItem.repeatMode == 2"></button>
                             <button class="md-btn playback-button--small repeat repeatOne" @click="repeat()"
                                 v-else-if="player.currentMediaItem.repeatMode == 1"></button>
-                            <button class="md-btn playback-button previous" @click="previous()"></button>
-                            <button class="md-btn playback-button pause" @click="pause()"
-                                v-if="player.currentMediaItem.status"></button>
-                            <button class="md-btn playback-button play" @click="play()" v-else></button>
-                            <button class="md-btn playback-button next" @click="next()"></button>
-                            <button class="md-btn playback-button--small shuffle" @click="shuffle()"
-                                v-if="player.currentMediaItem.shuffleMode == 0"></button>
-                            <button class="md-btn playback-button--small shuffle active" @click="shuffle()"
-                                v-else></button>
                         </div>
                         <div class="md-footer">
                             <div class="row volume-slider-container">