diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css
index f026b16a..71152e93 100755
--- a/server/public/assets/css/style.css
+++ b/server/public/assets/css/style.css
@@ -8,6 +8,11 @@
 3.3 Search
 */
 
+.material-icons {
+    display: none;
+    width: 24px;
+}
+
 html {
     background: #2d2d2d;
 }
diff --git a/server/public/layouts/client/main.handlebars b/server/public/layouts/client/main.handlebars
index adab3b6f..f713e77d 100644
--- a/server/public/layouts/client/main.handlebars
+++ b/server/public/layouts/client/main.handlebars
@@ -23,22 +23,17 @@
         <meta property="og:type" content="website"/>
         <meta property="fb:app_id" content="1581693815380949" />
         <link rel="manifest" href="/assets/manifest.json">
-        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" media="none" onload="if(media!='all')media='all'">
-        {{#if embed}}
-        {{else}}
+        {{#unless embed}}
             <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.css" media="none" onload="if(media!='all')media='all'">
             <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
             <link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon-32x32.png">
             <link rel="icon" id="favicon" type="image/png" sizes="16x16" href="/assets/images/favicon-16x16.png">
             <link rel="mask-icon" href="/assets/images/safari-pinned-tab.svg" color="#2d2d2d">
-        {{/if}}
+        {{/unless}}
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
         <link rel="stylesheet" type="text/css" href="/assets/css/{{stylesheet}}" title="Default">
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
-        {{#if embed}}
-        {{else}}
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" media="none" onload="if(media!='all')media='all'">
+        {{#unless embed}}
             <script async type="text/javascript">
                 if(window.location.hostname != "localhost") {
                     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -53,12 +48,11 @@
                     }
                 }
             </script>
-        {{/if}}
+        {{/unless}}
     </head>
     <body class="noselect">
         {{{body}}}
-        {{#if embed}}
-        {{else}}
+        {{#unless embed}}
             <div class="tap-target" data-activates="castButton">
                 <div class="tap-target-content">
                     <h5>Chromecast</h5>
@@ -73,7 +67,10 @@
             {{> donate}}
             {{> footer}}
             <textarea class="copy_video_id" style="display:none;"></textarea>
-        {{/if}}
+        {{/unless}}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
+        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
         <script type="text/javascript" src="/assets/dist/lib/jquery-ui.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
