diff --git a/java/com/android/dialer/widget/res/drawable/searchedittext_custom_cursor.xml b/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
similarity index 100%
rename from java/com/android/dialer/widget/res/drawable/searchedittext_custom_cursor.xml
rename to java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
diff --git a/java/com/android/dialer/widget/res/drawable/item_background_material_light.xml b/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml
similarity index 86%
rename from java/com/android/dialer/widget/res/drawable/item_background_material_light.xml
rename to java/com/android/dialer/widget/res/drawable/ripple_material_light.xml
index 6e524ac..175624c 100644
--- a/java/com/android/dialer/widget/res/drawable/item_background_material_light.xml
+++ b/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml
@@ -15,10 +15,9 @@
   ~ limitations under the License
   -->
 
-<!-- Based on the Theme.Material's default selectableItemBackground -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="@color/dialer_ripple_material_light">
+    android:color="@color/dialer_ripple_material_light">
   <item android:id="@android:id/mask">
     <color android:color="@android:color/white"/>
   </item>
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml
index bdb85fa..ac62dd9 100644
--- a/java/com/android/dialer/widget/res/layout/fragment_message.xml
+++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml
@@ -55,7 +55,7 @@
       android:textColor="@color/dialer_primary_text_color"
       android:textColorHint="@color/dialer_edit_text_hint_color"
       android:background="@color/background_dialer_white"
-      android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
+      android:textCursorDrawable="@drawable/edittext_custom_cursor"
       android:layout_toStartOf="@+id/count_and_send_container"
       android:inputType="textShortMessage|textCapSentences"
       android:imeOptions="flagNoExtractUi|actionSend"/>
diff --git a/java/com/android/dialer/widget/res/layout/selectable_text_view.xml b/java/com/android/dialer/widget/res/layout/selectable_text_view.xml
index 3d120d1..9cdb162 100644
--- a/java/com/android/dialer/widget/res/layout/selectable_text_view.xml
+++ b/java/com/android/dialer/widget/res/layout/selectable_text_view.xml
@@ -22,4 +22,4 @@
   android:textSize="16sp"
   android:textColor="@color/dialer_primary_text_color"
   android:padding="16dp"
-  android:background="@drawable/item_background_material_light"/>
\ No newline at end of file
+  android:background="@drawable/ripple_material_light"/>
\ No newline at end of file