[android] Add icon before some settings

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

android/app/src/main/res/drawable/ic_browse_activity.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M80,360v-160q0,-33 23.5,-56.5T160,120h640q33,0 56.5,23.5T880,200v160h-80v-160L160,200v160L80,360ZM160,720q-33,0 -56.5,-23.5T80,640v-200h80v200h640v-200h80v200q0,33 -23.5,56.5T800,720L160,720ZM40,840v-80h880v80L40,840ZM480,420ZM80,440v-80h240q11,0 21,6t15,16l47,93 123,-215q5,-9 14,-14.5t20,-5.5q11,0 21,5.5t15,16.5l49,98h235v80L620,440q-11,0 -21,-5.5T584,418l-26,-53 -123,215q-5,10 -15,15t-21,5q-11,0 -20.5,-6T364,578l-69,-138L80,440Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_dark_mode.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M480,840q-150,0 -255,-105T120,480q0,-150 105,-255t255,-105q14,0 27.5,1t26.5,3q-41,29 -65.5,75.5T444,300q0,90 63,153t153,63q55,0 101,-24.5t75,-65.5q2,13 3,26.5t1,27.5q0,150 -105,255T480,840ZM480,760q88,0 158,-48.5T740,585q-20,5 -40,8t-40,3q-123,0 -209.5,-86.5T364,300q0,-20 3,-40t8,-40q-78,32 -126.5,102T200,480q0,116 82,198t198,82ZM470,490Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_download_st.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?colorControlNormal">
+    <path
+        android:pathData="M19,9h-4v-6h-6v6h-4l7,7 7,-7ZM5,18v2h14v-2h-14Z"
+        android:fillColor="#FFF"/>
+</vector>

