diff --git a/website/src/lib/components/export/Export.svelte b/website/src/lib/components/export/Export.svelte
index b14ab5ce9..30d73822b 100644
--- a/website/src/lib/components/export/Export.svelte
+++ b/website/src/lib/components/export/Export.svelte
@@ -92,17 +92,17 @@
             class="fixed left-[50%] top-[50%] z-50 w-fit max-w-full translate-x-[-50%] translate-y-[-50%] flex flex-col items-center gap-3 border bg-background p-3 shadow-lg rounded-md"
         >
             <div
-                class="w-full flex flex-row items-center justify-center gap-4 border rounded-md p-2 bg-secondary"
+                class="w-full flex flex-col sm:flex-row items-center justify-center gap-1 sm:gap-2 border rounded-md p-2 bg-secondary"
             >
-                <span>⚠️</span>
-                <span class="max-w-[80%] text-sm">
+                <span class="w-12 shrink-0 text-center text-xl">⚠️</span>
+                <span class="text-sm">
                     {i18n._('menu.support_message')}
                 </span>
             </div>
             <div class="w-full flex flex-row flex-wrap gap-2">
                 <Button class="bg-support grow" href="https://ko-fi.com/gpxstudio" target="_blank">
                     {i18n._('menu.support_button')}
-                    <span class="ml-2">🙏</span>
+                    <span>🙏</span>
                 </Button>
                 <Button
                     variant="outline"
@@ -117,7 +117,7 @@
                         exportState.current = ExportState.NONE;
                     }}
                 >
-                    <Download size="16" class="mr-1" />
+                    <Download size="16" />
                     {#if $fileStateCollection.size === 1 || (exportState.current === ExportState.SELECTION && $selection.size === 1)}
                         {i18n._('menu.download_file')}
                     {:else}
diff --git a/website/src/lib/components/file-list/metadata/MetadataDialog.svelte b/website/src/lib/components/file-list/metadata/MetadataDialog.svelte
index 0b31d1a9f..2af578ead 100644
--- a/website/src/lib/components/file-list/metadata/MetadataDialog.svelte
+++ b/website/src/lib/components/file-list/metadata/MetadataDialog.svelte
@@ -68,7 +68,7 @@
                 open = false;
             }}
         >
-            <Save size="16" class="mr-1" />
+            <Save size="16" />
             {i18n._('menu.metadata.save')}
         </Button>
     </Popover.Content>
diff --git a/website/src/lib/components/file-list/style/StyleDialog.svelte b/website/src/lib/components/file-list/style/StyleDialog.svelte
index 4783cfca2..b4bed0272 100644
--- a/website/src/lib/components/file-list/style/StyleDialog.svelte
+++ b/website/src/lib/components/file-list/style/StyleDialog.svelte
@@ -164,7 +164,7 @@
             disabled={!colorChanged && !opacityChanged && !widthChanged}
             onclick={applyStyle}
         >
-            <Save size="16" class="mr-1" />
+            <Save size="16" />
             {i18n._('menu.metadata.save')}
         </Button>
     </Popover.Content>
diff --git a/website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte b/website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte
index 6b85425c0..5c9fc7bae 100644
--- a/website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte
+++ b/website/src/lib/components/map/gpx-layer/CopyCoordinates.svelte
@@ -16,7 +16,7 @@
 </script>
 
 <Button
