From 70c4d272412819dc47ba0316b129c8eefc69a3e0 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@openclonk.org>
Date: Fri, 22 Jun 2018 20:25:15 +0200
Subject: [PATCH] wip redesign maxspeed form

---
 .../quests/max_speed/AddMaxSpeed.java         |   4 +-
 .../quests/max_speed/AddMaxSpeedForm.java     |   2 +-
 .../res/drawable/background_maxspeed_sign.xml |  19 +--
 .../background_maxspeed_sign_no_frame.xml     |  13 ++
 .../background_rectangular_sign_blue.xml      |   3 +
 .../background_rectangular_sign_yellow.xml    |   3 +
 .../main/res/drawable/background_roadname.xml |   3 +
 app/src/main/res/drawable/ic_slow_zone.xml    | 134 +++++++++++++-----
 .../main/res/layout-mcc302/quest_maxspeed.xml |   2 -
 .../res/layout-mcc302/quest_maxspeed_sign.xml |   2 +
 .../quest_maxspeed_zone_sign.xml              |  16 +++
 .../main/res/layout-mcc310/quest_maxspeed.xml |   2 -
 .../res/layout-mcc310/quest_maxspeed_sign.xml |   2 +
 .../quest_maxspeed_zone_sign.xml              |  16 +++
 app/src/main/res/layout/quest_maxspeed.xml    |  98 +++++++------
 app/src/main/res/layout/quest_maxspeed_ca.xml |  50 -------
 .../layout/quest_maxspeed_living_street.xml   |   6 +
 .../main/res/layout/quest_maxspeed_sign.xml   |  35 +++++
 .../res/layout/quest_maxspeed_sign_ca.xml     |  43 ++++++
 .../res/layout/quest_maxspeed_sign_us.xml     |  42 ++++++
 app/src/main/res/layout/quest_maxspeed_us.xml |  73 ----------
 .../res/layout/quest_maxspeed_zone_sign.xml   |  57 ++++++++
 app/src/main/res/values/strings.xml           |   9 +-
 res/country_metadata/isSlowZoneKnown.yml      |   3 +-
 res/slow_zone.svg                             |  34 ++---
 25 files changed, 423 insertions(+), 248 deletions(-)
 create mode 100644 app/src/main/res/drawable/background_maxspeed_sign_no_frame.xml
 delete mode 100644 app/src/main/res/layout-mcc302/quest_maxspeed.xml
 create mode 100644 app/src/main/res/layout-mcc302/quest_maxspeed_sign.xml
 create mode 100644 app/src/main/res/layout-mcc302/quest_maxspeed_zone_sign.xml
 delete mode 100644 app/src/main/res/layout-mcc310/quest_maxspeed.xml
 create mode 100644 app/src/main/res/layout-mcc310/quest_maxspeed_sign.xml
 create mode 100644 app/src/main/res/layout-mcc310/quest_maxspeed_zone_sign.xml
 delete mode 100644 app/src/main/res/layout/quest_maxspeed_ca.xml
 create mode 100644 app/src/main/res/layout/quest_maxspeed_living_street.xml
 create mode 100644 app/src/main/res/layout/quest_maxspeed_sign.xml
 create mode 100644 app/src/main/res/layout/quest_maxspeed_sign_ca.xml
 create mode 100644 app/src/main/res/layout/quest_maxspeed_sign_us.xml
 delete mode 100644 app/src/main/res/layout/quest_maxspeed_us.xml
 create mode 100644 app/src/main/res/layout/quest_maxspeed_zone_sign.xml

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeed.java b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeed.java
index e7cd02c6ac..5e702fc921 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeed.java
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeed.java
@@ -80,8 +80,8 @@ else if (maxspeed != null)
 	{
 		boolean hasName = tags.containsKey("name");
 
-		if(hasName) return R.string.quest_maxspeed_name_title;
-		else return R.string.quest_maxspeed_title_short;
+		if(hasName) return R.string.quest_maxspeed_name_title2;
+		else return R.string.quest_maxspeed_title_short2;
 	}
 
 	@NonNull @Override public Countries getEnabledForCountries()
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.java b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.java
index e262d0d984..0dc16162c9 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.java
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/max_speed/AddMaxSpeedForm.java
@@ -61,7 +61,7 @@ public class AddMaxSpeedForm extends AbstractQuestFormAnswerFragment
 		}
 		else
 		{
-			setStreetSignLayout(R.layout.quest_maxspeed);
+			setStreetSignLayout(R.layout.quest_maxspeed_sign);
 		}
 
 		addOtherAnswers();
diff --git a/app/src/main/res/drawable/background_maxspeed_sign.xml b/app/src/main/res/drawable/background_maxspeed_sign.xml
index 8f9bcbe8aa..6f6b4d886f 100644
--- a/app/src/main/res/drawable/background_maxspeed_sign.xml
+++ b/app/src/main/res/drawable/background_maxspeed_sign.xml
@@ -6,17 +6,10 @@
             <solid android:color="#ffffff"/>
         </shape>
     </item>
-    <item android:top="0.5dp" android:left="0.5dp" android:bottom="0.5dp" android:right="0.5dp">
-        <shape android:shape="oval">
-            <solid android:color="#c1121c"/>
-            <stroke
-                android:color="#ffffff"
-                android:width="1.5dp"/>
-        </shape>
-    </item>
-    <item android:top="16dp" android:left="16dp" android:bottom="16dp" android:right="16dp">
-        <shape android:shape="oval">
-            <solid android:color="#ffffff"/>
-        </shape>
-    </item>
+    <item
+        android:drawable="@drawable/background_maxspeed_sign_no_frame"
+        android:top="2dp"
+        android:left="2dp"
+        android:bottom="2dp"
+        android:right="2dp"/>
 </layer-list>
