diff --git a/packages/primevue/src/datepicker/style/DatePickerStyle.js b/packages/primevue/src/datepicker/style/DatePickerStyle.js
index e92acfb98..4e3cfe0b2 100644
--- a/packages/primevue/src/datepicker/style/DatePickerStyle.js
+++ b/packages/primevue/src/datepicker/style/DatePickerStyle.js
@@ -262,7 +262,7 @@ const theme = ({ dt }) => `
     cursor: pointer;
     overflow: hidden;
     position: relative;
-    padding: ${dt('datepicker.date.padding')};
+    padding: ${dt('datepicker.month.padding')};
     transition: background ${dt('datepicker.transition.duration')}, color ${dt('datepicker.transition.duration')}, border-color ${dt('datepicker.transition.duration')}, box-shadow ${dt('datepicker.transition.duration')}, outline-color ${dt(
     'datepicker.transition.duration'
 )};
@@ -299,7 +299,7 @@ const theme = ({ dt }) => `
     cursor: pointer;
     overflow: hidden;
     position: relative;
-    padding: ${dt('datepicker.date.padding')};
+    padding: ${dt('datepicker.year.padding')};
     transition: background ${dt('datepicker.transition.duration')}, color ${dt('datepicker.transition.duration')}, border-color ${dt('datepicker.transition.duration')}, box-shadow ${dt('datepicker.transition.duration')}, outline-color ${dt(
     'datepicker.transition.duration'
 )};
diff --git a/packages/themes/src/presets/aura/datepicker/index.js b/packages/themes/src/presets/aura/datepicker/index.js
index 292caa68c..271950945 100644
--- a/packages/themes/src/presets/aura/datepicker/index.js
+++ b/packages/themes/src/presets/aura/datepicker/index.js
@@ -89,12 +89,14 @@ export default {
         margin: '0.5rem 0 0 0'
     },
     month: {
+        padding: '0.375rem',
         borderRadius: '{content.border.radius}'
     },
     yearView: {
         margin: '0.5rem 0 0 0'
     },
     year: {
+        padding: '0.375rem',
         borderRadius: '{content.border.radius}'
     },
     buttonbar: {
diff --git a/packages/themes/src/presets/lara/datepicker/index.js b/packages/themes/src/presets/lara/datepicker/index.js
index bceeaf4d4..1a7eb42d0 100644
--- a/packages/themes/src/presets/lara/datepicker/index.js
+++ b/packages/themes/src/presets/lara/datepicker/index.js
@@ -87,12 +87,14 @@ export default {
         margin: '0.75rem 0 0 0'
     },
     month: {
+        padding: '0.5rem',
         borderRadius: '{content.border.radius}'
     },
     yearView: {
         margin: '0.75rem 0 0 0'
     },
     year: {
+        padding: '0.5rem',
         borderRadius: '{content.border.radius}'
     },
     buttonbar: {
diff --git a/packages/themes/src/presets/material/datepicker/index.js b/packages/themes/src/presets/material/datepicker/index.js
index 928cdfee7..4e4e566b1 100644
--- a/packages/themes/src/presets/material/datepicker/index.js
+++ b/packages/themes/src/presets/material/datepicker/index.js
@@ -89,12 +89,14 @@ export default {
         margin: '0.5rem 0 0 0'
     },
     month: {
+        padding: '0.625rem',
         borderRadius: '{content.border.radius}'
     },
     yearView: {
         margin: '0.5rem 0 0 0'
     },
     year: {
+        padding: '0.625rem',
         borderRadius: '{content.border.radius}'
     },
     buttonbar: {
diff --git a/packages/themes/src/presets/nora/datepicker/index.js b/packages/themes/src/presets/nora/datepicker/index.js
index c9c9226ff..9e1bc2acb 100644
--- a/packages/themes/src/presets/nora/datepicker/index.js
+++ b/packages/themes/src/presets/nora/datepicker/index.js
@@ -91,12 +91,14 @@ export default {
         margin: '0.5rem 0 0 0'
     },
     month: {
+        padding: '0.375rem',
         borderRadius: '{content.border.radius}'
     },
     yearView: {
         margin: '0.5rem 0 0 0'
     },
     year: {
+        padding: '0.375rem',
         borderRadius: '{content.border.radius}'
     },
     buttonbar: {