diff --git a/data/classificator.txt b/data/classificator.txt
index 2955f9f855..483eccfb7d 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -703,9 +703,13 @@ world +
communication -
{}
wastewater_plant -
- water_tap -
+ water_tap +
+ drinking_water_no -
+ {}
water_tower -
- water_well -
+ water_well +
+ drinking_water_no -
+ {}
windmill -
works -
{}
@@ -741,7 +745,9 @@ world +
scree -
scrub -
shingle -
- spring -
+ spring +
+ drinking_water_no -
+ {}
strait -
tree_row -
volcano -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 3ae4123957..b0602c78ba 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 d2e4ce3fda..d424075e9d 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -55477,6 +55477,121 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_tap-drinking_water_no"
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-water_well"
element {
@@ -55570,6 +55685,121 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_well-drinking_water_no"
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-windmill"
element {
@@ -58726,6 +58956,126 @@ cont {
}
}
}
+cont {
+ name: "natural-spring-drinking_water_no"
+ element {
+ scale: 12
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "natural-strait"
element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 1786fe8387..f7b0a3c23e 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 41629b782a..034ecd5f22 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -52910,6 +52910,57 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_tap-drinking_water_no"
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-water_well"
element {
@@ -52975,6 +53026,57 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_well-drinking_water_no"
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-windmill"
element {
@@ -55805,6 +55907,112 @@ cont {
}
}
}
+cont {
+ name: "natural-spring-drinking_water_no"
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "natural-strait"
element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index b3f76db6f6..7e36bbc172 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 82d7adc300..37a488cbaf 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -52664,6 +52664,57 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_tap-drinking_water_no"
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-water_well"
element {
@@ -52729,6 +52780,57 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_well-drinking_water_no"
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-windmill"
element {
@@ -55579,6 +55681,112 @@ cont {
}
}
}
+cont {
+ name: "natural-spring-drinking_water_no"
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "natural-strait"
element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index c90af45c13..692b7c7ee7 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 2fd5f4ece4..15996db79e 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -55553,6 +55553,121 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_tap-drinking_water_no"
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-water_well"
element {
@@ -55682,6 +55797,121 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_well-drinking_water_no"
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-windmill"
element {
@@ -58983,6 +59213,135 @@ cont {
}
}
}
+cont {
+ name: "natural-spring-drinking_water_no"
+ element {
+ scale: 12
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "natural-strait"
element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 857ac7d0ce..8d20810c10 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 14d857f855..b138944d6e 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -55307,6 +55307,121 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_tap-drinking_water_no"
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-water_well"
element {
@@ -55436,6 +55551,121 @@ cont {
}
}
}
+cont {
+ name: "man_made-water_well-drinking_water_no"
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "man_made-windmill"
element {
@@ -58757,6 +58987,135 @@ cont {
}
}
}
+cont {
+ name: "natural-spring-drinking_water_no"
+ element {
+ scale: 12
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 13
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "drinking-water-no-s"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "drinking-water-no-m"
+ priority: 1200
+ }
+ caption {
+ primary {
+ height: 11
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8800
+ }
+ }
+}
cont {
name: "natural-strait"
element {
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index eb2c58bd8c..18f905c5d9 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index f20a982d4c..b916c813b3 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_light/symbols.png b/data/resources-6plus_light/symbols.png
index 5247498312..df4bd3b650 100644
Binary files a/data/resources-6plus_light/symbols.png and b/data/resources-6plus_light/symbols.png differ
diff --git a/data/resources-6plus_light/symbols.sdf b/data/resources-6plus_light/symbols.sdf
index 4ed0f129c2..38e6604b79 100644
--- a/data/resources-6plus_light/symbols.sdf
+++ b/data/resources-6plus_light/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 1bd5e23154..95b6032bcd 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 98d4046a77..73b57e075a 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_light/symbols.png b/data/resources-hdpi_light/symbols.png
index bbcc5a40aa..d2304cbf52 100644
Binary files a/data/resources-hdpi_light/symbols.png and b/data/resources-hdpi_light/symbols.png differ
diff --git a/data/resources-hdpi_light/symbols.sdf b/data/resources-hdpi_light/symbols.sdf
index 98d4046a77..73b57e075a 100644
--- a/data/resources-hdpi_light/symbols.sdf
+++ b/data/resources-hdpi_light/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 4b7df08e7b..380b08120c 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index 09f224857b..095e93443a 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_light/symbols.png b/data/resources-mdpi_light/symbols.png
index a3ce5fe684..632b8ce9bb 100644
Binary files a/data/resources-mdpi_light/symbols.png and b/data/resources-mdpi_light/symbols.png differ
diff --git a/data/resources-mdpi_light/symbols.sdf b/data/resources-mdpi_light/symbols.sdf
index 09f224857b..095e93443a 100644
--- a/data/resources-mdpi_light/symbols.sdf
+++ b/data/resources-mdpi_light/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 9ac4505ae0..95639ae8bf 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index 6c706b1a21..8e1698b358 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_light/symbols.png b/data/resources-xhdpi_light/symbols.png
index eecf0bbca0..443df24104 100644
Binary files a/data/resources-xhdpi_light/symbols.png and b/data/resources-xhdpi_light/symbols.png differ
diff --git a/data/resources-xhdpi_light/symbols.sdf b/data/resources-xhdpi_light/symbols.sdf
index 6c706b1a21..8e1698b358 100644
--- a/data/resources-xhdpi_light/symbols.sdf
+++ b/data/resources-xhdpi_light/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index 527d6126d8..86e030de34 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index bab8b5ad98..fee38b685c 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_light/symbols.png b/data/resources-xxhdpi_light/symbols.png
index ee5a459657..cfbe51b6f6 100644
Binary files a/data/resources-xxhdpi_light/symbols.png and b/data/resources-xxhdpi_light/symbols.png differ
diff --git a/data/resources-xxhdpi_light/symbols.sdf b/data/resources-xxhdpi_light/symbols.sdf
index bab8b5ad98..fee38b685c 100644
--- a/data/resources-xxhdpi_light/symbols.sdf
+++ b/data/resources-xxhdpi_light/symbols.sdf
@@ -405,393 +405,395 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index 7833818e3b..d125892e3d 100644
Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf
index bc93007e02..6fb75c84f1 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -405,127 +405,128 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -690,108 +691,109 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_light/symbols.png b/data/resources-xxxhdpi_light/symbols.png
index 5d926546d3..ff7c9878db 100644
Binary files a/data/resources-xxxhdpi_light/symbols.png and b/data/resources-xxxhdpi_light/symbols.png differ
diff --git a/data/resources-xxxhdpi_light/symbols.sdf b/data/resources-xxxhdpi_light/symbols.sdf
index bc93007e02..6fb75c84f1 100644
--- a/data/resources-xxxhdpi_light/symbols.sdf
+++ b/data/resources-xxxhdpi_light/symbols.sdf
@@ -405,127 +405,128 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -690,108 +691,109 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/types.txt b/data/types.txt
index eb55d575b2..c5e7cdc9f3 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1601,3 +1601,6 @@ amenity|recycling|container
*emergency|emergency_ward_entrance
*amenity|dojo
*leisure|sports_hall
+*man_made|water_tap|drinking_water_no
+*man_made|water_well|drinking_water_no
+*natural|spring|drinking_water_no
diff --git a/data/visibility.txt b/data/visibility.txt
index 9eead97c29..27a273d985 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -703,9 +703,13 @@ world 000000000000000000000 +
communication 000000000000000000000 -
{}
wastewater_plant 000000000000000000000 -
- water_tap 000000000000000000000 -
+ water_tap 000000000000000000000 +
+ drinking_water_no 000000000000000000000 -
+ {}
water_tower 000000000000000000000 -
- water_well 000000000000000000000 -
+ water_well 000000000000000000000 +
+ drinking_water_no 000000000000000000000 -
+ {}
windmill 000000000000000000000 -
works 000000000000000000000 -
{}
@@ -741,7 +745,9 @@ world 000000000000000000000 +
scree 000000000000000000000 -
scrub 000000000000001111111 -
shingle 000000000000000000000 -
- spring 000000000000000000000 -
+ spring 000000000000000000000 +
+ drinking_water_no 000000000000000000000 -
+ {}
strait 000000000000000000000 -
tree_row 000000000000000000000 -
volcano 000000000000000000000 -