diff --git a/lib/java/com/google/android/material/timepicker/res/layout/material_timepicker_dialog.xml b/lib/java/com/google/android/material/timepicker/res/layout/material_timepicker_dialog.xml
index 49acb091aa8..9ec880bae33 100644
--- a/lib/java/com/google/android/material/timepicker/res/layout/material_timepicker_dialog.xml
+++ b/lib/java/com/google/android/material/timepicker/res/layout/material_timepicker_dialog.xml
@@ -78,7 +78,6 @@
     style="?attr/borderlessButtonStyle"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="2dp"
     android:layout_marginEnd="8dp"
     android:minWidth="72dp"
     android:text="@string/mtrl_timepicker_cancel"
@@ -90,7 +89,6 @@
     style="?attr/borderlessButtonStyle"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="2dp"
     android:layout_marginEnd="8dp"
     android:minWidth="64dp"
     android:text="@string/mtrl_timepicker_confirm"
diff --git a/lib/java/com/google/android/material/timepicker/res/values/styles.xml b/lib/java/com/google/android/material/timepicker/res/values/styles.xml
index 6d4ccb75d67..c4f78400d91 100644
--- a/lib/java/com/google/android/material/timepicker/res/values/styles.xml
+++ b/lib/java/com/google/android/material/timepicker/res/values/styles.xml
@@ -151,10 +151,9 @@
     <item name="backgroundTint">@macro/m3_comp_time_picker_container_color</item>
   </style>
 
-  <style name="Widget.Material3.MaterialTimePicker.ImageButton" parent="Widget.MaterialComponents.TimePicker.ImageButton">
+  <style name="Widget.Material3.MaterialTimePicker.ImageButton" parent="Widget.Material3.Button.IconButton">
     <item name="iconTint">@color/m3_timepicker_secondary_text_button_text_color</item>
     <item name="rippleColor">@color/m3_timepicker_secondary_text_button_ripple_color</item>
-    <item name="shapeAppearance">@style/ShapeAppearance.Material3.Corner.Full</item>
   </style>
 
   <style name="Widget.Material3.MaterialTimePicker.Display" parent="Widget.MaterialComponents.TimePicker.Display">