diff --git a/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java b/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java
index 99f68d41457..da6fd234d06 100644
--- a/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java
+++ b/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java
@@ -50,6 +50,7 @@
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.InsetDialogOnTouchListener;
 import com.google.android.material.internal.CheckableImageButton;
 import com.google.android.material.resources.MaterialAttributes;
@@ -125,7 +126,7 @@ public String getHeaderText() {
   @InputMode private int inputMode;
 
   private TextView headerSelectionText;
-  private CheckableImageButton headerToggleButton;
+  private MaterialButton headerToggleButton;
   @Nullable private MaterialShapeDrawable background;
   private Button confirmButton;
 
@@ -360,7 +361,7 @@ public void onIncompleteSelectionChanged() {
 
   private void initHeaderToggle(Context context) {
     headerToggleButton.setTag(TOGGLE_BUTTON_TAG);
-    headerToggleButton.setImageDrawable(createHeaderToggleDrawable(context));
+    headerToggleButton.setIcon(createHeaderToggleDrawable(context));
     headerToggleButton.setChecked(inputMode != INPUT_MODE_CALENDAR);
 
     // By default, CheckableImageButton adds a delegate that reads checked state.
@@ -374,14 +375,13 @@ public void onClick(View v) {
             // Update confirm button in case in progress selection has been reset
             confirmButton.setEnabled(dateSelector.isSelectionComplete());
 
-            headerToggleButton.toggle();
             updateToggleContentDescription(headerToggleButton);
             startPickerFragment();
           }
         });
   }
 
-  private void updateToggleContentDescription(@NonNull CheckableImageButton toggle) {
+  private void updateToggleContentDescription(@NonNull MaterialButton toggle) {
     String contentDescription =
         headerToggleButton.isChecked()
             ? toggle.getContext().getString(R.string.mtrl_picker_toggle_to_calendar_input_mode)
diff --git a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_header_toggle.xml b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_header_toggle.xml
index 850fd75f493..939ce81a6e9 100644
--- a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_header_toggle.xml
+++ b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_header_toggle.xml
@@ -15,10 +15,11 @@
      limitations under the License.
 -->
 
-<com.google.android.material.internal.CheckableImageButton
+<com.google.android.material.button.MaterialButton
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/mtrl_picker_header_toggle"
     style="?attr/materialCalendarHeaderToggleButton"
+    android:checkable="true"
     android:layout_width="@dimen/mtrl_min_touch_target_size"
     android:layout_height="@dimen/mtrl_min_touch_target_size"
     android:layout_marginBottom="@dimen/mtrl_calendar_header_toggle_margin_bottom"
diff --git a/lib/java/com/google/android/material/datepicker/res/values/styles.xml b/lib/java/com/google/android/material/datepicker/res/values/styles.xml
index f58493cad2c..9650b16ced4 100644
--- a/lib/java/com/google/android/material/datepicker/res/values/styles.xml
+++ b/lib/java/com/google/android/material/datepicker/res/values/styles.xml
@@ -91,9 +91,12 @@
     <item name="rippleColor">@color/mtrl_btn_ripple_color</item>
   </style>
 
-  <style name="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton" parent="Widget.AppCompat.ImageButton">
-    <item name="android:background">?attr/actionBarItemBackground</item>
-    <item name="android:tint">?attr/colorOnPrimary</item>
+  <style name="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton" parent="Widget.MaterialComponents.Button.TextButton">
+    <item name="iconTint">?attr/colorOnPrimary</item>
+    <item name="android:insetTop">0dp</item>
+    <item name="android:insetBottom">0dp</item>
+    <item name="android:padding">12dp</item>
+    <item name="rippleColor">@color/mtrl_btn_ripple_color</item>
   </style>
 
   <style name="Widget.MaterialComponents.MaterialCalendar.DayTextView" parent="Widget.AppCompat.TextView">