diff --git a/lib/java/com/google/android/material/datepicker/MaterialCalendar.java b/lib/java/com/google/android/material/datepicker/MaterialCalendar.java
index af9dd8043..c19a50f30 100644
--- a/lib/java/com/google/android/material/datepicker/MaterialCalendar.java
+++ b/lib/java/com/google/android/material/datepicker/MaterialCalendar.java
@@ -248,7 +248,7 @@ public final class MaterialCalendar<S> extends PickerFragment<S> {
 
     int columns =
         themedContext.getResources().getInteger(R.integer.mtrl_calendar_year_selector_span);
-    yearSelector = root.findViewById(R.id.mtrl_calendar_year_selector_frame);
+    yearSelector = root.findViewById(R.id.mtrl_calendar_year_selector);
     if (yearSelector != null) {
       yearSelector.setHasFixedSize(true);
       yearSelector.setLayoutManager(
diff --git a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_horizontal.xml b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_horizontal.xml
index 6d16ecbe7..325434055 100644
--- a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_horizontal.xml
+++ b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_horizontal.xml
@@ -26,18 +26,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <LinearLayout
       android:id="@+id/mtrl_calendar_year_selector_frame"
-      android:layout_width="wrap_content"
+      android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:layout_gravity="center_horizontal"
-      android:scrollbars="none"/>
+      android:orientation="vertical">
+
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/mtrl_calendar_year_selector"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+        android:scrollbars="none"
+        android:paddingStart="@dimen/mtrl_calendar_content_padding"
+        android:paddingEnd="@dimen/mtrl_calendar_content_padding"
+        android:paddingLeft="@dimen/mtrl_calendar_content_padding"
+        android:paddingRight="@dimen/mtrl_calendar_content_padding"/>
+
+      <View
+        style="?attr/materialCalendarHeaderDivider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/mtrl_calendar_header_divider_thickness"/>
+
+    </LinearLayout>
 
     <LinearLayout
       android:id="@+id/mtrl_calendar_day_selector_frame"
       android:layout_width="wrap_content"
       android:layout_height="match_parent"
-      android:orientation="vertical">
+      android:orientation="vertical"
+      android:paddingStart="@dimen/mtrl_calendar_content_padding"
+      android:paddingEnd="@dimen/mtrl_calendar_content_padding"
+      android:paddingLeft="@dimen/mtrl_calendar_content_padding"
+      android:paddingRight="@dimen/mtrl_calendar_content_padding">
 
       <include layout="@layout/mtrl_calendar_days_of_week"/>
 
diff --git a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_month_navigation.xml b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_month_navigation.xml
index 38cb495ba..cae8e195d 100644
--- a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_month_navigation.xml
+++ b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_month_navigation.xml
@@ -22,7 +22,11 @@
   android:layout_height="wrap_content"
   android:paddingTop="@dimen/mtrl_calendar_navigation_top_padding"
   android:paddingBottom="@dimen/mtrl_calendar_navigation_bottom_padding"
-  android:orientation="horizontal">
+  android:orientation="horizontal"
+  android:paddingStart="@dimen/mtrl_calendar_content_padding"
+  android:paddingEnd="@dimen/mtrl_calendar_content_padding"
+  android:paddingLeft="@dimen/mtrl_calendar_content_padding"
+  android:paddingRight="@dimen/mtrl_calendar_content_padding">
 
   <FrameLayout
     android:layout_width="0dp"
diff --git a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_vertical.xml b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_vertical.xml
index 0592b8b0e..a2e003e54 100644
--- a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_vertical.xml
+++ b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_calendar_vertical.xml
@@ -18,15 +18,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:gravity="center">
+    android:gravity="center"
+    android:paddingStart="@dimen/mtrl_calendar_content_padding"
+    android:paddingEnd="@dimen/mtrl_calendar_content_padding"
+    android:paddingLeft="@dimen/mtrl_calendar_content_padding"
+    android:paddingRight="@dimen/mtrl_calendar_content_padding">
 
   <include layout="@layout/mtrl_calendar_days_of_week"/>
 
-  <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?attr/colorOnSurface"/>
-
   <include layout="@layout/mtrl_calendar_months"/>
 
 </LinearLayout>
diff --git a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_dialog.xml b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_dialog.xml
index dd654dc1a..2308af1f7 100644
--- a/lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_dialog.xml
+++ b/lib/java/com/google/android/material/datepicker/res/layout/mtrl_picker_dialog.xml
@@ -33,11 +33,7 @@
       android:layout_width="match_parent"
       android:layout_height="0dp"
       android:layout_weight="1"
-      android:paddingBottom="@dimen/mtrl_calendar_bottom_padding"
-      android:paddingStart="@dimen/mtrl_calendar_content_padding"
-      android:paddingEnd="@dimen/mtrl_calendar_content_padding"
-      android:paddingLeft="@dimen/mtrl_calendar_content_padding"
-      android:paddingRight="@dimen/mtrl_calendar_content_padding"/>
+      android:paddingBottom="@dimen/mtrl_calendar_bottom_padding"/>
 
     <include
       layout="@layout/mtrl_picker_actions"
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 aa798161c..a3dd8cdce 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
@@ -247,7 +247,8 @@
   </style>
 
   <style name="Widget.Material3.MaterialCalendar.HeaderDivider" parent="Widget.MaterialComponents.MaterialCalendar.HeaderDivider">
-    <item name="android:visibility">gone</item>
+    <item name="android:visibility">visible</item>
+    <item name="android:background">?attr/colorOutlineVariant</item>
   </style>
 
   <style name="Widget.Material3.MaterialCalendar.HeaderTitle" parent="Widget.MaterialComponents.MaterialCalendar.HeaderTitle">