diff --git a/data/classificator.txt b/data/classificator.txt
index 829ac9dae1..894e88e9ae 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -508,6 +508,7 @@ world  +
         churchyard  -
         commercial  -
         construction  -
+        education  -
         farm  -
         farmland  -
         farmyard  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 61530861b4..43e6227fed 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 b0b475ef3d..82068c2dcb 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3427,10 +3427,14 @@ cont {
 cont {
   name: "amenity-college"
   element {
-    scale: 17
+    scale: 16
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3438,14 +3442,37 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15650
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16311482
+      priority: -15981
+    }
+    symbol {
+      name: "college-m"
+      priority: 16019
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3454,14 +3481,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15650
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3470,7 +3501,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15650
+      priority: 16000
     }
   }
 }
@@ -4790,9 +4821,13 @@ cont {
   name: "amenity-kindergarten"
   element {
     scale: 17
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4800,14 +4835,18 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15601
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4816,14 +4855,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15601
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4832,7 +4875,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15601
+      priority: 16000
     }
   }
 }
@@ -7661,9 +7704,13 @@ cont {
   name: "amenity-school"
   element {
     scale: 17
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7671,14 +7718,18 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15631
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7687,14 +7738,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7703,7 +7758,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 16000
     }
   }
 }
@@ -8085,11 +8140,11 @@ cont {
     scale: 14
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-s"
-      priority: 16009
+      priority: 16019
       min_distance: 12
     }
     caption {
@@ -8106,11 +8161,11 @@ cont {
     scale: 15
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 12
     }
     caption {
@@ -8127,7 +8182,7 @@ cont {
     scale: 15
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -8143,11 +8198,11 @@ cont {
     scale: 16
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 11
     }
     caption {
@@ -8164,7 +8219,7 @@ cont {
     scale: 16
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -8180,11 +8235,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 10
     }
     caption {
@@ -8201,7 +8256,7 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -8217,11 +8272,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
     }
     caption {
       primary {
@@ -8238,7 +8293,7 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -8254,11 +8309,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
     }
     caption {
       primary {
@@ -8275,7 +8330,7 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -32184,6 +32239,30 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-education"
+  element {
+    scale: 17
+    area {
+      color: 16311482
+      priority: -15991
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16311482
+      priority: -15991
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16311482
+      priority: -15991
+    }
+  }
+}
 cont {
   name: "landuse-farmland"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 960e03fb2a..1b4391c1b2 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 77b59e6de0..94a6922539 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3427,10 +3427,14 @@ cont {
 cont {
   name: "amenity-college"
   element {
-    scale: 17
+    scale: 16
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3438,14 +3442,37 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15650
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16311482
+      priority: -15981
+    }
+    symbol {
+      name: "college-m"
+      priority: 16019
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3454,14 +3481,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15650
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3470,7 +3501,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15650
+      priority: 16000
     }
   }
 }
@@ -4756,9 +4787,13 @@ cont {
   name: "amenity-kindergarten"
   element {
     scale: 17
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4766,14 +4801,18 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15601
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4782,14 +4821,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15601
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4798,7 +4841,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15601
+      priority: 16000
     }
   }
 }
@@ -7451,9 +7494,13 @@ cont {
   name: "amenity-school"
   element {
     scale: 17
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7461,14 +7508,18 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15631
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7477,14 +7528,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 16311482
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7493,7 +7548,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 16000
     }
   }
 }
@@ -7875,11 +7930,11 @@ cont {
     scale: 14
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-s"
-      priority: 16009
+      priority: 16019
       min_distance: 12
     }
     caption {
@@ -7896,11 +7951,11 @@ cont {
     scale: 15
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 12
     }
     caption {
@@ -7917,7 +7972,7 @@ cont {
     scale: 15
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -7933,11 +7988,11 @@ cont {
     scale: 16
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 11
     }
     caption {
@@ -7954,7 +8009,7 @@ cont {
     scale: 16
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -7970,11 +8025,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 10
     }
     caption {
@@ -7991,7 +8046,7 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -8007,11 +8062,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
     }
     caption {
       primary {
@@ -8028,7 +8083,7 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -8044,11 +8099,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
     }
     caption {
       primary {
@@ -8065,7 +8120,7 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -31846,6 +31901,30 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-education"
+  element {
+    scale: 17
+    area {
+      color: 16311482
+      priority: -15991
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16311482
+      priority: -15991
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16311482
+      priority: -15991
+    }
+  }
+}
 cont {
   name: "landuse-farmland"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 61215f40d2..fd4356050d 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 60c84a57b5..db87b55f5f 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -3427,10 +3427,14 @@ cont {
 cont {
   name: "amenity-college"
   element {
-    scale: 17
+    scale: 16
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3438,14 +3442,37 @@ cont {
         color: 5592405
         offset_y: 1
       }
-      priority: 15650
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2498323
+      priority: -15981
+    }
+    symbol {
+      name: "college-m"
+      priority: 16019
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3454,14 +3481,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15650
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "college-m"
-      priority: 16650
+      priority: 16019
     }
     caption {
       primary {
@@ -3470,7 +3501,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15650
+      priority: 16000
     }
   }
 }
@@ -4756,9 +4787,13 @@ cont {
   name: "amenity-kindergarten"
   element {
     scale: 17
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4766,14 +4801,18 @@ cont {
         color: 5592405
         offset_y: 1
       }
-      priority: 15601
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4782,14 +4821,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15601
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "kindergarten-m"
-      priority: 16601
+      priority: 16019
     }
     caption {
       primary {
@@ -4798,7 +4841,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15601
+      priority: 16000
     }
   }
 }
@@ -7451,9 +7494,13 @@ cont {
   name: "amenity-school"
   element {
     scale: 17
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7461,14 +7508,18 @@ cont {
         color: 5592405
         offset_y: 1
       }
-      priority: 15631
+      priority: 16000
     }
   }
   element {
     scale: 18
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7477,14 +7528,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 16000
     }
   }
   element {
     scale: 19
+    area {
+      color: 2498323
+      priority: -15981
+    }
     symbol {
       name: "school-m"
-      priority: 16631
+      priority: 16019
     }
     caption {
       primary {
@@ -7493,7 +7548,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 16000
     }
   }
 }
@@ -7875,11 +7930,11 @@ cont {
     scale: 14
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-s"
-      priority: 16009
+      priority: 16019
       min_distance: 12
     }
     caption {
@@ -7896,11 +7951,11 @@ cont {
     scale: 15
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 12
     }
     caption {
@@ -7917,7 +7972,7 @@ cont {
     scale: 15
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -7933,11 +7988,11 @@ cont {
     scale: 16
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 11
     }
     caption {
@@ -7954,7 +8009,7 @@ cont {
     scale: 16
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -7970,11 +8025,11 @@ cont {
     scale: 17
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
       min_distance: 10
     }
     caption {
@@ -7991,7 +8046,7 @@ cont {
     scale: 17
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -8007,11 +8062,11 @@ cont {
     scale: 18
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
     }
     caption {
       primary {
@@ -8028,7 +8083,7 @@ cont {
     scale: 18
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -8044,11 +8099,11 @@ cont {
     scale: 19
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     symbol {
       name: "college-m"
-      priority: 16009
+      priority: 16019
     }
     caption {
       primary {
@@ -8065,7 +8120,7 @@ cont {
     scale: 19
     area {
       color: 2498323
-      priority: -15991
+      priority: -15981
     }
     caption {
       primary {
@@ -32022,6 +32077,30 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-education"
+  element {
+    scale: 17
+    area {
+      color: 2498323
+      priority: -15991
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2498323
+      priority: -15991
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2498323
+      priority: -15991
+    }
+  }
+}
 cont {
   name: "landuse-farmland"
   element {
diff --git a/data/types.txt b/data/types.txt
index ae1bce830e..b28f3cf6bd 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -389,7 +389,7 @@ mapswithme
 *aerialway|cable_car
 *piste:type|downhill
 *sport|american_football
-mapswithme
+*landuse|education
 *man_made|cairn
 *railway|preserved|bridge
 *highway|path|demanding_alpine_hiking
diff --git a/data/visibility.txt b/data/visibility.txt
index e5a742f016..267ab5ca4c 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -508,6 +508,7 @@ world  00000000000000000000  +
         churchyard  00000000000000011111  -
         commercial  00000000000000000000  -
         construction  00000000000000011111  -
+        education  00000000000000000000  -
         farm  00000000000000000000  -
         farmland  00000000000000111111  -
         farmyard  00000000000000000000  -