diff --git a/.gitignore b/.gitignore
index 0ae99c0e0..3af1572ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ node_modules
 scratch
 assets/editor-layer-index.json
 assets/generated/*
+assets/generated/images/*
 /*.webmanifest
 /*.html
 !/index.html
@@ -18,4 +19,4 @@ missing_translations.txt
 Svg.ts
 data/
 Folder.DotSettings.user
-index_*.ts
\ No newline at end of file
+index_*.ts
diff --git a/404.html b/404.html
index fa1f722f3..35c96f545 100644
--- a/404.html
+++ b/404.html
@@ -15,16 +15,16 @@
     <meta content="MapComplete is a platform to visualize OpenStreetMap on a specific topic and to easily contribute data back to it."
           property="og:description">
 
-    <link href="./assets/generated/svg_mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
-    <link href="./assets/generated/svg_mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
-    <link href="./assets/generated/svg_mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
-    <link href="./assets/generated/svg_mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
-    <link href="./assets/generated/svg_mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
-    <link href="./assets/generated/svg_mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
-    <link href="./assets/generated/svg_mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
-    <link href="./assets/generated/svg_mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
-    <link href="./assets/generated/svg_mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
-    <link href="./assets/generated/svg_mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
+    <link href="./assets/generated/images/mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
+    <link href="./assets/generated/images/mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
+    <link href="./assets/generated/images/mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
+    <link href="./assets/generated/images/mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
+    <link href="./assets/generated/images/mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
+    <link href="./assets/generated/images/mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
+    <link href="./assets/generated/images/mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
+    <link href="./assets/generated/images/mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
+    <link href="./assets/generated/images/mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
+    <link href="./assets/generated/images/mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
 
 
     <style>
diff --git a/automaton.html b/automaton.html
index d4c9ffb3e..e15431050 100644
--- a/automaton.html
+++ b/automaton.html
@@ -21,16 +21,16 @@
     <meta content="Page to perform automatic actions with MapComplete"
           property="og:description">
 
-    <link href="./assets/generated/svg_mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
-    <link href="./assets/generated/svg_mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
-    <link href="./assets/generated/svg_mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
-    <link href="./assets/generated/svg_mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
-    <link href="./assets/generated/svg_mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
-    <link href="./assets/generated/svg_mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
-    <link href="./assets/generated/svg_mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
-    <link href="./assets/generated/svg_mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
-    <link href="./assets/generated/svg_mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
-    <link href="./assets/generated/svg_mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
+    <link href="./assets/generated/images/mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
+    <link href="./assets/generated/images/mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
+    <link href="./assets/generated/images/mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
+    <link href="./assets/generated/images/mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
+    <link href="./assets/generated/images/mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
+    <link href="./assets/generated/images/mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
+    <link href="./assets/generated/images/mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
+    <link href="./assets/generated/images/mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
+    <link href="./assets/generated/images/mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
+    <link href="./assets/generated/images/mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
 
     <style>
         #decoration-desktop img {
diff --git a/import_helper.html b/import_helper.html
index a64cc840a..cbab38cf5 100644
--- a/import_helper.html
+++ b/import_helper.html
@@ -21,16 +21,16 @@
     <meta content="Page to 'import' data as notes'"
           property="og:description">
 
-    <link href="./assets/generated/svg_mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
-    <link href="./assets/generated/svg_mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
-    <link href="./assets/generated/svg_mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
-    <link href="./assets/generated/svg_mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
-    <link href="./assets/generated/svg_mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
-    <link href="./assets/generated/svg_mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
-    <link href="./assets/generated/svg_mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
-    <link href="./assets/generated/svg_mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
-    <link href="./assets/generated/svg_mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
-    <link href="./assets/generated/svg_mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
+    <link href="./assets/generated/images/mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
+    <link href="./assets/generated/images/mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
+    <link href="./assets/generated/images/mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
+    <link href="./assets/generated/images/mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
+    <link href="./assets/generated/images/mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
+    <link href="./assets/generated/images/mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
+    <link href="./assets/generated/images/mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
+    <link href="./assets/generated/images/mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
+    <link href="./assets/generated/images/mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
+    <link href="./assets/generated/images/mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
 
     <style>
         #decoration-desktop img {
diff --git a/import_viewer.html b/import_viewer.html
index bcf476da7..7518822b0 100644
--- a/import_viewer.html
+++ b/import_viewer.html
@@ -16,16 +16,16 @@
     <meta content="Page to 'import' data as notes'"
           property="og:description">
 
-    <link href="./assets/generated/svg_mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
-    <link href="./assets/generated/svg_mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
-    <link href="./assets/generated/svg_mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
-    <link href="./assets/generated/svg_mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
-    <link href="./assets/generated/svg_mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
-    <link href="./assets/generated/svg_mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
-    <link href="./assets/generated/svg_mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
-    <link href="./assets/generated/svg_mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
-    <link href="./assets/generated/svg_mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
-    <link href="./assets/generated/svg_mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
+    <link href="./assets/generated/images/mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
+    <link href="./assets/generated/images/mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
+    <link href="./assets/generated/images/mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
+    <link href="./assets/generated/images/mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
+    <link href="./assets/generated/images/mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
+    <link href="./assets/generated/images/mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
+    <link href="./assets/generated/images/mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
+    <link href="./assets/generated/images/mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
+    <link href="./assets/generated/images/mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
+    <link href="./assets/generated/images/mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
 
     <style>
         #decoration-desktop img {
diff --git a/index.html b/index.html
index 6f4f08b31..d4b1a7bc3 100644
--- a/index.html
+++ b/index.html
@@ -24,16 +24,16 @@
     <meta content="MapComplete is a platform to visualize OpenStreetMap on a specific topic and to easily contribute data back to it."
           property="og:description">
 
-    <link href="./assets/generated/svg_mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
-    <link href="./assets/generated/svg_mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
-    <link href="./assets/generated/svg_mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
-    <link href="./assets/generated/svg_mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
-    <link href="./assets/generated/svg_mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
-    <link href="./assets/generated/svg_mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
-    <link href="./assets/generated/svg_mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
-    <link href="./assets/generated/svg_mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
-    <link href="./assets/generated/svg_mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
-    <link href="./assets/generated/svg_mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
+    <link href="./assets/generated/images/mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
+    <link href="./assets/generated/images/mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
+    <link href="./assets/generated/images/mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
+    <link href="./assets/generated/images/mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
+    <link href="./assets/generated/images/mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
+    <link href="./assets/generated/images/mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
+    <link href="./assets/generated/images/mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
+    <link href="./assets/generated/images/mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
+    <link href="./assets/generated/images/mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
+    <link href="./assets/generated/images/mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
 
 
     <!-- THEME-SPECIFIC-END-->
diff --git a/theme.html b/theme.html
index d032d0174..aa03cc820 100644
--- a/theme.html
+++ b/theme.html
@@ -24,16 +24,16 @@
     <meta content="MapComplete is a platform to visualize OpenStreetMap on a specific topic and to easily contribute data back to it."
           property="og:description">
 
-    <link href="./assets/generated/svg_mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
-    <link href="./assets/generated/svg_mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
-    <link href="./assets/generated/svg_mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
-    <link href="./assets/generated/svg_mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
-    <link href="./assets/generated/svg_mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
-    <link href="./assets/generated/svg_mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
-    <link href="./assets/generated/svg_mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
-    <link href="./assets/generated/svg_mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
-    <link href="./assets/generated/svg_mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
-    <link href="./assets/generated/svg_mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
+    <link href="./assets/generated/images/mapcomplete_logo512.png" rel="apple-touch-icon" sizes="512x512">
+    <link href="./assets/generated/images/mapcomplete_logo384.png" rel="apple-touch-icon" sizes="384x384">
+    <link href="./assets/generated/images/mapcomplete_logo192.png" rel="apple-touch-icon" sizes="192x192">
+    <link href="./assets/generated/images/mapcomplete_logo180.png" rel="apple-touch-icon" sizes="180x180">
+    <link href="./assets/generated/images/mapcomplete_logo152.png" rel="apple-touch-icon" sizes="152x152">
+    <link href="./assets/generated/images/mapcomplete_logo144.png" rel="apple-touch-icon" sizes="144x144">
+    <link href="./assets/generated/images/mapcomplete_logo128.png" rel="apple-touch-icon" sizes="128x128">
+    <link href="./assets/generated/images/mapcomplete_logo120.png" rel="apple-touch-icon" sizes="120x120">
+    <link href="./assets/generated/images/mapcomplete_logo96.png" rel="apple-touch-icon" sizes="96x96">
+    <link href="./assets/generated/images/mapcomplete_logo72.png" rel="apple-touch-icon" sizes="72x72">
 
     <!-- THEME-SPECIFIC-END-->