diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 5d4c11c9ed..6d3cae6a4f 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 658a3492f9..eb35b424cc 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -80895,72 +80895,31 @@ cont {
}
cont {
name: "railway-station-monorail"
- element {
- scale: 12
- symbol {
- name: "train-s"
- priority: 6250
- }
- caption {
- primary {
- height: 9
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 8
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
- }
element {
scale: 13
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
- caption {
- primary {
- height: 10
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 9
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
}
element {
scale: 14
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
caption {
primary {
height: 11
color: 2236962
- stroke_color: 1308622847
+ stroke_color: 872415231
offset_y: 1
is_optional: true
}
secondary {
- height: 10
+ height: 9
color: 2236962
- stroke_color: 1308622847
+ stroke_color: 872415231
offset_y: 1
is_optional: true
}
@@ -80970,7 +80929,7 @@ cont {
element {
scale: 15
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -80994,7 +80953,7 @@ cont {
element {
scale: 16
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81018,7 +80977,7 @@ cont {
element {
scale: 17
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81030,7 +80989,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -81042,7 +81001,7 @@ cont {
element {
scale: 18
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81054,7 +81013,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -81066,7 +81025,7 @@ cont {
element {
scale: 19
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81078,7 +81037,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -81090,7 +81049,7 @@ cont {
element {
scale: 20
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81102,7 +81061,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 49e48da823..44b929eac3 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 ad4b3d12b2..a9f8bd2241 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -76423,72 +76423,31 @@ cont {
}
cont {
name: "railway-station-monorail"
- element {
- scale: 12
- symbol {
- name: "train-s"
- priority: 6250
- }
- caption {
- primary {
- height: 9
- color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 8
- color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
- }
element {
scale: 13
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
- caption {
- primary {
- height: 10
- color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 9
- color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
}
element {
scale: 14
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
caption {
primary {
height: 11
color: 8947848
- stroke_color: 1292240384
+ stroke_color: 856032768
offset_y: 1
is_optional: true
}
secondary {
- height: 10
+ height: 9
color: 8947848
- stroke_color: 1292240384
+ stroke_color: 856032768
offset_y: 1
is_optional: true
}
@@ -76498,7 +76457,7 @@ cont {
element {
scale: 15
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76522,7 +76481,7 @@ cont {
element {
scale: 16
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76546,7 +76505,7 @@ cont {
element {
scale: 17
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76558,7 +76517,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -76570,7 +76529,7 @@ cont {
element {
scale: 18
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76582,7 +76541,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -76594,7 +76553,7 @@ cont {
element {
scale: 19
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76606,7 +76565,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -76618,7 +76577,7 @@ cont {
element {
scale: 20
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76630,7 +76589,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 0a8d0ce045..e6f12c27dc 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 607ea116b4..1ba8512f44 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -76208,72 +76208,31 @@ cont {
}
cont {
name: "railway-station-monorail"
- element {
- scale: 12
- symbol {
- name: "train-s"
- priority: 6250
- }
- caption {
- primary {
- height: 9
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 8
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
- }
element {
scale: 13
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
- caption {
- primary {
- height: 10
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 9
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
}
element {
scale: 14
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
caption {
primary {
height: 11
color: 2236962
- stroke_color: 1308622847
+ stroke_color: 872415231
offset_y: 1
is_optional: true
}
secondary {
- height: 10
+ height: 9
color: 2236962
- stroke_color: 1308622847
+ stroke_color: 872415231
offset_y: 1
is_optional: true
}
@@ -76283,7 +76242,7 @@ cont {
element {
scale: 15
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76307,7 +76266,7 @@ cont {
element {
scale: 16
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76331,7 +76290,7 @@ cont {
element {
scale: 17
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76343,7 +76302,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -76355,7 +76314,7 @@ cont {
element {
scale: 18
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76367,7 +76326,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -76379,7 +76338,7 @@ cont {
element {
scale: 19
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76391,7 +76350,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -76403,7 +76362,7 @@ cont {
element {
scale: 20
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -76415,7 +76374,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 09a68a5018..a32bb86e3f 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 4ecc6ec380..9b417b1c99 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -81403,72 +81403,31 @@ cont {
}
cont {
name: "railway-station-monorail"
- element {
- scale: 12
- symbol {
- name: "train-s"
- priority: 6250
- }
- caption {
- primary {
- height: 9
- color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 8
- color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
- }
element {
scale: 13
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
- caption {
- primary {
- height: 10
- color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 9
- color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
}
element {
scale: 14
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
caption {
primary {
height: 11
color: 8947848
- stroke_color: 1292240384
+ stroke_color: 856032768
offset_y: 1
is_optional: true
}
secondary {
- height: 10
+ height: 9
color: 8947848
- stroke_color: 1292240384
+ stroke_color: 856032768
offset_y: 1
is_optional: true
}
@@ -81478,7 +81437,7 @@ cont {
element {
scale: 15
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81502,7 +81461,7 @@ cont {
element {
scale: 16
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81526,7 +81485,7 @@ cont {
element {
scale: 17
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81538,7 +81497,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -81550,7 +81509,7 @@ cont {
element {
scale: 18
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81562,7 +81521,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -81574,7 +81533,7 @@ cont {
element {
scale: 19
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81586,7 +81545,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -81598,7 +81557,7 @@ cont {
element {
scale: 20
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81610,7 +81569,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index d8095194ce..4d34bb46a7 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 6907b7a31f..1958cedecd 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -81188,72 +81188,31 @@ cont {
}
cont {
name: "railway-station-monorail"
- element {
- scale: 12
- symbol {
- name: "train-s"
- priority: 6250
- }
- caption {
- primary {
- height: 9
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 8
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
- }
element {
scale: 13
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
- caption {
- primary {
- height: 10
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 9
- color: 2236962
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- priority: -3750
- }
}
element {
scale: 14
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 6250
}
caption {
primary {
height: 11
color: 2236962
- stroke_color: 1308622847
+ stroke_color: 872415231
offset_y: 1
is_optional: true
}
secondary {
- height: 10
+ height: 9
color: 2236962
- stroke_color: 1308622847
+ stroke_color: 872415231
offset_y: 1
is_optional: true
}
@@ -81263,7 +81222,7 @@ cont {
element {
scale: 15
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81287,7 +81246,7 @@ cont {
element {
scale: 16
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81311,7 +81270,7 @@ cont {
element {
scale: 17
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81323,7 +81282,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -81335,7 +81294,7 @@ cont {
element {
scale: 18
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81347,7 +81306,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -81359,7 +81318,7 @@ cont {
element {
scale: 19
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81371,7 +81330,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
@@ -81383,7 +81342,7 @@ cont {
element {
scale: 20
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 6250
}
caption {
@@ -81395,7 +81354,7 @@ cont {
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 2236962
stroke_color: 452984831
offset_y: 1
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 1f43574c87..f8cd4a8f2e 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 6395feb403..245d094dbf 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -49533,54 +49533,30 @@ cont {
cont {
name: "railway-station-monorail"
element {
- scale: 12
+ scale: 13
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 2900
}
}
element {
- scale: 13
+ scale: 14
symbol {
- name: "train-m"
+ name: "monorail-s"
priority: 2900
}
caption {
primary {
height: 11
color: 8947848
- stroke_color: 1711670784
+ stroke_color: 856032768
offset_y: 1
is_optional: true
}
secondary {
height: 9
color: 8947848
- stroke_color: 1711670784
- offset_y: 1
- is_optional: true
- }
- priority: -7100
- }
- }
- element {
- scale: 14
- symbol {
- name: "train-m"
- priority: 2900
- }
- caption {
- primary {
- height: 12
- color: 8947848
- stroke_color: 1292240384
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 10
- color: 8947848
- stroke_color: 1292240384
+ stroke_color: 856032768
offset_y: 1
is_optional: true
}
@@ -49590,7 +49566,7 @@ cont {
element {
scale: 15
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
@@ -49614,7 +49590,7 @@ cont {
element {
scale: 16
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
@@ -49638,19 +49614,19 @@ cont {
element {
scale: 17
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
primary {
- height: 14
+ height: 13
color: 8947848
stroke_color: 436602368
offset_y: 1
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -49662,19 +49638,19 @@ cont {
element {
scale: 18
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
primary {
- height: 14
+ height: 13
color: 8947848
stroke_color: 436602368
offset_y: 1
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -49686,19 +49662,19 @@ cont {
element {
scale: 19
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
primary {
- height: 14
+ height: 13
color: 8947848
stroke_color: 436602368
offset_y: 1
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
@@ -49710,19 +49686,19 @@ cont {
element {
scale: 20
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
primary {
- height: 14
+ height: 13
color: 8947848
stroke_color: 436602368
offset_y: 1
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 8947848
stroke_color: 436602368
offset_y: 1
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 691c156ff5..4d1f2855f5 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 faeb05d615..7ac4aa20bb 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -48993,54 +48993,30 @@ cont {
cont {
name: "railway-station-monorail"
element {
- scale: 12
+ scale: 13
symbol {
- name: "train-s"
+ name: "monorail-s"
priority: 2900
}
}
element {
- scale: 13
+ scale: 14
symbol {
- name: "train-m"
+ name: "monorail-s"
priority: 2900
}
caption {
primary {
height: 11
color: 3355443
- stroke_color: 1728053247
+ stroke_color: 872415231
offset_y: 1
is_optional: true
}
secondary {
height: 9
color: 3355443
- stroke_color: 1728053247
- offset_y: 1
- is_optional: true
- }
- priority: -7100
- }
- }
- element {
- scale: 14
- symbol {
- name: "train-m"
- priority: 2900
- }
- caption {
- primary {
- height: 12
- color: 3355443
- stroke_color: 1308622847
- offset_y: 1
- is_optional: true
- }
- secondary {
- height: 10
- color: 3355443
- stroke_color: 1308622847
+ stroke_color: 872415231
offset_y: 1
is_optional: true
}
@@ -49050,7 +49026,7 @@ cont {
element {
scale: 15
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
@@ -49074,7 +49050,7 @@ cont {
element {
scale: 16
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
@@ -49098,19 +49074,19 @@ cont {
element {
scale: 17
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
primary {
- height: 14
+ height: 13
color: 3355443
stroke_color: 452984831
offset_y: 1
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 3355443
stroke_color: 452984831
offset_y: 1
@@ -49122,19 +49098,19 @@ cont {
element {
scale: 18
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
primary {
- height: 14
+ height: 13
color: 3355443
stroke_color: 452984831
offset_y: 1
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 3355443
stroke_color: 452984831
offset_y: 1
@@ -49146,19 +49122,19 @@ cont {
element {
scale: 19
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
primary {
- height: 14
+ height: 13
color: 3355443
stroke_color: 452984831
offset_y: 1
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 3355443
stroke_color: 452984831
offset_y: 1
@@ -49170,19 +49146,19 @@ cont {
element {
scale: 20
symbol {
- name: "train-m"
+ name: "monorail-m"
priority: 2900
}
caption {
primary {
- height: 14
+ height: 13
color: 3355443
stroke_color: 452984831
offset_y: 1
is_optional: true
}
secondary {
- height: 12
+ height: 11
color: 3355443
stroke_color: 452984831
offset_y: 1
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 355e551452..1a8e16514d 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 0b6b624be2..9fe70d2009 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_light/symbols.png b/data/resources-6plus_light/symbols.png
index 3831d6413c..e701d5d056 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 40e631293d..f97800103d 100644
--- a/data/resources-6plus_light/symbols.sdf
+++ b/data/resources-6plus_light/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 34c675c431..8288e7daf6 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 3752b188a4..7225c3acdb 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_light/symbols.png b/data/resources-hdpi_light/symbols.png
index b8a479b93f..7cdde7423e 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 3752b188a4..7225c3acdb 100644
--- a/data/resources-hdpi_light/symbols.sdf
+++ b/data/resources-hdpi_light/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index baa496dcfb..a67f232213 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 9d07d0eb37..de7b054224 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_light/symbols.png b/data/resources-mdpi_light/symbols.png
index 44a0657c15..03e2c9d651 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 9d07d0eb37..de7b054224 100644
--- a/data/resources-mdpi_light/symbols.sdf
+++ b/data/resources-mdpi_light/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 791c2e2f52..8e7f0eb035 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 e5de17c32e..eb496efd39 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_light/symbols.png b/data/resources-xhdpi_light/symbols.png
index 983e38f4b0..9724ae41a8 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 e5de17c32e..eb496efd39 100644
--- a/data/resources-xhdpi_light/symbols.sdf
+++ b/data/resources-xhdpi_light/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index 2bd6cd47fe..1a439f2ace 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 307dfa8499..a29ed38031 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_light/symbols.png b/data/resources-xxhdpi_light/symbols.png
index 34f5443998..f12e56cbcd 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 307dfa8499..a29ed38031 100644
--- a/data/resources-xxhdpi_light/symbols.sdf
+++ b/data/resources-xxhdpi_light/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index a25305fb88..571e326234 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 319a5eec8e..4d48536f4d 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_light/symbols.png b/data/resources-xxxhdpi_light/symbols.png
index 9beb1c2e3a..2617683822 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 319a5eec8e..4d48536f4d 100644
--- a/data/resources-xxxhdpi_light/symbols.sdf
+++ b/data/resources-xxxhdpi_light/symbols.sdf
@@ -333,473 +333,475 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index cf9ca56b06..1c2d7d55d2 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -139,7 +139,7 @@ railway-station-light_rail # icon z13- (also has captio
railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-london # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-)
-railway-station-monorail # icon z12- (also has caption(optional) z12-)
+railway-station-monorail # icon z13- (also has caption(optional) z14-)
railway-station-subway # icon z13- (also has caption(optional) z14-)
railway-station-subway-adana # icon z12- (also has caption(optional) z14-)
railway-station-subway-algiers # icon z12- (also has caption(optional) z14-)
@@ -1305,7 +1305,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-)
-# railway-station-monorail # caption(optional) z12- (also has icon z12-)
+# railway-station-monorail # caption(optional) z14- (also has icon z13-)
# railway-station-subway # caption(optional) z14- (also has icon z13-)
# railway-station-subway-adana # caption(optional) z14- (also has icon z12-)
# railway-station-subway-algiers # caption(optional) z14- (also has icon z12-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 3ed9f27184..f27462d0bc 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -139,7 +139,7 @@ railway-station-light_rail # icon z13- (also has captio
railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-london # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-)
-railway-station-monorail # icon z12- (also has caption(optional) z12-)
+railway-station-monorail # icon z13- (also has caption(optional) z14-)
railway-station-subway # icon z13- (also has caption(optional) z14-)
railway-station-subway-adana # icon z12- (also has caption(optional) z14-)
railway-station-subway-algiers # icon z12- (also has caption(optional) z14-)
@@ -1305,7 +1305,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-)
-# railway-station-monorail # caption(optional) z12- (also has icon z12-)
+# railway-station-monorail # caption(optional) z14- (also has icon z13-)
# railway-station-subway # caption(optional) z14- (also has icon z13-)
# railway-station-subway-adana # caption(optional) z14- (also has icon z12-)
# railway-station-subway-algiers # caption(optional) z14- (also has icon z12-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index b6e11c1ad3..bb6b63850a 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -199,7 +199,7 @@ railway-station-light_rail # icon z13- (also has captio
railway-station-light_rail-berlin # icon z13- (also has caption(optional) z15-)
railway-station-light_rail-london # icon z13- (also has caption(optional) z15-)
railway-station-light_rail-porto # icon z13- (also has caption(optional) z15-)
-railway-station-monorail # icon z12- (also has caption(optional) z13-)
+railway-station-monorail # icon z13- (also has caption(optional) z14-)
=== 2900
barrier-toll_booth # icon z12- (also has caption(optional) z14-)
@@ -775,7 +775,7 @@ entrance-main # icon z18- (also has captio
# railway-station-light_rail-berlin # caption(optional) z15- (also has icon z13-)
# railway-station-light_rail-london # caption(optional) z15- (also has icon z13-)
# railway-station-light_rail-porto # caption(optional) z15- (also has icon z13-)
-# railway-station-monorail # caption(optional) z13- (also has icon z12-)
+# railway-station-monorail # caption(optional) z14- (also has icon z13-)
# === -7100
# barrier-toll_booth # caption(optional) z14- (also has icon z12-)
diff --git a/data/visibility.txt b/data/visibility.txt
index 2cdda6caf2..73d39595be 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -958,7 +958,7 @@ world 000000000000000000000 +
london 000000000000011111111 -
porto 000000000000011111111 -
{}
- monorail 000000000000111111111 -
+ monorail 000000000000011111111 -
subway 000000000000011111111 +
adana 000000000000111111111 -
algiers 000000000000111111111 -