-    class="w-full px-2 py-1 h-8 justify-start {className}"
+    class="p-1 has-[>svg]:px-2 h-8 justify-start {className}"
     variant="outline"
     onclick={() => {
         navigator.clipboard.writeText(
@@ -25,6 +25,6 @@
         onCopy();
     }}
 >
-    <ClipboardCopy size="16" class="mr-1" />
+    <ClipboardCopy size="16" />
     {i18n._('menu.copy_coordinates')}
 </Button>
diff --git a/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte b/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte
index cc24e730f..cb0f362f3 100644
--- a/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte
+++ b/website/src/lib/components/map/gpx-layer/WaypointPopup.svelte
@@ -11,12 +11,16 @@
     import sanitizeHtml from 'sanitize-html';
     import type { Waypoint } from 'gpx';
     import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
-    import type { PopupItem } from '$lib/components/map/map';
     import { fileActions } from '$lib/logic/file-actions';
+    import type { PopupItem } from '$lib/components/map/map-popup';
 
-    export let waypoint: PopupItem<Waypoint>;
+    let {
+        waypoint,
+    }: {
+        waypoint: PopupItem<Waypoint>;
+    } = $props();
 
-    $: symbolKey = waypoint ? getSymbolKey(waypoint.item.sym) : undefined;
+    let symbolKey = $derived(waypoint ? getSymbolKey(waypoint.item.sym) : undefined);
 
     function sanitize(text: string | undefined): string {
         if (text === undefined) {
@@ -50,11 +54,8 @@
             {#if symbolKey}
                 <span>
                     {#if symbols[symbolKey].icon}
-                        <svelte:component
-                            this={symbols[symbolKey].icon}
-                            size="12"
-                            class="inline-block mb-0.5"
-                        />
+                        {@const Icon = symbols[symbolKey].icon}
+                        <Icon size="12" class="inline-block mb-1" />
                     {:else}
                         <span class="w-4 inline-block"></span>
                     {/if}
@@ -82,15 +83,16 @@
             <CopyCoordinates coordinates={waypoint.item.attributes} />
             {#if $currentTool === Tool.WAYPOINT}
                 <Button
-                    class="w-full px-2 py-1 h-8 justify-start"
+                    class="p-1 has-[>svg]:px-2 h-8"
                     variant="outline"
                     onclick={() => {
                         if (waypoint.fileId) {
                             fileActions.deleteWaypoint(waypoint.fileId, waypoint.item._data.index);
+                            waypoint.hide?.();
                         }
                     }}
                 >
-                    <Trash2 size="16" class="mr-1" />
+                    <Trash2 size="16" />
                     {i18n._('menu.delete')}
                     <Shortcut shift={true} click={true} />
                 </Button>
diff --git a/website/src/lib/components/map/layer-control/CustomLayers.svelte b/website/src/lib/components/map/layer-control/CustomLayers.svelte
index c76eddbd0..6c7a78fb7 100644
--- a/website/src/lib/components/map/layer-control/CustomLayers.svelte
+++ b/website/src/lib/components/map/layer-control/CustomLayers.svelte
@@ -463,7 +463,7 @@
                 {#if selectedLayerId}
                     <div class="mt-2 flex flex-row gap-2">
                         <Button variant="outline" onclick={createLayer} class="grow">
-                            <Save size="16" class="mr-1" />
+                            <Save size="16" />
                             {i18n._('layers.custom_layers.update')}
                         </Button>
                         <Button variant="outline" onclick={() => (selectedLayerId = undefined)}>
@@ -472,7 +472,7 @@
                     </div>
                 {:else}
                     <Button variant="outline" class="mt-2" onclick={createLayer}>
-                        <CirclePlus size="16" class="mr-1" />
+                        <CirclePlus size="16" />
                         {i18n._('layers.custom_layers.create')}
                     </Button>
                 {/if}
diff --git a/website/src/lib/components/map/layer-control/OverpassPopup.svelte b/website/src/lib/components/map/layer-control/OverpassPopup.svelte
index 572b1f821..3066865c0 100644
--- a/website/src/lib/components/map/layer-control/OverpassPopup.svelte
+++ b/website/src/lib/components/map/layer-control/OverpassPopup.svelte
@@ -53,13 +53,14 @@
             <div class="flex flex-row gap-3">
                 <div class="flex flex-col">
                     {name}
-                    <div class="text-muted-foreground text-sm font-normal">
+                    <div class="text-muted-foreground text-xs font-normal">
                         {poi.item.lat.toFixed(6)}&deg; {poi.item.lon.toFixed(6)}&deg;
                     </div>
                 </div>
                 <Button
-                    class="ml-auto p-1.5 h-8"
+                    class="ml-auto"
                     variant="outline"
+                    size="icon"
                     href="https://www.openstreetmap.org/edit?editor=id&{poi.item.type ??
                         'node'}={poi.item.id}"
                     target="_blank"
@@ -95,7 +96,7 @@
             </div>
         </ScrollArea>
         <Button class="mt-2" variant="outline" disabled={$selection.size === 0} onclick={addToFile}>
-            <MapPin size="16" class="mr-1" />
+            <MapPin size="16" />
             {i18n._('toolbar.waypoint.add')}
         </Button>
     </Card.Content>
diff --git a/website/src/lib/components/toolbar/tools/Clean.svelte b/website/src/lib/components/toolbar/tools/Clean.svelte
index a15be1dc7..39a6d6aab 100644
--- a/website/src/lib/components/toolbar/tools/Clean.svelte
+++ b/website/src/lib/components/toolbar/tools/Clean.svelte
@@ -177,7 +177,7 @@
             rectangleCoordinates = [];
         }}
     >
-        <Trash2 size="16" class="mr-1" />
+        <Trash2 size="16" />
         {i18n._('toolbar.clean.button')}
     </Button>
     <Help link={getURLForLanguage(i18n.lang, '/help/toolbar/clean')}>
diff --git a/website/src/lib/components/toolbar/tools/Elevation.svelte b/website/src/lib/components/toolbar/tools/Elevation.svelte
index 17ee458bc..d3f161a68 100644
--- a/website/src/lib/components/toolbar/tools/Elevation.svelte
+++ b/website/src/lib/components/toolbar/tools/Elevation.svelte
@@ -26,7 +26,7 @@
             }
         }}
     >
-        <MountainSnow size="16" class="mr-1 shrink-0" />
+        <MountainSnow size="16" class="shrink-0" />
         {i18n._('toolbar.elevation.button')}
     </Button>
     <Help link={getURLForLanguage(i18n.lang, '/help/toolbar/elevation')}>
diff --git a/website/src/lib/components/toolbar/tools/Extract.svelte b/website/src/lib/components/toolbar/tools/Extract.svelte
index 52465fda0..3f8601d5f 100644
--- a/website/src/lib/components/toolbar/tools/Extract.svelte
+++ b/website/src/lib/components/toolbar/tools/Extract.svelte
@@ -46,7 +46,7 @@
 
 <div class="flex flex-col gap-3 w-full max-w-80 {props.class ?? ''}">
     <Button variant="outline" disabled={!validSelection} onclick={fileActions.extractSelection}>
-        <Ungroup size="16" class="mr-1" />
+        <Ungroup size="16" />
         {i18n._('toolbar.extract.button')}
     </Button>
     <Help link={getURLForLanguage(i18n.lang, '/help/toolbar/extract')}>
diff --git a/website/src/lib/components/toolbar/tools/Merge.svelte b/website/src/lib/components/toolbar/tools/Merge.svelte
index e3dc27b92..9d62e7d73 100644
--- a/website/src/lib/components/toolbar/tools/Merge.svelte
+++ b/website/src/lib/components/toolbar/tools/Merge.svelte
@@ -86,7 +86,7 @@
             );
         }}
     >
