diff --git a/core/res/res/drawable/btn_clock_material.xml b/core/res/res/drawable/btn_clock_material.xml
index f785ebf7a8817..ec3171857a69c 100644
--- a/core/res/res/drawable/btn_clock_material.xml
+++ b/core/res/res/drawable/btn_clock_material.xml
@@ -19,8 +19,9 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="#90ffffff"
+        android:fillColor="@android:color/white"
         android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
 </vector>
diff --git a/core/res/res/drawable/btn_keyboard_key_material.xml b/core/res/res/drawable/btn_keyboard_key_material.xml
index 14a9492f00239..c47d034d998e3 100644
--- a/core/res/res/drawable/btn_keyboard_key_material.xml
+++ b/core/res/res/drawable/btn_keyboard_key_material.xml
@@ -19,10 +19,11 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24">
+        android:viewportHeight="24"
+        android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="#90ffffff"
+        android:fillColor="@android:color/white"
         android:pathData="M20 5H4c-1.1 0-1.99 .9 -1.99 2L2 17c0 1.1 .9 2 2 2h16c1.1 0 2-.9
 2-2V7c0-1.1-.9-2-2-2zm-9 3h2v2h-2V8zm0 3h2v2h-2v-2zM8 8h2v2H8V8zm0
 3h2v2H8v-2zm-1 2H5v-2h2v2zm0-3H5V8h2v2zm9
diff --git a/core/res/res/layout/time_picker_header_material.xml b/core/res/res/layout/time_picker_header_material.xml
index 30c10b1181218..a1e10ff8c7d11 100644
--- a/core/res/res/layout/time_picker_header_material.xml
+++ b/core/res/res/layout/time_picker_header_material.xml
@@ -48,6 +48,7 @@
         android:layout_marginLeft="@dimen/timepicker_separator_padding"
         android:layout_marginRight="@dimen/timepicker_separator_padding"
         android:layout_centerInParent="true"
+        android:paddingBottom="4dp"
         android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
         android:importantForAccessibility="no" />
 
diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml
index a0b40edd68a1f..972fe7ed91de4 100644
--- a/core/res/res/values/dimens_material.xml
+++ b/core/res/res/values/dimens_material.xml
@@ -149,7 +149,7 @@
     <dimen name="timepicker_am_top_padding">4dp</dimen>
     <dimen name="timepicker_pm_top_padding">4dp</dimen>
     <dimen name="timepicker_separator_padding">2dp</dimen>
-    <dimen name="timepicker_header_height">96dp</dimen>
+    <dimen name="timepicker_header_height">100dp</dimen>
     <dimen name="timepicker_radial_picker_dimen">296dp</dimen>
     <dimen name="timepicker_radial_picker_top_margin">16dp</dimen>
     <dimen name="timepicker_radial_picker_horizontal_margin">16dp</dimen>