diff --git a/core/src/main/res/drawable-hdpi/background_darkgray.xml b/core/src/main/res/drawable-hdpi/background_darkgray.xml
deleted file mode 100644
index 4d5138556b..0000000000
--- a/core/src/main/res/drawable-hdpi/background_darkgray.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="#505050"/>
-    <stroke android:width="1dp" android:color="@color/colorLightGray"/>
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/core/src/main/res/drawable-hdpi/background_input_border.xml b/core/src/main/res/drawable-hdpi/background_input_border.xml
new file mode 100644
index 0000000000..fb775c3f6f
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/background_input_border.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/mtrl_textinput_default_box_stroke_color" />
+    <corners android:radius="4dp" />
+
+</shape>
diff --git a/core/src/main/res/layout/datetime.xml b/core/src/main/res/layout/datetime.xml
index bd9415d21d..f4e4d538da 100644
--- a/core/src/main/res/layout/datetime.xml
+++ b/core/src/main/res/layout/datetime.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="2dp"
     android:orientation="horizontal">
 
     <TextView
@@ -21,6 +22,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:layout_marginEnd="20dp"
+        android:background="@drawable/background_input_border"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
         android:padding="10dp"
         android:text="2017/05/05" />
 
@@ -29,6 +34,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:background="@drawable/background_input_border"
+        android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
         android:padding="10dp"
         android:text="08:20pm" />