From d22d50f9e28bc5c922c42d88dbefcf7bcdcf1d75 Mon Sep 17 00:00:00 2001
From: memms <devneraj3@gmail.com>
Date: Mon, 1 Apr 2024 12:40:43 -0400
Subject: [PATCH] style: Added relevant icons for preferences UI #4902 (#4992)

####  Description
Added appropriate icons (SVG) to the preferences fragment UI. SVGs
(most) used (and edited) from svgrepo. Appropriate licensing was checked
to allow change and use of the SVG.

#### Related issues
Fixes #4902

#### Screenshots

![p1](https://github.com/openfoodfacts/openfoodfacts-androidapp/assets/16926153/d9342ced-98d8-471c-8481-6a674318d79a)

![p2](https://github.com/openfoodfacts/openfoodfacts-androidapp/assets/16926153/aa070bf1-9faa-4c19-844f-728cbffb8bf0)

![p3](https://github.com/openfoodfacts/openfoodfacts-androidapp/assets/16926153/bc09992a-347c-45cf-9375-cc1e6f792287)

![p4](https://github.com/openfoodfacts/openfoodfacts-androidapp/assets/16926153/976e13b8-e553-4f56-a90b-702e3b29c8c1)

#### Link to the automatically generated build APK
<!-- If your build succeeds after making this PR, you will get an APK.
Please edit your PR and add the link here -->
---
 .../preferences/PreferencesFragment.kt        | 13 +++++-
 .../drawable/ic_preference_all_products.xml   | 10 +++++
 .../res/drawable/ic_preference_contact.xml    | 21 +++++++++
 .../res/drawable/ic_preference_country.xml    | 10 +++++
 .../drawable/ic_preference_crash_report.xml   | 14 ++++++
 .../main/res/drawable/ic_preference_crop.xml  | 10 +++++
 .../ic_preference_database_export.xml         | 12 +++++
 .../res/drawable/ic_preference_donate.xml     | 10 +++++
 .../main/res/drawable/ic_preference_drop.xml  | 10 +++++
 .../res/drawable/ic_preference_energy.xml     | 10 +++++
 .../main/res/drawable/ic_preference_faq.xml   | 21 +++++++++
 .../main/res/drawable/ic_preference_fast.xml  | 21 +++++++++
 .../res/drawable/ic_preference_image_res.xml  | 10 +++++
 .../res/drawable/ic_preference_language.xml   | 10 +++++
 .../drawable/ic_preference_mobile_data.xml    | 19 ++++++++
 .../res/drawable/ic_preference_no_image.xml   | 10 +++++
 .../res/drawable/ic_preference_power_mode.xml | 37 +++++++++++++++
 .../res/drawable/ic_preference_scanner.xml    | 45 +++++++++++++++++++
 .../res/drawable/ic_preference_send_data.xml  | 14 ++++++
 .../main/res/drawable/ic_preference_share.xml | 15 +++++++
 .../main/res/drawable/ic_preference_star.xml  | 10 +++++
 .../res/drawable/ic_preference_startup.xml    | 40 +++++++++++++++++
 .../main/res/drawable/ic_preference_terms.xml | 13 ++++++
 .../main/res/drawable/ic_preference_theme.xml | 10 +++++
 .../main/res/drawable/ic_preference_trash.xml | 42 +++++++++++++++++
 .../main/res/drawable/ic_preference_vegan.xml | 10 +++++
 .../res/drawable/ic_preference_vegetarian.xml | 15 +++++++
 .../res/drawable/ic_preference_volume.xml     | 14 ++++++
 app/src/main/res/xml/preferences.xml          | 27 ++++++++++-
 29 files changed, 501 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_preference_all_products.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_contact.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_country.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_crash_report.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_crop.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_database_export.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_donate.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_drop.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_energy.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_faq.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_fast.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_image_res.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_language.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_mobile_data.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_no_image.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_power_mode.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_scanner.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_send_data.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_share.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_star.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_startup.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_terms.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_theme.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_trash.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_vegan.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_vegetarian.xml
 create mode 100644 app/src/main/res/drawable/ic_preference_volume.xml

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/preferences/PreferencesFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/preferences/PreferencesFragment.kt
index 8ab7d95ab33c..c305c54de9ca 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/preferences/PreferencesFragment.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/preferences/PreferencesFragment.kt
@@ -28,6 +28,7 @@ import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.net.toUri
@@ -395,9 +396,11 @@ class PreferencesFragment : PreferenceFragmentCompat(), INavigationItem {
                                         pref.summary = null
                                         pref.widgetLayoutResource = R.layout.loading
                                     }
+
                                     WorkInfo.State.SUCCEEDED -> {
                                         setupAnalysisTagConfigs()
                                     }
+
                                     else -> Unit  // Nothing
                                 }
                             }
@@ -416,7 +419,15 @@ class PreferencesFragment : PreferenceFragmentCompat(), INavigationItem {
 
         key = config.type
         title = getString(R.string.display_analysis_tag_status, config.typeName.lowercase(Locale.getDefault()))
-
+        val drawable = when (config.typeName.lowercase(Locale.getDefault())) {
+            "palm oil" -> R.drawable.ic_preference_drop
+            "vegan" -> R.drawable.ic_preference_vegan
+            "vegetarian" -> R.drawable.ic_preference_vegetarian
+            else -> null
+        }
+        drawable?.let {
+            icon = ContextCompat.getDrawable(requireContext(), it)
+        }
         summary = null
         summaryOn = null
         summaryOff = null
diff --git a/app/src/main/res/drawable/ic_preference_all_products.xml b/app/src/main/res/drawable/ic_preference_all_products.xml
new file mode 100644
index 000000000000..2da33526a037
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_all_products.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="1024"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="1024"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M235.5,143.4h757.8c17,0 30.7,13.8 30.7,30.7s-13.8,30.7 -30.7,30.7L235.5,204.8c-17,0 -30.7,-13.8 -30.7,-30.7s13.8,-30.7 30.7,-30.7zM235.5,368.6h757.8c17,0 30.7,13.8 30.7,30.7s-13.8,30.7 -30.7,30.7L235.5,430.1c-17,0 -30.7,-13.8 -30.7,-30.7s13.8,-30.7 30.7,-30.7zM235.5,604.2h757.8c17,0 30.7,13.8 30.7,30.7s-13.8,30.7 -30.7,30.7L235.5,665.6c-17,0 -30.7,-13.8 -30.7,-30.7s13.8,-30.7 30.7,-30.7zM235.5,829.4h757.8c17,0 30.7,13.8 30.7,30.7s-13.8,30.7 -30.7,30.7L235.5,890.9c-17,0 -30.7,-13.8 -30.7,-30.7s13.8,-30.7 30.7,-30.7zM61.4,235.5C27.5,235.5 0,208 0,174.1s27.5,-61.4 61.4,-61.4 61.4,27.5 61.4,61.4 -27.5,61.4 -61.4,61.4zM61.4,460.8C27.5,460.8 0,433.3 0,399.4s27.5,-61.4 61.4,-61.4 61.4,27.5 61.4,61.4 -27.5,61.4 -61.4,61.4zM61.4,696.3C27.5,696.3 0,668.8 0,634.9s27.5,-61.4 61.4,-61.4 61.4,27.5 61.4,61.4 -27.5,61.4 -61.4,61.4zM61.4,921.6C27.5,921.6 0,894.1 0,860.2s27.5,-61.4 61.4,-61.4 61.4,27.5 61.4,61.4 -27.5,61.4 -61.4,61.4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_contact.xml b/app/src/main/res/drawable/ic_preference_contact.xml
new file mode 100644
index 000000000000..06631914c343
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_contact.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?attr/colorControlNormal"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M4,3H14a2,2 0,0 1,2 2v6a2,2 0,0 1,-2 2H11L8,16 5,13H4a2,2 0,0 1,-2 -2V5A2,2 0,0 1,4 3Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M16,8h4a2,2 0,0 1,2 2v6a2,2 0,0 1,-2 2H18l-2,3 -3,-3H10a2,2 0,0 1,-2 -2H8"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_country.xml b/app/src/main/res/drawable/ic_preference_country.xml
new file mode 100644
index 000000000000..dac28695ad45
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_country.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19.42,4.45C19.32,4.381 19.205,4.338 19.085,4.324C18.965,4.31 18.843,4.326 18.73,4.37C17.54,4.876 16.284,5.213 15,5.37C14.188,5.153 13.413,4.816 12.7,4.37C11.779,3.803 10.762,3.41 9.7,3.21C7.993,3.361 6.313,3.731 4.7,4.31C4.551,4.36 4.422,4.456 4.331,4.583C4.239,4.71 4.19,4.863 4.19,5.02V20C4.19,20.199 4.269,20.39 4.41,20.53C4.55,20.671 4.741,20.75 4.94,20.75C5.139,20.75 5.33,20.671 5.47,20.53C5.611,20.39 5.69,20.199 5.69,20V14.15C6.935,13.699 8.232,13.407 9.55,13.28C10.396,13.489 11.206,13.826 11.95,14.28C12.82,14.812 13.773,15.194 14.77,15.41H15C16.448,15.227 17.865,14.847 19.21,14.28C19.351,14.225 19.473,14.129 19.559,14.004C19.644,13.879 19.69,13.731 19.69,13.58V5.07C19.698,4.953 19.677,4.835 19.63,4.727C19.583,4.619 19.511,4.524 19.42,4.45ZM18.25,13.08C17.211,13.51 16.117,13.793 15,13.92C14.188,13.703 13.413,13.366 12.7,12.92C11.779,12.353 10.762,11.96 9.7,11.76H9.5C8.213,11.876 6.944,12.144 5.72,12.56V5.56C6.965,5.109 8.262,4.817 9.58,4.69C10.426,4.899 11.236,5.236 11.98,5.69C12.85,6.222 13.803,6.604 14.8,6.82C15.973,6.774 17.13,6.527 18.22,6.09L18.25,13.08Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_crash_report.xml b/app/src/main/res/drawable/ic_preference_crash_report.xml
new file mode 100644
index 000000000000..58721c21b15a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_crash_report.xml
@@ -0,0 +1,14 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,9v4m0,3v0.01M5.313,20h13.374c1.505,0 2.471,-1.6 1.77,-2.931L13.77,4.363c-0.75,-1.425 -2.79,-1.425 -3.54,0L3.543,17.068C2.842,18.4 3.808,20 5.313,20Z"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_crop.xml b/app/src/main/res/drawable/ic_preference_crop.xml
new file mode 100644
index 000000000000..9f6f282296dd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_crop.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M17,15h2V7c0,-1.1 -0.9,-2 -2,-2H9v2h8v8zM7,17V1H5v4H1v2h4v10c0,1.1 0.9,2 2,2h10v4h2v-4h4v-2H7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_database_export.xml b/app/src/main/res/drawable/ic_preference_database_export.xml
new file mode 100644
index 000000000000..9448afb24c58
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_database_export.xml
@@ -0,0 +1,12 @@
+<vector android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="20"
+    android:viewportWidth="20"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#222222"
+        android:pathData="M10.5,0L8,2.5L8,4L10,2L10,9L11,9L11,2L13,4L13,2.5L10.5,0zM0,7L0,13L1,13L1,14L0,14L0,20L20,20L20,14L19,14L19,13L20,13L20,7L12,7L12,8L19,8L19,12L1,12L1,8L9,8L9,7L0,7zM2,9L2,10L3,10L3,9L2,9zM4,9L4,10L5,10L5,9L4,9zM2,13L18,13L18,14L2,14L2,13zM1,15L19,15L19,19L1,19L1,15zM2,16L2,17L3,17L3,16L2,16zM4,16L4,17L5,17L5,16L4,16z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="0" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_donate.xml b/app/src/main/res/drawable/ic_preference_donate.xml
new file mode 100644
index 000000000000..b5118de3d23e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_donate.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M4,21h9.62a3.995,3.995 0,0 0,3.037 -1.397l5.102,-5.952a1,1 0,0 0,-0.442 -1.6l-1.968,-0.656a3.043,3.043 0,0 0,-2.823 0.503l-3.185,2.547 -0.617,-1.235A3.98,3.98 0,0 0,9.146 11L4,11c-1.103,0 -2,0.897 -2,2v6c0,1.103 0.897,2 2,2zM4,13h5.146c0.763,0 1.448,0.423 1.789,1.105l0.447,0.895L7,15v2h6.014a0.996,0.996 0,0 0,0.442 -0.11l0.003,-0.001 0.004,-0.002h0.003l0.002,-0.001h0.004l0.001,-0.001c0.009,0.003 0.003,-0.001 0.003,-0.001 0.01,0 0.002,-0.001 0.002,-0.001h0.001l0.002,-0.001 0.003,-0.001 0.002,-0.001 0.002,-0.001 0.003,-0.001 0.002,-0.001c0.003,0 0.001,-0.001 0.002,-0.001l0.003,-0.002 0.002,-0.001 0.002,-0.001 0.003,-0.001 0.002,-0.001h0.001l0.002,-0.001h0.001l0.002,-0.001 0.002,-0.001c0.009,-0.001 0.003,-0.001 0.003,-0.001l0.002,-0.001a0.915,0.915 0,0 0,0.11 -0.078l4.146,-3.317c0.262,-0.208 0.623,-0.273 0.94,-0.167l0.557,0.186 -4.133,4.823a2.029,2.029 0,0 1,-1.52 0.688L4,19v-6zM16,2h-0.017c-0.163,0.002 -1.006,0.039 -1.983,0.705 -0.951,-0.648 -1.774,-0.7 -1.968,-0.704L12.002,2h-0.004c-0.801,0 -1.555,0.313 -2.119,0.878C9.313,3.445 9,4.198 9,5s0.313,1.555 0.861,2.104l3.414,3.586a1.006,1.006 0,0 0,1.45 -0.001l3.396,-3.568C18.688,6.555 19,5.802 19,5s-0.313,-1.555 -0.878,-2.121A2.978,2.978 0,0 0,16.002 2L16,2zM17,5c0,0.267 -0.104,0.518 -0.311,0.725L14,8.55l-2.707,-2.843C11.104,5.518 11,5.267 11,5s0.104,-0.518 0.294,-0.708A0.977,0.977 0,0 1,11.979 4c0.025,0.001 0.502,0.032 1.067,0.485 0.081,0.065 0.163,0.139 0.247,0.222l0.707,0.707 0.707,-0.707c0.084,-0.083 0.166,-0.157 0.247,-0.222 0.529,-0.425 0.976,-0.478 1.052,-0.484a0.987,0.987 0,0 1,0.701 0.292c0.189,0.189 0.293,0.44 0.293,0.707z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_drop.xml b/app/src/main/res/drawable/ic_preference_drop.xml
new file mode 100644
index 000000000000..8a1d5446d0e5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_drop.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="32"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="32"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M15.95,31.959c-6.041,0 -10.956,-4.848 -10.956,-10.806 0,-6.959 9.739,-20.151 10.153,-20.71 0.188,-0.252 0.482,-0.402 0.796,-0.404 0.349,-0.003 0.611,0.144 0.802,0.393 0.419,0.548 10.261,13.507 10.261,20.721 0,5.959 -4.96,10.806 -11.056,10.806zM15.961,2.74c-2.325,3.302 -8.967,13.189 -8.967,18.413 0,4.855 4.018,8.806 8.956,8.806 4.993,0 9.056,-3.95 9.056,-8.806 0,-5.418 -6.692,-15.157 -9.045,-18.413z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_energy.xml b/app/src/main/res/drawable/ic_preference_energy.xml
new file mode 100644
index 000000000000..fc8734cf0da6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_energy.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="32"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="32"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M24.74,10.362c-0.226,-0.225 -0.538,-0.364 -0.882,-0.364 -0.515,0 -0.957,0.311 -1.148,0.756l-0.003,0.008c-0.262,0.602 -0.597,1.12 -1.003,1.573l0.005,-0.005c0.004,-0.122 0.007,-0.265 0.007,-0.408 0,-1.822 -0.405,-3.55 -1.13,-5.098l0.031,0.074c-1.274,-2.658 -3.407,-4.734 -6.032,-5.905l-0.077,-0.031c-0.146,-0.065 -0.317,-0.103 -0.496,-0.103 -0.691,0 -1.251,0.56 -1.251,1.251 0,0.076 0.007,0.15 0.02,0.222l-0.001,-0.008c0.001,0.044 0.002,0.097 0.002,0.149 0,2.007 -0.894,3.804 -2.304,5.017l-0.009,0.007c-0.521,0.527 -1.075,1.025 -1.63,1.523 -1.312,1.086 -2.451,2.309 -3.42,3.663l-0.04,0.058c-1.097,1.779 -1.747,3.935 -1.747,6.243 0,1.135 0.157,2.233 0.451,3.274l-0.02,-0.085c0.767,3.141 2.696,5.738 5.295,7.361l0.05,0.029c1.892,1.209 4.197,1.931 6.67,1.943h0.003c0.003,0 0.006,0 0.009,0 0.53,0 1.051,-0.035 1.563,-0.102l-0.06,0.006c4.72,-0.689 8.548,-3.907 10.104,-8.211l0.028,-0.088c0.395,-1.169 0.623,-2.516 0.623,-3.916 0,-3.441 -1.377,-6.56 -3.609,-8.837l0.002,0.002zM25.357,22.309c-1.263,3.505 -4.318,6.073 -8.03,6.616l-0.055,0.007c-0.354,0.044 -0.764,0.07 -1.179,0.07 -1.989,0 -3.843,-0.581 -5.401,-1.582l0.04,0.024c-2.103,-1.314 -3.635,-3.376 -4.231,-5.806l-0.013,-0.065c-0.227,-0.775 -0.357,-1.666 -0.357,-2.587 0,-1.802 0.5,-3.487 1.368,-4.925l-0.024,0.043c0.888,-1.221 1.887,-2.28 3.005,-3.2l0.03,-0.024c0.592,-0.531 1.183,-1.063 1.738,-1.627 1.411,-1.33 2.445,-3.046 2.934,-4.979l0.015,-0.071c2.45,1.719 4.031,4.531 4.031,7.712 0,0.983 -0.151,1.93 -0.431,2.821l0.018,-0.067c-0.035,0.109 -0.054,0.235 -0.054,0.365 0,0.691 0.56,1.25 1.25,1.25 0.169,0 0.329,-0.033 0.476,-0.094l-0.008,0.003c1.455,-0.602 2.662,-1.555 3.554,-2.755l0.016,-0.022c1.129,1.609 1.805,3.608 1.805,5.765 0,1.118 -0.182,2.194 -0.517,3.2l0.021,-0.071z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_faq.xml b/app/src/main/res/drawable/ic_preference_faq.xml
new file mode 100644
index 000000000000..642ed169ea3c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_faq.xml
@@ -0,0 +1,21 @@
+<vector android:height="24dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024"
+    android:tint="?attr/colorControlNormal"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:strokeColor="@color/black"
+        android:strokeWidth="24"
+        android:pathData="M320,853.3h490.7l128,128V533.3c0,-46.9 -38.4,-85.3 -85.3,-85.3H320c-46.9,0 -85.3,38.4 -85.3,85.3v234.7c0,46.9 38.4,85.3 85.3,85.3z" />
+    <path
+        android:fillColor="#1B5E20"
+        android:pathData="M614.4,699.7h-76.8l-14.9,44.8h-46.9l78.9,-213.3h40.5l78.9,213.3h-46.9l-12.8,-44.8zM548.3,665.6h53.3L576,584.5l-27.7,81.1z" />
+    <path
+        android:strokeColor="@color/black"
+        android:strokeWidth="24"
+        android:pathData="M704,533.3H213.3l-128,128V170.7c0,-46.9 38.4,-85.3 85.3,-85.3h533.3c46.9,0 85.3,38.4 85.3,85.3v277.3c0,46.9 -38.4,85.3 -85.3,85.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M541.9,302.9c0,21.3 -4.3,38.4 -10.7,53.3s-14.9,27.7 -27.7,36.3l36.3,27.7 -27.7,25.6 -46.9,-36.3c-4.3,0 -10.7,2.1 -17.1,2.1 -12.8,0 -25.6,-2.1 -38.4,-6.4 -10.7,-4.3 -21.3,-12.8 -29.9,-21.3 -8.5,-8.5 -14.9,-21.3 -19.2,-34.1 -4.3,-12.8 -6.4,-27.7 -6.4,-44.8v-8.5c0,-17.1 2.1,-32 6.4,-44.8 4.3,-12.8 10.7,-25.6 19.2,-34.1 8.5,-8.5 17.1,-17.1 29.9,-21.3 10.7,-4.3 23.5,-6.4 38.4,-6.4 12.8,0 25.6,2.1 38.4,6.4 10.7,4.3 21.3,12.8 29.9,21.3 8.5,8.5 14.9,21.3 19.2,34.1 4.3,12.8 6.4,27.7 6.4,44.8v6.4zM494.9,292.3c0,-23.5 -4.3,-40.5 -12.8,-51.2 -8.5,-12.8 -19.2,-17.1 -34.1,-17.1 -14.9,0 -27.7,6.4 -34.1,17.1 -8.5,12.8 -12.8,29.9 -12.8,51.2v10.7c0,10.7 2.1,21.3 4.3,29.9 2.1,8.5 4.3,17.1 8.5,21.3 4.3,6.4 8.5,10.7 14.9,12.8 6.4,2.1 12.8,4.3 19.2,4.3 14.9,0 27.7,-6.4 34.1,-17.1 8.5,-12.8 12.8,-29.9 12.8,-53.3v-8.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_fast.xml b/app/src/main/res/drawable/ic_preference_fast.xml
new file mode 100644
index 000000000000..d7b3556446b7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_fast.xml
@@ -0,0 +1,21 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M14.4,8.8L14.158,8.662C13.642,8.367 13,8.739 13,9.333L13,14.667C13,15.261 13.642,15.633 14.158,15.339L14.4,15.2L18.6,12.8C19.219,12.446 19.219,11.554 18.6,11.2L14.4,8.8Z"
+        android:strokeColor="#323232"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6.6,8L6.413,7.883C5.798,7.499 5,7.941 5,8.667L5,15.333C5,16.059 5.798,16.501 6.413,16.117L6.6,16L11.4,13C12.139,12.538 12.139,11.462 11.4,11L6.6,8Z"
+        android:strokeColor="#323232"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_image_res.xml b/app/src/main/res/drawable/ic_preference_image_res.xml
new file mode 100644
index 000000000000..ecb636cc411b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_image_res.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,17h17L23,3L6,3zM22,16L7,16v-3.386l1.771,-1.771a1.38,1.38 0,0 0,1.402 -0.334l2.288,-2.29 2.27,1.892a1.376,1.376 0,0 0,1.708 0.043l1.245,-0.933L22,12.681zM22,4v7.399l-4.035,-3.234a0.377,0.377 0,0 0,-0.493 -0.035l-1.633,1.225a0.377,0.377 0,0 1,-0.468 -0.012l-2.706,-2.256a0.377,0.377 0,0 0,-0.509 0.023L9.466,9.8a0.377,0.377 0,0 1,-0.533 0,0.377 0.377,0 0,0 -0.533,0L7,11.2L7,4zM15.5,5.521v-0.043a0.979,0.979 0,0 1,0.979 -0.978A1.021,1.021 0,0 1,17.5 5.521a0.979,0.979 0,0 1,-0.979 0.979h-0.043a0.981,0.981 0,0 1,-0.978 -0.979zM21,18.824l2.058,1.676L21,22.176L21,21L8,21v1.176L5.942,20.5 8,18.824L8,20h13zM3,5v10h1.176L2.5,17.058 0.824,15L2,15L2,5L0.824,5L2.5,2.942 4.176,5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_language.xml b/app/src/main/res/drawable/ic_preference_language.xml
new file mode 100644
index 000000000000..bd28d6856472
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_language.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M20.58,19.37L17.59,11.01C17.38,10.46 16.91,10.12 16.37,10.12C15.83,10.12 15.37,10.46 15.14,11.03L12.16,19.37C12.02,19.76 12.22,20.19 12.61,20.33C13,20.47 13.43,20.27 13.57,19.88L14.19,18.15H18.54L19.16,19.88C19.27,20.19 19.56,20.38 19.87,20.38C19.95,20.38 20.04,20.37 20.12,20.34C20.51,20.2 20.71,19.77 20.57,19.38L20.58,19.37ZM14.74,16.64L16.38,12.05L18.02,16.64H14.74ZM12.19,7.85C9.93,11.42 7.89,13.58 5.41,15.02C5.29,15.09 5.16,15.12 5.04,15.12C4.78,15.12 4.53,14.99 4.39,14.75C4.18,14.39 4.3,13.93 4.66,13.73C6.76,12.51 8.48,10.76 10.41,7.86H4.12C3.71,7.86 3.37,7.52 3.37,7.11C3.37,6.7 3.71,6.36 4.12,6.36H7.87V4.38C7.87,3.97 8.21,3.63 8.62,3.63C9.03,3.63 9.37,3.97 9.37,4.38V6.36H13.12C13.53,6.36 13.87,6.7 13.87,7.11C13.87,7.52 13.53,7.86 13.12,7.86H12.18L12.19,7.85ZM12.23,15.12C12.1,15.12 11.97,15.09 11.85,15.02C11.2,14.64 10.57,14.22 9.98,13.78C9.65,13.53 9.58,13.06 9.83,12.73C10.08,12.4 10.55,12.33 10.88,12.58C11.42,12.99 12.01,13.37 12.61,13.72C12.97,13.93 13.09,14.39 12.88,14.75C12.74,14.99 12.49,15.12 12.23,15.12Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_mobile_data.xml b/app/src/main/res/drawable/ic_preference_mobile_data.xml
new file mode 100644
index 000000000000..7992903db5bb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_mobile_data.xml
@@ -0,0 +1,19 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13,8H15V20H13V8Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M5,16H7V20H5V16Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M9,12H11V20H9V12Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M17,4H19V20H17V4Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_no_image.xml b/app/src/main/res/drawable/ic_preference_no_image.xml
new file mode 100644
index 000000000000..5b23fd2fd44c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_no_image.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.828,5l-1,-1L22,4v15.172l-1,-1v-0.69l-3.116,-3.117 -0.395,0.296 -0.714,-0.714 0.854,-0.64a0.503,0.503 0,0 1,0.657 0.046L21,16.067L21,5zM3,20v-0.519l2.947,-2.947a1.506,1.506 0,0 0,0.677 0.163,1.403 1.403,0 0,0 0.997,-0.415l2.916,-2.916 -0.706,-0.707 -2.916,2.916a0.474,0.474 0,0 1,-0.678 -0.048,0.503 0.503,0 0,0 -0.704,0.007L3,18.067L3,5.828l-1,-1L2,21h16.172l-1,-1zM17,8.5A1.5,1.5 0,1 1,15.5 7,1.5 1.5,0 0,1 17,8.5zM16,8.5a0.5,0.5 0,1 0,-0.5 0.5,0.5 0.5,0 0,0 0.5,-0.5zM21.646,22.354l0.707,-0.707 -20,-20 -0.707,0.707z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_power_mode.xml b/app/src/main/res/drawable/ic_preference_power_mode.xml
new file mode 100644
index 000000000000..4d0b8571da14
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_power_mode.xml
@@ -0,0 +1,37 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:pathData="M2,9V7C2,4 4,2 7,2H17C20,2 22,4 22,7V9"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+    <path
+        android:pathData="M2,15V17C2,20 4,22 7,22H17C20,22 22,20 22,17V15"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+    <path
+        android:pathData="M6.699,9.26L11.999,12.33L17.259,9.28"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+    <path
+        android:pathData="M12,17.77V12.32"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+    <path
+        android:pathData="M10.76,6.29L7.56,8.07C6.84,8.47 6.24,9.48 6.24,10.31V13.7C6.24,14.53 6.83,15.54 7.56,15.94L10.76,17.72C11.44,18.1 12.56,18.1 13.25,17.72L16.45,15.94C17.17,15.54 17.77,14.53 17.77,13.7V10.31C17.77,9.48 17.18,8.47 16.45,8.07L13.25,6.29C12.56,5.9 11.44,5.9 10.76,6.29Z"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_scanner.xml b/app/src/main/res/drawable/ic_preference_scanner.xml
new file mode 100644
index 000000000000..1357cb2168e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_scanner.xml
@@ -0,0 +1,45 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h24v24h-24z" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M20,12H4"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M16,4H18C19.105,4 20,4.895 20,6V8"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M8,20L6,20C4.895,20 4,19.104 4,18L4,16"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M20,16V18C20,19.104 19.105,20 18,20H16"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M4,8L4,6C4,4.895 4.895,4 6,4L8,4"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_send_data.xml b/app/src/main/res/drawable/ic_preference_send_data.xml
new file mode 100644
index 000000000000..ca7e9e63eeaf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_send_data.xml
@@ -0,0 +1,14 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,6L12,3M12,3L15,6M12,3V13M7,10C6.068,10 5.602,10 5.235,10.152C4.745,10.355 4.355,10.745 4.152,11.235C4,11.602 4,12.068 4,13V17.8C4,18.92 4,19.48 4.218,19.908C4.41,20.284 4.715,20.59 5.092,20.782C5.519,21 6.079,21 7.197,21H16.804C17.921,21 18.48,21 18.908,20.782C19.284,20.59 19.59,20.284 19.782,19.908C20,19.48 20,18.921 20,17.803V13C20,12.068 20,11.602 19.848,11.235C19.645,10.745 19.255,10.355 18.765,10.152C18.398,10 17.932,10 17,10"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_share.xml b/app/src/main/res/drawable/ic_preference_share.xml
new file mode 100644
index 000000000000..f2bd3cc08b5f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_share.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,13.5L15,16.5M15,7.5L9,10.5M18,21C16.343,21 15,19.657 15,18C15,16.343 16.343,15 18,15C19.657,15 21,16.343 21,18C21,19.657 19.657,21 18,21ZM6,15C4.343,15 3,13.657 3,12C3,10.343 4.343,9 6,9C7.657,9 9,10.343 9,12C9,13.657 7.657,15 6,15ZM18,9C16.343,9 15,7.657 15,6C15,4.343 16.343,3 18,3C19.657,3 21,4.343 21,6C21,7.657 19.657,9 18,9Z"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_star.xml b/app/src/main/res/drawable/ic_preference_star.xml
new file mode 100644
index 000000000000..d69796b1f4be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_star.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="32"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="32"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M16,2.421l4.296,8.909 9.769,1.452 -7.075,7.057 0.238,1.416 1.415,8.443 -8.644,-4.649 -8.643,4.652 1.415,-8.444 0.237,-1.416 -7.073,-7.059 9.768,-1.452 0.642,-1.329zM15.999,0.486c-0.896,0 -1.712,0.505 -2.093,1.296l-3.622,7.52 -8.335,1.239c-0.856,0.128 -1.567,0.713 -1.843,1.512 -0.276,0.802 -0.067,1.684 0.537,2.286l6.106,6.1 -1.417,8.458c-0.143,0.852 0.226,1.707 0.949,2.206 0.397,0.273 0.864,0.411 1.332,0.411 0.385,0 0.77,-0.093 1.119,-0.281l7.266,-3.912 7.266,3.912c0.349,0.187 0.735,0.281 1.118,0.281 0.468,0 0.934,-0.138 1.333,-0.411 0.722,-0.498 1.091,-1.353 0.947,-2.206l-1.417,-8.458 6.11,-6.1c0.605,-0.601 0.812,-1.485 0.536,-2.286s-0.988,-1.385 -1.843,-1.512l-8.333,-1.239 -3.624,-7.52c-0.378,-0.791 -1.195,-1.295 -2.093,-1.295z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_startup.xml b/app/src/main/res/drawable/ic_preference_startup.xml
new file mode 100644
index 000000000000..feb48cab7c0b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_startup.xml
@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <group>
+        <clip-path android:pathData="M0,0h24v24h-24z" />
+        <path
+            android:pathData="M16,4H18C19.105,4 20,4.895 20,6V8"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round" />
+        <path
+            android:pathData="M8,20L6,20C4.895,20 4,19.104 4,18L4,16"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round" />
+        <path
+            android:pathData="M20,16V18C20,19.104 19.105,20 18,20H16"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round" />
+        <path
+            android:pathData="M4,8L4,6C4,4.895 4.895,4 6,4L8,4"
+            android:strokeLineJoin="round"
+            android:strokeWidth="2.5"
+            android:strokeColor="#292929"
+            android:strokeLineCap="round" />
+    </group>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.19,8.416c-0.171,-0.15 -0.429,-0.128 -0.579,0.064c-0.15,0.171 -0.128,0.429 0.064,0.579c0.987,0.773 1.564,1.908 1.564,3.131c0,2.23 -1.886,4.031 -4.202,4.031S7.837,14.42 7.837,12.19c0,-1.222 0.579,-2.358 1.564,-3.131c0.171,-0.128 0.214,-0.385 0.064,-0.579c-0.128,-0.171 -0.385,-0.214 -0.579,-0.064C7.684,9.337 7,10.732 7,12.21C7,14.89 9.251,17.078 12.039,17.078S17.078,14.892 17.078,12.21C17.078,10.73 16.392,9.337 15.19,8.416z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.039,12.233c0.235,0 0.429,-0.194 0.429,-0.429L12.468,7.429c0,-0.235 -0.194,-0.429 -0.429,-0.429s-0.429,0.194 -0.429,0.429L11.61,11.802C11.61,12.039 11.804,12.233 12.039,12.233z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_terms.xml b/app/src/main/res/drawable/ic_preference_terms.xml
new file mode 100644
index 000000000000..1d0df0a89bc2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_terms.xml
@@ -0,0 +1,13 @@
+<vector android:height="24dp"
+    android:viewportHeight="1024"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="1024"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#0F1F3C"
+        android:pathData="M182.5,146.2h585.1v256h73.2V73.1H109.4v877.7h256v-73.1H182.5z" />
+    <path
+        android:fillColor="#0F1F3C"
+        android:pathData="M255.7,219.3h438.9v73.1L255.7,292.5zM255.7,365.6h365.7v73.1L255.7,438.8zM255.7,511.9L475.1,511.9v73.1L255.7,585zM775.2,458.2L439,794.4l-0.5,154.6 155.7,0.5L930.4,613.4 775.2,458.2zM826.9,613.4l-25.4,25.4 -51.7,-51.7 25.4,-25.4 51.7,51.7zM749.8,690.6L620.6,819.8l-51.7,-51.7 129.2,-129.2 51.7,51.7zM511.9,876.2l0.2,-51.3 5.1,-5.1 51.7,51.7 -4.8,4.8 -52.1,-0.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_theme.xml b/app/src/main/res/drawable/ic_preference_theme.xml
new file mode 100644
index 000000000000..659fca68ae1d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_theme.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,22C17.523,22 22,17.523 22,12C22,6.477 17.523,2 12,2C6.477,2 2,6.477 2,12C2,17.523 6.477,22 12,22ZM12,20L12,4C16.418,4 20,7.582 20,12C20,16.418 16.418,20 12,20Z"
+        android:fillColor="@android:color/white" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_trash.xml b/app/src/main/res/drawable/ic_preference_trash.xml
new file mode 100644
index 000000000000..3e42f81469bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_trash.xml
@@ -0,0 +1,42 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21,5.98C17.67,5.65 14.32,5.48 10.98,5.48C9,5.48 7.02,5.58 5.04,5.78L3,5.98"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8.5,4.97L8.72,3.66C8.88,2.71 9,2 10.69,2H13.31C15,2 15.13,2.75 15.28,3.67L15.5,4.97"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18.85,9.14L18.2,19.21C18.09,20.78 18,22 15.21,22H8.79C6,22 5.91,20.78 5.8,19.21L5.15,9.14"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M10.33,16.5H13.66"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9.5,12.5H14.5"
+        android:strokeColor="#292D32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_vegan.xml b/app/src/main/res/drawable/ic_preference_vegan.xml
new file mode 100644
index 000000000000..e5c6d1d7de25
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_vegan.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M20.553,3.105l-6,3C11.225,7.77 9.274,9.953 8.755,12.6c-0.738,3.751 1.992,7.958 2.861,8.321A0.985,0.985 0,0 0,12 21h0c6.682,0 11,-3.532 11,-9 0,-6.691 -0.9,-8.318 -1.293,-8.707A1,1 0,0 0,20.553 3.105ZM12.953,18.965a8.594,8.594 0,0 1,5.44 -8.046,1 1,0 1,0 -0.788,-1.838 10.363,10.363 0,0 0,-6.393 7.667,6.59 6.59,0 0,1 -0.494,-3.777c0.4,-2 1.989,-3.706 4.728,-5.076l5.03,-2.515A29.2,29.2 0,0 1,21 12C21,16.063 17.94,18.67 12.954,18.965ZM3.523,5.38A29.2,29.2 0,0 0,3 12a6.386,6.386 0,0 0,4.366 6.212,1 1,0 1,1 -0.732,1.861A8.377,8.377 0,0 1,1 12c0,-6.691 0.9,-8.318 1.293,-8.707a1,1 0,0 1,1.154 -0.188l6,3A1,1 0,0 1,8.553 7.9Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_vegetarian.xml b/app/src/main/res/drawable/ic_preference_vegetarian.xml
new file mode 100644
index 000000000000..a0f64c32c683
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_vegetarian.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp"
+    android:viewportHeight="512"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="512"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:pathData="M76.8,0L435.2,0A76.8,76.8 0,0 1,512 76.8L512,435.2A76.8,76.8 0,0 1,435.2 512L76.8,512A76.8,76.8 0,0 1,0 435.2L0,76.8A76.8,76.8 0,0 1,76.8 0z" />
+    <path
+        android:pathData="M256,256m-220,0a220,220 0,1 1,440 0a220,220 0,1 1,-440 0"
+        android:strokeColor="#0f0"
+        android:strokeWidth="25" />
+    <path
+        android:fillColor="#0f0"
+        android:pathData="m140,120h44l72,225 72,-225h44l-90,265h-52z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_preference_volume.xml b/app/src/main/res/drawable/ic_preference_volume.xml
new file mode 100644
index 000000000000..73b801308a05
--- /dev/null
+++ b/app/src/main/res/drawable/ic_preference_volume.xml
@@ -0,0 +1,14 @@
+<vector android:height="24dp"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M10,4V10L5.203,16.853C4.275,18.179 5.223,20 6.841,20H17.159C18.777,20 19.725,18.179 18.797,16.853L14,10V4M10,4H14M10,4H8M14,4H16"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2" />
+</vector>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index a5c48ff3ab3e..dffc9bedb8a3 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -18,6 +18,7 @@
             android:defaultValue="@string/pref_app_theme_default"
             android:dialogTitle="@string/pref_app_theme_dialog_title"
             android:key="@string/pref_app_theme_key"
+            android:icon="@drawable/ic_preference_theme"
             android:title="@string/pref_app_theme_title"
             app:useSimpleSummaryProvider="true" />
 
@@ -25,6 +26,7 @@
             android:defaultValue="@string/kcal"
             android:dialogTitle="@string/pref_energy_unit_title"
             android:key="@string/pref_energy_unit_key"
+            android:icon="@drawable/ic_preference_energy"
             android:title="@string/pref_energy_unit_title"
             app:useSimpleSummaryProvider="true" />
 
@@ -33,18 +35,21 @@
             android:dialogTitle="@string/pref_volume_unit_title"
             android:key="@string/pref_volume_unit_key"
             android:title="@string/pref_volume_unit_title"
+            android:icon="@drawable/ic_preference_volume"
             app:useSimpleSummaryProvider="true" />
 
         <Preference
             android:dialogTitle="@string/pref_delete_history_title"
             android:key="@string/pref_delete_history_key"
             android:title="@string/pref_delete_history_title"
+            android:icon="@drawable/ic_preference_trash"
             app:summary="@string/pref_delete_history_summary" />
 
         <ListPreference
             android:dialogTitle="@string/pref_country_dialog_title"
             android:key="@string/pref_country_key"
             android:title="@string/pref_country_title"
+            android:icon="@drawable/ic_preference_country"
             app:summary="@string/pref_country_summary" />
 
         <SwitchPreference
@@ -52,24 +57,28 @@
             android:key="@string/pref_scanner_mlkit_key"
             android:title="@string/pref_scanner_mlkit_title"
             app:summaryOff="@string/pref_scanner_mlkit_summaryOff"
+            android:icon="@drawable/ic_preference_scanner"
             app:summaryOn="@string/pref_scanner_mlkit_summaryOn" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="startScan"
             android:title="@string/pref_scan_startup_title"
+            android:icon="@drawable/ic_preference_startup"
             app:summary="@string/pref_scan_startup_summary" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/pref_power_mode_key"
             android:title="@string/pref_power_mode_title"
+            android:icon="@drawable/ic_preference_power_mode"
             app:summary="@string/pref_power_mode_summary" />
 
         <Preference
             android:defaultValue="false"
             android:key="@string/pref_export_db_key"
             android:title="@string/pref_export_db_title"
+            android:icon="@drawable/ic_preference_database_export"
             app:summary="@string/pref_export_db_summary" />
 
 
@@ -82,6 +91,7 @@
             android:key="@string/pref_enable_mobile_data_key"
             android:summaryOff="@string/pref_enable_mobile_data_summary_off"
             android:summaryOn="@string/pref_enable_mobile_data_summary_on"
+            android:icon="@drawable/ic_preference_mobile_data"
             android:title="@string/pref_enable_mobile_data_title" />
 
         <ListPreference
@@ -90,12 +100,14 @@
             android:key="@string/pref_resolution_key"
             android:selectable="true"
             android:summary="@string/pref_resolution_summary"
+            android:icon="@drawable/ic_preference_image_res"
             android:title="@string/pref_resolution_title" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/pref_low_battery_key"
             android:summaryOn="@string/pref_low_battery_summary"
+            android:icon="@drawable/ic_preference_no_image"
             android:title="@string/pref_low_battery_title" />
         android:summaryOff="@string/pref_low_battery_summary" />
 
@@ -113,7 +125,8 @@
 
         <Preference
             android:summary="@string/Donation"
-            android:title="@string/Donate">
+            android:title="@string/Donate"
+            android:icon="@drawable/ic_preference_donate">
             <intent
                 android:action="android.intent.action.VIEW"
                 android:data="@string/donation_url" />
@@ -122,6 +135,7 @@
         <Preference
             android:key="@string/pref_help_translate_key"
             android:summary="@string/pref_help_translate_summary"
+            android:icon="@drawable/ic_preference_language"
             android:title="@string/pref_help_translate_title" />
 
 
@@ -129,6 +143,7 @@
             android:defaultValue="true"
             android:key="cropNewImage"
             android:summaryOn="@string/pref_crop_new_images_summary"
+            android:icon="@drawable/ic_preference_crop"
             android:title="@string/pref_crop_new_images_title" />
         android:summaryOff="@string/pref_crop_new_images_summary" />
 
@@ -136,6 +151,7 @@
             android:defaultValue="true"
             android:key="@string/pref_fast_addition_key"
             android:summaryOn="@string/pref_fast_addition_summary"
+            android:icon="@drawable/ic_preference_fast"
             android:title="@string/pref_fast_addition_title" />
         android:summaryOff="@string/pref_fast_addition_summary" />
 
@@ -143,6 +159,7 @@
             android:defaultValue="false"
             android:key="@string/pref_contribution_tab_key"
             android:summaryOn="@string/pref_contribution_tab_summary"
+            android:icon="@drawable/ic_preference_share"
             android:title="@string/pref_contribution_tab_title" />
         android:summaryOff="@string/pref_contribution_tab_summary" />
 
@@ -150,6 +167,7 @@
             android:defaultValue="false"
             android:key="@string/pref_show_product_photos_key"
             android:summaryOn="@string/pref_show_product_photos_summary"
+            android:icon="@drawable/ic_preference_all_products"
             android:title="@string/pref_show_product_photos_title" />
         android:summaryOff="@string/pref_show_product_photos_summary" />
 
@@ -164,6 +182,7 @@
             android:key="@string/pref_crash_reporting_key"
             android:summaryOff="@string/preference_crash_summary"
             android:summaryOn="@string/preference_crash_summary"
+            android:icon="@drawable/ic_preference_crash_report"
             android:title="@string/preference_crash_title" />
 
         <SwitchPreference
@@ -171,6 +190,7 @@
             android:key="@string/pref_analytics_reporting_key"
             android:summaryOff="@string/preference_analytics_summary"
             android:summaryOn="@string/preference_analytics_summary"
+            android:icon="@drawable/ic_preference_send_data"
             android:title="@string/preference_analytics_title" />
 
     </PreferenceCategory>
@@ -183,20 +203,25 @@
         <Preference
             android:key="@string/pref_contact_us_key"
             android:summary="@string/pref_contact_us_summary"
+            android:icon="@drawable/ic_preference_contact"
             android:title="@string/pref_contact_us_title" />
 
         <Preference
             android:key="@string/pref_faq_key"
             android:summary="@string/pref_faq_summary"
+            android:icon="@drawable/ic_preference_faq"
             android:title="@string/pref_faq_title" />
+
         <Preference
             android:key="@string/pref_rate_us_key"
             android:summary="@string/pref_rate_us_title"
+            android:icon="@drawable/ic_preference_star"
             android:title="@string/pref_rate_us_summary" />
 
         <Preference
             android:key="@string/pref_terms_key"
             android:summary="@string/pref_terms_summary"
+            android:icon="@drawable/ic_preference_terms"
             android:title="@string/pref_terms_title" />
 
         <Preference