diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 8bba2637..80d513c0 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -10,12 +10,8 @@
         <link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}">
         <link rel="stylesheet" href="{{ scss('core/style.scss') }}">
         <link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
-        {% if settings.EXTERNAL_RES %}
-          <noscript><link rel="stylesheet" href="/static/core/font-awesome/css/font-awesome.min.css"></noscript>
-          <script href="/core/static/core/font-awesome/js/fontawesone.min.js"></script>
-        {% else %}
-          <link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}">
-        {% endif %}
+        <link rel="stylesheet" href="/static/core/font-awesome/css/font-awesome.min.css">
+        <script href="/core/static/core/font-awesome/js/fontawesone.min.js"></script>
 
         <!-- Jquery declared here to be accessible in every django widgets -->
         <script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script>
diff --git a/core/templates/core/markdown_textarea.jinja b/core/templates/core/markdown_textarea.jinja
index 8af26523..2f2b69c9 100644
--- a/core/templates/core/markdown_textarea.jinja
+++ b/core/templates/core/markdown_textarea.jinja
@@ -28,6 +28,7 @@
 		var easymde = new EasyMDE({
 			element: document.getElementById("{{ widget.attrs.id }}"),
 			spellChecker: false,
+			autoDownloadFontAwesome: false,
 			previewRender: function(plainText, preview){ // Async method
 				clearTimeout(lastAPICall);
 				lastAPICall = setTimeout(function (plainText, preview){