diff --git a/app/src/main/res/drawable/ic_preset_fas_apple_alt.xml b/app/src/main/res/drawable/ic_preset_fas_apple_alt.xml
index 6e77cc6109b..0e598a4d848 100644
--- a/app/src/main/res/drawable/ic_preset_fas_apple_alt.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_apple_alt.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_archway.xml b/app/src/main/res/drawable/ic_preset_fas_archway.xml
index 08b957a0e97..2c50f9383a6 100644
--- a/app/src/main/res/drawable/ic_preset_fas_archway.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_archway.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_baby.xml b/app/src/main/res/drawable/ic_preset_fas_baby.xml
index 573de19f9d0..ee89fb50f48 100644
--- a/app/src/main/res/drawable/ic_preset_fas_baby.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_baby.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_balance_scale.xml b/app/src/main/res/drawable/ic_preset_fas_balance_scale.xml
index afd3a8597d1..9569a1fdc40 100644
--- a/app/src/main/res/drawable/ic_preset_fas_balance_scale.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_balance_scale.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_bath.xml b/app/src/main/res/drawable/ic_preset_fas_bath.xml
index 5b01a052aec..f7c1ad6bac4 100644
--- a/app/src/main/res/drawable/ic_preset_fas_bath.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_bath.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_bell.xml b/app/src/main/res/drawable/ic_preset_fas_bell.xml
index a934083cf52..9aafc16e88f 100644
--- a/app/src/main/res/drawable/ic_preset_fas_bell.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_bell.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_biking.xml b/app/src/main/res/drawable/ic_preset_fas_biking.xml
index d407887a1fd..8c8da1986ee 100644
--- a/app/src/main/res/drawable/ic_preset_fas_biking.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_biking.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_box.xml b/app/src/main/res/drawable/ic_preset_fas_box.xml
index d7826316419..7698106617b 100644
--- a/app/src/main/res/drawable/ic_preset_fas_box.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_box.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_box_open.xml b/app/src/main/res/drawable/ic_preset_fas_box_open.xml
index 8e63e0168f4..1c87b8f5aef 100644
--- a/app/src/main/res/drawable/ic_preset_fas_box_open.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_box_open.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_cannabis.xml b/app/src/main/res/drawable/ic_preset_fas_cannabis.xml
index da36becebbc..ce95ff50948 100644
--- a/app/src/main/res/drawable/ic_preset_fas_cannabis.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_cannabis.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_car_crash.xml b/app/src/main/res/drawable/ic_preset_fas_car_crash.xml
index 1b9de5593a0..89e9c759b81 100644
--- a/app/src/main/res/drawable/ic_preset_fas_car_crash.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_car_crash.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_chess_knight.xml b/app/src/main/res/drawable/ic_preset_fas_chess_knight.xml
index bfe1f7aff43..271e47514c1 100644
--- a/app/src/main/res/drawable/ic_preset_fas_chess_knight.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_chess_knight.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_code.xml b/app/src/main/res/drawable/ic_preset_fas_code.xml
index 7bea5b15fc9..80016632cd5 100644
--- a/app/src/main/res/drawable/ic_preset_fas_code.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_code.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_comments.xml b/app/src/main/res/drawable/ic_preset_fas_comments.xml
index 487be313e54..f6b29f5cce4 100644
--- a/app/src/main/res/drawable/ic_preset_fas_comments.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_comments.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_crown.xml b/app/src/main/res/drawable/ic_preset_fas_crown.xml
index 45756dc88a6..fc64cdaaf5e 100644
--- a/app/src/main/res/drawable/ic_preset_fas_crown.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_crown.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_crutch.xml b/app/src/main/res/drawable/ic_preset_fas_crutch.xml
index ad3ac38fe87..3c7f3069f4a 100644
--- a/app/src/main/res/drawable/ic_preset_fas_crutch.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_crutch.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_cut.xml b/app/src/main/res/drawable/ic_preset_fas_cut.xml
index 25114faf364..f250e63486b 100644
--- a/app/src/main/res/drawable/ic_preset_fas_cut.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_cut.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_door_closed.xml b/app/src/main/res/drawable/ic_preset_fas_door_closed.xml
index 5fe82bb89e3..24753e73b2c 100644
--- a/app/src/main/res/drawable/ic_preset_fas_door_closed.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_door_closed.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_dove.xml b/app/src/main/res/drawable/ic_preset_fas_dove.xml
index 7a4d0d3bf85..c40b4213c90 100644
--- a/app/src/main/res/drawable/ic_preset_fas_dove.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_dove.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_drafting_compass.xml b/app/src/main/res/drawable/ic_preset_fas_drafting_compass.xml
index 8d4df156912..32c2f88c615 100644
--- a/app/src/main/res/drawable/ic_preset_fas_drafting_compass.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_drafting_compass.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_dragon.xml b/app/src/main/res/drawable/ic_preset_fas_dragon.xml
index e48cfafa336..8880a9c1d4a 100644
--- a/app/src/main/res/drawable/ic_preset_fas_dragon.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_dragon.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_drumstick_bite.xml b/app/src/main/res/drawable/ic_preset_fas_drumstick_bite.xml
index ad70c3d4a99..d05c444fa0b 100644
--- a/app/src/main/res/drawable/ic_preset_fas_drumstick_bite.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_drumstick_bite.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_dumpster_fire.xml b/app/src/main/res/drawable/ic_preset_fas_dumpster_fire.xml
index b8688420f0b..e62dfeb8ca6 100644
--- a/app/src/main/res/drawable/ic_preset_fas_dumpster_fire.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_dumpster_fire.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_dungeon.xml b/app/src/main/res/drawable/ic_preset_fas_dungeon.xml
index 2ebd14df154..a76d83f6dc2 100644
--- a/app/src/main/res/drawable/ic_preset_fas_dungeon.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_dungeon.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_fish.xml b/app/src/main/res/drawable/ic_preset_fas_fish.xml
index 841217cb777..45d8cf1996f 100644
--- a/app/src/main/res/drawable/ic_preset_fas_fish.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_fish.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_frog.xml b/app/src/main/res/drawable/ic_preset_fas_frog.xml
index 4de5affbb2e..5fea8be4656 100644
--- a/app/src/main/res/drawable/ic_preset_fas_frog.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_frog.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_futbol.xml b/app/src/main/res/drawable/ic_preset_fas_futbol.xml
index f997334188e..832f061edc9 100644
--- a/app/src/main/res/drawable/ic_preset_fas_futbol.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_futbol.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_guitar.xml b/app/src/main/res/drawable/ic_preset_fas_guitar.xml
index 9cef86dc210..04680da564a 100644
--- a/app/src/main/res/drawable/ic_preset_fas_guitar.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_guitar.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_hammer.xml b/app/src/main/res/drawable/ic_preset_fas_hammer.xml
index 3d6a6d90ecf..38340d06624 100644
--- a/app/src/main/res/drawable/ic_preset_fas_hammer.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_hammer.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_handshake.xml b/app/src/main/res/drawable/ic_preset_fas_handshake.xml
index c3b74d07ca4..4145b4a6fcb 100644
--- a/app/src/main/res/drawable/ic_preset_fas_handshake.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_handshake.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_hat_cowboy_side.xml b/app/src/main/res/drawable/ic_preset_fas_hat_cowboy_side.xml
index 1f4d644f936..a235f164a8d 100644
--- a/app/src/main/res/drawable/ic_preset_fas_hat_cowboy_side.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_hat_cowboy_side.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_hiking.xml b/app/src/main/res/drawable/ic_preset_fas_hiking.xml
index d1304840b1f..ddad9e425e6 100644
--- a/app/src/main/res/drawable/ic_preset_fas_hiking.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_hiking.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_horse.xml b/app/src/main/res/drawable/ic_preset_fas_horse.xml
index 470227d9316..3bd48a48b95 100644
--- a/app/src/main/res/drawable/ic_preset_fas_horse.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_horse.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_house_damage.xml b/app/src/main/res/drawable/ic_preset_fas_house_damage.xml
index d3365241f79..7a32b380a2c 100644
--- a/app/src/main/res/drawable/ic_preset_fas_house_damage.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_house_damage.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_ice_cream.xml b/app/src/main/res/drawable/ic_preset_fas_ice_cream.xml
index 453a2563a54..5dfdd93d247 100644
--- a/app/src/main/res/drawable/ic_preset_fas_ice_cream.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_ice_cream.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_key.xml b/app/src/main/res/drawable/ic_preset_fas_key.xml
index 822d37cda11..072be2781c5 100644
--- a/app/src/main/res/drawable/ic_preset_fas_key.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_key.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_laptop.xml b/app/src/main/res/drawable/ic_preset_fas_laptop.xml
index cd34cb409f6..89fa8c3441b 100644
--- a/app/src/main/res/drawable/ic_preset_fas_laptop.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_laptop.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_leaf.xml b/app/src/main/res/drawable/ic_preset_fas_leaf.xml
index b0eb737d28b..f4ecf232a20 100644
--- a/app/src/main/res/drawable/ic_preset_fas_leaf.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_leaf.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_mail_bulk.xml b/app/src/main/res/drawable/ic_preset_fas_mail_bulk.xml
index 02d6d201566..21c4115b56a 100644
--- a/app/src/main/res/drawable/ic_preset_fas_mail_bulk.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_mail_bulk.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_motorcycle.xml b/app/src/main/res/drawable/ic_preset_fas_motorcycle.xml
index 0e937bf6dd6..a182c5b3ac5 100644
--- a/app/src/main/res/drawable/ic_preset_fas_motorcycle.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_motorcycle.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_paperclip.xml b/app/src/main/res/drawable/ic_preset_fas_paperclip.xml
index fca2a9420a5..843f1d3fb5f 100644
--- a/app/src/main/res/drawable/ic_preset_fas_paperclip.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_paperclip.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_people_carry.xml b/app/src/main/res/drawable/ic_preset_fas_people_carry.xml
index df14c0291d7..0689e546030 100644
--- a/app/src/main/res/drawable/ic_preset_fas_people_carry.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_people_carry.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_pepper_hot.xml b/app/src/main/res/drawable/ic_preset_fas_pepper_hot.xml
index bab4c0457dc..09ccd3ed632 100644
--- a/app/src/main/res/drawable/ic_preset_fas_pepper_hot.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_pepper_hot.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_person_booth.xml b/app/src/main/res/drawable/ic_preset_fas_person_booth.xml
index 17a52501063..011ac6cef37 100644
--- a/app/src/main/res/drawable/ic_preset_fas_person_booth.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_person_booth.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_phone_alt.xml b/app/src/main/res/drawable/ic_preset_fas_phone_alt.xml
index 03d85f7a8d2..d36ec342fbc 100644
--- a/app/src/main/res/drawable/ic_preset_fas_phone_alt.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_phone_alt.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_pills.xml b/app/src/main/res/drawable/ic_preset_fas_pills.xml
index 3173660d202..a6b5a8a0646 100644
--- a/app/src/main/res/drawable/ic_preset_fas_pills.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_pills.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_plane.xml b/app/src/main/res/drawable/ic_preset_fas_plane.xml
index e50809467c2..1aa83b055bd 100644
--- a/app/src/main/res/drawable/ic_preset_fas_plane.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_plane.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_plane_departure.xml b/app/src/main/res/drawable/ic_preset_fas_plane_departure.xml
index bea958099f1..3f9e4f2b635 100644
--- a/app/src/main/res/drawable/ic_preset_fas_plane_departure.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_plane_departure.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_rocket.xml b/app/src/main/res/drawable/ic_preset_fas_rocket.xml
index 466ec0f3934..6406d621bea 100644
--- a/app/src/main/res/drawable/ic_preset_fas_rocket.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_rocket.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_running.xml b/app/src/main/res/drawable/ic_preset_fas_running.xml
index 7a196102a67..36c518f2a1a 100644
--- a/app/src/main/res/drawable/ic_preset_fas_running.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_running.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_shoe_prints.xml b/app/src/main/res/drawable/ic_preset_fas_shoe_prints.xml
index f1277e4f9db..fdbbaf18ee2 100644
--- a/app/src/main/res/drawable/ic_preset_fas_shoe_prints.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_shoe_prints.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_skating.xml b/app/src/main/res/drawable/ic_preset_fas_skating.xml
index 8ab1bcc6736..1bf119f9339 100644
--- a/app/src/main/res/drawable/ic_preset_fas_skating.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_skating.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_skiing.xml b/app/src/main/res/drawable/ic_preset_fas_skiing.xml
index a10448f5e0e..e836c348013 100644
--- a/app/src/main/res/drawable/ic_preset_fas_skiing.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_skiing.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_skiing_nordic.xml b/app/src/main/res/drawable/ic_preset_fas_skiing_nordic.xml
index 5e8713ab8bd..f52fc399f4d 100644
--- a/app/src/main/res/drawable/ic_preset_fas_skiing_nordic.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_skiing_nordic.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_snowboarding.xml b/app/src/main/res/drawable/ic_preset_fas_snowboarding.xml
index 68bb8ed9ecc..07d1e384cc2 100644
--- a/app/src/main/res/drawable/ic_preset_fas_snowboarding.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_snowboarding.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_solar_panel.xml b/app/src/main/res/drawable/ic_preset_fas_solar_panel.xml
index 92d3c427571..e64d4561a37 100644
--- a/app/src/main/res/drawable/ic_preset_fas_solar_panel.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_solar_panel.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_space_shuttle.xml b/app/src/main/res/drawable/ic_preset_fas_space_shuttle.xml
index 1231449a3f6..23c58f65eb1 100644
--- a/app/src/main/res/drawable/ic_preset_fas_space_shuttle.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_space_shuttle.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_stamp.xml b/app/src/main/res/drawable/ic_preset_fas_stamp.xml
index 92f7cf8ca55..3487f4b9aa5 100644
--- a/app/src/main/res/drawable/ic_preset_fas_stamp.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_stamp.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_store.xml b/app/src/main/res/drawable/ic_preset_fas_store.xml
index 27fbaa5f25f..e2196c84ef4 100644
--- a/app/src/main/res/drawable/ic_preset_fas_store.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_store.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_swimmer.xml b/app/src/main/res/drawable/ic_preset_fas_swimmer.xml
index 699e5aad805..7f2734d5389 100644
--- a/app/src/main/res/drawable/ic_preset_fas_swimmer.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_swimmer.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_synagogue.xml b/app/src/main/res/drawable/ic_preset_fas_synagogue.xml
index 2103a0f7218..865ff06475b 100644
--- a/app/src/main/res/drawable/ic_preset_fas_synagogue.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_synagogue.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_table_tennis.xml b/app/src/main/res/drawable/ic_preset_fas_table_tennis.xml
index e53673dce30..1ec517c0681 100644
--- a/app/src/main/res/drawable/ic_preset_fas_table_tennis.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_table_tennis.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_tachometer_alt.xml b/app/src/main/res/drawable/ic_preset_fas_tachometer_alt.xml
index bd31229372b..a0504a48bb3 100644
--- a/app/src/main/res/drawable/ic_preset_fas_tachometer_alt.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_tachometer_alt.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_thermometer_three_quarters.xml b/app/src/main/res/drawable/ic_preset_fas_thermometer_three_quarters.xml
index c6628c0ce2d..59903d8ea71 100644
--- a/app/src/main/res/drawable/ic_preset_fas_thermometer_three_quarters.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_thermometer_three_quarters.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_tools.xml b/app/src/main/res/drawable/ic_preset_fas_tools.xml
index 4825bfbdcc1..e371c364608 100644
--- a/app/src/main/res/drawable/ic_preset_fas_tools.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_tools.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_tractor.xml b/app/src/main/res/drawable/ic_preset_fas_tractor.xml
index 34b3269d234..6c6cb2463c5 100644
--- a/app/src/main/res/drawable/ic_preset_fas_tractor.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_tractor.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_tram.xml b/app/src/main/res/drawable/ic_preset_fas_tram.xml
index 2d343c2c37f..79142d175c9 100644
--- a/app/src/main/res/drawable/ic_preset_fas_tram.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_tram.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_truck_loading.xml b/app/src/main/res/drawable/ic_preset_fas_truck_loading.xml
index eeba695272a..c63295741f9 100644
--- a/app/src/main/res/drawable/ic_preset_fas_truck_loading.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_truck_loading.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_truck_monster.xml b/app/src/main/res/drawable/ic_preset_fas_truck_monster.xml
index 0cb5381ca78..b02312a1e9d 100644
--- a/app/src/main/res/drawable/ic_preset_fas_truck_monster.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_truck_monster.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_tshirt.xml b/app/src/main/res/drawable/ic_preset_fas_tshirt.xml
index fa442ed9f98..86781b9bd88 100644
--- a/app/src/main/res/drawable/ic_preset_fas_tshirt.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_tshirt.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_umbrella_beach.xml b/app/src/main/res/drawable/ic_preset_fas_umbrella_beach.xml
index 8f5587b3f33..fce623371eb 100644
--- a/app/src/main/res/drawable/ic_preset_fas_umbrella_beach.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_umbrella_beach.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_user_secret.xml b/app/src/main/res/drawable/ic_preset_fas_user_secret.xml
index 47ce07c8be0..0df79ad6a8b 100644
--- a/app/src/main/res/drawable/ic_preset_fas_user_secret.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_user_secret.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_video.xml b/app/src/main/res/drawable/ic_preset_fas_video.xml
index b708258e18b..5e1efba6e92 100644
--- a/app/src/main/res/drawable/ic_preset_fas_video.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_video.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_vihara.xml b/app/src/main/res/drawable/ic_preset_fas_vihara.xml
index d9de82b9614..5316beaa00e 100644
--- a/app/src/main/res/drawable/ic_preset_fas_vihara.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_vihara.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_vote_yea.xml b/app/src/main/res/drawable/ic_preset_fas_vote_yea.xml
index c4dd5e14d01..558d0487c5e 100644
--- a/app/src/main/res/drawable/ic_preset_fas_vote_yea.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_vote_yea.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_warehouse.xml b/app/src/main/res/drawable/ic_preset_fas_warehouse.xml
index c9d114802b2..8f5f6081e8e 100644
--- a/app/src/main/res/drawable/ic_preset_fas_warehouse.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_warehouse.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_weight.xml b/app/src/main/res/drawable/ic_preset_fas_weight.xml
index c7e4062f72f..0ac55169540 100644
--- a/app/src/main/res/drawable/ic_preset_fas_weight.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_weight.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_wifi.xml b/app/src/main/res/drawable/ic_preset_fas_wifi.xml
index 25b591faee7..b9abef29417 100644
--- a/app/src/main/res/drawable/ic_preset_fas_wifi.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_wifi.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_fas_wine_bottle.xml b/app/src/main/res/drawable/ic_preset_fas_wine_bottle.xml
index 3cc9d71806a..bc98fd64198 100644
--- a/app/src/main/res/drawable/ic_preset_fas_wine_bottle.xml
+++ b/app/src/main/res/drawable/ic_preset_fas_wine_bottle.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_art_gallery.xml b/app/src/main/res/drawable/ic_preset_maki_art_gallery.xml
index 8f639b344bb..ecbb3064829 100644
--- a/app/src/main/res/drawable/ic_preset_maki_art_gallery.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_art_gallery.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_bakery.xml b/app/src/main/res/drawable/ic_preset_maki_bakery.xml
index bab67c476b3..5d4194a9cf1 100644
--- a/app/src/main/res/drawable/ic_preset_maki_bakery.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_bakery.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_barrier.xml b/app/src/main/res/drawable/ic_preset_maki_barrier.xml
index 71a6b2c89c4..dde4f0d7cdb 100644
--- a/app/src/main/res/drawable/ic_preset_maki_barrier.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_barrier.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_baseball.xml b/app/src/main/res/drawable/ic_preset_maki_baseball.xml
index 1f23760e537..bcb209c562c 100644
--- a/app/src/main/res/drawable/ic_preset_maki_baseball.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_baseball.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_blood_bank.xml b/app/src/main/res/drawable/ic_preset_maki_blood_bank.xml
index 00219f17546..c27fa54c1ac 100644
--- a/app/src/main/res/drawable/ic_preset_maki_blood_bank.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_blood_bank.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_bridge.xml b/app/src/main/res/drawable/ic_preset_maki_bridge.xml
index 98abe5afca2..d6722b66f6f 100644
--- a/app/src/main/res/drawable/ic_preset_maki_bridge.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_bridge.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_car.xml b/app/src/main/res/drawable/ic_preset_maki_car.xml
index 37842d54f31..4bea73c1da8 100644
--- a/app/src/main/res/drawable/ic_preset_maki_car.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_car.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_commercial.xml b/app/src/main/res/drawable/ic_preset_maki_commercial.xml
index 8fb9f428489..03477f045e8 100644
--- a/app/src/main/res/drawable/ic_preset_maki_commercial.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_commercial.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_communications_tower.xml b/app/src/main/res/drawable/ic_preset_maki_communications_tower.xml
index 249cc05adb9..c8997ee48d3 100644
--- a/app/src/main/res/drawable/ic_preset_maki_communications_tower.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_communications_tower.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_confectionery.xml b/app/src/main/res/drawable/ic_preset_maki_confectionery.xml
index 32332b5b11f..6b579b9bddf 100644
--- a/app/src/main/res/drawable/ic_preset_maki_confectionery.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_confectionery.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_defibrillator.xml b/app/src/main/res/drawable/ic_preset_maki_defibrillator.xml
index 926988138cd..5ade96a4293 100644
--- a/app/src/main/res/drawable/ic_preset_maki_defibrillator.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_defibrillator.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_drinking_water.xml b/app/src/main/res/drawable/ic_preset_maki_drinking_water.xml
index dfb74be4095..a7cba31cc05 100644
--- a/app/src/main/res/drawable/ic_preset_maki_drinking_water.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_drinking_water.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_emergency_phone.xml b/app/src/main/res/drawable/ic_preset_maki_emergency_phone.xml
index df83f32da88..1272c7e77df 100644
--- a/app/src/main/res/drawable/ic_preset_maki_emergency_phone.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_emergency_phone.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_entrance.xml b/app/src/main/res/drawable/ic_preset_maki_entrance.xml
index aa32b18e1aa..53366072adf 100644
--- a/app/src/main/res/drawable/ic_preset_maki_entrance.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_entrance.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_entrance_alt1.xml b/app/src/main/res/drawable/ic_preset_maki_entrance_alt1.xml
index 48ef5ad31b9..046d833faef 100644
--- a/app/src/main/res/drawable/ic_preset_maki_entrance_alt1.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_entrance_alt1.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_farm.xml b/app/src/main/res/drawable/ic_preset_maki_farm.xml
index bb106b48c48..62304578888 100644
--- a/app/src/main/res/drawable/ic_preset_maki_farm.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_farm.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_fence.xml b/app/src/main/res/drawable/ic_preset_maki_fence.xml
index fe8c313a891..b76566c67b9 100644
--- a/app/src/main/res/drawable/ic_preset_maki_fence.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_fence.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_florist.xml b/app/src/main/res/drawable/ic_preset_maki_florist.xml
index 235ce642bbc..3cde43029fa 100644
--- a/app/src/main/res/drawable/ic_preset_maki_florist.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_florist.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_fuel.xml b/app/src/main/res/drawable/ic_preset_maki_fuel.xml
index d54865460e6..69ca13a2c3f 100644
--- a/app/src/main/res/drawable/ic_preset_maki_fuel.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_fuel.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_gaming.xml b/app/src/main/res/drawable/ic_preset_maki_gaming.xml
index 6c011d58bf2..d04e8db69f9 100644
--- a/app/src/main/res/drawable/ic_preset_maki_gaming.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_gaming.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_gift.xml b/app/src/main/res/drawable/ic_preset_maki_gift.xml
index 4aaf01b02b0..eb792320231 100644
--- a/app/src/main/res/drawable/ic_preset_maki_gift.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_gift.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_globe.xml b/app/src/main/res/drawable/ic_preset_maki_globe.xml
index b2bae950182..33463482c92 100644
--- a/app/src/main/res/drawable/ic_preset_maki_globe.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_globe.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_heart.xml b/app/src/main/res/drawable/ic_preset_maki_heart.xml
index 591f9c5794e..9bbc28aa44b 100644
--- a/app/src/main/res/drawable/ic_preset_maki_heart.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_heart.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_highway_rest_area.xml b/app/src/main/res/drawable/ic_preset_maki_highway_rest_area.xml
index 359ee3986d1..ae5afa9541f 100644
--- a/app/src/main/res/drawable/ic_preset_maki_highway_rest_area.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_highway_rest_area.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_horse_riding.xml b/app/src/main/res/drawable/ic_preset_maki_horse_riding.xml
index a69b0c2ec0a..570fcc3698b 100644
--- a/app/src/main/res/drawable/ic_preset_maki_horse_riding.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_horse_riding.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_hot_spring.xml b/app/src/main/res/drawable/ic_preset_maki_hot_spring.xml
index 49b20a15327..0d9b0641b8c 100644
--- a/app/src/main/res/drawable/ic_preset_maki_hot_spring.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_hot_spring.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_karaoke.xml b/app/src/main/res/drawable/ic_preset_maki_karaoke.xml
index a7aaf50f7a9..ce809603282 100644
--- a/app/src/main/res/drawable/ic_preset_maki_karaoke.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_karaoke.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_logging.xml b/app/src/main/res/drawable/ic_preset_maki_logging.xml
index 68fa07ae9f8..0a4c2118faa 100644
--- a/app/src/main/res/drawable/ic_preset_maki_logging.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_logging.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_mountain.xml b/app/src/main/res/drawable/ic_preset_maki_mountain.xml
index 048e021f71f..1ffe3fe619d 100644
--- a/app/src/main/res/drawable/ic_preset_maki_mountain.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_mountain.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_natural.xml b/app/src/main/res/drawable/ic_preset_maki_natural.xml
index 49ef769d136..e930c1e746f 100644
--- a/app/src/main/res/drawable/ic_preset_maki_natural.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_natural.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_park_alt1.xml b/app/src/main/res/drawable/ic_preset_maki_park_alt1.xml
index 37f4fdf2013..9da45f4ee0c 100644
--- a/app/src/main/res/drawable/ic_preset_maki_park_alt1.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_park_alt1.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_playground.xml b/app/src/main/res/drawable/ic_preset_maki_playground.xml
index 974dbc0cf5f..7ac398275db 100644
--- a/app/src/main/res/drawable/ic_preset_maki_playground.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_playground.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_racetrack_cycling.xml b/app/src/main/res/drawable/ic_preset_maki_racetrack_cycling.xml
index 31f63c4af18..209dbefd493 100644
--- a/app/src/main/res/drawable/ic_preset_maki_racetrack_cycling.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_racetrack_cycling.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_residential_community.xml b/app/src/main/res/drawable/ic_preset_maki_residential_community.xml
index cea693b3c1e..251b0671e5a 100644
--- a/app/src/main/res/drawable/ic_preset_maki_residential_community.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_residential_community.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_restaurant_bbq.xml b/app/src/main/res/drawable/ic_preset_maki_restaurant_bbq.xml
index d9d1a2853b7..e7e1519f2ce 100644
--- a/app/src/main/res/drawable/ic_preset_maki_restaurant_bbq.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_restaurant_bbq.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_restaurant_noodle.xml b/app/src/main/res/drawable/ic_preset_maki_restaurant_noodle.xml
index 8c6bbb88e2c..030bbaa3e27 100644
--- a/app/src/main/res/drawable/ic_preset_maki_restaurant_noodle.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_restaurant_noodle.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_restaurant_pizza.xml b/app/src/main/res/drawable/ic_preset_maki_restaurant_pizza.xml
index d5afe98d08f..de7f68cdfaa 100644
--- a/app/src/main/res/drawable/ic_preset_maki_restaurant_pizza.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_restaurant_pizza.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_restaurant_seafood.xml b/app/src/main/res/drawable/ic_preset_maki_restaurant_seafood.xml
index 1a1835ff5bf..63506e7b499 100644
--- a/app/src/main/res/drawable/ic_preset_maki_restaurant_seafood.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_restaurant_seafood.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_school.xml b/app/src/main/res/drawable/ic_preset_maki_school.xml
index c8bb813852f..df9d8954b62 100644
--- a/app/src/main/res/drawable/ic_preset_maki_school.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_school.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_shoe.xml b/app/src/main/res/drawable/ic_preset_maki_shoe.xml
index e38a2dfd94c..a23256cf240 100644
--- a/app/src/main/res/drawable/ic_preset_maki_shoe.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_shoe.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_shop.xml b/app/src/main/res/drawable/ic_preset_maki_shop.xml
index e415dcb0823..3ad9f8a0d4f 100644
--- a/app/src/main/res/drawable/ic_preset_maki_shop.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_shop.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_slaughterhouse.xml b/app/src/main/res/drawable/ic_preset_maki_slaughterhouse.xml
index 2b9cb8575d2..92642a3755f 100644
--- a/app/src/main/res/drawable/ic_preset_maki_slaughterhouse.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_slaughterhouse.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_slipway.xml b/app/src/main/res/drawable/ic_preset_maki_slipway.xml
index 6173f0f3fca..e9dad1c80bd 100644
--- a/app/src/main/res/drawable/ic_preset_maki_slipway.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_slipway.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_teahouse.xml b/app/src/main/res/drawable/ic_preset_maki_teahouse.xml
index 8771e6bd206..77f12289f97 100644
--- a/app/src/main/res/drawable/ic_preset_maki_teahouse.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_teahouse.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_telephone.xml b/app/src/main/res/drawable/ic_preset_maki_telephone.xml
index 56f6b0e05b8..004186eefa7 100644
--- a/app/src/main/res/drawable/ic_preset_maki_telephone.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_telephone.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_tennis.xml b/app/src/main/res/drawable/ic_preset_maki_tennis.xml
index 93245b8fad7..9a711b2ed84 100644
--- a/app/src/main/res/drawable/ic_preset_maki_tennis.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_tennis.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_toilet.xml b/app/src/main/res/drawable/ic_preset_maki_toilet.xml
index bd069657ddf..e73e85f9fe2 100644
--- a/app/src/main/res/drawable/ic_preset_maki_toilet.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_toilet.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_town.xml b/app/src/main/res/drawable/ic_preset_maki_town.xml
index 2b2217976b0..63030cad083 100644
--- a/app/src/main/res/drawable/ic_preset_maki_town.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_town.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_triangle.xml b/app/src/main/res/drawable/ic_preset_maki_triangle.xml
index 6fd8542686f..291a584103d 100644
--- a/app/src/main/res/drawable/ic_preset_maki_triangle.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_triangle.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_triangle_stroked.xml b/app/src/main/res/drawable/ic_preset_maki_triangle_stroked.xml
index 389b11e2ff6..15cdbf47416 100644
--- a/app/src/main/res/drawable/ic_preset_maki_triangle_stroked.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_triangle_stroked.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_veterinary.xml b/app/src/main/res/drawable/ic_preset_maki_veterinary.xml
index e1874508df1..99949fdc819 100644
--- a/app/src/main/res/drawable/ic_preset_maki_veterinary.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_veterinary.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_village.xml b/app/src/main/res/drawable/ic_preset_maki_village.xml
index 2d0b7ca1916..d577ebbad70 100644
--- a/app/src/main/res/drawable/ic_preset_maki_village.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_village.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_volleyball.xml b/app/src/main/res/drawable/ic_preset_maki_volleyball.xml
index e1527239bec..e7c1bbbd4e6 100644
--- a/app/src/main/res/drawable/ic_preset_maki_volleyball.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_volleyball.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/app/src/main/res/drawable/ic_preset_maki_watch.xml b/app/src/main/res/drawable/ic_preset_maki_watch.xml
index 5d9e583bf3e..58c6808cd6b 100644
--- a/app/src/main/res/drawable/ic_preset_maki_watch.xml
+++ b/app/src/main/res/drawable/ic_preset_maki_watch.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/buildSrc/src/main/java/DownloadAndConvertPresetIconsTask.kt b/buildSrc/src/main/java/DownloadAndConvertPresetIconsTask.kt
index afc3080b864..5eee7b742af 100644
--- a/buildSrc/src/main/java/DownloadAndConvertPresetIconsTask.kt
+++ b/buildSrc/src/main/java/DownloadAndConvertPresetIconsTask.kt
@@ -35,6 +35,11 @@ open class DownloadAndConvertPresetIconsTask : DefaultTask() {
val indexTargetFile = File(indexFile)
indexTargetFile.parentFile.mkdirs()
+ val prefix = transformName("")
+ for (file in File(targetDir).listFiles { _, s -> s.startsWith(prefix) }!!) {
+ file.delete()
+ }
+
for (icon in icons) {
val url = getDownloadUrl(icon) ?: continue
@@ -140,7 +145,7 @@ open class DownloadAndConvertPresetIconsTask : DefaultTask() {
val path = drawable.createElement("path")
path.setAttribute("android:fillColor", "@android:color/white")
- path.setAttribute("android:pathData", d)
+ path.setAttribute("android:pathData", makePathCompatible(d))
vector.appendChild(path)
}
@@ -149,6 +154,25 @@ open class DownloadAndConvertPresetIconsTask : DefaultTask() {
private val supportedPathAttributes = setOf("d", "id")
+ private fun makePathCompatible(path: String): String {
+ val scientificNotation = Regex("\\d*\\.\\d+e-\\d+")
+ // likely only used for very small numbers, just round to 0
+ var result = scientificNotation.replace(path, "0")
+
+ val zeroBeforeDot = Regex("(?[- ,a-zA-Z])\\.")
+ result = zeroBeforeDot.replace(result, "\${before}0.")
+
+ val spaceAfterDecimal = Regex("(\\d+\\.\\d+)\\.")
+ var i = 0
+ var previousPath: String
+ do {
+ if (i++ > 3) throw IllegalStateException()
+ previousPath = result
+ result = spaceAfterDecimal.replace(previousPath, "\$1 0.")
+ } while (result != previousPath)
+ return result
+ }
+
private fun writeXml(xml: Document, targetFile: File) {
FileOutputStream(targetFile).use { output ->
val transformer = TransformerFactory.newInstance().newTransformer()