diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index 51caa052..e35c760b 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -71,9 +71,9 @@
                         <div class="app-chrome-item">
                             <button class="playback-button--small repeat" v-if="app.mk.repeatMode == 0"
                                     @click="app.mk.repeatMode = 1"></button>
-                            <button class="playback-button--small repeat active" @click="app.mk.repeatMode = 2"
+                            <button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 2"
                                     v-else-if="app.mk.repeatMode == 1"></button>
-                            <button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 0"
+                            <button class="playback-button--small repeat active" @click="app.mk.repeatMode = 0"
                                     v-else-if="app.mk.repeatMode == 2"></button>
                         </div>
                     </div>
diff --git a/src/renderer/views/components/miniplayer.ejs b/src/renderer/views/components/miniplayer.ejs
index 2d585401..ad9d33e2 100644
--- a/src/renderer/views/components/miniplayer.ejs
+++ b/src/renderer/views/components/miniplayer.ejs
@@ -74,9 +74,9 @@
                     <div class="app-chrome-item">
                         <button class="playback-button--small repeat" v-if="app.mk.repeatMode == 0"
                                 @click="app.mk.repeatMode = 1"></button>
-                        <button class="playback-button--small repeat active" @click="app.mk.repeatMode = 2"
+                        <button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 2"
                                 v-else-if="app.mk.repeatMode == 1"></button>
-                        <button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 0"
+                        <button class="playback-button--small repeat active" @click="app.mk.repeatMode = 0"
                                 v-else-if="app.mk.repeatMode == 2"></button>
                     </div>
                 </div>
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 1242881e..d674ee29 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -71,9 +71,9 @@
                     <div class="app-chrome-item display--large">
                         <button class="playback-button--small repeat" v-if="mk.repeatMode == 0"
                                 @click="mk.repeatMode = 1"></button>
-                        <button class="playback-button--small repeat active" @click="mk.repeatMode = 2"
+                        <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
                                 v-else-if="mk.repeatMode == 1"></button>
-                        <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 0"
+                        <button class="playback-button--small repeat active" @click="mk.repeatMode = 0"
                                 v-else-if="mk.repeatMode == 2"></button>
                     </div>
                 </div>
@@ -316,9 +316,9 @@
                                 <div class="app-chrome-item">
                                     <button class="playback-button--small repeat" v-if="mk.repeatMode == 0"
                                             @click="mk.repeatMode = 1"></button>
-                                    <button class="playback-button--small repeat active" @click="mk.repeatMode = 2"
+                                    <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
                                             v-else-if="mk.repeatMode == 1"></button>
-                                    <button class="playback-button--small repeat repeatOne"
+                                    <button class="playback-button--small repeat active"
                                             @click="mk.repeatMode = 0" v-else-if="mk.repeatMode == 2"></button>
                                 </div>
                             </div>
diff --git a/src/web-remote/views/index.ejs b/src/web-remote/views/index.ejs
index b022410f..46915075 100644
--- a/src/web-remote/views/index.ejs
+++ b/src/web-remote/views/index.ejs
@@ -39,10 +39,10 @@
                         <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--small repeat active" @click="repeat()"
+                            v-else-if="player.currentMediaItem.repeatMode == 2"></button>
                     </div>
                 </div>
             </template>
@@ -161,10 +161,10 @@
                             <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--small repeat active" @click="repeat()"
+                                v-else-if="player.currentMediaItem.repeatMode == 2"></button>
                         </div>
                         <div class="md-footer">
                             <div class="row volume-slider-container">