diff --git a/mitxpro/templates/base.html b/mitxpro/templates/base.html
index cc405a733..6c8cca986 100644
--- a/mitxpro/templates/base.html
+++ b/mitxpro/templates/base.html
@@ -16,6 +16,10 @@
     <link href="https://fonts.googleapis.com/css?family=Rajdhani:300,400,500,600,700&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,600,700&display=swap" rel="stylesheet">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css" rel="stylesheet"/>
+    <link rel="preload" as="font" href="{% static 'fonts/icomoon.eot' %}?dd3z7r"  type="font/embedded-opentype" crossorigin>
+    <link rel="preload" as="font" href="{% static 'fonts/icomoon.ttf' %}?dd3z7r" type="font/truetype" crossorigin>
+    <link rel="preload" as="font" href="{% static 'fonts/icomoon.woff' %}?dd3z7r" type="font/woff" crossorigin>
+    <link rel="preload" as="font" href="{% static 'fonts/icomoon.svg' %}?dd3z7r" type="font/svg" crossorigin>
     <script type="text/javascript">
     var SETTINGS = {{ js_settings_json|safe }};
     {% if CSOURCE_PAYLOAD %}
diff --git a/mitxpro/templates/footer.html b/mitxpro/templates/footer.html
index 19b63fb93..875bd3386 100644
--- a/mitxpro/templates/footer.html
+++ b/mitxpro/templates/footer.html
@@ -1,62 +1,80 @@
 {% load static %}
 
 <footer class="footer">
-    <div class="footer-top">
-        <div class="container">
-            <div class="content-holder">
-                <div class="row">
-                    <div class="col-sm-6 clearfix">
-                        <img src={% static 'images/help.png' %}>
-                        <div class="info">
-                            <a href="https://xpro.zendesk.com/hc/">
-                                <h2>Help & FAQ</h2>
-                            </a>
-                            <p>Find answers to your questions.</p>
-                        </div>
-                    </div>
-                    <div class="col-sm-6 clearfix">
-                        <img src={% static 'images/contact.png' %}>
-                        <div class="info">
-                            <a href="https://xpro.zendesk.com/hc/en-us/requests/new">
-                                <h2>Contact Us</h2>
-                            </a>
-                            <p>Let us know how we can assist you.</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+  <div class="footer-top">
     <div class="container">
-        <div class="footer-bottom">
-            <div class="mit-info">
-                <img src="{% static 'images/mit.png' %}" alt="MIT">
-                <address>
-                    Massachusetts Institute of Technology <br>77 Massachusetts Avenue <br>Cambridge, MA 02139
-                </address>
+      <div class="content-holder">
+        <div class="row">
+          <div class="col-sm-6 clearfix">
+            <img src={% static 'images/help.png' %} alt="Help">
+            <div class="info">
+              <a href="https://xpro.zendesk.com/hc/">
+                <h2>Help & FAQ</h2>
+              </a>
+              <p>Find answers to your questions.</p>
             </div>
-            <div class="right-info">
-                <ul class="footer-nav">
-                    <li><a href="/about-us/">About Us</a></li>
-                </ul>
-                <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2-legacy.js"></script>
-                <script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2.js"></script>
-                <script>
-                    if (typeof hbspt !== 'undefined') {
-                        hbspt.forms.create({
-                            portalId: '{{ hubspot_portal_id }}',
-                            formId: '{{ hubspot_footer_form_guid }}'
-                        });
-                    }
-                </script>
+          </div>
+          <div class="col-sm-6 clearfix">
+            <img src={% static 'images/contact.png' %} alt="Contact Us">
+            <div class="info">
+              <a href="https://xpro.zendesk.com/hc/en-us/requests/new">
+                <h2>Contact Us</h2>
+              </a>
+              <p>Let us know how we can assist you.</p>
             </div>
+          </div>
         </div>
-        <ul class="footer-sub-nav">
-            <li><a href="/terms-of-service/">Terms of Service</a></li>
-            <li><a href="/privacy-policy/">Privacy Policy</a></li>
-            <li><a href="/honor-code/">Honor Code</a></li>
-            <li><a target="_blank" href="https://accessibility.mit.edu/">Accessibility</a></li>
+      </div>
+    </div>
+  </div>
+  <div class="container">
+    <div class="footer-bottom">
+      <div class="mit-info">
+        <img src="{% static 'images/mit.png' %}" alt="MIT" />
+        <address>
+          Massachusetts Institute of Technology <br />77 Massachusetts Avenue
+          <br />Cambridge, MA 02139
+        </address>
+      </div>
+      <div class="right-info">
+        <ul class="footer-nav">
+          <li><a href="/about-us/">About Us</a></li>
         </ul>
-        <span class="copyright">© 2019 All rights reserved. <a href="#">{{ site_name }}</a>.</span>
+        <script
+          charset="utf-8"
+          type="text/javascript"
+          src="//js.hsforms.net/forms/v2-legacy.js"
+        ></script>
+        <script
+          charset="utf-8"
+          type="text/javascript"
+          src="//js.hsforms.net/forms/v2.js"
+        ></script>
+        <script>
+          if (typeof hbspt !== "undefined") {
+            hbspt.forms.create({
+              portalId: "{{ hubspot_portal_id }}",
+              formId: "{{ hubspot_footer_form_guid }}",
+            });
+          }
+        </script>
+      </div>
     </div>
+    <ul class="footer-sub-nav">
+      <li><a href="/terms-of-service/">Terms of Service</a></li>
+      <li><a href="/privacy-policy/">Privacy Policy</a></li>
+      <li><a href="/honor-code/">Honor Code</a></li>
+      <li>
+        <a
+          target="_blank"
+          href="https://accessibility.mit.edu/"
+          rel="noopener noreferrer"
+          >Accessibility</a
+        >
+      </li>
+    </ul>
+    <span class="copyright"
+      >© 2019 All rights reserved. <a href="#">{{ site_name }}</a>.</span
+    >
+  </div>
 </footer>
diff --git a/static/scss/icomoon.scss b/static/scss/icomoon.scss
index c31919c3e..c40a29e2b 100644
--- a/static/scss/icomoon.scss
+++ b/static/scss/icomoon.scss
@@ -1,12 +1,6 @@
 // sass-lint:disable mixins-before-declarations
 @font-face {
   font-family: "icomoon";
-  src: url("#{$static-path}/fonts/icomoon.eot?dd3z7r"),
-  url("#{$static-path}/fonts/icomoon.eot?dd3z7r#iefix")
-  format("embedded-opentype"),
-  url("#{$static-path}/fonts/icomoon.ttf?dd3z7r") format("truetype"),
-  url("#{$static-path}/fonts/icomoon.woff?dd3z7r") format("woff"),
-  url("#{$static-path}/fonts/icomoon.svg?dd3z7r#icomoon") format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -21,7 +15,6 @@
   font-variant: normal;
   text-transform: none;
   line-height: 1;
-
 }
 
 .icon-close-outline:before {