android/app/src/main/res/drawable/ic_eco.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M216,784q-45,-45 -70.5,-104T120,558q0,-63 24,-124.5T222,318q35,-35 86.5,-60t122,-39.5Q501,204 591.5,201t202.5,7q8,106 5,195t-16.5,160.5q-13.5,71.5 -38,125T684,778q-53,53 -112.5,77.5T450,880q-65,0 -127,-25.5T216,784ZM328,768q29,17 59.5,24.5T450,800q46,0 91,-18.5t86,-59.5q18,-18 36.5,-50.5t32,-85Q709,534 716,459.5t2,-177.5q-49,-2 -110.5,-1.5T485,290q-61,9 -116,29t-90,55q-45,45 -62,89t-17,85q0,59 22.5,103.5T262,714q42,-80 111,-153.5T534,440q-72,63 -125.5,142.5T328,768ZM328,768ZM328,768Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_instant_mix.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M200,800v-280h-80v-80h240v80h-80v280h-80ZM200,360v-200h80v200h-80ZM360,360v-80h80v-120h80v120h80v80L360,360ZM440,800v-360h80v360h-80ZM680,800v-120h-80v-80h240v80h-80v120h-80ZM680,520v-360h80v360h-80Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v124q18,7 29,22t11,34v80q0,19 -11,34t-29,22v404q0,33 -23.5,56.5T680,920L280,920ZM280,840h400v-720L280,120v720ZM280,840v-720,720ZM394,640h172q14,0 24,-10t10,-24v-132q0,-14 -10,-24t-24,-10h-6v-40q0,-33 -23.5,-56.5T480,320q-33,0 -56.5,23.5T400,400v40h-6q-14,0 -24,10t-10,24v132q0,14 10,24t24,10ZM440,440v-40q0,-17 11.5,-28.5T480,360q17,0 28.5,11.5T520,400v40h-80Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_network_manage.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M339,698q22,-22 49.5,-36t58.5,-19q-5,19 -8,38t-3,39q0,24 3.5,47t11.5,44L339,698ZM254,614 L170,528q62,-62 142,-95t168,-33q49,0 96,10.5t90,30.5q-44,8 -81.5,29T517,522q-9,-1 -18.5,-1.5T480,520q-64,0 -122.5,24.5T254,614ZM84,444 L0,360q95,-97 219.5,-148.5T480,160q136,0 260.5,51.5T960,360l-84,84q-79,-79 -181.5,-121.5T480,280q-112,0 -214.5,42.5T84,444ZM760,520 L772,580q12,5 22.5,10.5T816,604l58,-18 40,68 -46,40q2,12 2,26t-2,26l46,40 -40,68 -58,-18q-11,8 -21.5,13.5T772,860l-12,60h-80l-12,-60q-12,-5 -22.5,-10.5T624,836l-58,18 -40,-68 46,-40q-2,-12 -2,-26t2,-26l-46,-40 40,-68 58,18q11,-8 21.5,-13.5T668,580l12,-60h80ZM720,640q-33,0 -56.5,23.5T640,720q0,33 23.5,56.5T720,800q33,0 56.5,-23.5T800,720q0,-33 -23.5,-56.5T720,640Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_profile.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M480,480q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM160,800v-112q0,-34 17.5,-62.5T224,582q62,-31 126,-46.5T480,520q66,0 130,15.5T736,582q29,15 46.5,43.5T800,688v112L160,800ZM240,720h480v-32q0,-11 -5.5,-20T700,654q-54,-27 -109,-40.5T480,600q-56,0 -111,13.5T260,654q-9,5 -14.5,14t-5.5,20v32ZM480,400q33,0 56.5,-23.5T560,320q0,-33 -23.5,-56.5T480,240q-33,0 -56.5,23.5T400,320q0,33 23.5,56.5T480,400ZM480,320ZM480,720Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_record_voice_over.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="m798,638 l-62,-62q44,-41 69,-97t25,-119q0,-63 -25,-118t-69,-96l62,-64q56,53 89,125t33,153q0,81 -33,153t-89,125ZM670,510l-64,-64q18,-17 29,-38.5t11,-47.5q0,-26 -11,-47.5T606,274l64,-64q32,29 50,67.5t18,82.5q0,44 -18,82.5T670,510ZM360,520q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM40,840v-112q0,-33 17,-62t47,-44q51,-26 115,-44t141,-18q77,0 141,18t115,44q30,15 47,44t17,62v112L40,840ZM120,760h480v-32q0,-11 -5.5,-20T580,694q-36,-18 -92.5,-36T360,640q-71,0 -127.5,18T140,694q-9,5 -14.5,14t-5.5,20v32ZM360,440q33,0 56.5,-23.5T440,360q0,-33 -23.5,-56.5T360,280q-33,0 -56.5,23.5T280,360q0,33 23.5,56.5T360,440ZM360,360ZM360,760Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_sd_card.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M360,440h80v-160h-80v160ZM480,440h80v-160h-80v160ZM600,440h80v-160h-80v160ZM240,880q-33,0 -56.5,-23.5T160,800v-480l240,-240h320q33,0 56.5,23.5T800,160v640q0,33 -23.5,56.5T720,880L240,880ZM240,800h480v-640L434,160L240,354v446ZM240,800h480,-480Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_search_recent_st.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.26,3C8.17,2.86 4,6.95 4,12L2.21,12c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.8c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.8c0.31,-0.31 0.09,-0.85 -0.36,-0.85L6,12c0,-3.9 3.18,-7.05 7.1,-7 3.72,0.05 6.85,3.18 6.9,6.9 0.05,3.91 -3.1,7.1 -7,7.1 -1.61,0 -3.1,-0.55 -4.28,-1.48 -0.4,-0.31 -0.96,-0.28 -1.32,0.08 -0.42,0.42 -0.39,1.13 0.08,1.49C9,20.29 10.91,21 13,21c5.05,0 9.14,-4.17 9,-9.26 -0.13,-4.69 -4.05,-8.61 -8.74,-8.74zM12.75,8c-0.41,0 -0.75,0.34 -0.75,0.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26 0.21,-0.36 0.09,-0.82 -0.26,-1.03l-2.88,-1.71v-3.4c0,-0.4 -0.34,-0.74 -0.75,-0.74z"/>
+</vector>

android/app/src/main/res/drawable/ic_settings_backup_restore.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M480,560q-33,0 -56.5,-23.5T400,480q0,-33 23.5,-56.5T480,400q33,0 56.5,23.5T560,480q0,33 -23.5,56.5T480,560ZM480,840q-139,0 -241,-91.5T122,520h82q14,104 92.5,172T480,760q117,0 198.5,-81.5T760,480q0,-117 -81.5,-198.5T480,200q-69,0 -129,32t-101,88h110v80L120,400v-240h80v94q51,-64 124.5,-99T480,120q75,0 140.5,28.5t114,77q48.5,48.5 77,114T840,480q0,75 -28.5,140.5t-77,114q-48.5,48.5 -114,77T480,840Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_storage_light.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M2,20h20v-4h-20v4ZM4,17h2v2h-2v-2ZM2,4v4h20v-4h-20ZM6,7h-2v-2h2v2ZM2,14h20v-4h-20v4ZM4,11h2v2h-2v-2Z"
-      android:fillColor="#FFF"/>
-</vector>

