diff --git a/res/favicon.png b/res/favicon.png
new file mode 100644
index 0000000000..61cfa6e514
Binary files /dev/null and b/res/favicon.png differ
diff --git a/src/pretix/base/templates/error.html b/src/pretix/base/templates/error.html
index b26764b9c9..9ad36df247 100644
--- a/src/pretix/base/templates/error.html
+++ b/src/pretix/base/templates/error.html
@@ -9,6 +9,7 @@
{% endcompress %}
+
diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index 87127b77f0..c03a17a60d 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -19,6 +19,7 @@
{% endcompress %}
{{ html_head|safe }}
+
diff --git a/src/pretix/presale/templates/pretixpresale/base.html b/src/pretix/presale/templates/pretixpresale/base.html
index ec590de891..75071cfdc9 100644
--- a/src/pretix/presale/templates/pretixpresale/base.html
+++ b/src/pretix/presale/templates/pretixpresale/base.html
@@ -17,6 +17,7 @@
{% endcompress %}
{{ html_head|safe }}
+
diff --git a/src/static/pretixbase/img/favicon.ico b/src/static/pretixbase/img/favicon.ico
new file mode 100644
index 0000000000..098bfbc157
Binary files /dev/null and b/src/static/pretixbase/img/favicon.ico differ