diff --git a/data/styles/default/dark/symbols/bicycle-rental-xm.svg b/data/styles/default/dark/symbols/bicycle-rental-xm.svg
new file mode 100644
index 000000000..b325ed508
--- /dev/null
+++ b/data/styles/default/dark/symbols/bicycle-rental-xm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m6.82305 2.813175c-.243-.6769275-.885225-1.157175-1.637325-1.157175-.96045 0-1.735725.775275-1.735725 1.735725 0 .954675.775275 1.735725 1.735725 1.735725.752175 0 1.394325-.486 1.637325-1.157175h2.991225v1.157175h1.157175v-1.157175h.578565v-1.157175zm-1.637325 1.157175c-.3182175 0-.5785725-.260355-.5785725-.5785725s.260355-.5785725.5785725-.5785725.5785725.260355.5785725.5785725-.260355.5785725-.5785725.5785725zm2.314125 1.515675c-.473265-.0070275-.473265.709305 0 .7025625h1.05v.889125l-1.96185 1.639725-.682245-1.8264h.194175c.473265.0070275.473265-.7092975 0-.7025625h-1.400025c-.473265-.0070275-.473265.7092975 0 .7025625h.4566l.62349 1.6686c-.3274575-.1634175-.6909675-.2634675-1.080075-.2634675-1.34895 0-2.450025 1.10505-2.450025 2.45895s1.101 2.45895 2.450025 2.45895c1.34895 0 2.450025-1.10505 2.450025-2.45895 0-.4706475-.140205-.90705-.3705075-1.281675l1.97415-1.65075.32403.815175c-.7297875.4266675-1.227675 1.211775-1.227675 2.11725 0 1.3539 1.101 2.45895 2.450025 2.45895s2.450025-1.10505 2.450025-2.45895-1.101-2.45895-2.450025-2.45895c-.198165 0-.3880725.0304875-.57291.0754575l-.4771125-1.197975v-1.3365c0-.19398-.156735-.351285-.349995-.351285zm-2.7999 3.512835c.4146 0 .7893.14889 1.08825.38832l-1.3125 1.097775c-.35763.3002025.08946.839175.4484175.54063l1.3125-1.097775c.1317375.2471625.213285.526125.213285.827475 0 .974175-.7794 1.756425-1.749975 1.756425s-1.749975-.78225-1.749975-1.756425c0-.92546625.70327313-1.67772019 1.60587578-1.75063192zm5.599875.000015c.970575 0 1.749975.78225 1.749975 1.756425s-.7794 1.756425-1.749975 1.756425-1.749975-.78225-1.749975-1.756425c0-.6161475.3127575-1.15365.7875-1.46685l.6371325 1.597275c.1722.4377675.826275.17571.65082-.2607225l-.6356925-1.5945.1531331-.02251687z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bicycle-rental.svg b/data/styles/default/dark/symbols/bicycle-rental.svg
deleted file mode 100644
index 68e8967be..000000000
--- a/data/styles/default/dark/symbols/bicycle-rental.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
-	<title>bike-parking-m</title>
-	<g>
-		<rect id="Rectangle" width="20" height="20" rx="2.5" fill="#000" opacity=".6"/>
-		<rect x="1" y="1" width="18" height="18" rx="2" fill="#2F6499"/>
-		<path d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#000"/>
-		<path d="m9.9998 7.3147c-0.63102-0.00937-0.63102 0.94574 0 0.93675h1.4v1.1855l-2.6158 2.1863-0.90966-2.4352h0.2589c0.63102 0.00937 0.63102-0.94573 0-0.93675h-1.8667c-0.63102-0.00937-0.63102 0.94573 0 0.93675h0.6088l0.83132 2.2248c-0.43661-0.21789-0.92129-0.35129-1.4401-0.35129-1.7986 0-3.2667 1.4734-3.2667 3.2786 0 1.8052 1.468 3.2786 3.2667 3.2786 1.7986 0 3.2667-1.4734 3.2667-3.2786 0-0.62753-0.18694-1.2094-0.49401-1.7089l2.6322-2.201 0.43204 1.0869c-0.97305 0.56889-1.6369 1.6157-1.6369 2.823 0 1.8052 1.468 3.2786 3.2667 3.2786s3.2667-1.4734 3.2667-3.2786c0-1.8052-1.468-3.2786-3.2667-3.2786-0.26422 0-0.51743 0.04065-0.76388 0.10061l-0.63615-1.5973v-1.782c0-0.25864-0.20898-0.46838-0.46666-0.46838zm-3.7332 4.6838c0.5528 0 1.0524 0.1985 1.451 0.51774l-1.75 1.4637c-0.47684 0.40027 0.11928 1.1189 0.59789 0.72084l1.75-1.4637c0.17565 0.32955 0.28438 0.7015 0.28438 1.1033 0 1.2989-1.0392 2.3419-2.3333 2.3419-1.2941 0-2.3333-1.043-2.3333-2.3419 0-1.2989 1.039-2.3419 2.3333-2.3419zm7.4665 0c1.2941 0 2.3333 1.043 2.3333 2.3419 0 1.2989-1.0392 2.3419-2.3333 2.3419s-2.3333-1.043-2.3333-2.3419c0-0.82153 0.41701-1.5382 1.05-1.9558l0.84951 2.1297c0.2296 0.58369 1.1017 0.23428 0.86776-0.34763l-0.84759-2.126c0.13459-0.02398 0.27197-0.04206 0.41374-0.04206z" fill="#000"/>
-	</g>
-</svg>
diff --git a/data/styles/default/dark/symbols/taxi-m.svg b/data/styles/default/dark/symbols/taxi-m.svg
deleted file mode 100644
index e57e00374..000000000
--- a/data/styles/default/dark/symbols/taxi-m.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#000" opacity=".6"/>
-  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-  <path d="m7.2007 9.1768v2.825h3.1972v-2.825zm3.1972 2.825v2.8214h3.2007v-2.8214zm3.2007 0h3.2007v-2.825h-3.2007zm3.2007 0v2.8214h3.2007v-2.8214zm-9.5986 0h-3.2007v2.8214h3.2007z" fill="#000" />
- </g>
-</svg>
diff --git a/data/styles/default/dark/symbols/taxi-xm.svg b/data/styles/default/dark/symbols/taxi-xm.svg
new file mode 100644
index 000000000..cd6eeab8f
--- /dev/null
+++ b/data/styles/default/dark/symbols/taxi-xm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m4.5004375 5.7355v1.765625h1.99825v-1.765625zm1.99825 1.765625v1.763375h2.0004375v-1.763375zm2.0004375 0h2.0004375v-1.765625h-2.0004375zm2.0004375 0v1.763375h2.0004375v-1.763375zm-5.999125 0h-2.0004375v1.763375h2.0004375z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 6d928ec76..faa959529 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1579,7 +1579,7 @@ node|z17-[man_made=petroleum_well],
 {icon-image: pole-m.svg;}
 
 node|z16-[amenity=taxi],