android/app/src/main/res/drawable/ic_straighten.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M160,720q-33,0 -56.5,-23.5T80,640v-320q0,-33 23.5,-56.5T160,240h640q33,0 56.5,23.5T880,320v320q0,33 -23.5,56.5T800,720L160,720ZM160,640h640v-320L680,320v160h-80v-160h-80v160h-80v-160h-80v160h-80v-160L160,320v320ZM280,480h80,-80ZM440,480h80,-80ZM600,480h80,-80ZM480,480Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_text_fields.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M280,800v-520L80,280v-120h520v120L400,280v520L280,800ZM640,800v-320L520,480v-120h360v120L760,480v320L640,800Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_three_d_rotation.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480h80q0,115 72.5,203T418,794l-58,-58 56,-56L598,862q-29,10 -58.5,14T480,880ZM500,600v-240h120q17,0 28.5,11.5T660,400v160q0,17 -11.5,28.5T620,600L500,600ZM300,600v-60h100v-40h-60v-40h60v-40L300,420v-60h120q17,0 28.5,11.5T460,400v160q0,17 -11.5,28.5T420,600L300,600ZM560,540h40v-120h-40v120ZM800,480q0,-115 -72.5,-203T542,166l58,58 -56,56 -182,-182q29,-10 58.5,-14t59.5,-4q83,0 156,31.5T763,197q54,54 85.5,127T880,480h-80Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_translate.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM160,760l-56,-56 202,-202q-35,-35 -63.5,-80T190,320h84q20,39 40,68t48,58q33,-33 68.5,-92.5T484,240L40,240v-80h280v-80h80v80h280v80L564,240q-21,72 -63,148t-83,116l96,98 -30,82 -122,-125 -202,201ZM628,688h144l-72,-204 -72,204Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_translate_indic.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM628,688h144l-72,-204 -72,204ZM254,640q-66,0 -123.5,-38.5T44,498l72,-36q21,42 58,70t79,28q38,0 62.5,-23.5T340,480q0,-33 -23.5,-56.5T260,400h-60v-80h60q25,0 42.5,-17.5T320,260q0,-25 -17,-42.5T261,200q-23,0 -41,15t-32,33l-63,-49q26,-32 60,-55.5t77,-23.5q57,0 97.5,40.5T400,259q0,27 -10,52.5T361,357q10,10 18.5,20.5T396,400h124v-200h-80v-80h240v80h-80v116l-61,164L420,480v4q0,63 -46,109.5T254,640Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/ic_wifi_find.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?colorControlNormal">
+  <path
+      android:pathData="M480,840 L0,359q93,-93 215.5,-146T480,160q142,0 264.5,53T960,359l-56,57q-81,-81 -190,-128.5T480,240q-103,0 -195,32.5T117,363l419,420 -56,57ZM864,800L761,698q-18,11 -38,16.5t-43,5.5q-68,0 -114,-46t-46,-114q0,-68 46,-114t114,-46q68,0 114,46t46,114q0,23 -5.5,43T818,641l102,103 -56,56ZM680,640q34,0 57,-23t23,-57q0,-34 -23,-57t-57,-23q-34,0 -57,23t-23,57q0,34 23,57t57,23ZM480,783Z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/values-sw360dp/values-preference.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Items in the Preferences can have space reserved for an icon. As none of the
-settings currently have associated icons, this leads to items that seem indented
-without purpose. This wastes space and can lead to truncation of the item names
-and descriptions. See https://github.com/organicmaps/organicmaps/issues/1872
-
-To rectify this, the iconSpaceReserved property needs to be set to false.
-According to https://developer.android.com/reference/android/preference/Preference#attr_android:iconSpaceReserved
-false should be the default. However, according to
-https://material.io/design/platform-guidance/android-settings.html this goes
-against the material design guidelines and the default was overridden to true in
-https://cs.android.com/android/platform/superproject/+/android-9.0.0_r1:prebuilts/sdk/current/support/v7/preference/res/values-sw360dp-v13/values-sw360dp-v13.xml
-This file sets the default value back to false (i.e. no space reserved for icons).
-
-See also the discussion at https://github.com/organicmaps/organicmaps/pull/1924
--->
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <bool name="config_materialPreferenceIconSpaceReserved" tools:ignore="MissingDefaultResource">false</bool>
-</resources>

android/app/src/main/res/xml/prefs_backup.xml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
   <Preference
       android:key="backup_location"
       android:summary="@string/pref_backup_location_summary_initial"
