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 e3d72eb0..c027b0fa 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
@@ -96,7 +96,7 @@
     <table class="indent">
         <tr>
             <td colspan="2">
-                <form:checkbox path="captchaEnabled" id="enablecaptcha" cssclass="checkbox"/>
+                <form:checkbox path="captchaEnabled" id="enablecaptcha"/>
                 <label for="enablecaptcha">
                     <fmt:message key="advancedsettings.enableCaptcha"/>
                 </label>
@@ -122,7 +122,7 @@
     </table>
 
     <table class="indent"><tr><td>
-        <form:checkbox path="ldapEnabled" id="ldap" cssClass="checkbox" onclick="enableLdapFields()"/>
+        <form:checkbox path="ldapEnabled" id="ldap" onclick="enableLdapFields()"/>
         <label for="ldap"><fmt:message key="advancedsettings.ldapenabled"/></label>
         <c:import url="helpToolTip.jsp"><c:param name="topic" value="ldap"/></c:import>
     </td></tr></table>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
index c343b655..a176e7df 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
@@ -317,7 +317,7 @@
                             <c:param name="asTable" value="true"/>
                         </c:import>
 
-                        <td class="fit"><input type="checkbox" class="checkbox" id="songIndex${loopStatus.count - 1}">
+                        <td class="fit"><input type="checkbox" id="songIndex${loopStatus.count - 1}">
                             <span id="songId${loopStatus.count - 1}" style="display: none">${song.id}</span></td>
 
                         <c:if test="${model.visibility.trackNumberVisible}">
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 93bb947f..4cc78e33 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
@@ -37,8 +37,7 @@
     <sec:csrfInput />
 
     <div>
-        <input type="checkbox" name="dlnaEnabled" id="dlnaEnabled" class="checkbox"
-               <c:if test="${model.dlnaEnabled}">checked="checked"</c:if>/>
+        <input type="checkbox" name="dlnaEnabled" id="dlnaEnabled" {model.dlnaEnabled? "checked": ""}/>
         <label for="dlnaEnabled"><fmt:message key="dlnasettings.enabled"/></label>
     </div>
     <p class="detail" style="width:60%;white-space:normal">
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 bc59105b..b702ee53 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
@@ -27,8 +27,8 @@
             <td><input type="text" name="name[${radio.id}]" size="20" value="${radio.name}"/></td>
             <td><input type="text" name="streamUrl[${radio.id}]" size="40" value="${radio.streamUrl}"/></td>
             <td><input type="text" name="homepageUrl[${radio.id}]" size="40" value="${radio.homepageUrl}"/></td>
-            <td align="center" style="padding-left:1em"><input type="checkbox" ${radio.enabled ? "checked" : ""} name="enabled[${radio.id}]" class="checkbox"/></td>
-            <td align="center" style="padding-left:1em"><input type="checkbox" name="delete[${radio.id}]" class="checkbox"/></td>
+            <td align="center" style="padding-left:1em"><input type="checkbox" ${radio.enabled ? "checked" : ""} name="enabled[${radio.id}]" /></td>
+            <td align="center" style="padding-left:1em"><input type="checkbox" name="delete[${radio.id}]" /></td>
         </tr>
     </c:forEach>
 
@@ -42,7 +42,7 @@
         <td><input type="text" name="name" size="20" placeholder="<fmt:message key="internetradiosettings.name"/>"/></td>
         <td><input type="text" name="streamUrl" size="40" placeholder="<fmt:message key="internetradiosettings.streamurl"/>"/></td>
         <td><input type="text" name="homepageUrl" size="40" placeholder="<fmt:message key="internetradiosettings.homepageurl"/>"/></td>
-        <td align="center" style="padding-left:1em"><input name="enabled" checked type="checkbox" class="checkbox"/></td>
+        <td align="center" style="padding-left:1em"><input name="enabled" checked type="checkbox"/></td>
         <td/>
     </tr>
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
index 4d74aa49..27b62d5e 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -30,7 +30,7 @@
             <div class="details">
                 <div id="loginremember">
                     <label for="remember"><fmt:message key="login.remember"/></label>
-                    <input type="checkbox" name="remember-me" id="remember" class="checkbox" tabindex="3">
+                    <input type="checkbox" name="remember-me" id="remember" tabindex="3">
                 </div>
 
                 <a href="recover.view"><fmt:message key="login.recover"/></a>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
index 8b3facea..e6d64b8b 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
@@ -304,7 +304,7 @@
             </tr>
             <tr>
                 <td colspan="2">
