diff --git a/data/test_data/kml/generated.kml b/data/test_data/kml/generated.kml
index 3b5873338..58bbc5ec1 100644
--- a/data/test_data/kml/generated.kml
+++ b/data/test_data/kml/generated.kml
@@ -4,112 +4,112 @@
   <Style id="placemark-red">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-red.png</href>
+        <href>https://comaps.at/placemarks/placemark-red.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-blue">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-blue.png</href>
+        <href>https://comaps.at/placemarks/placemark-blue.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-purple">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-purple.png</href>
+        <href>https://comaps.at/placemarks/placemark-purple.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-yellow">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-yellow.png</href>
+        <href>https://comaps.at/placemarks/placemark-yellow.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-pink">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-pink.png</href>
+        <href>https://comaps.at/placemarks/placemark-pink.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-brown">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-brown.png</href>
+        <href>https://comaps.at/placemarks/placemark-brown.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-green">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-green.png</href>
+        <href>https://comaps.at/placemarks/placemark-green.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-orange">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-orange.png</href>
+        <href>https://comaps.at/placemarks/placemark-orange.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-deeppurple">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-deeppurple.png</href>
+        <href>https://comaps.at/placemarks/placemark-deeppurple.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-lightblue">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-lightblue.png</href>
+        <href>https://comaps.at/placemarks/placemark-lightblue.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-cyan">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-cyan.png</href>
+        <href>https://comaps.at/placemarks/placemark-cyan.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-teal">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-teal.png</href>
+        <href>https://comaps.at/placemarks/placemark-teal.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-lime">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-lime.png</href>
+        <href>https://comaps.at/placemarks/placemark-lime.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-deeporange">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-deeporange.png</href>
+        <href>https://comaps.at/placemarks/placemark-deeporange.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-gray">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-gray.png</href>
+        <href>https://comaps.at/placemarks/placemark-gray.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-bluegray">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-bluegray.png</href>
+        <href>https://comaps.at/placemarks/placemark-bluegray.png</href>
       </Icon>
     </IconStyle>
   </Style>
diff --git a/data/test_data/kml/generated_mixed_tracks.kml b/data/test_data/kml/generated_mixed_tracks.kml
index ecd57101f..82ccc0290 100644
--- a/data/test_data/kml/generated_mixed_tracks.kml
+++ b/data/test_data/kml/generated_mixed_tracks.kml
@@ -4,112 +4,112 @@
   <Style id="placemark-red">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-red.png</href>
+        <href>https://comaps.at/placemarks/placemark-red.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-blue">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-blue.png</href>
+        <href>https://comaps.at/placemarks/placemark-blue.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-purple">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-purple.png</href>
+        <href>https://comaps.at/placemarks/placemark-purple.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-yellow">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-yellow.png</href>
+        <href>https://comaps.at/placemarks/placemark-yellow.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-pink">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-pink.png</href>
+        <href>https://comaps.at/placemarks/placemark-pink.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-brown">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-brown.png</href>
+        <href>https://comaps.at/placemarks/placemark-brown.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-green">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-green.png</href>
+        <href>https://comaps.at/placemarks/placemark-green.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-orange">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-orange.png</href>
+        <href>https://comaps.at/placemarks/placemark-orange.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-deeppurple">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-deeppurple.png</href>
+        <href>https://comaps.at/placemarks/placemark-deeppurple.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-lightblue">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-lightblue.png</href>
+        <href>https://comaps.at/placemarks/placemark-lightblue.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-cyan">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-cyan.png</href>
+        <href>https://comaps.at/placemarks/placemark-cyan.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-teal">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-teal.png</href>
+        <href>https://comaps.at/placemarks/placemark-teal.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-lime">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-lime.png</href>
+        <href>https://comaps.at/placemarks/placemark-lime.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-deeporange">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-deeporange.png</href>
+        <href>https://comaps.at/placemarks/placemark-deeporange.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-gray">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-gray.png</href>
+        <href>https://comaps.at/placemarks/placemark-gray.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-bluegray">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-bluegray.png</href>
+        <href>https://comaps.at/placemarks/placemark-bluegray.png</href>
       </Icon>
     </IconStyle>
   </Style>