-{icon-image: taxi-m.svg;icon-min-distance: 30;}
+{icon-image: taxi-xm.svg;icon-min-distance: 30;}
 node|z17-[amenity=taxi],
 {icon-min-distance: 20;}
 
@@ -1680,7 +1680,7 @@ node|z18-[amenity=boat_rental],
 {font-size: 11;}
 
 node|z17-[amenity=bicycle_rental],
-{icon-image: bicycle-rental.svg;}
+{icon-image: bicycle-rental-xm.svg;}
 node|z18-[amenity=bicycle_rental],
 {font-size: 11;}
 
diff --git a/data/styles/default/light/symbols/bicycle-rental-xm.svg b/data/styles/default/light/symbols/bicycle-rental-xm.svg
new file mode 100644
index 000000000..2599d7fd4
--- /dev/null
+++ b/data/styles/default/light/symbols/bicycle-rental-xm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m6.82305 2.813175c-.243-.6769275-.885225-1.157175-1.637325-1.157175-.96045 0-1.735725.775275-1.735725 1.735725 0 .954675.775275 1.735725 1.735725 1.735725.752175 0 1.394325-.486 1.637325-1.157175h2.991225v1.157175h1.157175v-1.157175h.578565v-1.157175zm-1.637325 1.157175c-.3182175 0-.5785725-.260355-.5785725-.5785725s.260355-.5785725.5785725-.5785725.5785725.260355.5785725.5785725-.260355.5785725-.5785725.5785725zm2.314125 1.515675c-.473265-.0070275-.473265.709305 0 .7025625h1.05v.889125l-1.96185 1.639725-.682245-1.8264h.194175c.473265.0070275.473265-.7092975 0-.7025625h-1.400025c-.473265-.0070275-.473265.7092975 0 .7025625h.4566l.62349 1.6686c-.3274575-.1634175-.6909675-.2634675-1.080075-.2634675-1.34895 0-2.450025 1.10505-2.450025 2.45895s1.101 2.45895 2.450025 2.45895c1.34895 0 2.450025-1.10505 2.450025-2.45895 0-.4706475-.140205-.90705-.3705075-1.281675l1.97415-1.65075.32403.815175c-.7297875.4266675-1.227675 1.211775-1.227675 2.11725 0 1.3539 1.101 2.45895 2.450025 2.45895s2.450025-1.10505 2.450025-2.45895-1.101-2.45895-2.450025-2.45895c-.198165 0-.3880725.0304875-.57291.0754575l-.4771125-1.197975v-1.3365c0-.19398-.156735-.351285-.349995-.351285zm-2.7999 3.512835c.4146 0 .7893.14889 1.08825.38832l-1.3125 1.097775c-.35763.3002025.08946.839175.4484175.54063l1.3125-1.097775c.1317375.2471625.213285.526125.213285.827475 0 .974175-.7794 1.756425-1.749975 1.756425s-1.749975-.78225-1.749975-1.756425c0-.92546625.70327313-1.67772019 1.60587578-1.75063192zm5.599875.000015c.970575 0 1.749975.78225 1.749975 1.756425s-.7794 1.756425-1.749975 1.756425-1.749975-.78225-1.749975-1.756425c0-.6161475.3127575-1.15365.7875-1.46685l.6371325 1.597275c.1722.4377675.826275.17571.65082-.2607225l-.6356925-1.5945.1531331-.02251687z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/bicycle-rental.svg b/data/styles/default/light/symbols/bicycle-rental.svg
deleted file mode 100644
index 7773cfe17..000000000
--- a/data/styles/default/light/symbols/bicycle-rental.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
-	<title>bike-parking-m</title>
-	<g>
-		<rect id="Rectangle" width="20" height="20" rx="2.5" fill="#fff" opacity=".6"/>
-		<rect x="1" y="1" width="18" height="18" rx="2" fill="#2f6499"/>
-		<path d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#fff"/>
-		<path d="m9.9998 7.3147c-0.63102-0.00937-0.63102 0.94574 0 0.93675h1.4v1.1855l-2.6158 2.1863-0.90966-2.4352h0.2589c0.63102 0.00937 0.63102-0.94573 0-0.93675h-1.8667c-0.63102-0.00937-0.63102 0.94573 0 0.93675h0.6088l0.83132 2.2248c-0.43661-0.21789-0.92129-0.35129-1.4401-0.35129-1.7986 0-3.2667 1.4734-3.2667 3.2786 0 1.8052 1.468 3.2786 3.2667 3.2786 1.7986 0 3.2667-1.4734 3.2667-3.2786 0-0.62753-0.18694-1.2094-0.49401-1.7089l2.6322-2.201 0.43204 1.0869c-0.97305 0.56889-1.6369 1.6157-1.6369 2.823 0 1.8052 1.468 3.2786 3.2667 3.2786s3.2667-1.4734 3.2667-3.2786c0-1.8052-1.468-3.2786-3.2667-3.2786-0.26422 0-0.51743 0.04065-0.76388 0.10061l-0.63615-1.5973v-1.782c0-0.25864-0.20898-0.46838-0.46666-0.46838zm-3.7332 4.6838c0.5528 0 1.0524 0.1985 1.451 0.51774l-1.75 1.4637c-0.47684 0.40027 0.11928 1.1189 0.59789 0.72084l1.75-1.4637c0.17565 0.32955 0.28438 0.7015 0.28438 1.1033 0 1.2989-1.0392 2.3419-2.3333 2.3419-1.2941 0-2.3333-1.043-2.3333-2.3419 0-1.2989 1.039-2.3419 2.3333-2.3419zm7.4665 0c1.2941 0 2.3333 1.043 2.3333 2.3419 0 1.2989-1.0392 2.3419-2.3333 2.3419s-2.3333-1.043-2.3333-2.3419c0-0.82153 0.41701-1.5382 1.05-1.9558l0.84951 2.1297c0.2296 0.58369 1.1017 0.23428 0.86776-0.34763l-0.84759-2.126c0.13459-0.02398 0.27197-0.04206 0.41374-0.04206z" fill="#fff"/>
-	</g>
-</svg>
diff --git a/data/styles/default/light/symbols/taxi-m.svg b/data/styles/default/light/symbols/taxi-m.svg
deleted file mode 100644
index 3405253fb..000000000
--- a/data/styles/default/light/symbols/taxi-m.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
-  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-  <path d="m7.2007 9.1768v2.825h3.1972v-2.825zm3.1972 2.825v2.8214h3.2007v-2.8214zm3.2007 0h3.2007v-2.825h-3.2007zm3.2007 0v2.8214h3.2007v-2.8214zm-9.5986 0h-3.2007v2.8214h3.2007z" fill="#fff" />
- </g>
-</svg>
diff --git a/data/styles/default/light/symbols/taxi-xm.svg b/data/styles/default/light/symbols/taxi-xm.svg
new file mode 100644
index 000000000..c6f831339
--- /dev/null
+++ b/data/styles/default/light/symbols/taxi-xm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m4.5004375 5.7355v1.765625h1.99825v-1.765625zm1.99825 1.765625v1.763375h2.0004375v-1.763375zm2.0004375 0h2.0004375v-1.765625h-2.0004375zm2.0004375 0v1.763375h2.0004375v-1.763375zm-5.999125 0h-2.0004375v1.763375h2.0004375z" fill="#fff"/></g></svg>
\ No newline at end of file