diff --git a/data/classificator.txt b/data/classificator.txt
index b37ae55af6..216f1168cf 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -342,16 +342,16 @@ world  +
         main  -
         {}
     healthcare  +
+        alternative  -
+        audiologist  -
+        blood_donation  -
         laboratory  -
+        optometrist  -
         physiotherapist  -
-        alternative -
-        audiologist -
-        blood_donation -
-        optometrist -
-        podiatrist -
-        psychotherapist -
-        sample_collection -
-        speech_therapist -
+        podiatrist  -
+        psychotherapist  -
+        sample_collection  -
+        speech_therapist  -
         {}
     highway  +
         bridleway  +
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 503109dcb9..d1d9c68abc 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 87f5766dbb..5cf8c1ad1b 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -14019,20 +14019,18 @@ cont {
   }
 }
 cont {
-  name: "healthcare-laboratory"
+  name: "healthcare-alternative"
   element {
     scale: 17
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
       priority: 16657
-      min_distance: 4
     }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
-        is_optional: true
       }
       priority: 15657
     }
@@ -14040,7 +14038,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
       priority: 16657
     }
     caption {
@@ -14056,7 +14054,207 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-audiologist"
+  element {
+    scale: 17
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-blood_donation"
+  element {
+    scale: 17
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-laboratory"
+  element {
+    scale: 17
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-optometrist"
+  element {
+    scale: 17
+    symbol {
+      name: "optometrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "optometrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "optometrist-m"
       priority: 16657
     }
     caption {
@@ -14120,6 +14318,206 @@ cont {
     }
   }
 }
+cont {
+  name: "healthcare-podiatrist"
+  element {
+    scale: 17
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-psychotherapist"
+  element {
+    scale: 17
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-sample_collection"
+  element {
+    scale: 17
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-speech_therapist"
+  element {
+    scale: 17
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
 cont {
   name: "highway-bridleway"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 735ab23b77..b820147384 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 598ea5d634..6ff00151d0 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -13788,20 +13788,18 @@ cont {
   }
 }
 cont {
-  name: "healthcare-laboratory"
+  name: "healthcare-alternative"
   element {
     scale: 17
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
       priority: 16657
-      min_distance: 4
     }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
-        is_optional: true
       }
       priority: 15657
     }
@@ -13809,7 +13807,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
       priority: 16657
     }
     caption {
@@ -13825,7 +13823,207 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-audiologist"
+  element {
+    scale: 17
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-blood_donation"
+  element {
+    scale: 17
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-laboratory"
+  element {
+    scale: 17
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-optometrist"
+  element {
+    scale: 17
+    symbol {
+      name: "optometrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "optometrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "optometrist-m"
       priority: 16657
     }
     caption {
@@ -13889,6 +14087,206 @@ cont {
     }
   }
 }
+cont {
+  name: "healthcare-podiatrist"
+  element {
+    scale: 17
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-psychotherapist"
+  element {
+    scale: 17
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-sample_collection"
+  element {
+    scale: 17
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-speech_therapist"
+  element {
+    scale: 17
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
 cont {
   name: "highway-bridleway"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 8b9d9d2115..78eaaea5db 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 1cef385648..b1a36850f3 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -13788,20 +13788,18 @@ cont {
   }
 }
 cont {
-  name: "healthcare-laboratory"
+  name: "healthcare-alternative"
   element {
     scale: 17
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
       priority: 16657
-      min_distance: 4
     }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
-        is_optional: true
       }
       priority: 15657
     }
@@ -13809,7 +13807,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
       priority: 16657
     }
     caption {
@@ -13825,7 +13823,207 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "hospital-m"
+      name: "alternative-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-audiologist"
+  element {
+    scale: 17
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "audiologist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-blood_donation"
+  element {
+    scale: 17
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "blood_donation-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-laboratory"
+  element {
+    scale: 17
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-optometrist"
+  element {
+    scale: 17
+    symbol {
+      name: "optometrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "optometrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "optometrist-m"
       priority: 16657
     }
     caption {
@@ -13889,6 +14087,206 @@ cont {
     }
   }
 }
+cont {
+  name: "healthcare-podiatrist"
+  element {
+    scale: 17
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "podiatrist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-psychotherapist"
+  element {
+    scale: 17
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "psychotherapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-sample_collection"
+  element {
+    scale: 17
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "sample_collection-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
+cont {
+  name: "healthcare-speech_therapist"
+  element {
+    scale: 17
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "speech_therapist-m"
+      priority: 16657
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15657
+    }
+  }
+}
 cont {
   name: "highway-bridleway"
   element {
diff --git a/data/types.txt b/data/types.txt
index 527c091977..4d06f72ea2 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -416,14 +416,14 @@ mapswithme
 *highway|motorway|tunnel
 *railway|light_rail|tunnel
 *area:highway|service
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*healthcare|alternative
+*healthcare|audiologist
+*healthcare|blood_donation
+*healthcare|optometrist
 *highway|road|tunnel
 *sport|archery
-mapswithme
-mapswithme
+*healthcare|podiatrist
+*healthcare|psychotherapist
 *highway|ford
 *area:highway|path
 *railway|siding
@@ -432,10 +432,10 @@ mapswithme
 *railway|funicular
 *amenity|waste_transfer_station
 *historic|battlefield
-mapswithme
+*healthcare|sample_collection
 *sport|australian_football
 *leisure|bowling_alley
-mapswithme
+*healthcare|speech_therapist
 mapswithme
 mapswithme
 *aerialway|t-bar
diff --git a/data/visibility.txt b/data/visibility.txt
index 20fa7e9c84..8107c6050d 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -342,8 +342,16 @@ world  00000000000000000000  +
         main  00000000000000000000  -
         {}
     healthcare  00000000000000000000  +
+        alternative  00000000000000000000  -
+        audiologist  00000000000000000000  -
+        blood_donation  00000000000000000000  -
         laboratory  00000000000000000000  -
+        optometrist  00000000000000000000  -
         physiotherapist  00000000000000000000  -
+        podiatrist  00000000000000000000  -
+        psychotherapist  00000000000000000000  -
+        sample_collection  00000000000000000000  -
+        speech_therapist  00000000000000000000  -
         {}
     highway  00000000000000000000  +
         bridleway  00000000000000000000  +