diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
index 42fb932e..e3d72eb0 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
@@ -168,7 +168,7 @@
     <p class="warning"><fmt:message key="advancedsettings.ldapRequiresRestart"/></p>
 
     <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-    <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+    <a href="nowPlaying.view"><input type="button" value="<fmt:message key="common.cancel"/>"></a>
 
 </form:form>
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
index 93a94e2a..5bbe1335 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
@@ -119,10 +119,10 @@
 
     <p>
         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+        <a href="nowPlaying.view"><input type="button" value="<fmt:message key="common.cancel"/>"></a>
     </p>
 
 </form:form>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
index 383083cf..93bb947f 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
@@ -65,7 +65,7 @@
 
     <p>
         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+        <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
     </p>
 
 </form>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
index 186b6454..13301e4e 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
@@ -158,7 +158,7 @@
         <tr>
             <td colspan="2" style="padding-top:1.5em">
                 <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-                <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+                <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
             </td>
         </tr>
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
index 018aea97..bc59105b 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
@@ -49,7 +49,7 @@
     <tr>
         <td style="padding-top:1.5em" colspan="5">
             <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-            <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+            <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
         </td>
     </tr>
 </table>
@@ -64,4 +64,4 @@
     <script language="javascript" type="text/javascript">parent.frames.left.location.href="left.view?"</script>
 </c:if>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
index 1512b590..a367437a 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
@@ -139,7 +139,7 @@
 
     <p >
         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+        <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
     </p>
 
 </form:form>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
index 3c410d56..533bf59b 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
@@ -38,7 +38,7 @@
                 <tr>
                     <td colspan="3" style="padding-top:1.5em">
                         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-                        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+                        <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
                     </td>
                 </tr>
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
index 6d010c69..85ee71cc 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
@@ -208,7 +208,7 @@
 
     <p style="padding-top:1em;padding-bottom:1em">
         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em"/>
-        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+        <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
     </p>
 
     <h2><fmt:message key="personalsettings.avatar.title"/></h2>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
index a99c03c1..f546293e 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
@@ -196,7 +196,7 @@ $(document).ready(function() {
             </c:if>
 
             <input type="submit" value="<fmt:message key="common.save"/>" style="margin-top:1em;margin-right:0.3em">
-            <input type="button" value="<fmt:message key="common.cancel"/>" style="margin-top:1em" onclick="location.href='nowPlaying.view'">
+            <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-top:1em"></a>
         </form:form>
     </c:otherwise>
 </c:choose>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
index f7f3ff24..f4b4c439 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
@@ -80,7 +80,7 @@
     <tr>
         <td style="padding-top:1.5em" colspan="2">
             <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-            <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+            <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
         </td>
     </tr>
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
index 732f28b6..9f721445 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
@@ -58,7 +58,7 @@
 
     <p style="padding-top:1em">
         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'" style="margin-right:2.0em">
+        <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-right:2.0em"></a>
         <input type="checkbox" id="deleteExpired" name="deleteExpired" class="checkbox"/>
         <label for="deleteExpired"><fmt:message key="sharesettings.deleteexpired"/></label>
     </p>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
index 63c551fc..330006af 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
@@ -56,7 +56,7 @@
 
     <p>
         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
+        <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
     </p>
 
 </form>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
index e5c3c945..f5789ab6 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
@@ -87,7 +87,7 @@
 
     <p style="padding-top:0.75em">
         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
-        <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'" style="margin-right:1.3em">
+        <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-right:1.3em"></a>
         <a href="https://airsonic.github.io/docs/transcode/" target="_blank"><fmt:message key="transcodingsettings.recommended"/></a>
     </p>
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
index ad94d3b0..3f4d8443 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
@@ -215,7 +215,7 @@
     </c:choose>
 
     <input type="submit" value="<fmt:message key="common.save"/>" style="margin-top:1.5em;margin-right:0.3em">
-    <input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'" style="margin-top:1.5em">
+    <a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-top:1.5em"></a>
 </form:form>
 
 </body></html>
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 43292320..bbcb19ed 100644
--- a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
+++ b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
@@ -193,6 +193,11 @@ input[type=submit], input[type=button] {
     background: white;
     padding-left: 1em;
     padding-right: 1em;
+    color: black;
+}
+
+input[type=submit]:hover, input[type=button]:hover {
+    text-decoration: none;
 }
 
 input[type=submit]:active, input[type=button]:active {