diff --git a/app/src/main/res/drawable/background_maxspeed_sign_no_frame.xml b/app/src/main/res/drawable/background_maxspeed_sign_no_frame.xml
new file mode 100644
index 0000000000..9dedcb01f4
--- /dev/null
+++ b/app/src/main/res/drawable/background_maxspeed_sign_no_frame.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#c1121c"/>
+        </shape>
+    </item>
+    <item android:top="12dp" android:left="12dp" android:bottom="12dp" android:right="12dp">
+        <shape android:shape="oval">
+            <solid android:color="#ffffff"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/background_rectangular_sign_blue.xml b/app/src/main/res/drawable/background_rectangular_sign_blue.xml
index 86a7d90473..70242bab2f 100644
--- a/app/src/main/res/drawable/background_rectangular_sign_blue.xml
+++ b/app/src/main/res/drawable/background_rectangular_sign_blue.xml
@@ -3,6 +3,9 @@
     <item android:top="0dp" android:left="0dp" android:bottom="0dp" android:right="0dp">
         <shape android:shape="rectangle">
             <solid android:color="#495aad"/>
+            <stroke
+                android:color="#666666"
+                android:width="0.5dp"/>
             <corners android:radius="14dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/background_rectangular_sign_yellow.xml b/app/src/main/res/drawable/background_rectangular_sign_yellow.xml
index a056243f21..6f4308e203 100644
--- a/app/src/main/res/drawable/background_rectangular_sign_yellow.xml
+++ b/app/src/main/res/drawable/background_rectangular_sign_yellow.xml
@@ -3,6 +3,9 @@
     <item android:top="0dp" android:left="0dp" android:bottom="0dp" android:right="0dp">
         <shape android:shape="rectangle">
             <solid android:color="#eecc00"/>
+            <stroke
+                android:color="#666666"
+                android:width="0.5dp"/>
             <corners android:radius="14dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/background_roadname.xml b/app/src/main/res/drawable/background_roadname.xml
index 6f1c4194d7..c7bfdc6216 100644
--- a/app/src/main/res/drawable/background_roadname.xml
+++ b/app/src/main/res/drawable/background_roadname.xml
@@ -5,6 +5,9 @@
         <shape android:shape="rectangle">
             <solid android:color="#495aad"/>
             <corners android:radius="12dp" />
+            <stroke
+                android:color="#666666"
+                android:width="0.5dp"/>
         </shape>
     </item>
     <item android:top="2dp" android:left="52dp" android:bottom="2dp" android:right="38dp">