-      android:title="@string/pref_backup_location_title" />
+      android:title="@string/pref_backup_location_title"
+      app:iconSpaceReserved="false" />
   <Preference
       android:key="backup_now"
       android:summary="@string/pref_backup_now_summary"
-      android:title="@string/pref_backup_now_title" />
+      android:title="@string/pref_backup_now_title"
+      app:iconSpaceReserved="false" />
   <ListPreference
       android:defaultValue="86400000"
       android:entries="@array/backup_interval_entries"
       android:entryValues="@array/backup_interval_values"
       android:key="backup_history_interval"
-      android:title="@string/pref_backup_interval_title" />
+      android:title="@string/pref_backup_interval_title"
+      app:iconSpaceReserved="false" />
   <ListPreference
       android:defaultValue="10"
       android:entries="@array/backup_history_entries"
       android:entryValues="@array/backup_history_values"
       android:key="backup_history_count"
-      android:title="@string/pref_backup_history_title" />
+      android:title="@string/pref_backup_history_title"
+      app:iconSpaceReserved="false" />
 
 </PreferenceScreen>

android/app/src/main/res/xml/prefs_main.xml

@@ -7,6 +7,7 @@
   <Preference
     android:key="@string/pref_osm_profile"
     android:title="@string/profile"
+    app:icon="@drawable/ic_profile"
     tools:summary="LongLongUsernameHere"
     app:singleLineTitle="false"
     android:order="1"/>
@@ -17,6 +18,7 @@
     <ListPreference
       android:key="@string/pref_munits"
       android:title="@string/measurement_units"
+      app:icon="@drawable/ic_straighten"
       app:singleLineTitle="false"
       android:summary="@string/measurement_units_summary"
       android:entries="@array/measument_units"
@@ -42,6 +44,7 @@
     <SwitchPreferenceCompat
       android:key="@string/pref_autodownload"
       android:title="@string/autodownload"
+      app:icon="@drawable/ic_download_st"
       app:singleLineTitle="false"
       android:order="5"/>
     <SwitchPreferenceCompat
@@ -49,22 +52,26 @@
       android:title="@string/big_font"
       app:singleLineTitle="false"
       android:defaultValue="false"
+      app:icon="@drawable/ic_text_fields"
       android:order="6"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_transliteration"
       android:title="@string/transliteration_title"
       app:singleLineTitle="false"
+      app:icon="@drawable/ic_translate_indic"
       android:defaultValue="false"
       android:order="7"/>
     <Preference
       android:key="@string/pref_storage"
       android:title="@string/maps_storage"
+      app:icon="@drawable/ic_sd_card"
       app:singleLineTitle="false"
       android:summary="@string/maps_storage_summary"
       android:order="8"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_enable_logging"
       android:title="@string/enable_logging"
+      app:icon="@drawable/ic_browse_activity"
       app:singleLineTitle="false"
       android:summary="@string/enable_logging_warning_message"
       android:defaultValue="false"
@@ -80,6 +87,7 @@
       android:key="@string/pref_use_mobile_data"
       android:title="@string/mobile_data"
       app:singleLineTitle="false"
+      app:icon="@drawable/ic_network_manage"
       android:summary="@string/mobile_data_description"
       android:entries="@array/mobile_data_options"
       android:entryValues="@array/mobile_data_options_values"
@@ -91,6 +99,7 @@
       android:summary="@string/power_managment_description"
       android:entries="@array/power_management_scheme"
       android:entryValues="@array/power_management_scheme_values"
+      app:icon="@drawable/ic_eco"
       android:order="15"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_keep_screen_on"
@@ -102,6 +111,7 @@
     <SwitchPreferenceCompat
       android:key="@string/pref_show_on_lock_screen"
       android:title="@string/enable_show_on_lock_screen"
+      app:icon="@drawable/ic_mobile_lock_portrait"
       app:singleLineTitle="false"
       android:summary="@string/enable_show_on_lock_screen_description"
       android:defaultValue="true"
@@ -109,6 +119,7 @@
     <Preference
         android:key="@string/pref_map_locale"
         android:title="@string/change_map_locale"
+        app:icon="@drawable/ic_translate"
         app:singleLineTitle="false"
         android:persistent="false"
         android:order="18"/>
@@ -116,6 +127,7 @@
         android:key="@string/pref_backup"
         android:title="@string/pref_backup_title"
         android:summary="@string/pref_backup_summary"