-                    <input type="checkbox" checked name="unzip" id="unzip" class="checkbox"/>
+                    <input type="checkbox" checked name="unzip" id="unzip"/>
                     <label for="unzip"><fmt:message key="more.upload.unzip"/></label>
                 </td>
             </tr>
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 6ed6cfc7..6124469f 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
@@ -806,7 +806,7 @@
             <td class="fit">
                 <img id="removeSong" onclick="onRemove(this.id.substring(10) - 1)" src="<spring:theme code="removeImage"/>"
                      style="cursor:pointer" alt="<fmt:message key="playlist.remove"/>" title="<fmt:message key="playlist.remove"/>"></td>
-            <td class="fit"><input type="checkbox" class="checkbox" id="songIndex"></td>
+            <td class="fit"><input type="checkbox" id="songIndex"></td>
 
             <c:if test="${model.visibility.trackNumberVisible}">
                 <td class="fit rightalign"><span class="detail" id="trackNumber">1</span></td>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannel.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannel.jsp
index 52e904c2..cef92199 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannel.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannel.jsp
@@ -108,7 +108,7 @@
 
         <tr>
 
-            <td class="fit"><input type="checkbox" class="checkbox" id="episode${i.index}" value="${episode.id}"/></td>
+            <td class="fit"><input type="checkbox" id="episode${i.index}" value="${episode.id}"/></td>
 
             <c:choose>
                 <c:when test="${empty episode.mediaFileId or episode.status ne 'COMPLETED'}">
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 9f721445..715b6451 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
@@ -50,7 +50,7 @@
                     <label><input type="radio" name="expireIn[${share.id}]" value="365"><fmt:message key="sharesettings.expirein.year"/></label>
                     <label><input type="radio" name="expireIn[${share.id}]" value="0"><fmt:message key="sharesettings.expirein.never"/></label>
                 </td>
-                <td style="padding-left:1em" align="center" style="padding-left:1em"><input type="checkbox" name="delete[${share.id}]" class="checkbox"/></td>
+                <td style="padding-left:1em" align="center" style="padding-left:1em"><input type="checkbox" name="delete[${share.id}]"/></td>
             </tr>
         </c:forEach>
 
@@ -59,7 +59,7 @@
     <p style="padding-top:1em">
         <input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
         <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"/>
+        <input type="checkbox" id="deleteExpired" name="deleteExpired"/>
         <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 330006af..7e2b3819 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
@@ -37,8 +37,7 @@
     <sec:csrfInput />
 
     <div>
-        <input type="checkbox" name="sonosEnabled" id="sonosEnabled" class="checkbox"
-               <c:if test="${model.sonosEnabled}">checked="checked"</c:if>/>
+        <input type="checkbox" name="sonosEnabled" id="sonosEnabled" ${model.sonosEnabled? "checked": ""}/>
         <label for="sonosEnabled"><fmt:message key="sonossettings.enabled"/></label>
     </div>
 
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 f5789ab6..63e4dcc8 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
@@ -27,12 +27,12 @@
 
     <c:forEach items="${model.transcodings}" var="transcoding">
         <tr>
-            <td><input style="font-family:monospace" type="text" name="name[${transcoding.id}]" size="10" value="${transcoding.name}"/></td>
-            <td><input style="font-family:monospace" type="text" name="sourceFormats[${transcoding.id}]" size="36" value="${transcoding.sourceFormats}"/></td>
-            <td><input style="font-family:monospace" type="text" name="targetFormat[${transcoding.id}]" size="10" value="${transcoding.targetFormat}"/></td>
-            <td><input style="font-family:monospace" type="text" name="step1[${transcoding.id}]" size="60" value="${transcoding.step1}"/></td>
-            <td><input style="font-family:monospace" type="text" name="step2[${transcoding.id}]" size="22" value="${transcoding.step2}"/></td>
-            <td align="center" style="padding-left:1em"><input type="checkbox" name="delete[${transcoding.id}]" class="checkbox"/></td>
+            <td><input class="monospace" name="name[${transcoding.id}]" size="10" value="${transcoding.name}"/></td>
+            <td><input class="monospace" name="sourceFormats[${transcoding.id}]" size="36" value="${transcoding.sourceFormats}"/></td>
+            <td><input class="monospace" name="targetFormat[${transcoding.id}]" size="10" value="${transcoding.targetFormat}"/></td>
+            <td><input class="monospace" name="step1[${transcoding.id}]" size="60" value="${transcoding.step1}"/></td>
+            <td><input class="monospace" name="step2[${transcoding.id}]" size="22" value="${transcoding.step2}"/></td>
+            <td align="center" style="padding-left:1em"><input type="checkbox" name="delete[${transcoding.id}]"/></td>
         </tr>
     </c:forEach>
 
