diff --git a/.editorconfig b/.editorconfig
index f1378ec1a..e67a396e4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,6 +14,9 @@ indent_style = space
indent_size = 2
quote_type = single
+[*.html]
+max_line_length = 120
+
[*.{html,sass,js,jsx,scss,css,php,svg}]
charset = utf-8
indent_style = tab
diff --git a/securedrop/static/favicon/favicon.png b/securedrop/static/favicon/favicon.png
deleted file mode 100644
index 213b58ffc..000000000
Binary files a/securedrop/static/favicon/favicon.png and /dev/null differ
diff --git a/securedrop/static/favicon/favicon.svg b/securedrop/static/favicon/favicon.svg
new file mode 100644
index 000000000..192169cda
--- /dev/null
+++ b/securedrop/static/favicon/favicon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/securedrop/static/icons/apple-touch-icon.png b/securedrop/static/icons/apple-touch-icon.png
new file mode 100644
index 000000000..c53217c78
Binary files /dev/null and b/securedrop/static/icons/apple-touch-icon.png differ
diff --git a/securedrop/templates/super.html b/securedrop/templates/super.html
index 8eba2c187..98517d482 100644
--- a/securedrop/templates/super.html
+++ b/securedrop/templates/super.html
@@ -1,20 +1,17 @@
+{% load i18n %}
{% load static wagtailmetadata_tags wagtailsettings_tags common_tags %}
{% load render_bundle from webpack_loader %}
+{% get_current_language as LANGUAGE_CODE %}
-
-
-
-
-
+
+
- {% if request.in_preview_panel %}
-
- {% endif %}
{% block head %}
-
-
+
+
+
{% block css %}
{% render_bundle 'common' 'css' %}
@@ -45,6 +42,9 @@
{% endwith %}
{% endblock %}
{% endblock %}
+ {% if request.in_preview_panel %}
+
+ {% endif %}