diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0e4f9ca666132272b99909514638daac3f9bb7eb..fc5d823afdd0a646c8569c1b7497ac71bd228ea1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -18,8 +18,16 @@ Fixed
 ~~~~~
 
 * Correctly update theme colours on change again
+* Use correct favicon as default AlekSIS favicon
 * Show all years in a 200 year range around the current year in date pickers
 
+Removed
+~~~~~~~
+
+* Remove old generated AlekSIS icons
+* Imprint is now called "Imprint" and not "Impress".
+* Logo files weren't uploaded to public namespace.
+
 `2.3.1`_ – 2021-12-17
 ---------------------
 
diff --git a/aleksis/core/mixins.py b/aleksis/core/mixins.py
index 3232aac4deb912dfb65f28d69831767bf2fd8445..c6cee9a8c6bbefed3439eef156b685f5484e4a13 100644
--- a/aleksis/core/mixins.py
+++ b/aleksis/core/mixins.py
@@ -1,5 +1,6 @@
 # flake8: noqa: DJ12
 
+import os
 from datetime import datetime
 from typing import Any, Callable, List, Optional, Union
 
@@ -21,6 +22,8 @@ from django.views.generic import CreateView, UpdateView
 from django.views.generic.edit import DeleteView, ModelFormMixin
 
 import reversion
+from dynamic_preferences.settings import preferences_settings
+from dynamic_preferences.types import FilePreference
 from guardian.admin import GuardedModelAdmin
 from guardian.core import ObjectPermissionChecker
 from jsonstore.fields import IntegerField, JSONFieldMixin
@@ -529,3 +532,14 @@ class SchoolTermRelatedExtensibleForm(ExtensibleForm):
             kwargs["initial"] = {"school_term": SchoolTerm.current}
 
         super().__init__(*args, **kwargs)
+
+
+class PublicFilePreferenceMixin(FilePreference):
+    """Uploads a file to the public namespace."""
+
+    upload_path = "public"
+
+    def get_upload_path(self):
+        return os.path.join(
+            self.upload_path, preferences_settings.FILE_PREFERENCE_UPLOAD_DIR, self.identifier()
+        )
diff --git a/aleksis/core/preferences.py b/aleksis/core/preferences.py
index d0de22fe03cc044fa5722982dfcc7faf86a4503c..0110d9aa84d3848912bf411a00063d86609f6c1d 100644
--- a/aleksis/core/preferences.py
+++ b/aleksis/core/preferences.py
@@ -16,6 +16,7 @@ from dynamic_preferences.types import (
 )
 from oauth2_provider.models import AbstractApplication
 
+from .mixins import PublicFilePreferenceMixin
 from .models import Group, Person
 from .registries import person_preferences_registry, site_preferences_registry
 from .util.notifications import get_notification_choices_lazy
@@ -78,7 +79,7 @@ class ColourSecondary(StringPreference):
 
 
 @site_preferences_registry.register
-class Logo(FilePreference):
+class Logo(PublicFilePreferenceMixin, FilePreference):
     """Logo of your AlekSIS instance."""
 
     section = theme
@@ -88,7 +89,7 @@ class Logo(FilePreference):
 
 
 @site_preferences_registry.register
-class Favicon(FilePreference):
+class Favicon(PublicFilePreferenceMixin, FilePreference):
     """Favicon of your AlekSIS instance."""
 
     section = theme
@@ -98,7 +99,7 @@ class Favicon(FilePreference):
 
 
 @site_preferences_registry.register