diff --git a/app/src/main/res/drawable/ic_slow_zone.xml b/app/src/main/res/drawable/ic_slow_zone.xml
index 2e0d5c834c..732871482b 100644
--- a/app/src/main/res/drawable/ic_slow_zone.xml
+++ b/app/src/main/res/drawable/ic_slow_zone.xml
@@ -1,39 +1,99 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="100dp"
-        android:height="112dp"
-        android:viewportWidth="26.458332"
-        android:viewportHeight="29.633333">
-    <path
-        android:pathData="M3.177,-0.002L23.281,-0.002A3.177,3.177 0,0 1,26.458 3.175L26.458,26.456A3.177,3.177 0,0 1,23.281 29.633L3.177,29.633A3.177,3.177 0,0 1,0 26.456L0,3.175A3.177,3.177 0,0 1,3.177 -0.002z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="M3.44,0.794L23.019,0.794A2.646,2.646 0,0 1,25.665 3.44L25.665,26.194A2.646,2.646 0,0 1,23.019 28.84L3.44,28.84A2.646,2.646 0,0 1,0.794 26.194L0.794,3.44A2.646,2.646 0,0 1,3.44 0.794z"
-        android:fillColor="#000"/>
-    <path
-        android:pathData="M3.732,1.86L22.754,1.86A1.866,1.844 0,0 1,24.62 3.704L24.62,25.946A1.866,1.844 0,0 1,22.754 27.79L3.732,27.79A1.866,1.844 0,0 1,1.866 25.946L1.866,3.704A1.866,1.844 0,0 1,3.732 1.86z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="m8.694,25.826h1.447v0.588L7.865,26.414v-0.427l1.432,-2.494L7.85,23.494v-0.591h2.264v0.417z"
-        android:fillColor="#000"/>
-    <path
-        android:pathData="m12.997,24.975q0,0.369 -0.092,0.649 -0.092,0.28 -0.258,0.465 -0.164,0.186 -0.398,0.28 -0.232,0.094 -0.514,0.094 -0.282,0 -0.516,-0.094 -0.234,-0.094 -0.403,-0.28 -0.166,-0.186 -0.26,-0.465 -0.092,-0.28 -0.092,-0.649v-0.584q0,-0.379 0.092,-0.666 0.092,-0.289 0.258,-0.482 0.166,-0.193 0.4,-0.289 0.234,-0.099 0.516,-0.099 0.282,0 0.514,0.099 0.234,0.097 0.4,0.289 0.169,0.193 0.26,0.482 0.092,0.287 0.092,0.666zM12.285,24.386q0,-0.251 -0.036,-0.427 -0.036,-0.178 -0.106,-0.292 -0.07,-0.113 -0.174,-0.166 -0.104,-0.053 -0.239,-0.053 -0.137,0 -0.241,0.053 -0.104,0.053 -0.174,0.166 -0.07,0.113 -0.106,0.292 -0.036,0.176 -0.036,0.427v0.588q0,0.239 0.036,0.41 0.036,0.169 0.106,0.277 0.072,0.109 0.176,0.159 0.106,0.051 0.244,0.051 0.135,0 0.236,-0.051 0.104,-0.051 0.174,-0.159 0.07,-0.109 0.104,-0.277 0.036,-0.171 0.036,-0.41z"
-        android:fillColor="#000"/>
-    <path
-        android:pathData="m15.97,26.414h-0.709l-1.037,-2.303v2.303h-0.709v-3.511h0.709l1.039,2.305v-2.305h0.707z"
-        android:fillColor="#000"/>
-    <path
-        android:pathData="m18.348,24.895h-1.104v0.931h1.307v0.588h-2.016v-3.511h2.011v0.591h-1.302v0.83h1.104z"
-        android:fillColor="#000"/>
-    <path
-        android:pathData="M13.229,12.16m-8.996,0a8.996,8.996 0,1 1,17.992 0a8.996,8.996 0,1 1,-17.992 0"
-        android:fillColor="#c1121c"/>
-    <path
-        android:pathData="M7.408,12.171a5.821,5.821 0,1 0,11.642 0a5.821,5.821 0,1 0,-11.642 0z"
-        android:fillColor="#fff"/>
-    <path
-        android:pathData="m10.756,13.452q0,-0.277 0.025,-0.496 0.025,-0.223 0.083,-0.409 0.062,-0.186 0.161,-0.347 0.103,-0.161 0.252,-0.318 0.112,-0.124 0.207,-0.24 0.095,-0.12 0.161,-0.24 0.07,-0.12 0.107,-0.248 0.041,-0.128 0.041,-0.277 0,-0.69 -0.446,-0.69 -0.079,0 -0.161,0.041 -0.083,0.037 -0.153,0.124 -0.066,0.087 -0.112,0.219 -0.041,0.132 -0.045,0.318L9.706,10.889q0.004,-0.434 0.132,-0.752 0.128,-0.318 0.347,-0.525 0.223,-0.207 0.517,-0.306 0.298,-0.103 0.645,-0.103 0.38,0 0.678,0.107 0.302,0.107 0.508,0.314 0.211,0.207 0.322,0.508 0.112,0.302 0.112,0.695 0,0.269 -0.074,0.488 -0.074,0.219 -0.194,0.413 -0.12,0.19 -0.277,0.372 -0.157,0.178 -0.322,0.364 -0.091,0.107 -0.153,0.215 -0.058,0.107 -0.095,0.227 -0.033,0.116 -0.05,0.252 -0.017,0.132 -0.021,0.294zM10.649,14.717q0,-0.136 0.045,-0.252 0.045,-0.116 0.128,-0.198 0.083,-0.087 0.198,-0.136 0.12,-0.05 0.265,-0.05 0.149,0 0.265,0.05 0.12,0.05 0.203,0.136 0.083,0.083 0.128,0.198 0.045,0.116 0.045,0.252 0,0.136 -0.045,0.252 -0.045,0.116 -0.128,0.203 -0.083,0.087 -0.203,0.132 -0.116,0.05 -0.265,0.05 -0.145,0 -0.265,-0.05 -0.116,-0.045 -0.198,-0.132 -0.083,-0.087 -0.128,-0.203 -0.045,-0.116 -0.045,-0.252z"
-        android:fillColor="#000"/>
-    <path
-        android:pathData="m14.543,13.452q0,-0.277 0.025,-0.496 0.025,-0.223 0.083,-0.409 0.062,-0.186 0.161,-0.347 0.103,-0.161 0.252,-0.318 0.112,-0.124 0.207,-0.24 0.095,-0.12 0.161,-0.24 0.07,-0.12 0.107,-0.248 0.041,-0.128 0.041,-0.277 0,-0.69 -0.446,-0.69 -0.079,0 -0.161,0.041 -0.083,0.037 -0.153,0.124 -0.066,0.087 -0.112,0.219 -0.041,0.132 -0.045,0.318h-1.17q0.004,-0.434 0.132,-0.752 0.128,-0.318 0.347,-0.525 0.223,-0.207 0.517,-0.306 0.298,-0.103 0.645,-0.103 0.38,0 0.678,0.107 0.302,0.107 0.508,0.314 0.211,0.207 0.322,0.508 0.112,0.302 0.112,0.695 0,0.269 -0.074,0.488 -0.074,0.219 -0.194,0.413 -0.12,0.19 -0.277,0.372 -0.157,0.178 -0.322,0.364 -0.091,0.107 -0.153,0.215 -0.058,0.107 -0.095,0.227 -0.033,0.116 -0.05,0.252 -0.017,0.132 -0.021,0.294zM14.436,14.717q0,-0.136 0.045,-0.252 0.045,-0.116 0.128,-0.198 0.083,-0.087 0.198,-0.136 0.12,-0.05 0.265,-0.05 0.149,0 0.265,0.05 0.12,0.05 0.203,0.136 0.083,0.083 0.128,0.198 0.045,0.116 0.045,0.252 0,0.136 -0.045,0.252 -0.045,0.116 -0.128,0.203 -0.083,0.087 -0.203,0.132 -0.116,0.05 -0.265,0.05 -0.145,0 -0.265,-0.05 -0.116,-0.045 -0.198,-0.132 -0.083,-0.087 -0.128,-0.203 -0.045,-0.116 -0.045,-0.252z"
-        android:fillColor="#000"/>
+    android:width="100dp"
+    android:height="112dp"
+    android:viewportWidth="26.458332"
+    android:viewportHeight="29.633333">
+  <path
+      android:pathData="M3.1774,-0.0023L23.281,-0.0023A3.1774,3.1774 0,0 1,26.4583 3.175L26.4583,26.456A3.1774,3.1774 0,0 1,23.281 29.6333L3.1774,29.6333A3.1774,3.1774 0,0 1,0 26.456L0,3.175A3.1774,3.1774 0,0 1,3.1774 -0.0023z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.89958334"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3.4396,0.7938L23.0187,0.7938A2.6458,2.6458 0,0 1,25.6646 3.4396L25.6646,26.1938A2.6458,2.6458 0,0 1,23.0187 28.8396L3.4396,28.8396A2.6458,2.6458 0,0 1,0.7937 26.1938L0.7937,3.4396A2.6458,2.6458 0,0 1,3.4396 0.7938z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.89958334"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3.7322,1.8604L22.7542,1.8604A1.8661,1.8437 0,0 1,24.6203 3.7042L24.6203,25.9459A1.8661,1.8437 0,0 1,22.7542 27.7896L3.7322,27.7896A1.8661,1.8437 0,0 1,1.8661 25.9459L1.8661,3.7042A1.8661,1.8437 0,0 1,3.7322 1.8604z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.89958334"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m8.6943,25.8259h1.4469v0.5884L7.8648,26.4143v-0.4268l1.4325,-2.4936L7.8503,23.4939v-0.5908h2.2645v0.4172z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.26458332"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m12.9966,24.9746q0,0.369 -0.0916,0.6487 -0.0916,0.2797 -0.258,0.4654 -0.164,0.1857 -0.3979,0.2797 -0.2315,0.094 -0.5137,0.094 -0.2822,0 -0.5161,-0.094 -0.2339,-0.0941 -0.4027,-0.2797 -0.1664,-0.1857 -0.2604,-0.4654 -0.0916,-0.2797 -0.0916,-0.6487v-0.5836q0,-0.3786 0.0916,-0.6656 0.0916,-0.2894 0.258,-0.4823 0.1664,-0.1929 0.4003,-0.2894 0.2339,-0.0989 0.5161,-0.0989 0.2822,0 0.5137,0.0989 0.2339,0.0965 0.4003,0.2894 0.1688,0.1929 0.2604,0.4823 0.0916,0.287 0.0916,0.6656zM12.2852,24.3862q0,-0.2508 -0.0362,-0.4268 -0.0362,-0.1785 -0.1061,-0.2918 -0.0699,-0.1133 -0.1736,-0.1664 -0.1037,-0.053 -0.2387,-0.053 -0.1375,0 -0.2412,0.053 -0.1037,0.0531 -0.1736,0.1664 -0.0699,0.1133 -0.1061,0.2918 -0.0362,0.176 -0.0362,0.4268v0.5884q0,0.2387 0.0362,0.41 0.0362,0.1688 0.1061,0.2773 0.0724,0.1085 0.176,0.1592 0.1061,0.0506 0.2436,0.0506 0.135,0 0.2363,-0.0506 0.1037,-0.0506 0.1736,-0.1592 0.0699,-0.1085 0.1037,-0.2773 0.0362,-0.1712 0.0362,-0.41z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.26458332"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m15.97,26.4143h-0.709l-1.037,-2.3031v2.3031h-0.709v-3.5113h0.709l1.0394,2.3055v-2.3055h0.7066z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.26458332"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m18.3478,24.8951h-1.1045v0.9309h1.3071v0.5884h-2.0161v-3.5113h2.0112v0.5908h-1.3022v0.8296h1.1045z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.26458332"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M13.2292,12.1601m-8.9958,0a8.9958,8.9958 0,1 1,17.9917 0a8.9958,8.9958 0,1 1,-17.9917 0"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.89958334"
+      android:fillColor="#c1121c"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7.4083,12.1708a5.8208,5.8208 0,1 0,11.6417 0a5.8208,5.8208 0,1 0,-11.6417 0z"
+      android:strokeAlpha="1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.89958334"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m8.7137,14.0338 l1.4211,-1.726 -1.4314,-1.7415 0.5839,-0.6356 1.4056,1.7053 1.4056,-1.7053 0.5788,0.6356 -1.4366,1.7415 1.4263,1.726 -0.5839,0.6356 -1.3953,-1.6898 -1.3901,1.6898z"
+      android:strokeWidth="0.26458332"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"/>
+  <path
+      android:pathData="m13.6953,14.0338 l1.4211,-1.726 -1.4314,-1.7415 0.5839,-0.6356 1.4056,1.7053 1.4056,-1.7053 0.5788,0.6356 -1.4366,1.7415 1.4263,1.726 -0.5839,0.6356 -1.3953,-1.6898 -1.3901,1.6898z"
+      android:strokeWidth="0.26458332"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:fillAlpha="1"/>
 </vector>
