diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs
index dacff2c8..8d30c9dd 100644
--- a/src/renderer/views/app/sidebar.ejs
+++ b/src/renderer/views/app/sidebar.ejs
@@ -196,6 +196,7 @@
               v-if="mk.shuffleMode == 0"
               @click="mk.shuffleMode = 1"
               :title="$root.getLz('term.enableShuffle')"
+              :class="$root.isDisabled() && 'disabled'"
               v-b-tooltip.hover.righttop
             ></button>
             <button
@@ -203,6 +204,7 @@
               v-else
               @click="mk.shuffleMode = 0"
               :title="$root.getLz('term.disableShuffle')"
+              :class="$root.isDisabled() && 'disabled'"
               v-b-tooltip.hover.righttop
             ></button>
           </div>
@@ -210,31 +212,26 @@
             <button
               class="playback-button previous"
               @click="prevButton()"
+              :class="$root.isPrevDisabled() && 'disabled'"
               :title="$root.getLz('term.previous')"
               v-b-tooltip.hover
             ></button>
           </div>
           <div class="app-chrome-item">
-            <button
-              class="playback-button pause"
-              @click="mk.pause()"
-              v-if="mk.isPlaying"
-              :title="$root.getLz('term.pause')"
-              v-b-tooltip.hover
-            ></button>
-            <button
-              class="playback-button play"
-              @click="mk.play()"
-              v-else
-              :title="$root.getLz('term.play')"
-              v-b-tooltip.hover
-            ></button>
+            <button class="playback-button stop" @click="$root.mk.stop()"
+              v-if="$root.mk.isPlaying && $root.mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
+              :title="$root.getLz('term.stop')" v-b-tooltip.hover></button>
+            <button class="playback-button pause" @click="$root.mk.pause()" v-else-if="$root.mk.isPlaying"
+              :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
+            <button class="playback-button play" @click="$root.mk.play()" v-else :title="$root.getLz('term.play')"
+              v-b-tooltip.hover></button>
           </div>
           <div class="app-chrome-item">
             <button
               class="playback-button next"
               @click="skipToNextItem()"
               :title="$root.getLz('term.next')"
+              :class="$root.isNextDisabled() && 'disabled'"
               v-b-tooltip.hover
             ></button>
           </div>
@@ -243,6 +240,7 @@
               class="playback-button--small repeat"
               v-if="mk.repeatMode == 0"
               @click="mk.repeatMode = 1"
+              :class="$root.isDisabled() && 'disabled'"
               :title="$root.getLz('term.enableRepeatOne')"
               v-b-tooltip.hover
             ></button>
@@ -251,6 +249,7 @@
               @click="mk.repeatMode = 2"
               v-else-if="mk.repeatMode == 1"
               :title="$root.getLz('term.disableRepeatOne')"
+              :class="$root.isDisabled() && 'disabled'"
               v-b-tooltip.hover
             ></button>
             <button
@@ -258,6 +257,7 @@
               @click="mk.repeatMode = 0"
               v-else-if="mk.repeatMode == 2"
               :title="$root.getLz('term.disableRepeat')"
+              :class="$root.isDisabled() && 'disabled'"
               v-b-tooltip.hover
             ></button>
           </div>
diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index 038d2b80..ee7f7ed2 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -54,39 +54,40 @@
                             </div>
                         </div>
                     <div class="control-buttons">
