diff --git a/config.yml.sample b/config.yml.sample
index d38114d52..2471c2928 100644
--- a/config.yml.sample
+++ b/config.yml.sample
@@ -58,6 +58,8 @@ service:
   # If set to true, the frontend will show a big red warning not to use this instance for real data as it will be cleared out.
   # You probably don't need to set this value, it was created specifically for usage on [try](https://try.vikunja.io).
   demomode: false
+  # Allow changing the logo and other icons based on various occasions throughout the year.
+  allowiconchanges: true
 
 sentry:
   # If set to true, enables anonymous error tracking of api errors via Sentry. This allows us to gather more 
diff --git a/frontend/index.html b/frontend/index.html
index fb64a7142..6833a9a80 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -23,8 +23,6 @@
 	// It has to be the full url, including the last /api/v1 part and port.
 	// You can change this if your api is not reachable on the same port as the frontend.
 	window.API_URL = 'http://localhost:3456/api/v1'
-	// Allow changing the logo and other icons based on various occasions throughout the year.
-	window.ALLOW_ICON_CHANGES = true
 	// Allow using a custom logo via external URL.
 	window.CUSTOM_LOGO_URL = ''
 </script>
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 8dd3d4801..cd65de264 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -62,6 +62,7 @@ const (
 	ServiceEnableEmailReminders  Key = `service.enableemailreminders`
 	ServiceEnableUserDeletion    Key = `service.enableuserdeletion`
 	ServiceMaxAvatarSize         Key = `service.maxavatarsize`
+	ServiceAllowIconChanges      Key = `service.allowiconchanges`
 
 	SentryEnabled         Key = `sentry.enabled`
 	SentryDsn             Key = `sentry.dsn`
@@ -309,6 +310,7 @@ func InitDefaultConfig() {
 	ServiceEnableUserDeletion.setDefault(true)
 	ServiceMaxAvatarSize.setDefault(1024)
 	ServiceDemoMode.setDefault(false)
+	ServiceAllowIconChanges.setDefault(true)
 
 	// Sentry
 	SentryDsn.setDefault("https://440eedc957d545a795c17bbaf477497c@o1047380.ingest.sentry.io/4504254983634944")
diff --git a/pkg/routes/static.go b/pkg/routes/static.go
index 3ed3d121b..9d0797dfe 100644
--- a/pkg/routes/static.go
+++ b/pkg/routes/static.go
@@ -75,8 +75,11 @@ func serveIndexFile(c echo.Context, assetFs http.FileSystem) (err error) {
 			data["SENTRY_ENABLED"] = "true"
 		}
 		data["SENTRY_DSN"] = config.SentryFrontendDsn.GetString()
-		data["ALLOW_ICON_CHANGES"] = "true" // TODO
-		data["CUSTOM_LOGO_URL"] = ""        // TODO
+		data["ALLOW_ICON_CHANGES"] = "false"
+		if config.ServiceAllowIconChanges.GetBool() {
+			data["ALLOW_ICON_CHANGES"] = "true"
+		}
+		data["CUSTOM_LOGO_URL"] = "" // TODO
 
 		err = tmpl.Execute(&tplOutput, data)
 		if err != nil {