diff --git a/public/css/index-tailwind-output.css b/public/css/index-tailwind-output.css
index 0d9189e9f..c21370d10 100644
--- a/public/css/index-tailwind-output.css
+++ b/public/css/index-tailwind-output.css
@@ -1530,6 +1530,10 @@ input[type="range"].range-lg::-moz-range-thumb {
   margin-left: 1rem;
 }
 
+.mr-3 {
+  margin-right: 0.75rem;
+}
+
 .mt-8 {
   margin-top: 2rem;
 }
diff --git a/src/Models/ThemeConfig/TagRenderingConfig.ts b/src/Models/ThemeConfig/TagRenderingConfig.ts
index 3408cbcd9..e2a4c1538 100644
--- a/src/Models/ThemeConfig/TagRenderingConfig.ts
+++ b/src/Models/ThemeConfig/TagRenderingConfig.ts
@@ -926,6 +926,9 @@ export default class TagRenderingConfig {
      * Might give undefined if setting to unknown is not possible
      */
     public removeToSetUnknown(partOfLayer: LayerConfig, currentTags: Record<string, string>): string[] | undefined {
+        if(!partOfLayer?.source || !currentTags){
+            return
+        }
         const toDelete = new Set<string>()
         if (this.freeform) {
             toDelete.add(this.freeform.key)
diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte
index b9c27b660..0dd490b4a 100644
--- a/src/UI/BigComponents/MenuDrawer.svelte
+++ b/src/UI/BigComponents/MenuDrawer.svelte
@@ -158,7 +158,7 @@
 
     <Page {onlyLink} shown={pg.about_theme}>
       <svelte:fragment slot="link">
-        <Marker size="h-6 w-6 mr-2" icons={layout.icon} />
+        <Marker size="h-7 w-7" icons={layout.icon} />
         <Tr t={t.showIntroduction} />
       </svelte:fragment>
       <svelte:fragment slot="header">
diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
index b4e85abb2..c7ba6155a 100644
--- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
@@ -546,7 +546,7 @@
           </Popup>
 
           <div
-            class="sticky bottom-0 flex justify-between flex-wrap"
+            class="sticky bottom-0 flex justify-between flex-wrap interactive"
             style="z-index: 11"
           >