-                        <div class="app-chrome-item">
-                            <button class="playback-button--small shuffle" v-if="app.mk.shuffleMode == 0"
-                                    @click="app.mk.shuffleMode = 1" :title="$root.getLz('term.enableShuffle')"
-                                    v-b-tooltip.hover></button>
-                            <button class="playback-button--small shuffle active" v-else
-                                    @click="app.mk.shuffleMode = 0" :title="$root.getLz('term.disableShuffle')"
-                                    v-b-tooltip.hover></button>
-                        </div>
-                        <div class="app-chrome-item">
-                            <button class="playback-button previous" @click="app.prevButton()"
-                                    :title="$root.getLz('term.previous')" v-b-tooltip.hover></button>
-                        </div>
-                        <div class="app-chrome-item">
-                            <button class="playback-button pause" @click="app.mk.pause()" v-if="app.mk.isPlaying"
-                                    :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
-                            <button class="playback-button play" @click="app.mk.play()" v-else
-                                    :title="$root.getLz('term.play')" v-b-tooltip.hover></button>
-                        </div>
-                        <div class="app-chrome-item">
-                            <button class="playback-button next" @click="app.skipToNextItem()"
-                                    :title="$root.getLz('term.next')" v-b-tooltip.hover></button>
-                        </div>
-                        <div class="app-chrome-item">
-                            <button class="playback-button--small repeat" v-if="app.mk.repeatMode == 0"
-                                    @click="app.mk.repeatMode = 1" :title="$root.getLz('term.enableRepeatOne')"
-                                    v-b-tooltip.hover></button>
-                            <button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 2"
-                                    v-else-if="app.mk.repeatMode == 1" :title="$root.getLz('term.disableRepeatOne')"
-                                    v-b-tooltip.hover></button>
-                            <button class="playback-button--small repeat active" @click="app.mk.repeatMode = 0"
-                                    v-else-if="app.mk.repeatMode == 2" :title="$root.getLz('term.disableRepeat')"
-                                    v-b-tooltip.hover></button>
-                        </div>
+                        <div class="app-chrome-item display--large">
+                            <button class="playback-button--small shuffle" v-if="$root.mk.shuffleMode == 0" :class="$root.isDisabled() && 'disabled'"
+                              @click="$root.mk.shuffleMode = 1" :title="$root.getLz('term.enableShuffle')" v-b-tooltip.hover></button>
+                            <button class="playback-button--small shuffle active" v-else :class="$root.isDisabled() && 'disabled'"
+                              @click="$root.mk.shuffleMode = 0" :title="$root.getLz('term.disableShuffle')" v-b-tooltip.hover></button>
+                          </div>
+                          <div class="app-chrome-item display--large">
+                            <button class="playback-button previous" @click="$root.prevButton()" :class="$root.isPrevDisabled() && 'disabled'"
+                              :title="$root.getLz('term.previous')" v-b-tooltip.hover></button>
+                          </div>
+                          <div class="app-chrome-item display--large">
+                            <button class="playback-button stop" @click="$root.mk.stop()"
+                              v-if="$root.mk.isPlaying && $root.mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
+                              :title="$root.getLz('term.stop')" v-b-tooltip.hover></button>
+                            <button class="playback-button pause" @click="$root.mk.pause()" v-else-if="$root.mk.isPlaying"
+                              :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
+                            <button class="playback-button play" @click="$root.mk.play()" v-else :title="$root.getLz('term.play')"
+                              v-b-tooltip.hover></button>
+                          </div>
+                          <div class="app-chrome-item display--large">
+                            <button class="playback-button next" @click="$root.skipToNextItem()" :class="$root.isNextDisabled() && 'disabled'"
+                              :title="$root.getLz('term.next')" v-b-tooltip.hover></button>
+                          </div>
+                          <div class="app-chrome-item display--large">
+                            <button class="playback-button--small repeat" v-if="$root.mk.repeatMode == 0" :class="$root.isDisabled() && 'disabled'"
+                              @click="$root.mk.repeatMode = 1" :title="$root.getLz('term.enableRepeatOne')" v-b-tooltip.hover></button>
+                            <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
+                              :class="$root.isDisabled() && 'disabled'" v-else-if="$root.mk.repeatMode == 1"
+                              :title="$root.getLz('term.disableRepeatOne')" v-b-tooltip.hover></button>
+                            <button class="playback-button--small repeat active" @click="$root.mk.repeatMode = 0"
+                              :class="$root.isDisabled() && 'disabled'" v-else-if="$root.mk.repeatMode == 2" :title="$root.getLz('term.disableRepeat')"
+                              v-b-tooltip.hover></button>
+                          </div>
+                        </div>     
                     </div>
                     <div class="app-chrome-item volume display--large">
                         <div class="input-container">
