diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp
index 511b94da..f0dedf5b 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -6,13 +6,13 @@
     <link rel="alternate" type="application/rss+xml" title="Airsonic Podcast" href="podcast.view?suffix=.rss">
 </head>
 
-<frameset rows="80,*,0" border="0" framespacing="0" frameborder="0">
+<frameset rows="80,*,0">
     <frame name="upper" src="top.view?" class="bgcolor2">
-    <frameset id="mainFrameset" cols=${model.showSideBar ? "230,*" : "0,*"} border="0" framespacing="0" frameborder="0">
+    <frameset id="mainFrameset" cols=${model.showSideBar ? "230,*" : "0,*"}>
         <frame name="left" src="left.view?" marginwidth="0" marginheight="0" class="bgcolor2">
 
-        <frameset id="playQueueFrameset" rows=${model.autoHidePlayQueue ? "*,50" : "*,150"} border="0" framespacing="0" frameborder="0">
-            <frameset cols="*,${model.showRight ? 235 : 0}" border="0" framespacing="0" frameborder="0">
+        <frameset id="playQueueFrameset" rows=${model.autoHidePlayQueue ? "*,50" : "*,150"}>
+            <frameset cols="*,${model.showRight ? 235 : 0}">
                 <frame name="main" src="nowPlaying.view?" marginwidth="0" marginheight="0" class="bgcolor1">
                 <frame name="right" src="right.view?" class="bgcolor1">
             </frameset>
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..617438d3 100644
--- a/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
+++ b/airsonic-main/src/main/webapp/style/default-without-mediaelement.css
@@ -221,6 +221,11 @@ table {
     margin: 0 0 0.4em 0;
 }
 
+frameset {
+  border: 0;
+  frameborder: 0;
+  framespacing: 0;
+}
 
 /* Table with some white space above it.*/
 table.indent {