diff --git a/files/routes/allroutes.py b/files/routes/allroutes.py
index e2c3283ac..71f569c8b 100644
--- a/files/routes/allroutes.py
+++ b/files/routes/allroutes.py
@@ -53,9 +53,9 @@ def teardown_request(error):
def after_request(response: Response):
response.headers.add("Content-Security-Policy", (
"script-src 'self' 'unsafe-inline';"
- " connect-src 'self' *.google-analytics.com *.analytics.google.com;"
- " object-src 'none';"
- " img-src 'self' *.google-analytics.com *.analytics.google.com"
+ " script-src: 'self' https://*.googletagmanager.com"
+ " img-src: https://*.google-analytics.com https://*.googletagmanager.com"
+ " connect-src: 'self' https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com"
))
response.headers.add("Strict-Transport-Security", "max-age=31536000")
response.headers.add("X-Frame-Options", "deny")
diff --git a/files/templates/email/default.html b/files/templates/email/default.html
index 5cad9fb25..5a1acfc94 100644
--- a/files/templates/email/default.html
+++ b/files/templates/email/default.html
@@ -3,7 +3,6 @@
-
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 02fce6ffa..72e1c04f2 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -6,7 +6,6 @@
{% include "analytics.html" %}
-