diff --git a/app/src/main/res/layout-mcc302/quest_maxspeed.xml b/app/src/main/res/layout-mcc302/quest_maxspeed.xml
deleted file mode 100644
index b6f56c71ed..0000000000
--- a/app/src/main/res/layout-mcc302/quest_maxspeed.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge><include layout="@layout/quest_maxspeed_ca"/></merge>
diff --git a/app/src/main/res/layout-mcc302/quest_maxspeed_sign.xml b/app/src/main/res/layout-mcc302/quest_maxspeed_sign.xml
new file mode 100644
index 0000000000..16f4e3605a
--- /dev/null
+++ b/app/src/main/res/layout-mcc302/quest_maxspeed_sign.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge><include layout="@layout/quest_maxspeed_sign_ca"/></merge>
diff --git a/app/src/main/res/layout-mcc302/quest_maxspeed_zone_sign.xml b/app/src/main/res/layout-mcc302/quest_maxspeed_zone_sign.xml
new file mode 100644
index 0000000000..da1d3b0743
--- /dev/null
+++ b/app/src/main/res/layout-mcc302/quest_maxspeed_zone_sign.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center">
+
+    <include layout="@layout/quest_maxspeed_sign_ca"/>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_slow_zone_us"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout-mcc310/quest_maxspeed.xml b/app/src/main/res/layout-mcc310/quest_maxspeed.xml
deleted file mode 100644
index dfbe67bfa3..0000000000
--- a/app/src/main/res/layout-mcc310/quest_maxspeed.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge><include layout="@layout/quest_maxspeed_us"/></merge>
diff --git a/app/src/main/res/layout-mcc310/quest_maxspeed_sign.xml b/app/src/main/res/layout-mcc310/quest_maxspeed_sign.xml
new file mode 100644
index 0000000000..af2fb06346
--- /dev/null
+++ b/app/src/main/res/layout-mcc310/quest_maxspeed_sign.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge><include layout="@layout/quest_maxspeed_sign_us"/></merge>
diff --git a/app/src/main/res/layout-mcc310/quest_maxspeed_zone_sign.xml b/app/src/main/res/layout-mcc310/quest_maxspeed_zone_sign.xml
new file mode 100644
index 0000000000..2b0c26e6c8
--- /dev/null
+++ b/app/src/main/res/layout-mcc310/quest_maxspeed_zone_sign.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center">
+
+    <include layout="@layout/quest_maxspeed_sign_us"/>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_slow_zone_us"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/quest_maxspeed.xml b/app/src/main/res/layout/quest_maxspeed.xml
index e3d3cae484..d3d6f93ec5 100644
--- a/app/src/main/res/layout/quest_maxspeed.xml
+++ b/app/src/main/res/layout/quest_maxspeed.xml
@@ -1,66 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                xmlns:tools="http://schemas.android.com/tools">
+                android:layout_height="match_parent">
+    <View
+        android:id="@+id/strut"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_centerHorizontal="true"/>
 
     <LinearLayout
