diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
index 11c0c48f0..5ac9eb47d 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
@@ -52,7 +52,7 @@ public class LayerBottomSheetItem
       case SUBWAY:
         disabledResource = R.attr.subwayMenuDisabled;
         enabledResource = R.attr.subwayMenuEnabled;
-        buttonTextResource = R.string.button_layer_subway;
+        buttonTextResource = R.string.subway;
         break;
       case ISOLINES:
         disabledResource = R.attr.isoLinesMenuDisabled;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
index c13807c9f..7f2d02876 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
@@ -43,6 +43,7 @@ public class LayersAdapter extends RecyclerView.Adapter<LayerHolder>
     boolean isEnabled = item.getMode().isEnabled(context);
 
     holder.mButton.setSelected(isEnabled);
+    holder.mButton.setContentDescription(context.getString(item.getTitle()));
     holder.mTitle.setSelected(isEnabled);
     holder.mTitle.setText(item.getTitle());
     boolean isNewLayer = SharedPropertiesUtils.shouldShowNewMarkerForLayerMode(context,
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
index 5fd7ec6b2..800611b5f 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
@@ -113,6 +113,7 @@ public final class PlacePageButtons extends Fragment implements Observer<List<Pl
     TextView title = parent.findViewById(R.id.title);
 
     title.setText(current.getTitle());
+    parent.setContentDescription(getString(current.getTitle()));
     @AttrRes final int tint = current.getType() == ButtonType.BOOKMARK_DELETE
                               ? R.attr.iconTintActive
                               : R.attr.iconTint;
diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml
index 053ca18db..463009ad0 100644
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -22,6 +22,8 @@
       android:layout_height="wrap_content"
       android:textColorHint="?android:textColorSecondary"
       app:endIconMode="custom"
+      app:endIconCheckable="false"
+      app:endIconContentDescription="@string/clear"
       app:endIconDrawable="@drawable/ic_clear_rounded"
       app:endIconTint="?android:textColorSecondary">
       <com.google.android.material.textfield.TextInputEditText
@@ -79,6 +81,7 @@
       android:layout_alignParentEnd="true"
       android:layout_alignEnd="@id/divideerrr"
       android:background="?clickableBackground"
+      android:contentDescription="@string/bookmark_color"
       android:padding="@dimen/margin_half"
       tools:src="@drawable/ic_bookmark_none" />
   </RelativeLayout>
diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index 4962fa1d9..3e5789fee 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -38,6 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_centerInParent="true"
+            android:contentDescription="@string/route_type"
             android:orientation="horizontal">
 
           <app.organicmaps.widget.RoutingToolbarButton
@@ -45,6 +46,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginStart="@dimen/routing_selector_wheel_margin"
+              android:contentDescription="@string/vehicle"
               tools:button="@drawable/ic_car"
               tools:buttonTint="?colorAccent" />
 
@@ -54,6 +56,7 @@
               android:layout_height="wrap_content"
               android:layout_marginStart="12dp"
               android:layout_marginEnd="12dp"
+              android:contentDescription="@string/pedestrian"
               tools:button="@drawable/ic_pedestrian"
               tools:buttonTint="?iconTintLight" />
 
@@ -62,6 +65,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginEnd="@dimen/margin_half_plus"
+              android:contentDescription="@string/subway"
               tools:button="@drawable/ic_transit"
               tools:buttonTint="?iconTintLight" />
 
@@ -70,6 +74,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginEnd="12dp"
+              android:contentDescription="@string/bicycle"
               tools:button="@drawable/ic_bike"
               tools:buttonTint="?iconTintLight" />
 
@@ -78,6 +83,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginEnd="12dp"
+              android:contentDescription="@string/ruler"
               tools:button="@drawable/ic_ruler_route"
               tools:buttonTint="?iconTintLight" />
         </RadioGroup>
diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml
index de8bf0616..af1624176 100644
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -616,7 +616,7 @@
     <string name="privacy_policy">Privaatheidsbeleid</string>
     <string name="terms_of_use">Gebruiksvoorwaardes</string>
     <string name="button_layer_traffic">Verkeer</string>
-    <string name="button_layer_subway">Moltrein</string>
+    <string name="subway">Moltrein</string>
     <string name="layers_title">Kaartstyle en -lae</string>
     <string name="subway_data_unavailable">Moltreinkaart is onbeskikbaar</string>
     <string name="bookmarks_empty_list_title">Hierdie lys is leeg</string>
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index eae6439dd..d674e50f6 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -667,7 +667,7 @@
     <string name="privacy_policy">سياسة الخصوصية</string>
     <string name="terms_of_use">شروط الاستخدام</string>
     <string name="button_layer_traffic">حركة مرور</string>
-    <string name="button_layer_subway">مترو الانفاق</string>
+    <string name="subway">مترو الانفاق</string>
     <string name="layers_title">أنماط الخريطة وطبقاتها</string>
     <string name="subway_data_unavailable">خريطة مترو الانفاق غير متوفرة</string>
     <string name="bookmarks_empty_list_title">هذه اللائحة فارغة</string>
diff --git a/android/app/src/main/res/values-ast/strings.xml b/android/app/src/main/res/values-ast/strings.xml
index 80b9e813a..e3dce9e1d 100644
--- a/android/app/src/main/res/values-ast/strings.xml
+++ b/android/app/src/main/res/values-ast/strings.xml
@@ -86,7 +86,7 @@
     <string name="privacy">Privacidá</string>
     <string name="layers_title">Estilos y capes del mapa</string>
     <string name="subway_data_unavailable">El mapa del metro nun ta disponible</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="delete_list">Desaniciar llista</string>
     <string name="public_access">Accesu públicu</string>
     <string name="bookmarks_empty_list_title">Esta llista ta balera</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 03c6b8074..b5efbc90a 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -644,7 +644,7 @@
     <string name="privacy_policy">Gizlilik Siyasəti</string>
     <string name="terms_of_use">İstifadə qaydaları</string>
     <string name="button_layer_traffic">Nəqliyyat</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Xəritə Üslubları və Qatları</string>
     <string name="subway_data_unavailable">Metro xəritəsi mövcud deyil</string>
     <string name="bookmarks_empty_list_title">Bu siyahı boşdur</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index eed7ceaaa..f2f252354 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -636,7 +636,7 @@
     <string name="privacy_policy">Палітыка прыватнасці</string>
     <string name="terms_of_use">Умовы выкарыстання</string>
     <string name="button_layer_traffic">Рух</string>
-    <string name="button_layer_subway">Метро</string>
+    <string name="subway">Метро</string>
     <string name="layers_title">Стылі і слаі карты</string>
     <string name="subway_data_unavailable">Карта метро недаступная</string>
     <string name="bookmarks_empty_list_title">Гэты спіс пусты</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 4a1b213be..c21f858a9 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -594,7 +594,7 @@
     <string name="privacy_policy">Политика за поверителност</string>
     <string name="terms_of_use">Условия за ползване</string>
     <string name="button_layer_traffic">Трафик</string>
-    <string name="button_layer_subway">Метро</string>
+    <string name="subway">Метро</string>
     <string name="layers_title">Стилове и слоеве на картата</string>
     <string name="subway_data_unavailable">Картата на метрото не е налична</string>
     <string name="bookmarks_empty_list_title">Този списък е празен</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 64a3ca912..8a60f497a 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -646,7 +646,7 @@
     <string name="privacy_policy">Política de privadesa</string>
     <string name="terms_of_use">Condicions del servei</string>
     <string name="button_layer_traffic">Trànsit</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Estils i capes del mapa</string>
     <string name="subway_data_unavailable">El mapa del metro no està disponible</string>
     <string name="bookmarks_empty_list_title">Aquesta llista és buida</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index d9d69e382..8b1e394e3 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -619,7 +619,7 @@
     <string name="privacy_policy">Zásady ochrany osobních údajů</string>
     <string name="terms_of_use">Podmínky užívání</string>
     <string name="button_layer_traffic">Zácpy</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Styly a vrstvy mapy</string>
     <string name="subway_data_unavailable">Mapa metra není dostupná</string>
     <string name="bookmarks_empty_list_title">Seznam je prázdný</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 8a4184e05..e059e08c5 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -612,7 +612,7 @@
     <string name="privacy_policy">Privatlivspolitik</string>
     <string name="terms_of_use">Vilkår for bruger</string>
     <string name="button_layer_traffic">Trafik</string>
-    <string name="button_layer_subway">Undergrundsbane</string>
+    <string name="subway">Undergrundsbane</string>
     <string name="layers_title">Kortstile og -lag</string>
     <string name="subway_data_unavailable">Kort over undergrundsbaner er ikke tilgængeligt</string>
     <string name="bookmarks_empty_list_title">Listen er tom</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index bb9572044..ae1be3fd6 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -642,7 +642,7 @@
     <string name="privacy_policy">Datenschutzerklärung</string>
     <string name="terms_of_use">Nutzungsbedingungen</string>
     <string name="button_layer_traffic">Verkehr</string>
-    <string name="button_layer_subway">U-Bahn</string>
+    <string name="subway">U-Bahn</string>
     <string name="layers_title">Kartenstile und Ebenen</string>
     <string name="subway_data_unavailable">Die U-Bahnkarte steht nicht zur Verfügung</string>
     <string name="bookmarks_empty_list_title">Die Liste ist leer</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index a0f951e5c..edc889fbc 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -639,7 +639,7 @@
     <string name="privacy_policy">Πολιτική απορρήτου</string>
     <string name="terms_of_use">Όροι χρήσης</string>
     <string name="button_layer_traffic">Κίνηση</string>
-    <string name="button_layer_subway">Μετρό</string>
+    <string name="subway">Μετρό</string>
     <string name="layers_title">Στυλ χάρτη και επίπεδα</string>
     <string name="subway_data_unavailable">Ο χάρτης μετρό δεν είναι διαθέσιμος</string>
     <string name="bookmarks_empty_list_title">Η λίστα είναι άδεια</string>
diff --git a/android/app/src/main/res/values-en-rGB/strings.xml b/android/app/src/main/res/values-en-rGB/strings.xml
index e77953813..e354870ec 100644
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/android/app/src/main/res/values-en-rGB/strings.xml
@@ -31,7 +31,7 @@
         <item quantity="one">%d track</item>
         <item quantity="other">%d tracks</item>
     </plurals>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="subway_data_unavailable">Metro map is unavailable</string>
     <string name="avoid_motorways">Avoid motorways</string>
     <!-- SECTION: Bookmark types used for sorting -->
diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index b70737145..205e05260 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -101,7 +101,7 @@
     <string name="privacy_policy">Política de Privacidad</string>
     <string name="terms_of_use">Términos de uso</string>
     <string name="button_layer_traffic">Tráfico</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Estilos y capas de mapas</string>
     <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
     <string name="bookmarks_empty_list_title">Esta lista está vacía</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index d40acae5a..766430bb0 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -647,7 +647,7 @@
     <string name="privacy_policy">Normativa de privacidad</string>
     <string name="terms_of_use">Condiciones de uso</string>
     <string name="button_layer_traffic">Tráfico</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Estilos y capas del mapa</string>
     <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
     <string name="bookmarks_empty_list_title">Esta lista está vacía</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 8506605d4..122f57c4d 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -636,7 +636,7 @@
     <string name="privacy_policy">Privaatsuspoliitika</string>
     <string name="terms_of_use">Kasutustingimused</string>
     <string name="button_layer_traffic">Liiklus</string>
-    <string name="button_layer_subway">Metroo</string>
+    <string name="subway">Metroo</string>
     <string name="layers_title">Kaardi stiilid ja kihid</string>
     <string name="subway_data_unavailable">Metrookaart ei ole saadaval</string>
     <string name="bookmarks_empty_list_title">See loend on tühi</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 6716939ae..35796e120 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -642,7 +642,7 @@
     <string name="privacy_policy">Pribatutasun politika</string>
     <string name="terms_of_use">Erabilera baldintzak</string>
     <string name="button_layer_traffic">Trafikoa</string>
-    <string name="button_layer_subway">Metroa</string>
+    <string name="subway">Metroa</string>
     <string name="layers_title">Maparen estiloak eta geruzak</string>
     <string name="subway_data_unavailable">Metroaren mapa ez dago erabilgarri</string>
     <string name="bookmarks_empty_list_title">Zerrenda hau hutsik dago</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index c34a96328..7f040ef88 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -608,7 +608,7 @@
     <string name="privacy_policy">سیاست حریم خصوصی</string>
     <string name="terms_of_use">شرایط استفاده</string>
     <string name="button_layer_traffic">ترافیک</string>
-    <string name="button_layer_subway">مترو</string>
+    <string name="subway">مترو</string>
     <string name="layers_title">سبک ها و لایه های نقشه</string>
     <string name="subway_data_unavailable">نقشه مترو موجود نیست</string>
     <string name="bookmarks_empty_list_title">این لیست خالی است</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 8cfcbc081..6481b5c5c 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -646,7 +646,7 @@
     <string name="privacy_policy">Yksityisyyskäytäntö</string>
     <string name="terms_of_use">Käyttöehdot</string>
     <string name="button_layer_traffic">Liikenne</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Karttatyylit ja tasot</string>
     <string name="subway_data_unavailable">Metrokartta ei ole saatavilla</string>
     <string name="bookmarks_empty_list_title">Luettelo on tyhjä</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index d1aee06e2..4e2c410b0 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -651,7 +651,7 @@
     <string name="privacy_policy">Politique de confidentialité</string>
     <string name="terms_of_use">Conditions d\'utilisation</string>
     <string name="button_layer_traffic">Trafic</string>
-    <string name="button_layer_subway">Métro</string>
+    <string name="subway">Métro</string>
     <string name="layers_title">Styles et couches de cartes</string>
     <string name="subway_data_unavailable">La carte du métro n\'est pas disponible</string>
     <string name="bookmarks_empty_list_title">Cette liste est vide</string>
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index 3ee859d66..c55db1670 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -77,7 +77,7 @@
     <string name="privacy_policy">Normativa de privacidade</string>
     <string name="terms_of_use">Condiciones de uso</string>
     <string name="button_layer_traffic">Tráfico</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Estilos e capas do mapa</string>
     <string name="subway_data_unavailable">O mapa do metro non está dispoñible</string>
     <string name="export_file">Exportar KMZ</string>
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 0932b9fdc..fa0ae27c4 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -451,7 +451,7 @@
     <string name="privacy">निजता</string>
     <string name="privacy_policy">गोपनीयता नीति</string>
     <string name="terms_of_use">उपयोग की शर्तें</string>
-    <string name="button_layer_subway">भूमिगत मार्ग</string>
+    <string name="subway">भूमिगत मार्ग</string>
     <string name="layers_title">मानचित्र शैलियाँ और परतें</string>
     <string name="export_file">निर्यात KMZ</string>
     <string name="export_file_gpx">जीपीएक्स निर्यात करें</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index aeb302a70..371537b2d 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -624,7 +624,7 @@
     <string name="privacy_policy">Adatvédelmi irányelvek</string>
     <string name="terms_of_use">Felhasználási feltételek</string>
     <string name="button_layer_traffic">Forgalom</string>
-    <string name="button_layer_subway">Metró</string>
+    <string name="subway">Metró</string>
     <string name="layers_title">Térképstílusok és rétegek</string>
     <string name="subway_data_unavailable">A metrótérkép nem érhető el</string>
     <string name="bookmarks_empty_list_title">Ez a lista üres</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index c29b44741..95814ed16 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -610,7 +610,7 @@
     <string name="privacy_policy">Kebijakan privasi</string>
     <string name="terms_of_use">Ketentuan penggunaan</string>
     <string name="button_layer_traffic">Lalu lintas</string>
-    <string name="button_layer_subway">Kereta bawah tanah</string>
+    <string name="subway">Kereta bawah tanah</string>
     <string name="layers_title">Gaya dan Lapisan Peta</string>
     <string name="subway_data_unavailable">Peta bawah tanah tidak tersedia</string>
     <string name="bookmarks_empty_list_title">Daftar ini kosong</string>
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index 18267311c..e00395fd1 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -137,7 +137,7 @@
     <string name="bookmark_lists_hide_all">Fela allt</string>
     <string name="bookmark_lists_show_all">Sýna allt</string>
     <string name="button_layer_traffic">Umferð</string>
-    <string name="button_layer_subway">Neðanjarðarlest</string>
+    <string name="subway">Neðanjarðarlest</string>
     <string name="not_shared">Einka</string>
     <string name="yes_available">Já</string>
     <string name="by_type">Eftir gerð</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 901140147..cb0755647 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -630,7 +630,7 @@
     <string name="privacy_policy">Polizza sulla privacy</string>
     <string name="terms_of_use">Termini di utilizzo</string>
     <string name="button_layer_traffic">Traffico</string>
-    <string name="button_layer_subway">Metropolitana</string>
+    <string name="subway">Metropolitana</string>
     <string name="layers_title">Stili e livelli della mappa</string>
     <string name="subway_data_unavailable">La mappa della metropolitana non è disponibile</string>
     <string name="bookmarks_empty_list_title">Questo elenco è vuoto</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index a6b52b254..fe77d0067 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -638,7 +638,7 @@
     <string name="privacy_policy">מדיניות פרטיות</string>
     <string name="terms_of_use">תנאי שימוש</string>
     <string name="button_layer_traffic">תעבורה</string>
-    <string name="button_layer_subway">רכבת תחתית</string>
+    <string name="subway">רכבת תחתית</string>
     <string name="layers_title">סגנונות ושכבות מפה</string>
     <string name="subway_data_unavailable">מפת רכבת תחתית לא זמינה</string>
     <string name="bookmarks_empty_list_title">רשימה זו ריקה</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 91260edbc..d97796d5b 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -643,7 +643,7 @@
     <string name="privacy_policy">プライバシーポリシー</string>
     <string name="terms_of_use">利用規約</string>
     <string name="button_layer_traffic">交通状況</string>
-    <string name="button_layer_subway">地下鉄</string>
+    <string name="subway">地下鉄</string>
     <string name="layers_title">マップのスタイルとレイヤー</string>
     <string name="subway_data_unavailable">地下鉄路線図はご利用いただけません</string>
     <string name="bookmarks_empty_list_title">このリストは空です</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index d7b2fe986..3fe967eee 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -608,7 +608,7 @@
     <string name="privacy_policy">개인정보 보호 방침</string>
     <string name="terms_of_use">사용 약관</string>
     <string name="button_layer_traffic">트래픽</string>
-    <string name="button_layer_subway">지하철</string>
+    <string name="subway">지하철</string>
     <string name="layers_title">맵 스타일 및 레이어</string>
     <string name="subway_data_unavailable">지하철 지도가 가용하지 않습니다.</string>
     <string name="bookmarks_empty_list_title">이 목록은 비어있습니다.</string>
diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml
index c47a55783..7cd4a7e0f 100644
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -621,7 +621,7 @@
     <string name="privacy_policy">Privatumo politika</string>
     <string name="terms_of_use">Naudojimo sąlygos</string>
     <string name="button_layer_traffic">Eismas</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Žemėlapio stiliai ir sluoksniai</string>
     <string name="subway_data_unavailable">Metro žemėlapis neprieinamas</string>
     <string name="bookmarks_empty_list_title">Sąrašas tuščias</string>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index d6ddddf76..c6a80991f 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -640,7 +640,7 @@
     <string name="privacy_policy">Privātuma politika</string>
     <string name="terms_of_use">Lietošanas noteikumi</string>
     <string name="button_layer_traffic">Satiksme</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Kartes stili un slāņi</string>
     <string name="subway_data_unavailable">Metro karte nav pieejama</string>
     <string name="bookmarks_empty_list_title">Saraksts ir tukšs</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 84ad1145b..abf9a35e2 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -608,7 +608,7 @@
     <string name="privacy_policy">गोपनीयता धोरण</string>
     <string name="terms_of_use">वापरण्याच्या अटी</string>
     <string name="button_layer_traffic">ट्रॅफिक</string>
-    <string name="button_layer_subway">मेट्रो/भुयारी मार्ग</string>
+    <string name="subway">मेट्रो/भुयारी मार्ग</string>
     <string name="layers_title">नकाशा शैली आणि स्तर</string>
     <string name="subway_data_unavailable">मेट्रो नकाशा अनुपलब्ध आहे</string>
     <string name="bookmarks_empty_list_title">ही यादी रिकामी आहे</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 70a1337ea..a7b18cfd1 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -644,7 +644,7 @@
     <string name="privacy_policy">Personvernpolitikk</string>
     <string name="terms_of_use">Bruksbetingelser</string>
     <string name="button_layer_traffic">Trafikk</string>
-    <string name="button_layer_subway">T-bane</string>
+    <string name="subway">T-bane</string>
     <string name="layers_title">Kartstiler og -lag</string>
     <string name="subway_data_unavailable">T-banekart er utilgjengelig</string>
     <string name="bookmarks_empty_list_title">Denne listen er tom</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index c702f0442..f22abaf92 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -640,7 +640,7 @@
     <string name="privacy_policy">Privacybeleid</string>
     <string name="terms_of_use">Gebruiksvoorwaarden</string>
     <string name="button_layer_traffic">Verkeer</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Kaartstijlen en -lagen</string>
     <string name="subway_data_unavailable">Metrokaart is niet beschikbaar</string>
     <string name="bookmarks_empty_list_title">Deze lijst is leeg</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 75147cb78..03c90a18d 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -649,7 +649,7 @@
     <string name="privacy_policy">Polityka prywatności</string>
     <string name="terms_of_use">Warunki użytkowania</string>
     <string name="button_layer_traffic">Ruch drogowy</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Style i warstwy mapy</string>
     <string name="subway_data_unavailable">Mapa metra jest niedostępna</string>
     <string name="bookmarks_empty_list_title">Lista jest pusta</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index fbb624d8a..3713da0ac 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -578,7 +578,7 @@
     <string name="privacy_policy">Política de privacidade</string>
     <string name="terms_of_use">Termos de uso</string>
     <string name="button_layer_traffic">Tráfego</string>
-    <string name="button_layer_subway">Metrô</string>
+    <string name="subway">Metrô</string>
     <string name="subway_data_unavailable">Mapa de metrô está indisponível</string>
     <string name="bookmarks_empty_list_title">Esta lista está vazia</string>
     <string name="bookmarks_empty_list_message">Para adicionar um favorito, toque no mapa e então toque no ícone de estrela</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 558ccaaaf..e48d7a41b 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -621,7 +621,7 @@
     <string name="privacy_policy">Política de privacidade</string>
     <string name="terms_of_use">Termos de utilização</string>
     <string name="button_layer_traffic">Tráfego</string>
-    <string name="button_layer_subway">Metropolitano</string>
+    <string name="subway">Metropolitano</string>
     <string name="layers_title">Estilos e camadas de mapas</string>
     <string name="subway_data_unavailable">O mapa de metropolitano não está disponível</string>
     <string name="bookmarks_empty_list_title">Esta lista está vazia</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index d6341bc2d..af5b1f1f1 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -631,7 +631,7 @@
     <string name="privacy_policy">Confidențialitate</string>
     <string name="terms_of_use">Termeni de utilizare</string>
     <string name="button_layer_traffic">Trafic</string>
-    <string name="button_layer_subway">Metrou</string>
+    <string name="subway">Metrou</string>
     <string name="layers_title">Stiluri și straturi de hartă</string>
     <string name="subway_data_unavailable">Harta de metrou nu este disponibilă</string>
     <string name="bookmarks_empty_list_title">Lista este goală</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 13f7b70f5..cca769be4 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -655,7 +655,7 @@
     <string name="privacy_policy">Политика конфиденциальности</string>
     <string name="terms_of_use">Условия использования</string>
     <string name="button_layer_traffic">Пробки</string>
-    <string name="button_layer_subway">Метро</string>
+    <string name="subway">Метро</string>
     <string name="layers_title">Стили и слои карты</string>
     <string name="subway_data_unavailable">Карта метро недоступна</string>
     <string name="bookmarks_empty_list_title">Список пустой</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index a027c464e..61e8ebc5a 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -644,7 +644,7 @@
     <string name="privacy_policy">Zásady ochrany osobných údajov</string>
     <string name="terms_of_use">Podmienky používania</string>
     <string name="button_layer_traffic">Dopravné informácie</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Štýly a vrstvy mapy</string>
     <string name="subway_data_unavailable">Mapa metra nie je dostupná</string>
     <string name="bookmarks_empty_list_title">Tento zoznam je prázdny</string>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index dd2ad490d..fae65824d 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -633,7 +633,7 @@
     <string name="privacy_policy">Политика приватности</string>
     <string name="terms_of_use">Услови коришћења</string>
     <string name="button_layer_traffic">Саобраћај</string>
-    <string name="button_layer_subway">Метро</string>
+    <string name="subway">Метро</string>
     <string name="layers_title">Стилови мапе и слојеви</string>
     <string name="subway_data_unavailable">Мапа метроа не постоји</string>
     <string name="bookmarks_empty_list_title">Ова листа је празна</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index a4f714393..512c42b97 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -609,7 +609,7 @@
     <string name="privacy_policy">Integritetspolicy</string>
     <string name="terms_of_use">Allmänna villkor</string>
     <string name="button_layer_traffic">Trafik</string>
-    <string name="button_layer_subway">Tunnelbana</string>
+    <string name="subway">Tunnelbana</string>
     <string name="layers_title">Kartstilar och lager</string>
     <string name="subway_data_unavailable">Tunnelbanekartan är otillgänglig</string>
     <string name="bookmarks_empty_list_title">Listan är tom</string>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 764c789a4..0b356e985 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -196,7 +196,7 @@
     <string name="privacy_policy">Sera ya faragha</string>
     <string name="terms_of_use">Masharti ya matumizi</string>
     <string name="button_layer_traffic">Trafiki</string>
-    <string name="button_layer_subway">Njia ya chini</string>
+    <string name="subway">Njia ya chini</string>
     <string name="layers_title">Mitindo ya Ramani na Tabaka</string>
     <string name="subway_data_unavailable">Ramani ya njia ya chini haipatikani</string>
     <string name="bookmarks_empty_list_title">Orodha hii ni tupu</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 504025b49..d42f936c0 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -610,7 +610,7 @@
     <string name="privacy_policy">นโยบายความเป็นส่วนตัว</string>
     <string name="terms_of_use">ข้อกำหนดในการใช้งาน</string>
     <string name="button_layer_traffic">การจราจร</string>
-    <string name="button_layer_subway">รถไฟใต้ดิน</string>
+    <string name="subway">รถไฟใต้ดิน</string>
     <string name="layers_title">รูปแบบและเลเยอร์ของแผนที่</string>
     <string name="subway_data_unavailable">แผนที่รถไฟใต้ดินไม่พร้อมใช้งาน</string>
     <string name="bookmarks_empty_list_title">รายการนี้ว่างเปล่า</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 11a0314a8..b6e4660ce 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -644,7 +644,7 @@
     <string name="privacy_policy">Gizlilik politikası</string>
     <string name="terms_of_use">Kullanım koşulları</string>
     <string name="button_layer_traffic">Trafik</string>
-    <string name="button_layer_subway">Metro</string>
+    <string name="subway">Metro</string>
     <string name="layers_title">Harita Stilleri ve Katmanlar</string>
     <string name="subway_data_unavailable">Metro haritası yok</string>
     <string name="bookmarks_empty_list_title">Bu liste boş</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 95b435fb7..981a3b3a4 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -652,7 +652,7 @@
     <string name="privacy_policy">Політика конфіденційності</string>
     <string name="terms_of_use">Умови використання</string>
     <string name="button_layer_traffic">Затор</string>
-    <string name="button_layer_subway">Метрополітен</string>
+    <string name="subway">Метрополітен</string>
     <string name="layers_title">Стилі та шари мапи</string>
     <string name="subway_data_unavailable">Мапа метрополітену недоступна</string>
     <string name="bookmarks_empty_list_title">Список порожній</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index baa0eb3c0..67c8bd603 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -605,7 +605,7 @@
     <string name="privacy_policy">Chính sách bảo mật</string>
     <string name="terms_of_use">Điều khoảng sử dụng</string>
     <string name="button_layer_traffic">Giao thông</string>
-    <string name="button_layer_subway">Xe điện ngầm</string>
+    <string name="subway">Xe điện ngầm</string>
     <string name="layers_title">Kiểu và lớp bản đồ</string>
     <string name="subway_data_unavailable">Bản đồ tàu điện ngầm không khả dụng</string>
     <string name="bookmarks_empty_list_title">Danh sách trống</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index e759b409c..c95b8208f 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -652,7 +652,7 @@
     <string name="privacy_policy">隱私政策</string>
     <string name="terms_of_use">使用條款</string>
     <string name="button_layer_traffic">路況</string>
-    <string name="button_layer_subway">捷運</string>
+    <string name="subway">捷運</string>
     <string name="layers_title">地圖樣式和圖層</string>
     <string name="subway_data_unavailable">捷運圖層不可用</string>
     <string name="bookmarks_empty_list_title">該列表為空</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index e9dfae919..107c9f139 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -652,7 +652,7 @@
     <string name="privacy_policy">隐私政策</string>
     <string name="terms_of_use">使用条款</string>
     <string name="button_layer_traffic">路况</string>
-    <string name="button_layer_subway">地铁</string>
+    <string name="subway">地铁</string>
     <string name="layers_title">地图样式和图层</string>
     <string name="subway_data_unavailable">地铁地图不可用</string>
     <string name="bookmarks_empty_list_title">该列表为空</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index aa6e61069..d86752031 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -701,7 +701,7 @@
     <string name="privacy_policy">Privacy policy</string>
     <string name="terms_of_use">Terms of use</string>
     <string name="button_layer_traffic">Traffic</string>
-    <string name="button_layer_subway">Subway</string>
+    <string name="subway">Subway</string>
     <string name="layers_title">Map Styles and Layers</string>
     <string name="subway_data_unavailable">Subway map is unavailable</string>
     <string name="bookmarks_empty_list_title">This list is empty</string>
@@ -934,4 +934,11 @@
     <string name="codeberg">Codeberg</string>
     <string name="pref_left_button_title">Left button setup</string>
     <string name="pref_left_button_disable">Disable</string>
+    <string name="clear">Clear</string>
+    <string name="route_type">Route type</string>
+    <string name="vehicle">Vehicle</string>
+    <string name="pedestrian">Pedestrian</string>
+    <string name="bicycle">Bicycle</string>
+    <string name="ruler">Ruler</string>
+    <string name="bookmark_color">Bookmark color</string>
 </resources>