-class PWAIcon(FilePreference):
+class PWAIcon(PublicFilePreferenceMixin, FilePreference):
     """PWA-Icon of your AlekSIS instance."""
 
     section = theme
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 2ddf26cfde1fe010074534c0a7bedf00a04fbf3b..7c7082e82037aadfd3390677d09a23538f7b4ec4 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -664,7 +664,7 @@ if _settings.get("dev.uwsgi.celery", DEBUG):
 
 DEFAULT_FAVICON_PATHS = {
     "pwa_icon": os.path.join(STATIC_ROOT, "img/aleksis-icon.png"),
-    "favicon": os.path.join(STATIC_ROOT, "img/aleksis-icon.png"),
+    "favicon": os.path.join(STATIC_ROOT, "img/aleksis-favicon.png"),
 }
 PWA_ICONS_CONFIG = {
     "android": [192, 512],
diff --git a/aleksis/core/static/icons/android_192.png b/aleksis/core/static/icons/android_192.png
deleted file mode 100644
index b5f7fec68184883830f68dabc606f7a95c45e8bb..0000000000000000000000000000000000000000
Binary files a/aleksis/core/static/icons/android_192.png and /dev/null differ
diff --git a/aleksis/core/static/icons/android_512.png b/aleksis/core/static/icons/android_512.png
deleted file mode 100644
index 5e042b4f98ef6dd8056ce643ad16ba085658684e..0000000000000000000000000000000000000000
Binary files a/aleksis/core/static/icons/android_512.png and /dev/null differ
diff --git a/aleksis/core/static/icons/apple_114.png b/aleksis/core/static/icons/apple_114.png
deleted file mode 100644
index eb8db13ad567105a819dab802b4f7ddd360e34be..0000000000000000000000000000000000000000
Binary files a/aleksis/core/static/icons/apple_114.png and /dev/null differ
diff --git a/aleksis/core/static/icons/apple_152.png b/aleksis/core/static/icons/apple_152.png
deleted file mode 100644
index 51eaa8d28988a16629e2b884d8de4df58fbadccc..0000000000000000000000000000000000000000
Binary files a/aleksis/core/static/icons/apple_152.png and /dev/null differ
diff --git a/aleksis/core/static/icons/apple_180.png b/aleksis/core/static/icons/apple_180.png
deleted file mode 100644
index 5c6b70846586ef0bf4bd44d177f6f79b49d1cddd..0000000000000000000000000000000000000000
Binary files a/aleksis/core/static/icons/apple_180.png and /dev/null differ
diff --git a/aleksis/core/static/icons/apple_76.png b/aleksis/core/static/icons/apple_76.png
deleted file mode 100644
index 3751b84654d01943148fc6f1b90125a4195d4af9..0000000000000000000000000000000000000000
Binary files a/aleksis/core/static/icons/apple_76.png and /dev/null differ
diff --git a/aleksis/core/static/icons/favicon_16.png b/aleksis/core/static/icons/favicon_16.png
deleted file mode 100644
index f1d02a7a8a34825726d20eeb1f6a63922d1a848e..0000000000000000000000000000000000000000
Binary files a/aleksis/core/static/icons/favicon_16.png and /dev/null differ
diff --git a/aleksis/core/static/icons/favicon_32.png b/aleksis/core/static/icons/favicon_32.png
deleted file mode 100644
index edc72d4556cce0fde923a0ac3db4d0f94bb74412..0000000000000000000000000000000000000000
Binary files a/aleksis/core/static/icons/favicon_32.png and /dev/null differ
diff --git a/aleksis/core/static/icons/favicon_48.png b/aleksis/core/static/img/aleksis-favicon.png
similarity index 100%
rename from aleksis/core/static/icons/favicon_48.png
rename to aleksis/core/static/img/aleksis-favicon.png
diff --git a/aleksis/core/templates/core/base.html b/aleksis/core/templates/core/base.html
index 6c47c2a3bd0da7ba02e4c8aa96e7a5787cd933c0..06aebc4533369e9b7af39051dcb80713193f50d5 100644
--- a/aleksis/core/templates/core/base.html
+++ b/aleksis/core/templates/core/base.html
@@ -180,7 +180,7 @@
         <span id="doit"></span>
         {% if request.site.preferences.footer__imprint_url %}
           <a class="blue-text text-lighten-4" href="{{ request.site.preferences.footer__imprint_url }}">
-            {% trans "Impress" %}
+            {% trans "Imprint" %}
           </a>
         {% endif %}
         {% if request.site.preferences.footer__privacy_url and request.site.preferences.footer__imprint_url %}