-        android:id="@+id/zoneContainer"
-        android:layout_width="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_toStartOf="@id/strut"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:layout_alignParentEnd="true"
-        >
+        android:orientation="vertical">
 
-        <CheckBox
-            android:id="@+id/zoneCheckbox"
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:checked="false"/>
+            android:text="@string/quest_maxspeed_sign_question"/>
+
+        <RadioGroup
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <RadioButton
+                android:id="@+id/sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/quest_maxspeed_answer_sign" />
 
-        <ImageView
-            android:id="@+id/zoneImg"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/ic_slow_zone"
-            />
+            <RadioButton
+                android:id="@+id/zone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/quest_maxspeed_answer_zone" />
+
+            <RadioButton
+                android:id="@+id/no_sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/quest_maxspeed_answer_noSign2" />
+        </RadioGroup>
 
     </LinearLayout>
 
-    <RelativeLayout
-        android:layout_width="112dp"
-        android:layout_height="112dp"
-        android:gravity="center"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/background_maxspeed_sign"
-        android:padding="16dp"
+    <FrameLayout
+        android:layout_toEndOf="@id/strut"
+        android:layout_alignParentEnd="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         >
 
-        <EditText
-            android:id="@+id/maxSpeedInput"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_centerInParent="true"
-            android:background="#0fff"
-            android:inputType="number"
-            android:gravity="center"
-            android:textStyle="bold"
-            android:textSize="38dp"
-            android:maxLength="3"
-            tools:text="50"/>
-
-        <Spinner
-            android:id="@+id/speedUnitSelect"
+        <FrameLayout
+            android:id="@+id/sign_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/maxSpeedInput"
-            android:layout_centerHorizontal="true"
-            android:visibility="gone"
-            android:layout_marginTop="-2dp"
-            android:background="#0fff"
-            />
+            android:layout_gravity="center"
+            tools:ignore="UselessParent">
+
+        </FrameLayout>
 
