diff --git a/data/classificator.txt b/data/classificator.txt
index 28eaaaff45..b00b44e8b9 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -1053,6 +1053,7 @@ world +
sendai -
sf -
shanghai -
+ shenzhen -
shiraz -
singapore -
sofia -
@@ -1173,6 +1174,7 @@ world +
sendai -
sf -
shanghai -
+ shenzhen -
shiraz -
singapore -
sofia -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 52460906ad..a3234ee337 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 931f79b269..14cf0e64f5 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -97671,6 +97671,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-shenzhen"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 12
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-shiraz"
element {
@@ -111503,6 +111681,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-shenzhen"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-shiraz"
element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index eb842aad27..4d1d8d669e 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index ac73b50f55..539e1fea90 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -93199,6 +93199,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-shenzhen"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 12
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-shiraz"
element {
@@ -107031,6 +107209,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-shenzhen"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-shiraz"
element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 34ba434e86..3f73d2f4da 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 20ceb20225..8d08b06dc2 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -92984,6 +92984,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-shenzhen"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 12
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-shiraz"
element {
@@ -106816,6 +106994,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-shenzhen"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-shiraz"
element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 3ba041d306..a5e4132210 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 c57b7d6648..e78540d519 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -98179,6 +98179,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-shenzhen"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 12
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-shiraz"
element {
@@ -112011,6 +112189,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-shenzhen"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-shiraz"
element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 691a80baea..d9330ec5e5 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index dd2922bcaa..7f49790148 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -97964,6 +97964,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-shenzhen"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 12
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-shiraz"
element {
@@ -111796,6 +111974,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-shenzhen"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 2236962
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-shiraz"
element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index f05789caaa..d1cf608e09 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 cc7d0a649d..e024133d9e 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -64619,6 +64619,167 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-shenzhen"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 2000
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 2000
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+}
cont {
name: "railway-station-subway-shiraz"
element {
@@ -78071,6 +78232,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-shenzhen"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+}
cont {
name: "railway-subway_entrance-shiraz"
element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index b3203a831c..691c156ff5 100644
Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ
diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index fca48c6d72..faeb05d615 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -64079,6 +64079,167 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-shenzhen"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 2000
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 2000
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 3355443
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 3355443
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+}
cont {
name: "railway-station-subway-shiraz"
element {
@@ -77531,6 +77692,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-shenzhen"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-shenzhen-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+}
cont {
name: "railway-subway_entrance-shiraz"
element {
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index c5c8773f27..355e551452 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 b874ba5195..0b6b624be2 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -182,354 +182,355 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -621,183 +622,184 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_light/symbols.png b/data/resources-6plus_light/symbols.png
index 6d85f90193..3831d6413c 100644
Binary files a/data/resources-6plus_light/symbols.png and b/data/resources-6plus_light/symbols.png differ
diff --git a/data/resources-6plus_light/symbols.sdf b/data/resources-6plus_light/symbols.sdf
index 1fe327f81b..40e631293d 100644
--- a/data/resources-6plus_light/symbols.sdf
+++ b/data/resources-6plus_light/symbols.sdf
@@ -182,354 +182,355 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -621,183 +622,184 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 0328ed8473..34c675c431 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 f685acfcd4..3752b188a4 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_light/symbols.png b/data/resources-hdpi_light/symbols.png
index 8ef7d92d5b..b8a479b93f 100644
Binary files a/data/resources-hdpi_light/symbols.png and b/data/resources-hdpi_light/symbols.png differ
diff --git a/data/resources-hdpi_light/symbols.sdf b/data/resources-hdpi_light/symbols.sdf
index f685acfcd4..3752b188a4 100644
--- a/data/resources-hdpi_light/symbols.sdf
+++ b/data/resources-hdpi_light/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 0fe5d63293..baa496dcfb 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 0a079edfd1..9d07d0eb37 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_light/symbols.png b/data/resources-mdpi_light/symbols.png
index f958141316..44a0657c15 100644
Binary files a/data/resources-mdpi_light/symbols.png and b/data/resources-mdpi_light/symbols.png differ
diff --git a/data/resources-mdpi_light/symbols.sdf b/data/resources-mdpi_light/symbols.sdf
index 0a079edfd1..9d07d0eb37 100644
--- a/data/resources-mdpi_light/symbols.sdf
+++ b/data/resources-mdpi_light/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 7467e70e19..791c2e2f52 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 93c1c72a70..e5de17c32e 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_light/symbols.png b/data/resources-xhdpi_light/symbols.png
index 985f0c2afe..983e38f4b0 100644
Binary files a/data/resources-xhdpi_light/symbols.png and b/data/resources-xhdpi_light/symbols.png differ
diff --git a/data/resources-xhdpi_light/symbols.sdf b/data/resources-xhdpi_light/symbols.sdf
index 93c1c72a70..e5de17c32e 100644
--- a/data/resources-xhdpi_light/symbols.sdf
+++ b/data/resources-xhdpi_light/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index ebad6609c7..2bd6cd47fe 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 2f61fa21fe..307dfa8499 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_light/symbols.png b/data/resources-xxhdpi_light/symbols.png
index a77bd3906e..34f5443998 100644
Binary files a/data/resources-xxhdpi_light/symbols.png and b/data/resources-xxhdpi_light/symbols.png differ
diff --git a/data/resources-xxhdpi_light/symbols.sdf b/data/resources-xxhdpi_light/symbols.sdf
index 2f61fa21fe..307dfa8499 100644
--- a/data/resources-xxhdpi_light/symbols.sdf
+++ b/data/resources-xxhdpi_light/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index 76aeab048e..a25305fb88 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 8aed8ac251..319a5eec8e 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_light/symbols.png b/data/resources-xxxhdpi_light/symbols.png
index 5e12a19790..9beb1c2e3a 100644
Binary files a/data/resources-xxxhdpi_light/symbols.png and b/data/resources-xxxhdpi_light/symbols.png differ
diff --git a/data/resources-xxxhdpi_light/symbols.sdf b/data/resources-xxxhdpi_light/symbols.sdf
index 8aed8ac251..319a5eec8e 100644
--- a/data/resources-xxxhdpi_light/symbols.sdf
+++ b/data/resources-xxxhdpi_light/symbols.sdf
@@ -182,622 +182,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/types.txt b/data/types.txt
index 102f80fe1c..082497e911 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1617,3 +1617,5 @@ amenity|recycling|container
*railway|station|subway|hongkong
*railway|subway_entrance|hongkong
*railway|station|light_rail|berlin
+*railway|station|subway|shenzhen
+*railway|subway_entrance|shenzhen
diff --git a/data/visibility.txt b/data/visibility.txt
index f88ca12a1d..2cdda6caf2 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -1053,6 +1053,7 @@ world 000000000000000000000 +
sendai 000000000000011111111 -
sf 000000000000111111111 -
shanghai 000000000000111111111 -
+ shenzhen 000000000000011111111 -
shiraz 000000000000011111111 -
singapore 000000000000011111111 -
sofia 000000000000011111111 -
@@ -1173,6 +1174,7 @@ world 000000000000000000000 +
sendai 000000000000000011111 -
sf 000000000000000011111 -
shanghai 000000000000000011111 -
+ shenzhen 000000000000000011111 -
shiraz 000000000000000011111 -
singapore 000000000000000011111 -
sofia 000000000000000011111 -