diff --git a/lib/bottom_picker.dart b/lib/bottom_picker.dart
index 73c3d2e..00edd75 100644
--- a/lib/bottom_picker.dart
+++ b/lib/bottom_picker.dart
@@ -37,8 +37,8 @@ class BottomPicker extends StatefulWidget {
     @Deprecated('should use headerBuilder instead') this.pickerTitle,
     @Deprecated('should use headerBuilder instead') this.pickerDescription,
     required this.items,
-    this.titleAlignment,
-    this.titlePadding = const EdgeInsets.all(0),
+    @Deprecated('should use headerBuilder instead') this.titleAlignment,
+    @Deprecated('should use headerBuilder instead') this.titlePadding = const EdgeInsets.all(0),
     this.dismissable = false,
     this.onChange,
     this.onSubmit,
@@ -86,8 +86,8 @@ class BottomPicker extends StatefulWidget {
     super.key,
     @Deprecated('should use headerBuilder instead') this.pickerTitle,
     @Deprecated('should use headerBuilder instead') this.pickerDescription,
-    this.titlePadding = const EdgeInsets.all(0),
-    this.titleAlignment,
+    @Deprecated('should use headerBuilder instead') this.titlePadding = const EdgeInsets.all(0),
+    @Deprecated('should use headerBuilder instead') this.titleAlignment,
     this.dismissable = false,
     this.onChange,
     this.onSubmit,
@@ -134,8 +134,8 @@ class BottomPicker extends StatefulWidget {
     super.key,
     @Deprecated('should use headerBuilder instead') this.pickerTitle,
     @Deprecated('should use headerBuilder instead') this.pickerDescription,
-    this.titlePadding = const EdgeInsets.all(0),
-    this.titleAlignment,
+    @Deprecated('should use headerBuilder instead') this.titlePadding = const EdgeInsets.all(0),
+    @Deprecated('should use headerBuilder instead') this.titleAlignment,
     this.dismissable = false,
     this.onChange,
     this.onSubmit,
@@ -182,8 +182,8 @@ class BottomPicker extends StatefulWidget {
     super.key,
     @Deprecated('should use headerBuilder instead') this.pickerTitle,
     @Deprecated('should use headerBuilder instead') this.pickerDescription,
-    this.titlePadding = const EdgeInsets.all(0),
-    this.titleAlignment,
+    @Deprecated('should use headerBuilder instead') this.titlePadding = const EdgeInsets.all(0),
+    @Deprecated('should use headerBuilder instead') this.titleAlignment,
     this.dismissable = false,
     this.onChange,
     this.onSubmit,
@@ -235,8 +235,8 @@ class BottomPicker extends StatefulWidget {
     required this.initialTime,
     this.maxTime,
     this.minTime,
-    this.titlePadding = const EdgeInsets.all(0),
-    this.titleAlignment,
+    @Deprecated('should use headerBuilder instead') this.titlePadding = const EdgeInsets.all(0),
+    @Deprecated('should use headerBuilder instead') this.titleAlignment,
     this.dismissable = false,
     this.onChange,
     this.onSubmit,
@@ -286,8 +286,8 @@ class BottomPicker extends StatefulWidget {
     this.timerSecondsInterval = 1,
     @Deprecated('should use headerBuilder instead') this.pickerDescription,
     this.initialTimerDuration,
-    this.titlePadding = const EdgeInsets.all(0),
-    this.titleAlignment,
+    @Deprecated('should use headerBuilder instead') this.titlePadding = const EdgeInsets.all(0),
+    @Deprecated('should use headerBuilder instead') this.titleAlignment,
     this.dismissable = false,
     this.onChange,
     this.onSubmit,
@@ -334,8 +334,8 @@ class BottomPicker extends StatefulWidget {
     @Deprecated('should use headerBuilder instead') this.pickerDescription,
     required this.onRangeDateSubmitPressed,
     this.onRangePickerDismissed,
-    this.titlePadding = const EdgeInsets.all(0),
-    this.titleAlignment,
+    @Deprecated('should use headerBuilder instead') this.titlePadding = const EdgeInsets.all(0),
+    @Deprecated('should use headerBuilder instead') this.titleAlignment,
     this.dismissable = false,
     @Deprecated('should use headerBuilder instead') this.onCloseButtonPressed,
     this.bottomPickerTheme = BottomPickerTheme.blue,
@@ -399,8 +399,8 @@ class BottomPicker extends StatefulWidget {
     required this.onRangeTimeSubmitPressed,
     this.onRangePickerDismissed,
     this.use24hFormat = true,
-    this.titlePadding = const EdgeInsets.all(0),
-    this.titleAlignment,
+    @Deprecated('should use headerBuilder instead') this.titlePadding = const EdgeInsets.all(0),
+    @Deprecated('should use headerBuilder instead') this.titleAlignment,
     this.dismissable = false,
     @Deprecated('should use headerBuilder instead') this.onCloseButtonPressed,
     this.bottomPickerTheme = BottomPickerTheme.blue,
@@ -839,7 +839,7 @@ class BottomPickerState extends State<BottomPicker> {
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: [
                     Padding(
-                      padding: widget.titlePadding,
+                      padding: widget.headerBuilder == null ? widget.titlePadding : EdgeInsetsGeometry.zero,
                       child: Row(
                         children: [
                           if (widget.headerBuilder != null)