-    </RelativeLayout>
+    </FrameLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/quest_maxspeed_ca.xml b/app/src/main/res/layout/quest_maxspeed_ca.xml
deleted file mode 100644
index 358446ddfc..0000000000
--- a/app/src/main/res/layout/quest_maxspeed_ca.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                xmlns:tools="http://schemas.android.com/tools">
-
-    <LinearLayout
-        android:layout_centerInParent="true"
-        android:orientation="vertical"
-        android:layout_width="100dp"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="12dp"
-        android:background="@drawable/background_rectangular_sign_white"
-        android:gravity="center">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="MAXIMUM"
-            android:textStyle="bold"
-            android:textSize="15dp"
-            android:gravity="center"
-            android:textColor="#000000"
-            tools:ignore="HardcodedText"/>
-
-        <EditText
-            android:id="@+id/maxSpeedInput"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingTop="8dp"
-            android:background="#00ffffff"
-            android:inputType="number"
-            android:gravity="center"
-            android:textStyle="bold"
-            android:maxLength="3"
-            android:textSize="48dp"
-            tools:text="50"/>
-
-        <Spinner
-            android:id="@+id/speedUnitSelect"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/quest_maxspeed_living_street.xml b/app/src/main/res/layout/quest_maxspeed_living_street.xml
new file mode 100644
index 0000000000..64d76342a6
--- /dev/null
+++ b/app/src/main/res/layout/quest_maxspeed_living_street.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:src="@drawable/ic_living_street"/>
diff --git a/app/src/main/res/layout/quest_maxspeed_sign.xml b/app/src/main/res/layout/quest_maxspeed_sign.xml
new file mode 100644
index 0000000000..c791fb671b
--- /dev/null
+++ b/app/src/main/res/layout/quest_maxspeed_sign.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="112dp"
+    android:layout_height="112dp"
+    android:background="@drawable/background_maxspeed_sign"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp"
+    android:gravity="center"
+    android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/maxSpeedInput"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#0fff"
+            android:inputType="number"
+            android:gravity="center"
+            android:textStyle="bold"
+            android:textSize="40dp"
+            android:maxLength="3"
+            tools:text="120"/>
+
+        <Spinner
+            android:id="@+id/speedUnitSelect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-6dp"
+            android:visibility="gone"
+            />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/quest_maxspeed_sign_ca.xml b/app/src/main/res/layout/quest_maxspeed_sign_ca.xml
new file mode 100644
index 0000000000..528b8bca3d
--- /dev/null
+++ b/app/src/main/res/layout/quest_maxspeed_sign_ca.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="100dp"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingBottom="12dp"
+    android:background="@drawable/background_rectangular_sign_white"
+    android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="MAXIMUM"
+        android:textStyle="bold"
+        android:textSize="15dp"
+        android:gravity="center"
+        android:textColor="#000000"
+        tools:ignore="HardcodedText"/>
+
+    <EditText
+        android:id="@+id/maxSpeedInput"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="#00ffffff"
+        android:inputType="number"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:maxLength="3"
+        android:textSize="48dp"
+        tools:text="50"/>
+
+    <Spinner
+        android:id="@+id/speedUnitSelect"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-6dp"
+        android:visibility="gone"
+        />
+</LinearLayout>
diff --git a/app/src/main/res/layout/quest_maxspeed_sign_us.xml b/app/src/main/res/layout/quest_maxspeed_sign_us.xml
new file mode 100644
index 0000000000..1e03e017b3
--- /dev/null
+++ b/app/src/main/res/layout/quest_maxspeed_sign_us.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="100dp"
+    android:layout_height="wrap_content"
+    android:padding="12dp"
+    android:background="@drawable/background_rectangular_sign_white"
+    android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="SPEED LIMIT"
+        android:textStyle="bold"
+        android:textSize="18dp"
+        android:gravity="center"
+        android:textColor="#000000"
+        tools:ignore="HardcodedText"/>
+
+    <EditText
+        android:id="@+id/maxSpeedInput"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="#00ffffff"
+        android:inputType="number"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:maxLength="2"
+        android:textSize="42dp"
+        tools:text="80"/>
+
+    <Spinner
+        android:id="@+id/speedUnitSelect"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-6dp"
+        android:visibility="gone"
+        />
+</LinearLayout>
diff --git a/app/src/main/res/layout/quest_maxspeed_us.xml b/app/src/main/res/layout/quest_maxspeed_us.xml
deleted file mode 100644
index 281517b390..0000000000
--- a/app/src/main/res/layout/quest_maxspeed_us.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                xmlns:tools="http://schemas.android.com/tools">
-
-    <LinearLayout
-        android:id="@+id/zoneContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:layout_alignParentEnd="true"
-        >
-
-        <CheckBox
-            android:id="@+id/zoneCheckbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="false"/>
-
-        <ImageView
-            android:id="@+id/zoneImg"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/ic_slow_zone_us"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="100dp"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:background="@drawable/background_rectangular_sign_white"
-        android:gravity="center"
-        android:layout_centerInParent="true">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="SPEED LIMIT"
-            android:textStyle="bold"
-            android:textSize="18dp"
-            android:gravity="center"
-            android:textColor="#000000"
-            tools:ignore="HardcodedText"/>
-
-        <EditText
-            android:id="@+id/maxSpeedInput"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginBottom="-6dp"
-            android:background="#00ffffff"
-            android:inputType="number"
-            android:gravity="center"
-            android:textStyle="bold"
-            android:maxLength="2"
-            android:textSize="42dp"
-            tools:text="30"/>
-
-        <Spinner
-            android:id="@+id/speedUnitSelect"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/quest_maxspeed_zone_sign.xml b/app/src/main/res/layout/quest_maxspeed_zone_sign.xml
new file mode 100644
index 0000000000..fcf1bd12ec
--- /dev/null
+++ b/app/src/main/res/layout/quest_maxspeed_zone_sign.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:padding="12dp"
+    android:background="@drawable/background_rectangular_sign_white">
+
+    <LinearLayout
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        android:background="@drawable/background_maxspeed_sign_no_frame"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:orientation="vertical"
+        android:gravity="center"
+        >
+
+        <EditText
+            android:id="@+id/maxSpeedInput"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#0fff"
+            android:inputType="number"
+            android:gravity="center"
+            android:textStyle="bold"
+            android:textSize="38dp"
+            android:maxLength="2"
+            tools:text="25"/>
+
+        <Spinner
+            android:id="@+id/speedUnitSelect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-6dp"
+            android:visibility="gone"
+            />
+
+    </LinearLayout>
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="ZONE"
+        android:textStyle="bold"
+        android:textSize="18dp"
+        android:gravity="center"
+        android:textColor="#000000"
+        tools:ignore="HardcodedText"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13a5c2b927..67e880f64f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,9 +203,11 @@ However, before uploading your changes, the app checks with a &lt;a href=\"https
     <string name="quest_sidewalk_onlyWest">"Only on western side"</string>
     <string name="quest_sidewalk_onlyEast">"Only on eastern side"</string>
     <string name="quest_sidewalk_yes">"Yes"</string>
