diff --git a/android/app/src/main/res/drawable/ic_avoid_motoways_enabled.xml b/android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_avoid_motoways_enabled.xml
rename to android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml
diff --git a/android/app/src/main/res/layout/fragment_driving_options.xml b/android/app/src/main/res/layout/fragment_driving_options.xml
index 6ba4db6d2..02cb19775 100644
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:background="?attr/cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
@@ -20,8 +21,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_tolls_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_tolls"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -41,8 +49,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_unpaved_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_unpaved"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -62,8 +77,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_paved_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_paved"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -83,8 +105,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_ferry_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_ferry"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -104,8 +133,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_motorways_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_motorways"
       android:textAppearance="?android:attr/textAppearanceMedium"
@@ -125,8 +161,15 @@
     android:minHeight="@dimen/height_block_base"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
     android:paddingStart="@dimen/margin_base">
+    <com.google.android.material.imageview.ShapeableImageView
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_marginEnd="@dimen/margin_base_plus"
+      android:layout_marginTop="@dimen/margin_half_plus"
+      app:srcCompat="@drawable/ic_avoid_steps_disabled"
+      app:tint="?iconTint" />
     <com.google.android.material.textview.MaterialTextView
       android:text="@string/avoid_steps"
       android:textAppearance="?android:attr/textAppearanceMedium"