-        <Group size="16" class="mr-1 shrink-0" />
+        <Group size="16" class="shrink-0" />
         {i18n._('toolbar.merge.merge_selection')}
     </Button>
     <Help link={getURLForLanguage(i18n.lang, '/help/toolbar/merge')}>
diff --git a/website/src/lib/components/toolbar/tools/Time.svelte b/website/src/lib/components/toolbar/tools/Time.svelte
index dcbe72b11..d9ffd4765 100644
--- a/website/src/lib/components/toolbar/tools/Time.svelte
+++ b/website/src/lib/components/toolbar/tools/Time.svelte
@@ -188,7 +188,7 @@
         <div class="flex flex-row gap-2 justify-center">
             <div class="flex flex-col gap-2 grow">
                 <Label for="speed" class="flex flex-row">
-                    <Zap size="16" class="mr-1" />
+                    <Zap size="16" />
                     {#if $velocityUnits === 'speed'}
                         {i18n._('quantities.speed')}
                     {:else}
@@ -241,7 +241,7 @@
             </div>
             <div class="flex flex-col gap-2 grow">
                 <Label for="duration" class="flex flex-row">
-                    <Timer size="16" class="mr-1" />
+                    <Timer size="16" />
                     {i18n._('toolbar.time.total_time')}
                 </Label>
                 <TimePicker
@@ -254,7 +254,7 @@
             </div>
         </div>
         <Label class="flex flex-row">
-            <CirclePlay size="16" class="mr-1" />
+            <CirclePlay size="16" />
             {i18n._('toolbar.time.start')}
         </Label>
         <div class="flex flex-row gap-2">
@@ -280,7 +280,7 @@
             />
         </div>
         <Label class="flex flex-row">
-            <CircleStop size="16" class="mr-1" />
+            <CircleStop size="16" />
             {i18n._('toolbar.time.end')}
         </Label>
         <div class="flex flex-row gap-2">
@@ -393,10 +393,10 @@
                 });
             }}
         >