-    <string name="quest_maxspeed_title_short">"What is the speed limit sign for this street?"</string>
+    <string name="quest_maxspeed_title_short2">"What is the speed limit for this street?"</string>
     <string name="quest_maxspeed_unusualInput_confirmation_description">"This speed limit looks implausible."</string>
-    <string name="quest_maxspeed_answer_noSign">"There is no sign"</string>
+    <string name="quest_maxspeed_answer_sign">"A sign"</string>
+    <string name="quest_maxspeed_answer_zone">"It's within a zone"</string>
+    <string name="quest_maxspeed_answer_noSign2">"No sign, defaults apply"</string>
     <string name="quest_maxspeed_answer_noSign_confirmation_title">"Are you sure no limit is posted?"</string>
     <string name="quest_maxspeed_answer_noSign_confirmation">"Did you check at the ends of the street?
 If there are no signs along the whole street which apply for the highlighted section, default speed limits apply."</string>
@@ -513,7 +515,7 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards
     <string name="quest_construction_building_title">Is this building completed?</string>
     <string name="questList_disabled_in_country">Never shown in %s</string>
     <string name="quest_toiletAvailability_rest_area_title">Does this rest area have restroom facilities?</string>
-    <string name="quest_maxspeed_name_title">What is the speed limit sign for %s?</string>
+    <string name="quest_maxspeed_name_title2">What is the speed limit for %s here?</string>
     <string name="pref_quests_reset">Reset both quest enablement and order to the default?</string>
 
     <string name="quest_buildingType_title2">"What was this building constructed as?"</string>
@@ -604,5 +606,6 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards
     <string name="quest_address_answer_no_housenumber">It has no house number</string>
     <string name="quest_address_answer_no_housenumber_message1">The building was tagged as:</string>
     <string name="quest_address_answer_no_housenumber_message2">Is this correct and is it not just part of a building?</string>
+    <string name="quest_maxspeed_sign_question">What defines the speed limit?</string>
 
 </resources>
diff --git a/res/country_metadata/isSlowZoneKnown.yml b/res/country_metadata/isSlowZoneKnown.yml
index 5360335fa4..b3116f6ee6 100644
--- a/res/country_metadata/isSlowZoneKnown.yml
+++ b/res/country_metadata/isSlowZoneKnown.yml
@@ -50,4 +50,5 @@ US-NY: true
 CA: false
 # according to wikipedia
 MX: true
-PE: true
\ No newline at end of file
+PE: true
+NZ: true
diff --git a/res/slow_zone.svg b/res/slow_zone.svg
index b27bff5b35..c8c570fc22 100644
--- a/res/slow_zone.svg
+++ b/res/slow_zone.svg
@@ -14,7 +14,7 @@
    viewBox="0 0 26.458333 29.633333"
    version="1.1"
    id="svg5403"
-   inkscape:version="0.92.0 r15299"
+   inkscape:version="0.92.1 r15371"
    sodipodi:docname="slow_zone.svg">
   <defs
      id="defs5397" />
@@ -25,16 +25,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="51.569946"
-     inkscape:cy="-4.6613242"
+     inkscape:zoom="2.8"
+     inkscape:cx="-25.778099"
+     inkscape:cy="86.5487"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="931"
-     inkscape:window-height="804"
-     inkscape:window-x="871"
-     inkscape:window-y="89"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      units="px"
      showguides="false">
@@ -121,17 +121,17 @@
        rx="5.8208327"
        ry="5.8208356" />
     <g
-       aria-label="??"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.41111112px;line-height:6.61458302px;font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="text4503">
+       aria-label="××"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:'Book Antiqua';-inkscape-font-specification:'Book Antiqua';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       id="text4506">
       <path
