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..a0fd11986b1 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
@@ -22,5 +22,4 @@
     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"
-    android:layout_marginTop="@dimen/mtrl_calendar_header_toggle_margin_top"
-    android:layout_gravity="bottom|end"/>
+    android:layout_marginTop="@dimen/mtrl_calendar_header_toggle_margin_top"/>
diff --git a/lib/java/com/google/android/material/datepicker/res/values-land/styles.xml b/lib/java/com/google/android/material/datepicker/res/values-land/styles.xml
index 20795a6cad7..464d82febdb 100644
--- a/lib/java/com/google/android/material/datepicker/res/values-land/styles.xml
+++ b/lib/java/com/google/android/material/datepicker/res/values-land/styles.xml
@@ -30,4 +30,8 @@
     <item name="android:ellipsize">end</item>
   </style>
 
+  <style name="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton" parent="Base.Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton">
+    <item name="android:layout_gravity">bottom|start</item>
+  </style>
+
 </resources>
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 414da6f87ff..ff1d8cc3a01 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
@@ -92,11 +92,15 @@
     <item name="rippleColor">@color/mtrl_btn_ripple_color</item>
   </style>
 
-  <style name="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton" parent="Widget.AppCompat.ImageButton">
+  <style name="Base.Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton" parent="Widget.AppCompat.ImageButton">
     <item name="android:background">?attr/actionBarItemBackground</item>
     <item name="android:tint">?attr/colorOnPrimary</item>
   </style>
 
+  <style name="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton" parent="Base.Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton">
+    <item name="android:layout_gravity">bottom|end</item>
+  </style>
+
   <style name="Widget.MaterialComponents.MaterialCalendar.DayTextView" parent="Widget.AppCompat.TextView">
     <item name="android:textAppearance">?attr/textAppearanceCaption</item>
     <item name="android:gravity">center</item>