-            <CalendarClock size="16" class="mr-1 shrink-0" />
+            <CalendarClock size="16" class="shrink-0" />
             {i18n._('toolbar.time.update')}
         </Button>
-        <Button variant="outline" onclick={setGPXData}>
+        <Button variant="outline" size="icon" onclick={setGPXData}>
             <CircleX size="16" />
         </Button>
     </div>
diff --git a/website/src/lib/components/toolbar/tools/reduce/Reduce.svelte b/website/src/lib/components/toolbar/tools/reduce/Reduce.svelte
index 3fe513390..2cff66a15 100644
--- a/website/src/lib/components/toolbar/tools/reduce/Reduce.svelte
+++ b/website/src/lib/components/toolbar/tools/reduce/Reduce.svelte
@@ -47,7 +47,7 @@
         <span class="font-normal">{reducedLayers.currentPoints}/{reducedLayers.maxPoints}</span>
     </Label>
     <Button variant="outline" disabled={!validSelection} onclick={() => reducedLayers.reduce()}>
-        <Funnel size="16" class="mr-1" />
+        <Funnel size="16" />
         {i18n._('toolbar.reduce.button')}
     </Button>
 
diff --git a/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte b/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
index d7077de95..07f60bca3 100644
--- a/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
+++ b/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
@@ -15,7 +15,7 @@
 </script>
 
 <div bind:this={element} class="hidden">