diff --git a/src/renderer/views/components/miniplayer.ejs b/src/renderer/views/components/miniplayer.ejs
index a073e493..66c712d7 100644
--- a/src/renderer/views/components/miniplayer.ejs
+++ b/src/renderer/views/components/miniplayer.ejs
@@ -66,30 +66,40 @@
                         </div>
                     </div>
                 <div class="control-buttons">    
-                    <div class="app-chrome-item">
-                        <button class="playback-button--small shuffle" v-if="app.mk.shuffleMode == 0"
-                                @click="app.mk.shuffleMode = 1"></button>
-                        <button class="playback-button--small shuffle active" v-else
-                                @click="app.mk.shuffleMode = 0"></button>
-                    </div>
-                    <div class="app-chrome-item">
-                        <button class="playback-button previous" @click="app.prevButton()"></button>
-                    </div>
-                    <div class="app-chrome-item">
-                        <button class="playback-button pause" @click="app.mk.pause()" v-if="app.mk.isPlaying"></button>
-                        <button class="playback-button play" @click="app.mk.play()" v-else></button>
-                    </div>
-                    <div class="app-chrome-item">
-                        <button class="playback-button next" @click="app.skipToNextItem()"></button>
-                    </div>
-                    <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 repeatOne" @click="app.mk.repeatMode = 2"
-                                v-else-if="app.mk.repeatMode == 1"></button>
-                        <button class="playback-button--small repeat active" @click="app.mk.repeatMode = 0"
-                                v-else-if="app.mk.repeatMode == 2"></button>
-                    </div>
+                    <div class="app-chrome-item display--large">
+                        <button class="playback-button--small shuffle" v-if="$root.mk.shuffleMode == 0" :class="$root.isDisabled() && 'disabled'"
+                          @click="$root.mk.shuffleMode = 1" :title="$root.getLz('term.enableShuffle')" v-b-tooltip.hover></button>
+                        <button class="playback-button--small shuffle active" v-else :class="$root.isDisabled() && 'disabled'"
+                          @click="$root.mk.shuffleMode = 0" :title="$root.getLz('term.disableShuffle')" v-b-tooltip.hover></button>
+                      </div>
+                      <div class="app-chrome-item display--large">
+                        <button class="playback-button previous" @click="$root.prevButton()" :class="$root.isPrevDisabled() && 'disabled'"
+                          :title="$root.getLz('term.previous')" v-b-tooltip.hover></button>
+                      </div>
+                      <div class="app-chrome-item display--large">
+                        <button class="playback-button stop" @click="$root.mk.stop()"
+                          v-if="$root.mk.isPlaying && $root.mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
+                          :title="$root.getLz('term.stop')" v-b-tooltip.hover></button>
+                        <button class="playback-button pause" @click="$root.mk.pause()" v-else-if="$root.mk.isPlaying"
+                          :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
+                        <button class="playback-button play" @click="$root.mk.play()" v-else :title="$root.getLz('term.play')"
+                          v-b-tooltip.hover></button>
+                      </div>
+                      <div class="app-chrome-item display--large">
+                        <button class="playback-button next" @click="$root.skipToNextItem()" :class="$root.isNextDisabled() && 'disabled'"
+                          :title="$root.getLz('term.next')" v-b-tooltip.hover></button>
+                      </div>
+                      <div class="app-chrome-item display--large">
+                        <button class="playback-button--small repeat" v-if="$root.mk.repeatMode == 0" :class="$root.isDisabled() && 'disabled'"
+                          @click="$root.mk.repeatMode = 1" :title="$root.getLz('term.enableRepeatOne')" v-b-tooltip.hover></button>
+                        <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
+                          :class="$root.isDisabled() && 'disabled'" v-else-if="$root.mk.repeatMode == 1"
+                          :title="$root.getLz('term.disableRepeatOne')" v-b-tooltip.hover></button>
+                        <button class="playback-button--small repeat active" @click="$root.mk.repeatMode = 0"
+                          :class="$root.isDisabled() && 'disabled'" v-else-if="$root.mk.repeatMode == 2" :title="$root.getLz('term.disableRepeat')"
+                          v-b-tooltip.hover></button>
+                      </div>
+                    </div>     
                 </div>
                 <div class="app-chrome-item volume display--large">
                     <div class="input-container">