@@ -41,17 +41,17 @@
     </tr>
 
     <tr>
-        <td><input style="font-family:monospace" type="text" name="name" size="10" placeholder="<fmt:message key="transcodingsettings.name"/>" value="${newTranscoding.name}"/></td>
-        <td><input style="font-family:monospace" type="text" name="sourceFormats" size="36" placeholder="<fmt:message key="transcodingsettings.sourceformat"/>" value="${newTranscoding.sourceFormats}"/></td>
-        <td><input style="font-family:monospace" type="text" name="targetFormat" size="10" placeholder="<fmt:message key="transcodingsettings.targetformat"/>" value="${newTranscoding.targetFormat}"/></td>
-        <td><input style="font-family:monospace" type="text" name="step1" size="60" placeholder="<fmt:message key="transcodingsettings.step1"/>" value="${newTranscoding.step1}"/></td>
-        <td><input style="font-family:monospace" type="text" name="step2" size="22" placeholder="<fmt:message key="transcodingsettings.step2"/>" value="${newTranscoding.step2}"/></td>
+        <td><input class="monospace" name="name" size="10" placeholder="<fmt:message key="transcodingsettings.name"/>" value="${newTranscoding.name}"/></td>
+        <td><input class="monospace" name="sourceFormats" size="36" placeholder="<fmt:message key="transcodingsettings.sourceformat"/>" value="${newTranscoding.sourceFormats}"/></td>
+        <td><input class="monospace" name="targetFormat" size="10" placeholder="<fmt:message key="transcodingsettings.targetformat"/>" value="${newTranscoding.targetFormat}"/></td>
+        <td><input class="monospace" name="step1" size="60" placeholder="<fmt:message key="transcodingsettings.step1"/>" value="${newTranscoding.step1}"/></td>
+        <td><input class="monospace" name="step2" size="22" placeholder="<fmt:message key="transcodingsettings.step2"/>" value="${newTranscoding.step2}"/></td>
         <td/>
     </tr>
 
     <tr>
         <td colspan="6" style="padding-top:0.1em">
-            <input type="checkbox" id="defaultActive" name="defaultActive" class="checkbox" checked/>
+            <input type="checkbox" id="defaultActive" name="defaultActive" checked/>
             <label for="defaultActive"><fmt:message key="transcodingsettings.defaultactive"/></label>
         </td>
     </tr>
@@ -61,7 +61,7 @@
     <table style="white-space:nowrap" class="indent">
         <tr>
             <td>
-                <input type="checkbox" id="enableSeek" name="enableSeek" class="checkbox" ${model.enableSeek ? "checked" : ""}/>
+                <input type="checkbox" id="enableSeek" name="enableSeek" ${model.enableSeek ? "checked" : ""}/>
                 <label for="enableSeek"><fmt:message key="transcodingsettings.enableseek"/></label>
             </td>
         <tr>
@@ -70,7 +70,7 @@
                 <c:import url="helpToolTip.jsp"><c:param name="topic" value="downsamplecommand"/></c:import>
             </td>
             <td>
-                <input style="font-family:monospace" type="text" name="downsampleCommand" size="100" value="${model.downsampleCommand}"/>
+                <input class="monospace" type="text" name="downsampleCommand" size="100" value="${model.downsampleCommand}"/>
             </td>
         </tr>
         <tr>
@@ -79,7 +79,7 @@
                 <c:import url="helpToolTip.jsp"><c:param name="topic" value="hlscommand"/></c:import>
             </td>
             <td>
-                <input style="font-family:monospace" type="text" name="hlsCommand" size="100" value="${model.hlsCommand}"/>
+                <input class="monospace" type="text" name="hlsCommand" size="100" value="${model.hlsCommand}"/>
             </td>
         </tr>
     </table>
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 bbcb19ed..8313f6be 100644
--- a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
+++ b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
@@ -204,6 +204,10 @@ input[type=submit]:active, input[type=button]:active {
     background: #e9e9e9;
 }
 
+input[type=checkbox] {
+	border: 0;
+}
+
 input:hover, textarea:hover, select:hover {
     border: 1px solid darkgray;
 }
@@ -267,6 +271,10 @@ img {
     vertical-align: middle;
 }
 
+.monospace {
+	font-family: monospace;
+}
+
 .dropshadow {
     box-shadow: 2px 2px 10px #333333;
 }
@@ -398,10 +406,6 @@ img {
     line-height: 1em;
 }
 
-.checkbox {
-    border: 0
-}
-
 /* Table with simple lines between the cells. */
 .ruleTable {
     border-collapse: collapse;