+        app:icon="@drawable/ic_settings_backup_restore"
         app:singleLineTitle="false"
         android:persistent="false"
         android:order="19"/>
@@ -128,12 +140,14 @@
     <ListPreference
       android:key="@string/pref_map_style"
       android:title="@string/pref_map_style_title"
+      app:icon="@drawable/ic_dark_mode"
       app:singleLineTitle="false"
       android:entries="@array/map_style"
       android:order="1"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_3d"
       android:title="@string/pref_map_3d_title"
+      app:icon="@drawable/ic_three_d_rotation"
       app:singleLineTitle="false"
       android:order="2"/>
     <SwitchPreferenceCompat
@@ -146,12 +160,14 @@
       android:title="@string/pref_tts_enable_title"
       app:singleLineTitle="false"
       android:persistent="false"
+      app:icon="@drawable/ic_record_voice_over"
       android:order="4">
     </Preference>
     <PreferenceScreen
       android:key="@string/prefs_routing"
       android:order="5"
-      android:title="@string/driving_options_title">
+      android:title="@string/driving_options_title"
+      app:icon="@drawable/ic_instant_mix">
       <intent
         android:targetClass="app.organicmaps.settings.DrivingOptionsActivity"
         android:targetPackage="@string/app_id">
@@ -167,12 +183,14 @@
       android:key="@string/pref_play_services"
       android:title="@string/google_play_services"
       app:singleLineTitle="false"
+      app:icon="@drawable/ic_wifi_find"
       android:summary="@string/pref_use_google_play"
       android:defaultValue="true"
       android:order="1"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_search_history"
       android:title="@string/search_history_title"
+      app:icon="@drawable/ic_search_recent_st"
       app:singleLineTitle="false"
       android:defaultValue="true"
       android:order="2"/>

android/app/src/main/res/xml/prefs_voice_instructions.xml

@@ -5,45 +5,54 @@
 
   <SwitchPreferenceCompat
       android:key="@string/pref_tts_enabled"
-      android:title="@string/pref_tts_enable_title" />
+      android:title="@string/pref_tts_enable_title"
+      app:iconSpaceReserved="false"/>
   <SwitchPreferenceCompat
       android:key="@string/pref_tts_street_names"
       android:title="@string/pref_tts_street_names_title"
       app:isPreferenceVisible="false"
       android:summary="@string/pref_tts_street_names_description"
-      android:defaultValue="false" />
+      android:defaultValue="false"
+      app:iconSpaceReserved="false"/>
   <ListPreference
       android:key="@string/pref_tts_language"
       app:isPreferenceVisible="false"
-      android:title="@string/pref_tts_language_title" />
+      android:title="@string/pref_tts_language_title"
+      app:iconSpaceReserved="false"/>
   <SeekBarPreference
       android:key="@string/pref_tts_volume"
       app:isPreferenceVisible="false"
-      android:title="@string/volume" />
+      android:title="@string/volume"
+      app:iconSpaceReserved="false"/>
   <Preference
       android:key="@string/pref_tts_test_voice"
       app:isPreferenceVisible="false"
-      android:title="@string/pref_tts_test_voice_title" />
+      android:title="@string/pref_tts_test_voice_title"
+      app:iconSpaceReserved="false"/>
   <Preference
       android:key="@string/pref_tts_open_system_settings"
-      android:title="@string/pref_tts_open_system_settings" />
+      android:title="@string/pref_tts_open_system_settings"
+      app:iconSpaceReserved="false"/>
   <Preference
       android:enabled="false"
       android:key="@string/pref_tts_info"
       android:persistent="false"
       android:selectable="false"
-      android:summary="@string/prefs_languages_information" />
+      android:summary="@string/prefs_languages_information"
+      app:iconSpaceReserved="false" />
   <Preference
       android:enabled="true"
       android:key="@string/pref_tts_info_link"
       android:persistent="false"
       android:selectable="true"
-      android:summary="@string/prefs_languages_information_off_link" />
+      android:summary="@string/prefs_languages_information_off_link"
+      app:iconSpaceReserved="false" />
   <ListPreference
       android:key="@string/pref_tts_speed_cameras"
       android:title="@string/speedcams_alert_title"
       app:singleLineTitle="false"
       android:entries="@array/speed_cameras"
       android:entryValues="@array/speed_cameras_values"
-      android:defaultValue="@string/auto_enum_value" />
+      android:defaultValue="@string/auto_enum_value"
+      app:iconSpaceReserved="false" />
 </androidx.preference.PreferenceScreen>