diff --git a/data/test_data/kml/track_with_timestams_different_orders.kml b/data/test_data/kml/track_with_timestams_different_orders.kml
index efac093cf..dfd97f091 100644
--- a/data/test_data/kml/track_with_timestams_different_orders.kml
+++ b/data/test_data/kml/track_with_timestams_different_orders.kml
@@ -4,112 +4,112 @@
   <Style id="placemark-red">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-red.png</href>
+        <href>https://comaps.at/placemarks/placemark-red.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-blue">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-blue.png</href>
+        <href>https://comaps.at/placemarks/placemark-blue.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-purple">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-purple.png</href>
+        <href>https://comaps.at/placemarks/placemark-purple.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-yellow">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-yellow.png</href>
+        <href>https://comaps.at/placemarks/placemark-yellow.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-pink">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-pink.png</href>
+        <href>https://comaps.at/placemarks/placemark-pink.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-brown">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-brown.png</href>
+        <href>https://comaps.at/placemarks/placemark-brown.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-green">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-green.png</href>
+        <href>https://comaps.at/placemarks/placemark-green.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-orange">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-orange.png</href>
+        <href>https://comaps.at/placemarks/placemark-orange.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-deeppurple">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-deeppurple.png</href>
+        <href>https://comaps.at/placemarks/placemark-deeppurple.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-lightblue">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-lightblue.png</href>
+        <href>https://comaps.at/placemarks/placemark-lightblue.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-cyan">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-cyan.png</href>
+        <href>https://comaps.at/placemarks/placemark-cyan.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-teal">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-teal.png</href>
+        <href>https://comaps.at/placemarks/placemark-teal.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-lime">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-lime.png</href>
+        <href>https://comaps.at/placemarks/placemark-lime.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-deeporange">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-deeporange.png</href>
+        <href>https://comaps.at/placemarks/placemark-deeporange.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-gray">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-gray.png</href>
+        <href>https://comaps.at/placemarks/placemark-gray.png</href>
       </Icon>
     </IconStyle>
   </Style>
   <Style id="placemark-bluegray">
     <IconStyle>
       <Icon>
-        <href>https://comaps.app/placemarks/placemark-bluegray.png</href>
+        <href>https://comaps.at/placemarks/placemark-bluegray.png</href>
       </Icon>
     </IconStyle>
   </Style>
diff --git a/kml/kml_tests/tests_data.hpp b/kml/kml_tests/tests_data.hpp
index f9c468c53..0f9b974d9 100644
--- a/kml/kml_tests/tests_data.hpp
+++ b/kml/kml_tests/tests_data.hpp
@@ -10,49 +10,49 @@ char const * kTextKml =
       "<Style id=\"placemark-blue\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-blue.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-blue.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-brown\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-brown.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-brown.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-green\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-green.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-green.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-orange\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-orange.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-orange.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-pink\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-pink.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-pink.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-purple\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-purple.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-purple.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-red\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-red.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-red.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp
index ee284e875..8fb51b381 100644
--- a/map/map_tests/bookmarks_test.cpp
+++ b/map/map_tests/bookmarks_test.cpp
@@ -44,49 +44,49 @@ char const * kmlString =
       "<Style id=\"placemark-blue\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-blue.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-blue.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-brown\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-brown.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-brown.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-green\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-green.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-green.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-orange\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-orange.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-orange.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-pink\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-pink.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-pink.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-purple\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-purple.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-purple.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"
       "<Style id=\"placemark-red\">"
         "<IconStyle>"
           "<Icon>"
-            "<href>https://comaps.app/placemarks/placemark-red.png</href>"
+            "<href>https://comaps.at/placemarks/placemark-red.png</href>"
           "</Icon>"
         "</IconStyle>"
       "</Style>"