-         d="m 10.756421,280.81857 q 0,-0.27698 0.0248,-0.49609 0.02481,-0.22324 0.08268,-0.40928 0.06201,-0.18604 0.16123,-0.34727 0.103353,-0.16123 0.252181,-0.31832 0.111621,-0.12403 0.206706,-0.23978 0.09508,-0.11989 0.16123,-0.23978 0.07028,-0.11989 0.107487,-0.24805 0.04134,-0.12815 0.04134,-0.27698 0,-0.6904 -0.446484,-0.6904 -0.07855,0 -0.16123,0.0413 -0.08268,0.0372 -0.152963,0.12403 -0.06614,0.0868 -0.111621,0.2191 -0.04134,0.1323 -0.04547,0.31833 H 9.7063557 q 0.00413,-0.43408 0.1322917,-0.75241 0.1281575,-0.31833 0.3472656,-0.52503 0.223242,-0.20671 0.516764,-0.30593 0.297657,-0.10335 0.644922,-0.10335 0.380339,0 0.677995,0.10749 0.30179,0.10749 0.508496,0.31419 0.21084,0.20671 0.322461,0.5085 0.111621,0.30179 0.111621,0.69453 0,0.26872 -0.07441,0.48782 -0.07441,0.21911 -0.194303,0.41342 -0.11989,0.19016 -0.276986,0.37207 -0.157096,0.17776 -0.322461,0.3638 -0.09095,0.10748 -0.152962,0.21497 -0.05788,0.10749 -0.09509,0.22738 -0.03307,0.11575 -0.04961,0.25218 -0.01654,0.13229 -0.02067,0.29352 z m -0.107487,1.26504 q 0,-0.13643 0.04547,-0.25218 0.04547,-0.11576 0.128158,-0.19844 0.08268,-0.0868 0.198437,-0.13642 0.119889,-0.0496 0.264583,-0.0496 0.148829,0 0.264584,0.0496 0.119889,0.0496 0.202571,0.13642 0.08268,0.0827 0.128158,0.19844 0.04547,0.11575 0.04547,0.25218 0,0.13643 -0.04547,0.25218 -0.04547,0.11576 -0.128158,0.20257 -0.08268,0.0868 -0.202571,0.13229 -0.115755,0.0496 -0.264584,0.0496 -0.144694,0 -0.264583,-0.0496 -0.115755,-0.0455 -0.198437,-0.13229 -0.08268,-0.0868 -0.128158,-0.20257 -0.04547,-0.11575 -0.04547,-0.25218 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.46666622px;font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, Bold';stroke-width:0.26458332px"
-         id="path4505" />
+         d="m 8.7137089,281.40043 1.4211021,-1.72599 -1.4314374,-1.7415 0.5839436,-0.63562 1.4055988,1.70532 1.405599,-1.70532 0.578776,0.63562 -1.436605,1.7415 1.42627,1.72599 -0.583944,0.63562 -1.395263,-1.68982 -1.3900965,1.68982 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, ';stroke-width:0.26458332"
+         id="path4508" />
       <path
-         d="m 14.54327,280.81857 q 0,-0.27698 0.0248,-0.49609 0.02481,-0.22324 0.08268,-0.40928 0.06201,-0.18604 0.16123,-0.34727 0.103353,-0.16123 0.252181,-0.31832 0.111621,-0.12403 0.206706,-0.23978 0.09508,-0.11989 0.16123,-0.23978 0.07028,-0.11989 0.107487,-0.24805 0.04134,-0.12815 0.04134,-0.27698 0,-0.6904 -0.446484,-0.6904 -0.07855,0 -0.161231,0.0413 -0.08268,0.0372 -0.152962,0.12403 -0.06615,0.0868 -0.111621,0.2191 -0.04134,0.1323 -0.04547,0.31833 h -1.169954 q 0.0041,-0.43408 0.132291,-0.75241 0.128158,-0.31833 0.347266,-0.52503 0.223242,-0.20671 0.516764,-0.30593 0.297656,-0.10335 0.644922,-0.10335 0.380338,0 0.677995,0.10749 0.30179,0.10749 0.508496,0.31419 0.21084,0.20671 0.322461,0.5085 0.111621,0.30179 0.111621,0.69453 0,0.26872 -0.07441,0.48782 -0.07441,0.21911 -0.194304,0.41342 -0.119889,0.19016 -0.276985,0.37207 -0.157097,0.17776 -0.322461,0.3638 -0.09095,0.10748 -0.152963,0.21497 -0.05788,0.10749 -0.09508,0.22738 -0.03307,0.11575 -0.04961,0.25218 -0.01654,0.13229 -0.02067,0.29352 z m -0.107487,1.26504 q 0,-0.13643 0.04547,-0.25218 0.04547,-0.11576 0.128157,-0.19844 0.08268,-0.0868 0.198438,-0.13642 0.119889,-0.0496 0.264583,-0.0496 0.148828,0 0.264584,0.0496 0.119889,0.0496 0.202571,0.13642 0.08268,0.0827 0.128158,0.19844 0.04547,0.11575 0.04547,0.25218 0,0.13643 -0.04547,0.25218 -0.04548,0.11576 -0.128158,0.20257 -0.08268,0.0868 -0.202571,0.13229 -0.115756,0.0496 -0.264584,0.0496 -0.144694,0 -0.264583,-0.0496 -0.115755,-0.0455 -0.198438,-0.13229 -0.08268,-0.0868 -0.128157,-0.20257 -0.04547,-0.11575 -0.04547,-0.25218 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.46666622px;font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, Bold';stroke-width:0.26458332px"
-         id="path4507" />
+         d="m 13.695317,281.40043 1.421102,-1.72599 -1.431438,-1.7415 0.583944,-0.63562 1.405599,1.70532 1.405599,-1.70532 0.578776,0.63562 -1.436605,1.7415 1.42627,1.72599 -0.583944,0.63562 -1.395264,-1.68982 -1.390096,1.68982 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, ';stroke-width:0.26458332"
+         id="path4510" />
     </g>
   </g>
 </svg>