diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
index bdc21627..6142d7da 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
@@ -891,14 +891,14 @@
 
                     <td style="white-space:nowrap;">
                       <span class="header">
-                        <a href="javascript:onClear()">
+                        <a href="javascript:onClear()" class="player-control">
                             <img src="<spring:theme code="clearImage"/>" alt="Clear playlist" title="Clear playlist" style="cursor:pointer; height:18px">
                         </a>
                       </span> |</td>
 
                     <td style="white-space:nowrap;">
                       <span class="header">
-                        <a href="javascript:onShuffle()" id="shuffleQueue">
+                        <a href="javascript:onShuffle()" id="shuffleQueue" class="player-control">
                             <img src="<spring:theme code="shuffleImage"/>" alt="Shuffle" title="Shuffle" style="cursor:pointer; height:18px">
                         </a>
                       </span> |</td>
@@ -906,7 +906,7 @@
                     <c:if test="${model.player.web or model.player.jukebox or model.player.external}">
                         <td style="white-space:nowrap;">
                           <span class="header">
-                            <a href="javascript:onToggleRepeat()" id="repeatQueue">
+                            <a href="javascript:onToggleRepeat()" id="repeatQueue" class="player-control">
                               <img id="toggleRepeat" src="<spring:theme code="repeatOn"/>" alt="Toggle repeat" title="Toggle repeat" style="cursor:pointer; height:18px">
                             </a>
                           </span> |</td>
@@ -914,7 +914,7 @@
 
                     <td style="white-space:nowrap;">
                       <span class="header">
-                        <a href="javascript:onUndo()" id="undoQueue">
+                        <a href="javascript:onUndo()" id="undoQueue" class="player-control">
                           <img src="<spring:theme code="undoImage"/>" alt="Undo" title="Undo" style="cursor:pointer; height:18px">
                         </a>
                       </span>  |</td>
@@ -922,7 +922,7 @@
                     <c:if test="${model.user.settingsRole}">
                         <td style="white-space:nowrap;">
                           <span class="header">
-                            <a href="playerSettings.view?id=${model.player.id}" target="main">
+                            <a href="playerSettings.view?id=${model.player.id}" target="main" class="player-control">
                               <img src="<spring:theme code="settingsImage"/>" alt="Settings" title="Settings" style="cursor:pointer; height:18px">
                             </a>
                           </span> |</td>
diff --git a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
index 1e8f5b79..5acea753 100644
--- a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
+++ b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
@@ -69,6 +69,11 @@ a.disabled, a.disabled span, span.disabled {
     color: #bbb;
 }
 
+/* Player controls */
+a.player-control:hover {
+    text-decoration: none;
+}
+
 /* Color for warning messages. */
 .warning {
     color: red;