diff --git a/data/classificator.txt b/data/classificator.txt
index f38402066e..3556430c57 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -195,6 +195,9 @@ world +
trunk -
unclassified -
{}
+ attraction +
+ animal -
+ {}
barrier +
block -
bollard -
@@ -1389,10 +1392,7 @@ world +
sculpture -
statue -
{}
- attraction +
- animal -
- specified -
- {}
+ attraction -
camp_site -
caravan_site -
chalet -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f4666ea5e6..7d5cfe7abf 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 1f42c2cde8..2caad8393a 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -14327,6 +14327,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -59832,20 +59903,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 13620648
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 13620648
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -126794,250 +126851,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 99f7538ca0..2d12d1165e 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 b97009e19e..79fd896c68 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -13933,6 +13933,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -56840,20 +56911,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 13620648
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 13620648
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -122490,250 +122547,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index c15726398b..4f2e316343 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 92bba4511c..1ca97e0793 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -13933,6 +13933,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -57066,20 +57137,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 988160
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 988160
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -122705,250 +122762,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index b287f3a2bb..f8a3516ef6 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 8b2eb200e7..345ba6b390 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -14181,6 +14181,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 4473924
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -60603,20 +60674,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 13620648
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 13620648
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -127858,250 +127915,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index e2bbb49a41..669056a479 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 8232045949..30596cc50e 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -14181,6 +14181,77 @@ cont {
}
}
}
+cont {
+ name: "attraction-animal"
+ element {
+ scale: 17
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "animal-m"
+ priority: 2450
+ min_distance: 24
+ }
+ caption {
+ primary {
+ height: 10
+ color: 9211020
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -7550
+ }
+ }
+}
cont {
name: "barrier-block"
element {
@@ -60829,20 +60900,6 @@ cont {
}
cont {
name: "natural-scrub"
- element {
- scale: 10
- area {
- color: 988160
- priority: -1870
- }
- }
- element {
- scale: 11
- area {
- color: 988160
- priority: -1870
- }
- }
element {
scale: 12
area {
@@ -128073,250 +128130,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "zoo-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 14
- symbol {
- name: "tourism-s"
- priority: 2450
- min_distance: 12
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 10
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 2450
- min_distance: 24
- }
- caption {
- primary {
- height: 11
- color: 9211020
- offset_y: 1
- is_optional: true
- }
- priority: -7550
- }
- }
-}
cont {
name: "tourism-camp_site"
element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 6bfffe9bdf..050c1008ea 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 1fe7a13c95..0bfb4edcb7 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -81037,216 +81037,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 4473924
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
-}
cont {
name: "tourism-gallery"
element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 82c3e07702..3f416316db 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 35d40817a9..b69c658f31 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -81577,216 +81577,6 @@ cont {
}
}
}
-cont {
- name: "tourism-attraction-animal"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
-}
-cont {
- name: "tourism-attraction-specified"
- element {
- scale: 15
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 16
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 17
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 18
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 19
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
- element {
- scale: 20
- symbol {
- name: "tourism-m"
- priority: 1200
- min_distance: 36
- }
- caption {
- primary {
- height: 10
- color: 6710886
- offset_y: 1
- is_optional: true
- }
- priority: -8800
- }
- }
-}
cont {
name: "tourism-gallery"
element {
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 8ec3dbfd95..7935cac19c 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 dd2d19296d..c0ccf56b59 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -72,157 +72,157 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -456,133 +456,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 5c67fc51f2..c85cdf79f1 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 89d6ef41f2..81b6c3639f 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -72,157 +72,157 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -456,133 +456,134 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index d2647a6326..2cefefc383 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 39fb8e44cc..c113259a32 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 2762e386b6..b61b859e6a 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 39fb8e44cc..c113259a32 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 68d0eb37c8..1ff74cee3b 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 a7d731b4b9..8fcf99b356 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -97,138 +97,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,310 +462,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 58a7d19a92..9276813a25 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 a7d731b4b9..8fcf99b356 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -97,138 +97,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,310 +462,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index 3fc6732b54..4131c044f5 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 fea1846c15..c2c903cea7 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 80ef832d6f..ea5fe88ce5 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 fea1846c15..c2c903cea7 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index a5e4109e53..751a8f6899 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 ff15c020eb..4aa4d794a2 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index f875e79c7f..53d2b3fb4b 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 ff15c020eb..4aa4d794a2 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -97,675 +97,676 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png
index 5acbf8ca90..954e7fee32 100644
Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf
index 13ded08252..8d56c2ad39 100644
--- a/data/resources-xxxhdpi_clear/symbols.sdf
+++ b/data/resources-xxxhdpi_clear/symbols.sdf
@@ -97,138 +97,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,310 +462,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index 53e085fd4a..fbb39b55e9 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 13ded08252..8d56c2ad39 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -97,138 +97,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,310 +462,311 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
index fac25c830e..44531fe622 100644
--- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
@@ -67,7 +67,7 @@ leisure-golf_course # area z12- (also has icon z
=== 140
landuse-flowerbed # area z16-
-natural-scrub # area z10-
+natural-scrub # area z12-
=== 130
landuse-grass # area z12-
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 029f9c6b0d..6dc8dac68a 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -67,7 +67,7 @@ leisure-golf_course # area z12- (also has icon z
=== 140
landuse-flowerbed # area z16-
-natural-scrub # area z10-
+natural-scrub # area z12-
=== 130
landuse-grass # area z12-
diff --git a/data/types.txt b/data/types.txt
index cdf8686797..e7e0280746 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1233,8 +1233,8 @@ leisure|sports_centre
*historic|memorial|plaque
*historic|castle|defensive
*historic|castle|stately
-*tourism|attraction|animal
-*tourism|attraction|specified
+*attraction|animal
+tourism|attraction
*cuisine|regional
*cuisine|pizza
*cuisine|burger
diff --git a/data/visibility.txt b/data/visibility.txt
index 07a9794fa1..63f59d8b27 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -195,6 +195,9 @@ world 000000000000000000000 +
trunk 000000000000000000000 -
unclassified 000000000000000000000 -
{}
+ attraction 000000000000000000000 +
+ animal 000000000000000000000 -
+ {}
barrier 000000000000000000000 +
block 000000000000000000000 -
bollard 000000000000000000000 -
@@ -1389,10 +1392,7 @@ world 000000000000000000000 +
sculpture 000000000000000000111 -
statue 000000000000000000111 -
{}
- attraction 000000000000000111111 +
- animal 000000000000000111111 -
- specified 000000000000000111111 -
- {}
+ attraction 000000000000000111111 -
camp_site 000000000000000000000 -
caravan_site 000000000000000000000 -
chalet 000000000000000000000 -