diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index f5d1834c5d..41fc60f8de 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -126,7 +126,9 @@
{% endif %}
- {{ settings.PRETIX_INSTANCE_NAME }}
+
+ {{ settings.PRETIX_INSTANCE_NAME }}
+
diff --git a/src/pretix/static/pretixbase/img/favicon-16.png b/src/pretix/static/pretixbase/img/favicon-16.png
new file mode 100644
index 0000000000..9b976948cc
Binary files /dev/null and b/src/pretix/static/pretixbase/img/favicon-16.png differ
diff --git a/src/pretix/static/pretixbase/img/favicon-32.png b/src/pretix/static/pretixbase/img/favicon-32.png
new file mode 100644
index 0000000000..273d7b1dd4
Binary files /dev/null and b/src/pretix/static/pretixbase/img/favicon-32.png differ
diff --git a/src/pretix/static/pretixbase/img/favicon-64.png b/src/pretix/static/pretixbase/img/favicon-64.png
new file mode 100644
index 0000000000..4af4813149
Binary files /dev/null and b/src/pretix/static/pretixbase/img/favicon-64.png differ
diff --git a/src/pretix/static/pretixbase/img/favicon-debug-16.png b/src/pretix/static/pretixbase/img/favicon-debug-16.png
new file mode 100644
index 0000000000..297d7023d2
Binary files /dev/null and b/src/pretix/static/pretixbase/img/favicon-debug-16.png differ
diff --git a/src/pretix/static/pretixbase/img/favicon-debug-32.png b/src/pretix/static/pretixbase/img/favicon-debug-32.png
new file mode 100644
index 0000000000..e4b4d1fe9f
Binary files /dev/null and b/src/pretix/static/pretixbase/img/favicon-debug-32.png differ
diff --git a/src/pretix/static/pretixbase/img/favicon-debug-64.png b/src/pretix/static/pretixbase/img/favicon-debug-64.png
new file mode 100644
index 0000000000..84547e2ca3
Binary files /dev/null and b/src/pretix/static/pretixbase/img/favicon-debug-64.png differ
diff --git a/src/pretix/static/pretixbase/img/favicon-debug.ico b/src/pretix/static/pretixbase/img/favicon-debug.ico
index 0d29347428..8a188c7362 100644
Binary files a/src/pretix/static/pretixbase/img/favicon-debug.ico and b/src/pretix/static/pretixbase/img/favicon-debug.ico differ
diff --git a/src/pretix/static/pretixbase/img/favicon.ico b/src/pretix/static/pretixbase/img/favicon.ico
index 098bfbc157..49b5755745 100644
Binary files a/src/pretix/static/pretixbase/img/favicon.ico and b/src/pretix/static/pretixbase/img/favicon.ico differ
diff --git a/src/pretix/static/pretixbase/img/pretix-icon-colored.svg b/src/pretix/static/pretixbase/img/pretix-icon-colored.svg
deleted file mode 100644
index 04a7252da3..0000000000
--- a/src/pretix/static/pretixbase/img/pretix-icon-colored.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pretix/static/pretixbase/img/pretix-icon-white-mini.svg b/src/pretix/static/pretixbase/img/pretix-icon-white-mini.svg
index 069c66961b..a2db7082aa 100644
--- a/src/pretix/static/pretixbase/img/pretix-icon-white-mini.svg
+++ b/src/pretix/static/pretixbase/img/pretix-icon-white-mini.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/src/pretix/static/pretixbase/img/pretix-icon.svg b/src/pretix/static/pretixbase/img/pretix-icon.svg
index 04a7252da3..5b4ae39407 100644
--- a/src/pretix/static/pretixbase/img/pretix-icon.svg
+++ b/src/pretix/static/pretixbase/img/pretix-icon.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/src/pretix/static/pretixbase/img/pretix-logo-white.svg b/src/pretix/static/pretixbase/img/pretix-logo-white.svg
index 8e32268054..be78fe6a34 100644
--- a/src/pretix/static/pretixbase/img/pretix-logo-white.svg
+++ b/src/pretix/static/pretixbase/img/pretix-logo-white.svg
@@ -1 +1,2 @@
-
+
+
\ No newline at end of file
diff --git a/src/pretix/static/pretixbase/img/pretix-logo.svg b/src/pretix/static/pretixbase/img/pretix-logo.svg
index cba6ceb147..ba84fe78bf 100644
--- a/src/pretix/static/pretixbase/img/pretix-logo.svg
+++ b/src/pretix/static/pretixbase/img/pretix-logo.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/src/pretix/static/pretixbase/img/pretixscan.svg b/src/pretix/static/pretixbase/img/pretixscan.svg
index 733eae132f..7127bf69d6 100644
--- a/src/pretix/static/pretixbase/img/pretixscan.svg
+++ b/src/pretix/static/pretixbase/img/pretixscan.svg
@@ -1 +1 @@
-
+
diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss
index 9abd93b6f2..67b3f22b76 100644
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -36,10 +36,21 @@ nav.navbar {
margin: 0;
border: 0;
}
+.navbar-brand {
+ position: relative;
+ padding-bottom: 10px;
+ padding-top: 10px;
+ padding-left: 10px;
+}
+.navbar-brand span {
+ padding: 4px 8px 6px; // Optical alignment next to logo
+ display: inline-block;
+}
.navbar-brand img {
- height: 100%;
width: auto;
- display: inline;
+ height: 100%;
+ display: inline-block;
+ vertical-align: top;
}
#side-menu img.fa-img {