diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 33fa0a09c9..8fd81aeb29 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 140b8f1548..a380cd1e90 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -41762,7 +41762,7 @@ cont {
scale: 13
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41771,14 +41771,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 14
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41787,14 +41787,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 15
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41803,14 +41803,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 16
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41819,14 +41819,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 17
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41835,14 +41835,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 18
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41851,7 +41851,7 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
}
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 8a4960bd09..d002a8be88 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 54603cd117..cfba2d5ef7 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3284,7 +3284,7 @@ cont {
element {
scale: 18
symbol {
- name: "childcare-l"
+ name: "kindergarten-l"
priority: 16849
}
caption {
@@ -3299,7 +3299,7 @@ cont {
element {
scale: 19
symbol {
- name: "childcare-l"
+ name: "kindergarten-l"
priority: 16849
}
caption {
@@ -5848,7 +5848,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "buddhist-m"
priority: 16876
min_distance: 15
}
@@ -5868,7 +5868,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "buddhist-m"
priority: 16876
}
caption {
@@ -5887,7 +5887,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "buddhist-l"
priority: 16876
}
caption {
@@ -5906,7 +5906,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "buddhist-l"
priority: 16876
}
caption {
@@ -5925,7 +5925,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "buddhist-l"
priority: 16876
}
caption {
@@ -5943,7 +5943,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "christian-m"
priority: 16876
min_distance: 15
}
@@ -5963,7 +5963,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "christian-m"
priority: 16876
}
caption {
@@ -5982,7 +5982,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "christian-l"
priority: 16876
}
caption {
@@ -6001,7 +6001,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "christian-l"
priority: 16876
}
caption {
@@ -6020,7 +6020,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "christian-l"
priority: 16876
}
caption {
@@ -6038,7 +6038,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "hindu-m"
priority: 16876
min_distance: 15
}
@@ -6058,7 +6058,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "hindu-m"
priority: 16876
}
caption {
@@ -6077,7 +6077,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "hindu-l"
priority: 16876
}
caption {
@@ -6096,7 +6096,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "hindu-l"
priority: 16876
}
caption {
@@ -6115,7 +6115,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "hindu-l"
priority: 16876
}
caption {
@@ -6133,7 +6133,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "jewish-m"
priority: 16876
min_distance: 15
}
@@ -6153,7 +6153,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "jewish-m"
priority: 16876
}
caption {
@@ -6172,7 +6172,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "jewish-l"
priority: 16876
}
caption {
@@ -6191,7 +6191,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "jewish-l"
priority: 16876
}
caption {
@@ -6210,7 +6210,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "jewish-l"
priority: 16876
}
caption {
@@ -6228,7 +6228,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "muslim-m"
priority: 16876
min_distance: 15
}
@@ -6248,7 +6248,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "muslim-m"
priority: 16876
}
caption {
@@ -6267,7 +6267,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "muslim-l"
priority: 16876
}
caption {
@@ -6286,7 +6286,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "muslim-l"
priority: 16876
}
caption {
@@ -6305,7 +6305,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "muslim-l"
priority: 16876
}
caption {
@@ -6323,7 +6323,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "shinto-m"
priority: 16876
min_distance: 15
}
@@ -6343,7 +6343,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "shinto-m"
priority: 16876
}
caption {
@@ -6362,7 +6362,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "shinto-l"
priority: 16876
}
caption {
@@ -6381,7 +6381,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "shinto-l"
priority: 16876
}
caption {
@@ -6400,7 +6400,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "shinto-l"
priority: 16876
}
caption {
@@ -6418,7 +6418,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "taoist-m"
priority: 16876
min_distance: 15
}
@@ -6438,7 +6438,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "taoist-m"
priority: 16876
}
caption {
@@ -6457,7 +6457,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "taoist-l"
priority: 16876
}
caption {
@@ -6476,7 +6476,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "taoist-l"
priority: 16876
}
caption {
@@ -6495,7 +6495,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "taoist-l"
priority: 16876
}
caption {
@@ -28023,7 +28023,7 @@ cont {
element {
scale: 16
symbol {
- name: "boundary_stone-m"
+ name: "monument-m"
priority: 16849
min_distance: 30
}
@@ -28039,7 +28039,7 @@ cont {
element {
scale: 17
symbol {
- name: "boundary_stone-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28055,7 +28055,7 @@ cont {
element {
scale: 18
symbol {
- name: "boundary_stone-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28071,7 +28071,7 @@ cont {
element {
scale: 19
symbol {
- name: "boundary_stone-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28796,7 +28796,7 @@ cont {
element {
scale: 16
symbol {
- name: "wayside_cross-m"
+ name: "monument-m"
priority: 16849
min_distance: 30
}
@@ -28812,7 +28812,7 @@ cont {
element {
scale: 17
symbol {
- name: "wayside_cross-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28828,7 +28828,7 @@ cont {
element {
scale: 18
symbol {
- name: "wayside_cross-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28844,7 +28844,7 @@ cont {
element {
scale: 19
symbol {
- name: "wayside_cross-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -41034,7 +41034,7 @@ cont {
scale: 13
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41043,14 +41043,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 14
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41059,14 +41059,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 15
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41075,14 +41075,14 @@ cont {
color: 4473924
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 16
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41091,14 +41091,14 @@ cont {
color: 4473924
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 17
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41107,14 +41107,14 @@ cont {
color: 4473924
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 18
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41123,14 +41123,14 @@ cont {
color: 4473924
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 19
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41139,7 +41139,7 @@ cont {
color: 4473924
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
}
@@ -43194,7 +43194,7 @@ cont {
scale: 12
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16849
min_distance: 15
}
}
@@ -43202,7 +43202,7 @@ cont {
scale: 13
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16849
min_distance: 12
}
caption {
@@ -43211,14 +43211,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15849
}
}
element {
scale: 14
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16849
min_distance: 12
}
caption {
@@ -43227,14 +43227,14 @@ cont {
color: 4473924
offset_y: 6
}
- priority: 15890
+ priority: 15849
}
}
element {
scale: 15
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16849
min_distance: 5
}
caption {
@@ -43243,14 +43243,14 @@ cont {
color: 4473924
offset_y: 8
}
- priority: 15890
+ priority: 15849
}
}
element {
scale: 16
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16849
min_distance: 5
}
caption {
@@ -43259,14 +43259,14 @@ cont {
color: 4473924
offset_y: 8
}
- priority: 15890
+ priority: 15849
}
}
element {
scale: 17
symbol {
name: "drinking-water-l"
- priority: 16890
+ priority: 16849
min_distance: 5
}
caption {
@@ -43275,7 +43275,7 @@ cont {
color: 4473924
offset_y: 8
}
- priority: 15890
+ priority: 15849
}
}
element {
@@ -63018,7 +63018,7 @@ cont {
element {
scale: 15
symbol {
- name: "car_sharing-m"
+ name: "car_shop-m"
priority: 16849
}
caption {
@@ -63033,7 +63033,7 @@ cont {
element {
scale: 16
symbol {
- name: "car_sharing-m"
+ name: "car_shop-m"
priority: 16849
}
caption {
@@ -63048,7 +63048,7 @@ cont {
element {
scale: 17
symbol {
- name: "car_sharing-l"
+ name: "car_shop-l"
priority: 16849
}
caption {
@@ -63063,7 +63063,7 @@ cont {
element {
scale: 18
symbol {
- name: "car_sharing-l"
+ name: "car_shop-l"
priority: 16849
}
caption {
@@ -63078,7 +63078,7 @@ cont {
element {
scale: 19
symbol {
- name: "car_sharing-l"
+ name: "car_shop-l"
priority: 16849
}
caption {
@@ -63675,7 +63675,7 @@ cont {
element {
scale: 15
symbol {
- name: "convenience-m"
+ name: "grocery-m"
priority: 16849
}
caption {
@@ -63690,7 +63690,7 @@ cont {
element {
scale: 16
symbol {
- name: "convenience-m"
+ name: "grocery-m"
priority: 16849
}
caption {
@@ -63705,7 +63705,7 @@ cont {
element {
scale: 17
symbol {
- name: "convenience-l"
+ name: "grocery-l"
priority: 16849
}
caption {
@@ -63720,7 +63720,7 @@ cont {
element {
scale: 18
symbol {
- name: "convenience-l"
+ name: "grocery-l"
priority: 16849
}
caption {
@@ -63735,7 +63735,7 @@ cont {
element {
scale: 19
symbol {
- name: "convenience-l"
+ name: "grocery-l"
priority: 16849
}
caption {
@@ -64691,7 +64691,7 @@ cont {
element {
scale: 15
symbol {
- name: "hardware-m"
+ name: "doityourself-m"
priority: 16849
}
caption {
@@ -64706,7 +64706,7 @@ cont {
element {
scale: 16
symbol {
- name: "hardware-m"
+ name: "doityourself-m"
priority: 16849
}
caption {
@@ -64721,7 +64721,7 @@ cont {
element {
scale: 17
symbol {
- name: "hardware-l"
+ name: "doityourself-l"
priority: 16849
}
caption {
@@ -64736,7 +64736,7 @@ cont {
element {
scale: 18
symbol {
- name: "hardware-l"
+ name: "doityourself-l"
priority: 16849
}
caption {
@@ -64751,7 +64751,7 @@ cont {
element {
scale: 19
symbol {
- name: "hardware-l"
+ name: "doityourself-l"
priority: 16849
}
caption {
@@ -65269,7 +65269,7 @@ cont {
element {
scale: 15
symbol {
- name: "climbing-m"
+ name: "outdoor-shop-m"
priority: 16849
}
caption {
@@ -65284,7 +65284,7 @@ cont {
element {
scale: 16
symbol {
- name: "climbing-m"
+ name: "outdoor-shop-m"
priority: 16849
}
caption {
@@ -65299,7 +65299,7 @@ cont {
element {
scale: 17
symbol {
- name: "climbing-l"
+ name: "outdoor-shop-l"
priority: 16849
}
caption {
@@ -65314,7 +65314,7 @@ cont {
element {
scale: 18
symbol {
- name: "climbing-l"
+ name: "outdoor-shop-l"
priority: 16849
}
caption {
@@ -65329,7 +65329,7 @@ cont {
element {
scale: 19
symbol {
- name: "climbing-l"
+ name: "outdoor-shop-l"
priority: 16849
}
caption {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 41ddc7f698..e322b2b20d 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 42fec16d71..7121acc3d5 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -3284,7 +3284,7 @@ cont {
element {
scale: 18
symbol {
- name: "childcare-l"
+ name: "kindergarten-l"
priority: 16849
}
caption {
@@ -3299,7 +3299,7 @@ cont {
element {
scale: 19
symbol {
- name: "childcare-l"
+ name: "kindergarten-l"
priority: 16849
}
caption {
@@ -5848,7 +5848,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "buddhist-m"
priority: 16876
min_distance: 15
}
@@ -5868,7 +5868,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "buddhist-m"
priority: 16876
}
caption {
@@ -5887,7 +5887,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "buddhist-l"
priority: 16876
}
caption {
@@ -5906,7 +5906,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "buddhist-l"
priority: 16876
}
caption {
@@ -5925,7 +5925,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "buddhist-l"
priority: 16876
}
caption {
@@ -5943,7 +5943,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "christian-m"
priority: 16876
min_distance: 15
}
@@ -5963,7 +5963,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "christian-m"
priority: 16876
}
caption {
@@ -5982,7 +5982,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "christian-l"
priority: 16876
}
caption {
@@ -6001,7 +6001,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "christian-l"
priority: 16876
}
caption {
@@ -6020,7 +6020,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "christian-l"
priority: 16876
}
caption {
@@ -6038,7 +6038,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "hindu-m"
priority: 16876
min_distance: 15
}
@@ -6058,7 +6058,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "hindu-m"
priority: 16876
}
caption {
@@ -6077,7 +6077,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "hindu-l"
priority: 16876
}
caption {
@@ -6096,7 +6096,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "hindu-l"
priority: 16876
}
caption {
@@ -6115,7 +6115,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "hindu-l"
priority: 16876
}
caption {
@@ -6133,7 +6133,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "jewish-m"
priority: 16876
min_distance: 15
}
@@ -6153,7 +6153,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "jewish-m"
priority: 16876
}
caption {
@@ -6172,7 +6172,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "jewish-l"
priority: 16876
}
caption {
@@ -6191,7 +6191,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "jewish-l"
priority: 16876
}
caption {
@@ -6210,7 +6210,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "jewish-l"
priority: 16876
}
caption {
@@ -6228,7 +6228,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "muslim-m"
priority: 16876
min_distance: 15
}
@@ -6248,7 +6248,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "muslim-m"
priority: 16876
}
caption {
@@ -6267,7 +6267,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "muslim-l"
priority: 16876
}
caption {
@@ -6286,7 +6286,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "muslim-l"
priority: 16876
}
caption {
@@ -6305,7 +6305,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "muslim-l"
priority: 16876
}
caption {
@@ -6323,7 +6323,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "shinto-m"
priority: 16876
min_distance: 15
}
@@ -6343,7 +6343,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "shinto-m"
priority: 16876
}
caption {
@@ -6362,7 +6362,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "shinto-l"
priority: 16876
}
caption {
@@ -6381,7 +6381,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "shinto-l"
priority: 16876
}
caption {
@@ -6400,7 +6400,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "shinto-l"
priority: 16876
}
caption {
@@ -6418,7 +6418,7 @@ cont {
element {
scale: 15
symbol {
- name: "place-of-worship-m"
+ name: "taoist-m"
priority: 16876
min_distance: 15
}
@@ -6438,7 +6438,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-m"
+ name: "taoist-m"
priority: 16876
}
caption {
@@ -6457,7 +6457,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "taoist-l"
priority: 16876
}
caption {
@@ -6476,7 +6476,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "taoist-l"
priority: 16876
}
caption {
@@ -6495,7 +6495,7 @@ cont {
priority: -15124
}
symbol {
- name: "place-of-worship-l"
+ name: "taoist-l"
priority: 16876
}
caption {
@@ -28023,7 +28023,7 @@ cont {
element {
scale: 16
symbol {
- name: "boundary_stone-m"
+ name: "monument-m"
priority: 16849
min_distance: 30
}
@@ -28039,7 +28039,7 @@ cont {
element {
scale: 17
symbol {
- name: "boundary_stone-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28055,7 +28055,7 @@ cont {
element {
scale: 18
symbol {
- name: "boundary_stone-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28071,7 +28071,7 @@ cont {
element {
scale: 19
symbol {
- name: "boundary_stone-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28796,7 +28796,7 @@ cont {
element {
scale: 16
symbol {
- name: "wayside_cross-m"
+ name: "monument-m"
priority: 16849
min_distance: 30
}
@@ -28812,7 +28812,7 @@ cont {
element {
scale: 17
symbol {
- name: "wayside_cross-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28828,7 +28828,7 @@ cont {
element {
scale: 18
symbol {
- name: "wayside_cross-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -28844,7 +28844,7 @@ cont {
element {
scale: 19
symbol {
- name: "wayside_cross-l"
+ name: "monument-l"
priority: 16849
min_distance: 20
}
@@ -41034,7 +41034,7 @@ cont {
scale: 13
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41043,14 +41043,14 @@ cont {
color: 5592405
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 14
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16863
min_distance: 12
}
caption {
@@ -41059,14 +41059,14 @@ cont {
color: 5592405
offset_y: 6
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 15
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41075,14 +41075,14 @@ cont {
color: 5592405
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 16
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41091,14 +41091,14 @@ cont {
color: 5592405
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 17
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41107,14 +41107,14 @@ cont {
color: 5592405
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 18
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41123,14 +41123,14 @@ cont {
color: 5592405
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
element {
scale: 19
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16863
min_distance: 5
}
caption {
@@ -41139,7 +41139,7 @@ cont {
color: 5592405
offset_y: 8
}
- priority: 15890
+ priority: 15863
}
}
}
@@ -43194,7 +43194,7 @@ cont {
scale: 12
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16849
min_distance: 15
}
}
@@ -43202,7 +43202,7 @@ cont {
scale: 13
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16849
min_distance: 12
}
caption {
@@ -43211,14 +43211,14 @@ cont {
color: 5592405
offset_y: 6
}
- priority: 15890
+ priority: 15849
}
}
element {
scale: 14
symbol {
name: "drinking-water-s"
- priority: 16890
+ priority: 16849
min_distance: 12
}
caption {
@@ -43227,14 +43227,14 @@ cont {
color: 5592405
offset_y: 6
}
- priority: 15890
+ priority: 15849
}
}
element {
scale: 15
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16849
min_distance: 5
}
caption {
@@ -43243,14 +43243,14 @@ cont {
color: 5592405
offset_y: 8
}
- priority: 15890
+ priority: 15849
}
}
element {
scale: 16
symbol {
name: "drinking-water-m"
- priority: 16890
+ priority: 16849
min_distance: 5
}
caption {
@@ -43259,14 +43259,14 @@ cont {
color: 5592405
offset_y: 8
}
- priority: 15890
+ priority: 15849
}
}
element {
scale: 17
symbol {
name: "drinking-water-l"
- priority: 16890
+ priority: 16849
min_distance: 5
}
caption {
@@ -43275,7 +43275,7 @@ cont {
color: 5592405
offset_y: 8
}
- priority: 15890
+ priority: 15849
}
}
element {
@@ -63018,7 +63018,7 @@ cont {
element {
scale: 15
symbol {
- name: "car_sharing-m"
+ name: "car_shop-m"
priority: 16849
}
caption {
@@ -63033,7 +63033,7 @@ cont {
element {
scale: 16
symbol {
- name: "car_sharing-m"
+ name: "car_shop-m"
priority: 16849
}
caption {
@@ -63048,7 +63048,7 @@ cont {
element {
scale: 17
symbol {
- name: "car_sharing-l"
+ name: "car_shop-l"
priority: 16849
}
caption {
@@ -63063,7 +63063,7 @@ cont {
element {
scale: 18
symbol {
- name: "car_sharing-l"
+ name: "car_shop-l"
priority: 16849
}
caption {
@@ -63078,7 +63078,7 @@ cont {
element {
scale: 19
symbol {
- name: "car_sharing-l"
+ name: "car_shop-l"
priority: 16849
}
caption {
@@ -63675,7 +63675,7 @@ cont {
element {
scale: 15
symbol {
- name: "convenience-m"
+ name: "grocery-m"
priority: 16849
}
caption {
@@ -63690,7 +63690,7 @@ cont {
element {
scale: 16
symbol {
- name: "convenience-m"
+ name: "grocery-m"
priority: 16849
}
caption {
@@ -63705,7 +63705,7 @@ cont {
element {
scale: 17
symbol {
- name: "convenience-l"
+ name: "grocery-l"
priority: 16849
}
caption {
@@ -63720,7 +63720,7 @@ cont {
element {
scale: 18
symbol {
- name: "convenience-l"
+ name: "grocery-l"
priority: 16849
}
caption {
@@ -63735,7 +63735,7 @@ cont {
element {
scale: 19
symbol {
- name: "convenience-l"
+ name: "grocery-l"
priority: 16849
}
caption {
@@ -64691,7 +64691,7 @@ cont {
element {
scale: 15
symbol {
- name: "hardware-m"
+ name: "doityourself-m"
priority: 16849
}
caption {
@@ -64706,7 +64706,7 @@ cont {
element {
scale: 16
symbol {
- name: "hardware-m"
+ name: "doityourself-m"
priority: 16849
}
caption {
@@ -64721,7 +64721,7 @@ cont {
element {
scale: 17
symbol {
- name: "hardware-l"
+ name: "doityourself-l"
priority: 16849
}
caption {
@@ -64736,7 +64736,7 @@ cont {
element {
scale: 18
symbol {
- name: "hardware-l"
+ name: "doityourself-l"
priority: 16849
}
caption {
@@ -64751,7 +64751,7 @@ cont {
element {
scale: 19
symbol {
- name: "hardware-l"
+ name: "doityourself-l"
priority: 16849
}
caption {
@@ -65269,7 +65269,7 @@ cont {
element {
scale: 15
symbol {
- name: "climbing-m"
+ name: "outdoor-shop-m"
priority: 16849
}
caption {
@@ -65284,7 +65284,7 @@ cont {
element {
scale: 16
symbol {
- name: "climbing-m"
+ name: "outdoor-shop-m"
priority: 16849
}
caption {
@@ -65299,7 +65299,7 @@ cont {
element {
scale: 17
symbol {
- name: "climbing-l"
+ name: "outdoor-shop-l"
priority: 16849
}
caption {
@@ -65314,7 +65314,7 @@ cont {
element {
scale: 18
symbol {
- name: "climbing-l"
+ name: "outdoor-shop-l"
priority: 16849
}
caption {
@@ -65329,7 +65329,7 @@ cont {
element {
scale: 19
symbol {
- name: "climbing-l"
+ name: "outdoor-shop-l"
priority: 16849
}
caption {
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 1c47d70e27..237367d37d 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index 143bb7bfc4..5dbbc8004b 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -1,6 +1,6 @@
-
+
@@ -9,580 +9,591 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index f45a0e10b0..6af0c97bf1 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 c982e10632..2d535bbf09 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -1,515 +1,545 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_legacy/symbols.png b/data/resources-6plus_legacy/symbols.png
index de9c39e104..3b42b7de41 100644
Binary files a/data/resources-6plus_legacy/symbols.png and b/data/resources-6plus_legacy/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index 8f370ba301..73357e4253 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index 23642177b2..2e3f9c5336 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -9,580 +9,591 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index b63a787a37..2c4b0b5cb3 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 d806d09614..6403a714f3 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -1,515 +1,545 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_legacy/symbols.png b/data/resources-hdpi_legacy/symbols.png
index 239456be73..1c90ac4207 100644
Binary files a/data/resources-hdpi_legacy/symbols.png and b/data/resources-hdpi_legacy/symbols.png differ
diff --git a/data/resources-ldpi_clear/symbols.png b/data/resources-ldpi_clear/symbols.png
index 7830230782..6f08739e96 100644
Binary files a/data/resources-ldpi_clear/symbols.png and b/data/resources-ldpi_clear/symbols.png differ
diff --git a/data/resources-ldpi_clear/symbols.sdf b/data/resources-ldpi_clear/symbols.sdf
index f1673242c1..9db99d3f6d 100644
--- a/data/resources-ldpi_clear/symbols.sdf
+++ b/data/resources-ldpi_clear/symbols.sdf
@@ -9,580 +9,591 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-ldpi_dark/symbols.png b/data/resources-ldpi_dark/symbols.png
index 928c61a0bf..3a23291a43 100644
Binary files a/data/resources-ldpi_dark/symbols.png and b/data/resources-ldpi_dark/symbols.png differ
diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf
index ea83e7bb52..2ec7649372 100644
--- a/data/resources-ldpi_dark/symbols.sdf
+++ b/data/resources-ldpi_dark/symbols.sdf
@@ -6,510 +6,540 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-ldpi_legacy/symbols.png b/data/resources-ldpi_legacy/symbols.png
index 50e633fdd3..9608de4aba 100644
Binary files a/data/resources-ldpi_legacy/symbols.png and b/data/resources-ldpi_legacy/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index b491757577..5f28654f5b 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index fa1213c267..c58cd32bc1 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -1,6 +1,6 @@
-
+
@@ -21,571 +21,582 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 85a60f37b8..6acf6f47a2 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 bd79a0faf8..8b91b6ecfa 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
-
+
@@ -21,498 +21,528 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_legacy/symbols.png b/data/resources-mdpi_legacy/symbols.png
index 379cf85a48..257c6a392a 100644
Binary files a/data/resources-mdpi_legacy/symbols.png and b/data/resources-mdpi_legacy/symbols.png differ
diff --git a/data/resources-mdpi_legacy/symbols.sdf b/data/resources-mdpi_legacy/symbols.sdf
index 395c34ce45..d91d05b89d 100644
--- a/data/resources-mdpi_legacy/symbols.sdf
+++ b/data/resources-mdpi_legacy/symbols.sdf
@@ -1,6 +1,6 @@
-
+
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index f98cf43274..604683abba 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index 8cda53cf73..2cc22c89d4 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -21,571 +21,582 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index e4411769d2..f4ea731dbc 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 5b7f46be64..1e1225f9c4 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -21,498 +21,528 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_legacy/symbols.png b/data/resources-xhdpi_legacy/symbols.png
index 0d1085744c..95ef8639e8 100644
Binary files a/data/resources-xhdpi_legacy/symbols.png and b/data/resources-xhdpi_legacy/symbols.png differ
diff --git a/data/resources-xhdpi_legacy/symbols.sdf b/data/resources-xhdpi_legacy/symbols.sdf
index 1a59dd9423..6198f3efed 100644
--- a/data/resources-xhdpi_legacy/symbols.sdf
+++ b/data/resources-xhdpi_legacy/symbols.sdf
@@ -1,183 +1,183 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index e6b82eb83f..ea803d3202 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index 1cb651ff93..12dcc387a8 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -1,6 +1,6 @@
-
+
@@ -21,571 +21,582 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index a110e527e8..fa534bea0f 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 04ac4e24e3..36db1e127a 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
-
+
@@ -21,498 +21,528 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_legacy/symbols.png b/data/resources-xxhdpi_legacy/symbols.png
index 7dd0af63a2..cd2abfbb1f 100644
Binary files a/data/resources-xxhdpi_legacy/symbols.png and b/data/resources-xxhdpi_legacy/symbols.png differ
diff --git a/data/resources-xxhdpi_legacy/symbols.sdf b/data/resources-xxhdpi_legacy/symbols.sdf
index 2dffb29e5b..4a03a69563 100644
--- a/data/resources-xxhdpi_legacy/symbols.sdf
+++ b/data/resources-xxhdpi_legacy/symbols.sdf
@@ -1,6 +1,6 @@
-
+
diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index d5ed6883d0..6e57164257 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -417,7 +417,7 @@ node|z17[amenity=place_of_worship][religion=taoist], area|z17[amenity=place_of_w
node|z17[amenity=theatre], area|z17[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2100; }
-node|z17[amenity=childcare], area|z17[amenity=childcare] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2100; }
+node|z17[amenity=childcare], area|z17[amenity=childcare] { icon-image: childcare-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2100; }
node|z17[amenity=school], area|z17[amenity=school] { icon-image: school-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
node|z17[amenity=college], area|z17[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
node|z17[amenity=hospital], area|z17[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
diff --git a/data/styles/clear/style-clear/symbols/childcare-l.svg b/data/styles/clear/style-clear/symbols/childcare-l.svg
new file mode 100644
index 0000000000..f1a90976c4
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/childcare-l.svg
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/buddhist-l.svg b/data/styles/clear/style-night/symbols/buddhist-l.svg
new file mode 100644
index 0000000000..0e463040ba
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/buddhist-l.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/buddhist-m.svg b/data/styles/clear/style-night/symbols/buddhist-m.svg
new file mode 100644
index 0000000000..53617500a3
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/buddhist-m.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/buddhist-s.svg b/data/styles/clear/style-night/symbols/buddhist-s.svg
new file mode 100644
index 0000000000..3bf2a4cbc7
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/buddhist-s.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car_shop-l.svg b/data/styles/clear/style-night/symbols/car_shop-l.svg
new file mode 100644
index 0000000000..262da58614
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car_shop-l.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car_shop-m.svg b/data/styles/clear/style-night/symbols/car_shop-m.svg
new file mode 100644
index 0000000000..e133fa8609
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car_shop-m.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/car_shop-s.svg b/data/styles/clear/style-night/symbols/car_shop-s.svg
new file mode 100644
index 0000000000..1e98ef9077
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car_shop-s.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/christian-l.svg b/data/styles/clear/style-night/symbols/christian-l.svg
new file mode 100644
index 0000000000..0879b4bc3e
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/christian-l.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/christian-m.svg b/data/styles/clear/style-night/symbols/christian-m.svg
new file mode 100644
index 0000000000..2221fb8564
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/christian-m.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/christian-s.svg b/data/styles/clear/style-night/symbols/christian-s.svg
new file mode 100644
index 0000000000..c858095e22
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/christian-s.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hindu-l.svg b/data/styles/clear/style-night/symbols/hindu-l.svg
new file mode 100644
index 0000000000..574b442e5a
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/hindu-l.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hindu-m.svg b/data/styles/clear/style-night/symbols/hindu-m.svg
new file mode 100644
index 0000000000..b8a4f1dedd
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/hindu-m.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hindu-s.svg b/data/styles/clear/style-night/symbols/hindu-s.svg
new file mode 100644
index 0000000000..3ca50921bb
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/hindu-s.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/jewish-l.svg b/data/styles/clear/style-night/symbols/jewish-l.svg
new file mode 100644
index 0000000000..ec051f157d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/jewish-l.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/jewish-m.svg b/data/styles/clear/style-night/symbols/jewish-m.svg
new file mode 100644
index 0000000000..e27bee7591
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/jewish-m.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/jewish-s.svg b/data/styles/clear/style-night/symbols/jewish-s.svg
new file mode 100644
index 0000000000..17079d28b4
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/jewish-s.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/muslim-l.svg b/data/styles/clear/style-night/symbols/muslim-l.svg
new file mode 100644
index 0000000000..8e24906450
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/muslim-l.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/muslim-m.svg b/data/styles/clear/style-night/symbols/muslim-m.svg
new file mode 100644
index 0000000000..20ae1ecf8b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/muslim-m.svg
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/muslim-s.svg b/data/styles/clear/style-night/symbols/muslim-s.svg
new file mode 100644
index 0000000000..da221d9423
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/muslim-s.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/outdoor-shop-l.svg b/data/styles/clear/style-night/symbols/outdoor-shop-l.svg
new file mode 100644
index 0000000000..64b704680e
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/outdoor-shop-l.svg
@@ -0,0 +1,20 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/outdoor-shop-m.svg b/data/styles/clear/style-night/symbols/outdoor-shop-m.svg
new file mode 100644
index 0000000000..2055e7b9eb
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/outdoor-shop-m.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shinto-l.svg b/data/styles/clear/style-night/symbols/shinto-l.svg
new file mode 100644
index 0000000000..e08aa01890
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/shinto-l.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shinto-m.svg b/data/styles/clear/style-night/symbols/shinto-m.svg
new file mode 100644
index 0000000000..3bd471c380
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/shinto-m.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shinto-s.svg b/data/styles/clear/style-night/symbols/shinto-s.svg
new file mode 100644
index 0000000000..386ccb0969
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/shinto-s.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/taoist-l.svg b/data/styles/clear/style-night/symbols/taoist-l.svg
new file mode 100644
index 0000000000..c63a042674
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/taoist-l.svg
@@ -0,0 +1,21 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/taoist-m.svg b/data/styles/clear/style-night/symbols/taoist-m.svg
new file mode 100644
index 0000000000..91b25713ee
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/taoist-m.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/taoist-s.svg b/data/styles/clear/style-night/symbols/taoist-s.svg
new file mode 100644
index 0000000000..ab619e56be
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/taoist-s.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wayside_cross-l.svg b/data/styles/clear/style-night/symbols/wayside_cross-l.svg
deleted file mode 100644
index b912c98b76..0000000000
--- a/data/styles/clear/style-night/symbols/wayside_cross-l.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/wayside_cross-m.svg b/data/styles/clear/style-night/symbols/wayside_cross-m.svg
deleted file mode 100644
index 037a45446e..0000000000
--- a/data/styles/clear/style-night/symbols/wayside_cross-m.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
\ No newline at end of file
diff --git a/map/style_tests/classificator_tests.cpp b/map/style_tests/classificator_tests.cpp
index 9f88f38897..726508ebaf 100644
--- a/map/style_tests/classificator_tests.cpp
+++ b/map/style_tests/classificator_tests.cpp
@@ -156,8 +156,12 @@ void CheckPriority(vector const & arrT, vector const & arrI, d
Classificator const & c = classif();
vector > types;
- styles::RunForEveryMapStyle([&](MapStyle)
+ styles::RunForEveryMapStyle([&](MapStyle style)
{
+ // Not testing priorities in the legacy style, since it is not maintained anymore.
+ if (style == MapStyleLight)
+ return;
+
types.clear();
size_t ind = 0;
@@ -181,7 +185,7 @@ void CheckPriority(vector const & arrT, vector const & arrI, d
for (size_t i = 0; i < types.size(); ++i)
{
pair const mm = GetMinMax(level, types[i], ruleType);
- TEST_LESS(minmax.second, mm.first, (i));
+ TEST_LESS(minmax.second, mm.first, ("Priority bug on zoom", level, "group", i, ":", minmax.first, minmax.second, "vs", mm.first, mm.second));
minmax = mm;
}
}