diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index a9013265b9..1566502829 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1099,13 +1099,14 @@ node|z17[amenity=clinic],
 area|z17[amenity=clinic],
 node|z17[amenity=doctors],
 area|z17[amenity=doctors],
-{icon-image: hospital-m.svg;icon-min-distance: 4;}
+{icon-image: clinic-m.svg;icon-min-distance: 4;}
 node|z18-[amenity=hospital],
+{icon-image: hospital-m.svg;font-size: 11;}
 node|z18-[amenity=clinic],
 area|z18-[amenity=clinic],
 node|z18-[amenity=doctors],
 area|z18-[amenity=doctors],
-{icon-image: hospital-m.svg;font-size: 11;}
+{icon-image: clinic-m.svg;font-size: 11;}
 node|z17[healthcare=laboratory],
 area|z17[healthcare=laboratory],
 {icon-image: sample_collection-m.svg;}
diff --git a/data/styles/clear/style-clear/symbols/clinic-m.svg b/data/styles/clear/style-clear/symbols/clinic-m.svg
new file mode 100644
index 0000000000..a48c0f3d84
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/clinic-m.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
+ <circle cx="9" cy="9" r="8.25" fill="#c15746"/>
+ <path d="m12.889 4h-7.7777c-0.6111 0-1.1055 0.49999-1.1055 1.1111l-0.00556 7.7778c0 0.6111 0.49999 1.1111 1.1111 1.1111h7.7778c0.6111 0 1.1111-0.49999 1.1111-1.1111v-7.7778c0-0.6111-0.49999-1.1111-1.1111-1.1111z" fill="#fff"/>
+ <path d="m11.916 10h-1.916v1.9166c0 0.32084-0.2625 0.58334-0.58334 0.58334h-0.83332c-0.32084 0-0.58334-0.2625-0.58334-0.58334v-1.9166h-1.9174c-0.32084 0-0.58333-0.2625-0.58333-0.58334v-0.83332c0-0.32084 0.2625-0.58334 0.58333-0.58334h1.9174v-1.9168c0-0.32084 0.2625-0.58334 0.58334-0.58334h0.83332c0.32084 0 0.58334 0.2625 0.58334 0.58334v1.9168h1.916c0.32084 0 0.58334 0.2625 0.58334 0.58334v0.83332c0 0.32084-0.2625 0.58334-0.58334 0.58334z" fill="#c15746"/>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/hospital-m.svg b/data/styles/clear/style-clear/symbols/hospital-m.svg
index 26267552f9..1153faf577 100644
--- a/data/styles/clear/style-clear/symbols/hospital-m.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-m.svg
@@ -1,10 +1,6 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>hospital-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="hospital-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#C15746"/>
-   <path id="Shape" d="m17.444 5h-10.889c-0.85556 0-1.5478 0.7-1.5478 1.5556l-0.0077778 10.889c0 0.85556 0.7 1.5556 1.5556 1.5556h10.889c0.85556 0 1.5556-0.7 1.5556-1.5556v-10.889c0-0.85556-0.7-1.5556-1.5556-1.5556zm-1.5556 8.5556h-2.3333v2.3333c0 0.42778-0.35 0.77778-0.77778 0.77778h-1.5556c-0.42778 0-0.77778-0.35-0.77778-0.77778v-2.3333h-2.3333c-0.42778 0-0.77778-0.35-0.77778-0.77778v-1.5556c0-0.42778 0.35-0.77778 0.77778-0.77778h2.3333v-2.3333c0-0.42778 0.35-0.77778 0.77778-0.77778h1.5556c0.42778 0 0.77778 0.35 0.77778 0.77778v2.3333h2.3333c0.42778 0 0.77778 0.35 0.77778 0.77778v1.5556c0 0.42778-0.35 0.77778-0.77778 0.77778z" fill="#fff"/>
-  </g>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
+ <circle cx="9" cy="9" r="8.25" fill="#c15746"/>
+ <path d="m13.583 11h-2.5833v2.5833c0 0.50417-0.4125 0.91667-0.91667 0.91667h-2.1667c-0.50417 0-0.91667-0.4125-0.91667-0.91667v-2.5833h-2.5834c-0.50417 0-0.91665-0.4125-0.91665-0.91667v-2.1667c0-0.50417 0.4125-0.91667 0.91665-0.91667h2.5834v-2.5833c0-0.50417 0.4125-0.91667 0.91667-0.91667h2.1667c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.5833h2.5833c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.1667c0 0.50417-0.4125 0.91667-0.91667 0.91667z" fill="#fff"/>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/hospital-s.svg b/data/styles/clear/style-clear/symbols/hospital-s.svg
index 272c6702be..4b69dfb2b2 100644
--- a/data/styles/clear/style-clear/symbols/hospital-s.svg
+++ b/data/styles/clear/style-clear/symbols/hospital-s.svg
@@ -1,10 +1,6 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>hospital-s</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="hospital-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#fff" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#C15746"/>
-   <path id="Shape" d="m11.63 3.3333h-7.2593c-0.57037 0-1.0319 0.46667-1.0319 1.037l-0.0051852 7.2593c0 0.57037 0.46667 1.037 1.037 1.037h7.2593c0.57037 0 1.037-0.46667 1.037-1.037v-7.2593c0-0.57037-0.46667-1.037-1.037-1.037zm-1.037 5.7037h-1.5556v1.5556c0 0.28519-0.23333 0.51852-0.51852 0.51852h-1.037c-0.28519 0-0.51852-0.23333-0.51852-0.51852v-1.5556h-1.5556c-0.28519 0-0.51852-0.23333-0.51852-0.51852v-1.037c0-0.28519 0.23333-0.51852 0.51852-0.51852h1.5556v-1.5556c0-0.28519 0.23333-0.51852 0.51852-0.51852h1.037c0.28519 0 0.51852 0.23333 0.51852 0.51852v1.5556h1.5556c0.28519 0 0.51852 0.23333 0.51852 0.51852v1.037c0 0.28519-0.23333 0.51852-0.51852 0.51852z" fill="#fff"/>
-  </g>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="6" cy="6" r="6" fill="#fff" opacity=".6"/>
+ <circle cx="6" cy="6" r="5.5" fill="#c15746"/>
+ <path d="m9.3333 7.5h-1.8333v1.8333c0 0.36667-0.3 0.66667-0.66667 0.66667h-1.6667c-0.36667 0-0.66667-0.3-0.66667-0.66667v-1.8333h-1.8333c-0.36667 0-0.66666-0.3-0.66666-0.66666v-1.6667c0-0.36667 0.3-0.66666 0.66666-0.66666h1.8333v-1.8333c0-0.36667 0.3-0.66667 0.66667-0.66667h1.6667c0.36667 0 0.66667 0.3 0.66667 0.66667v1.8333h1.8333c0.36667 0 0.66667 0.3 0.66667 0.66666v1.6667c0 0.36667-0.3 0.66666-0.66667 0.66666z" fill="#fff"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/clinic-m.svg b/data/styles/clear/style-night/symbols/clinic-m.svg
new file mode 100644
index 0000000000..a1a800f1f5
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/clinic-m.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="9" cy="9" r="9" opacity=".6"/>
+ <circle cx="9" cy="9" r="8.25" fill="#c15746"/>
+ <path d="m12.889 4h-7.7777c-0.6111 0-1.1055 0.49999-1.1055 1.1111l-0.00556 7.7778c0 0.6111 0.49999 1.1111 1.1111 1.1111h7.7778c0.6111 0 1.1111-0.49999 1.1111-1.1111v-7.7778c0-0.6111-0.49999-1.1111-1.1111-1.1111z"/>
+ <path d="m11.916 10h-1.916v1.9166c0 0.32084-0.2625 0.58334-0.58334 0.58334h-0.83332c-0.32084 0-0.58334-0.2625-0.58334-0.58334v-1.9166h-1.9174c-0.32084 0-0.58333-0.2625-0.58333-0.58334v-0.83332c0-0.32084 0.2625-0.58334 0.58333-0.58334h1.9174v-1.9168c0-0.32084 0.2625-0.58334 0.58334-0.58334h0.83332c0.32084 0 0.58334 0.2625 0.58334 0.58334v1.9168h1.916c0.32084 0 0.58334 0.2625 0.58334 0.58334v0.83332c0 0.32084-0.2625 0.58334-0.58334 0.58334z" fill="#c15746"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/hospital-m.svg b/data/styles/clear/style-night/symbols/hospital-m.svg
index cfa27941aa..bb10b07f2b 100644
--- a/data/styles/clear/style-night/symbols/hospital-m.svg
+++ b/data/styles/clear/style-night/symbols/hospital-m.svg
@@ -1,10 +1,6 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>hospital-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="hospital-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#C15746"/>
-   <path id="Shape" d="m17.444 5h-10.889c-0.85556 0-1.5478 0.7-1.5478 1.5556l-0.0077778 10.889c0 0.85556 0.7 1.5556 1.5556 1.5556h10.889c0.85556 0 1.5556-0.7 1.5556-1.5556v-10.889c0-0.85556-0.7-1.5556-1.5556-1.5556zm-1.5556 8.5556h-2.3333v2.3333c0 0.42778-0.35 0.77778-0.77778 0.77778h-1.5556c-0.42778 0-0.77778-0.35-0.77778-0.77778v-2.3333h-2.3333c-0.42778 0-0.77778-0.35-0.77778-0.77778v-1.5556c0-0.42778 0.35-0.77778 0.77778-0.77778h2.3333v-2.3333c0-0.42778 0.35-0.77778 0.77778-0.77778h1.5556c0.42778 0 0.77778 0.35 0.77778 0.77778v2.3333h2.3333c0.42778 0 0.77778 0.35 0.77778 0.77778v1.5556c0 0.42778-0.35 0.77778-0.77778 0.77778z" fill="#000"/>
-  </g>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
+ <circle cx="9" cy="9" r="8.25" fill="#c15746"/>
+ <path d="m13.583 11h-2.5833v2.5833c0 0.50417-0.4125 0.91667-0.91667 0.91667h-2.1667c-0.50417 0-0.91667-0.4125-0.91667-0.91667v-2.5833h-2.5834c-0.50417 0-0.91665-0.4125-0.91665-0.91667v-2.1667c0-0.50417 0.4125-0.91667 0.91665-0.91667h2.5834v-2.5833c0-0.50417 0.4125-0.91667 0.91667-0.91667h2.1667c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.5833h2.5833c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.1667c0 0.50417-0.4125 0.91667-0.91667 0.91667z" fill="#000"/>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/hospital-s.svg b/data/styles/clear/style-night/symbols/hospital-s.svg
index ed1f4a8605..49fee501e6 100644
--- a/data/styles/clear/style-night/symbols/hospital-s.svg
+++ b/data/styles/clear/style-night/symbols/hospital-s.svg
@@ -1,10 +1,6 @@
-<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
- <title>hospital-s</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
-  <g id="hospital-s" fill-rule="nonzero">
-   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#C15746"/>
-   <path id="Shape" d="m11.63 3.3333h-7.2593c-0.57037 0-1.0319 0.46667-1.0319 1.037l-0.0051852 7.2593c0 0.57037 0.46667 1.037 1.037 1.037h7.2593c0.57037 0 1.037-0.46667 1.037-1.037v-7.2593c0-0.57037-0.46667-1.037-1.037-1.037zm-1.037 5.7037h-1.5556v1.5556c0 0.28519-0.23333 0.51852-0.51852 0.51852h-1.037c-0.28519 0-0.51852-0.23333-0.51852-0.51852v-1.5556h-1.5556c-0.28519 0-0.51852-0.23333-0.51852-0.51852v-1.037c0-0.28519 0.23333-0.51852 0.51852-0.51852h1.5556v-1.5556c0-0.28519 0.23333-0.51852 0.51852-0.51852h1.037c0.28519 0 0.51852 0.23333 0.51852 0.51852v1.5556h1.5556c0.28519 0 0.51852 0.23333 0.51852 0.51852v1.037c0 0.28519-0.23333 0.51852-0.51852 0.51852z" fill="#000"/>
-  </g>
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="6" cy="6" r="6" fill="#000" opacity=".6"/>
+ <circle cx="6" cy="6" r="5.5" fill="#c15746"/>
+ <path d="m9.3333 7.5h-1.8333v1.8333c0 0.36667-0.3 0.66667-0.66667 0.66667h-1.6667c-0.36667 0-0.66667-0.3-0.66667-0.66667v-1.8333h-1.8333c-0.36667 0-0.66666-0.3-0.66666-0.66666v-1.6667c0-0.36667 0.3-0.66666 0.66666-0.66666h1.8333v-1.8333c0-0.36667 0.3-0.66667 0.66667-0.66667h1.6667c0.36667 0 0.66667 0.3 0.66667 0.66667v1.8333h1.8333c0.36667 0 0.66667 0.3 0.66667 0.66666v1.6667c0 0.36667-0.3 0.66666-0.66667 0.66666z" fill="#000"/>
 </svg>