-    <Card.Root class="border-none shadow-md text-base">
+    <Card.Root class="border-none shadow-md text-base p-0 gap-0 rounded-lg">
         <Card.Content class="flex flex-col p-1">
             {#if $canChangeStart}
                 <Button
@@ -23,7 +23,7 @@
                     variant="ghost"
                     onclick={() => element?.dispatchEvent(new CustomEvent('change-start'))}
                 >
-                    <CirclePlay size="16" class="mr-1" />
+                    <CirclePlay size="16" />
                     {i18n._('toolbar.routing.start_loop_here')}
                 </Button>
             {/if}
@@ -32,7 +32,7 @@
                 variant="ghost"
                 onclick={() => element?.dispatchEvent(new CustomEvent('delete'))}
             >
-                <Trash2 size="16" class="mr-1" />
+                <Trash2 size="16" />
                 {i18n._('menu.delete')}
                 <Shortcut shift={true} click={true} />
             </Button>
diff --git a/website/src/lib/components/toolbar/tools/scissors/Scissors.svelte b/website/src/lib/components/toolbar/tools/scissors/Scissors.svelte
index 2d37df57a..47be47563 100644
--- a/website/src/lib/components/toolbar/tools/scissors/Scissors.svelte
+++ b/website/src/lib/components/toolbar/tools/scissors/Scissors.svelte
@@ -99,7 +99,7 @@
         disabled={!validSelection || !canCrop}
         onclick={() => fileActions.cropSelection(sliderValues[0], sliderValues[1])}
     >
-        <Crop size="16" class="mr-1" />{i18n._('toolbar.scissors.crop')}
+        <Crop size="16" />{i18n._('toolbar.scissors.crop')}
     </Button>
     <Separator />
     <Label class="flex flex-row flex-wrap gap-3 items-center">
diff --git a/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte b/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
index 51635d93b..caf64c8a4 100644
--- a/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
+++ b/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
@@ -203,14 +203,14 @@
             onclick={createOrUpdateWaypoint}
         >
             {#if $selectedWaypoint}
-                <Save size="16" class="mr-1 shrink-0" />
+                <Save size="16" class="shrink-0" />
                 {i18n._('menu.metadata.save')}
             {:else}
-                <MapPin size="16" class="mr-1 shrink-0" />
+                <MapPin size="16" class="shrink-0" />
                 {i18n._('toolbar.waypoint.create')}
             {/if}
         </Button>
-        <Button variant="outline" onclick={() => selectedWaypoint.reset()}>
+        <Button variant="outline" size="icon" onclick={() => selectedWaypoint.reset()}>
             <CircleX size="16" />
         </Button>
     </div>
diff --git a/website/src/lib/docs/en/home/funding.mdx b/website/src/lib/docs/en/home/funding.mdx
index eaec15b8c..f9d1e90d9 100644
--- a/website/src/lib/docs/en/home/funding.mdx
+++ b/website/src/lib/docs/en/home/funding.mdx
@@ -2,7 +2,7 @@
     import { HeartHandshake } from '@lucide/svelte';
 </script>
 
-## <HeartHandshake size="18" class="mr-1 inline-block align-baseline" /> Help keep the website free (and ad-free)
+## <HeartHandshake size="18" class="inline-block align-baseline" /> Help keep the website free (and ad-free)
 
 Each time you add or move GPS points, our servers calculate the best route on the road network.
 We also use APIs from <a href="https://mapbox.com" target="_blank">Mapbox</a> to display beautiful maps, retrieve elevation data and allow you to search for places.
diff --git a/website/src/lib/docs/en/home/translation.mdx b/website/src/lib/docs/en/home/translation.mdx
index e7d18ca72..07405067d 100644
--- a/website/src/lib/docs/en/home/translation.mdx
+++ b/website/src/lib/docs/en/home/translation.mdx
@@ -2,7 +2,7 @@
     import { Languages } from '@lucide/svelte';
 </script>
 
-## <Languages size="18" class="mr-1 inline-block align-baseline" /> Translation
+## <Languages size="18" class="inline-block align-baseline" /> Translation
 
 The website is translated by volunteers using a collaborative translation platform.
 You can contribute by adding or improving translations on our <a href="https://crowdin.com/project/gpxstudio" target="_blank">Crowdin project</a>.
diff --git a/website/src/routes/[[language]]/+page.svelte b/website/src/routes/[[language]]/+page.svelte
index 0753289d4..3f841ccff 100644
--- a/website/src/routes/[[language]]/+page.svelte
+++ b/website/src/routes/[[language]]/+page.svelte
@@ -65,7 +65,7 @@
                 </div>
                 <div class="w-full flex flex-row justify-center gap-3">
                     <Button href={getURLForLanguage(i18n.lang, '/app')} class="w-1/3 min-w-fit">
-                        <Map size="18" class="mr-1.5" />
+                        <Map size="18" />
                         {i18n._('homepage.app')}
                     </Button>
                     <Button
@@ -73,7 +73,7 @@
                         href={getURLForLanguage(i18n.lang, '/help')}
                         class="w-1/3 min-w-fit"
                     >
-                        <BookOpenText size="18" class="mr-1.5" />
+                        <BookOpenText size="18" />
                         <span>{i18n._('menu.help')}</span>
                     </Button>
                 </div>
@@ -96,7 +96,7 @@
         >
             <div class="markdown text-center">
                 <h1>
-                    <Route size="24" class="mr-1 inline-block align-baseline" />
+                    <Route size="24" class="inline-block align-baseline" />
                     {i18n._('homepage.route_planning')}
                 </h1>
                 <p class="text-muted-foreground">{i18n._('homepage.route_planning_description')}</p>
@@ -112,7 +112,7 @@
         >
             <div class="markdown text-center md:hidden">
                 <h1>
-                    <PencilRuler size="24" class="mr-1 inline-block align-baseline" />
+                    <PencilRuler size="24" class="inline-block align-baseline" />
                     {i18n._('homepage.file_processing')}
                 </h1>
                 <p class="text-muted-foreground">
@@ -124,7 +124,7 @@
             </div>
             <div class="markdown text-center hidden md:block">
                 <h1>
-                    <PencilRuler size="24" class="mr-1 inline-block align-baseline" />
+                    <PencilRuler size="24" class="inline-block align-baseline" />
                     {i18n._('homepage.file_processing')}
                 </h1>
                 <p class="text-muted-foreground">
@@ -139,7 +139,7 @@
         >
             <div class="markdown text-center">
                 <h1>
-                    <Map size="24" class="mr-1 inline-block align-baseline" />
+                    <Map size="24" class="inline-block align-baseline" />
                     {i18n._('homepage.maps')}
                 </h1>
                 <p class="text-muted-foreground">{i18n._('homepage.maps_description')}</p>
@@ -182,7 +182,7 @@
     <div class="px-8 md:px-12">
         <div class="markdown text-center px-4 md:px-12">
             <h1>
-                <ChartArea size="24" class="mr-1 inline-block align-baseline" />
+                <ChartArea size="24" class="inline-block align-baseline" />
                 {i18n._('homepage.data_visualization')}
             </h1>
             <p class="text-muted-foreground mb-6">
@@ -214,7 +214,7 @@
         >
             <div class="markdown text-center md:hidden">
                 <h1>
-                    <Scale size="24" class="mr-1 inline-block align-baseline" />
+                    <Scale size="24" class="inline-block align-baseline" />
                     {i18n._('homepage.identity')}
                 </h1>
                 <p class="text-muted-foreground">{i18n._('homepage.identity_description')}</p>
@@ -224,7 +224,7 @@
             </a>
             <div class="markdown text-center hidden md:block">
                 <h1>
-                    <Scale size="24" class="mr-1 inline-block align-baseline" />
+                    <Scale size="24" class="inline-block align-baseline" />
                     {i18n._('homepage.identity')}
                 </h1>
                 <p class="text-muted-foreground">{i18n._('homepage.identity_description')}</p>
@@ -250,7 +250,7 @@
                 <DocsContainer module={fundingModule.default} />
             {/await}
             <Button href="https://ko-fi.com/gpxstudio" target="_blank" class="text-base">
-                <Heart size="16" class="mr-1" fill="var(--support)" color="var(--support)" />
+                <Heart size="16" fill="var(--support)" color="var(--support)" />
                 <span>{i18n._('homepage.support_button')}</span>
             </Button>
         </div>
@@ -261,7 +261,7 @@
                 <DocsContainer module={translationModule.default} />
             {/await}
             <Button href="https://crowdin.com/project/gpxstudio" target="_blank" class="text-base">
-                <PenLine size="16" class="mr-1" />
+                <PenLine size="16" />
                 <span>{i18n._('homepage.contribute')}</span>
             </Button>
         </div>
diff --git a/website/src/routes/[[language]]/help/+page.svelte b/website/src/routes/[[language]]/help/+page.svelte
index 731008f17..5c977038d 100644
--- a/website/src/routes/[[language]]/help/+page.svelte
+++ b/website/src/routes/[[language]]/help/+page.svelte
@@ -38,7 +38,7 @@
                                 {guideIcons[subGuide]}
                             {:else}
                                 {@const GuideIcon = guideIcons[subGuide]}
-                                <GuideIcon size="16" class="mr-1 shrink-0" />
+                                <GuideIcon size="16" class="shrink-0" />
                             {/if}
                             {data.guideTitles[`${guide}/${subGuide}`]}
                         </Button>