diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index e7b4c866..0b13c612 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -872,12 +872,18 @@ Callbacks = {
         if(CHANNEL.openqueue) {
             $("#qlockbtn").removeClass("btn-danger")
                 .addClass("btn-success")
-                .text("Lock Playlist");
+                .attr("title", "Playlist Unlocked");
+            $("#qlockbtn").find("i")
+                .removeClass("icon-lock")
+                .addClass("icon-ok");
         }
         else {
             $("#qlockbtn").removeClass("btn-success")
                 .addClass("btn-danger")
-                .text("Unlock Playlist");
+                .attr("title", "Playlist Locked");
+            $("#qlockbtn").find("i")
+                .removeClass("icon-ok")
+                .addClass("icon-lock");
         }
     },
 
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index d11bacb9..cc4f91a5 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -876,7 +876,7 @@ function handlePermissionChange() {
 
     setVisible("#playlisttogglewrap", hasPermission("playlistadd"));
     $("#queue_next").attr("disabled", !hasPermission("playlistnext"));
-    setVisible("#qlockbtn", CLIENT.rank >= 2);
+    $("#qlockbtn").attr("disabled", CLIENT.rank < 2);
 
     if(hasPermission("playlistadd") ||
         hasPermission("playlistmove") ||
diff --git a/www/channel.html b/www/channel.html
index 3d84f848..e87bd8b8 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -183,15 +183,17 @@
                         <br>
                     </div>
                     <div id="extended_controls" class="span12">
-                      <button class="btn btn-danger btn-block" id="qlockbtn">Unlock Queue</button>
                       <button class="btn btn-block" id="clearplaylist">Clear Playlist</button>
                       <button class="btn btn-block" id="shuffleplaylist">Shuffle Playlist</button>
                     </div>
                   </div>
                   </div>
                   <div class="btn-group span12">
-                      <button class="btn" style="width: 50%" id="voteskip">Voteskip</button>
-                      <button class="btn" style="width: 50%" id="getplaylist">Get Playlist URLs</button>
+                      <button class="btn" style="width: 46%" id="voteskip">Voteskip</button>
+                      <button class="btn" style="width: 46%" id="getplaylist">Get Playlist URLs</button>
+                      <button class="btn btn-danger" style="width: 8%" id="qlockbtn" title="Playlist Locked">
+                        <i class="icon-lock"></i>
+                      </button>
                   </div>
                   <!-- video queue -->
                   <ul class="span12 videolist" id="queue">