diff --git a/core/res/res/layout/select_dialog_multichoice_material.xml b/core/res/res/layout/select_dialog_multichoice_material.xml
index e21df73d70c73..36e8e57b29880 100644
--- a/core/res/res/layout/select_dialog_multichoice_material.xml
+++ b/core/res/res/layout/select_dialog_multichoice_material.xml
@@ -25,6 +25,6 @@
     android:gravity="center_vertical"
     android:paddingStart="@dimen/select_dialog_padding_start_material"
     android:paddingEnd="?attr/dialogPreferredPadding"
-    android:checkMark="?attr/listChoiceIndicatorMultiple"
-    android:checkMarkGravity="start"
+    android:drawableStart="?attr/listChoiceIndicatorMultiple"
+    android:drawablePadding="20dp"
     android:ellipsize="marquee" />
diff --git a/core/res/res/layout/select_dialog_singlechoice_material.xml b/core/res/res/layout/select_dialog_singlechoice_material.xml
index 38283174373c2..995272ad80efc 100644
--- a/core/res/res/layout/select_dialog_singlechoice_material.xml
+++ b/core/res/res/layout/select_dialog_singlechoice_material.xml
@@ -25,6 +25,6 @@
     android:gravity="center_vertical"
     android:paddingStart="@dimen/select_dialog_padding_start_material"
     android:paddingEnd="?attr/dialogPreferredPadding"
-    android:checkMark="?attr/listChoiceIndicatorSingle"
-    android:checkMarkGravity="start"
+    android:drawableStart="?attr/listChoiceIndicatorSingle"
+    android:drawablePadding="20dp"
     android:ellipsize="marquee" />