diff --git a/public/viewjs/components/datetimepicker.js b/public/viewjs/components/datetimepicker.js
index 7c73f3af..3e44be9a 100644
--- a/public/viewjs/components/datetimepicker.js
+++ b/public/viewjs/components/datetimepicker.js
@@ -86,7 +86,7 @@ Grocy.Components.DateTimePicker.Init = function(reInit = false)
 			{
 				format: $(this).find("input").data('format'),
 				buttons: {
-					showToday: true,
+					showToday: Grocy.Components.DateTimePicker.GetInputElement().data('limit-end-to-now') !== true,
 					showClose: true
 				},
 				calendarWeeks: Grocy.CalendarShowWeekNumbers,
@@ -101,9 +101,9 @@ Grocy.Components.DateTimePicker.Init = function(reInit = false)
 					down: 'fas fa-arrow-down',
 					previous: 'fas fa-chevron-left',
 					next: 'fas fa-chevron-right',
-					today: 'fas fa-calendar-check',
+					today: 'fas fa-calendar-day',
 					clear: 'far fa-trash-alt',
-					close: 'far fa-times-circle'
+					close: 'fas fa-check'
 				},
 				sideBySide: true,
 				keyBinds: {
diff --git a/public/viewjs/components/datetimepicker2.js b/public/viewjs/components/datetimepicker2.js
index ed2fcb26..a134e460 100644
--- a/public/viewjs/components/datetimepicker2.js
+++ b/public/viewjs/components/datetimepicker2.js
@@ -86,7 +86,7 @@ Grocy.Components.DateTimePicker2.Init = function(reInit = false)
 			{
 				format: $(this).find("input").data('format'),
 				buttons: {
-					showToday: true,
+					showToday: Grocy.Components.DateTimePicker2.GetInputElement().data('limit-end-to-now') !== true,
 					showClose: true
 				},
 				calendarWeeks: Grocy.CalendarShowWeekNumbers,
@@ -101,9 +101,9 @@ Grocy.Components.DateTimePicker2.Init = function(reInit = false)
 					down: 'fas fa-arrow-down',
 					previous: 'fas fa-chevron-left',
 					next: 'fas fa-chevron-right',
-					today: 'fas fa-calendar-check',
+					today: 'fas fa-calendar-day',
 					clear: 'far fa-trash-alt',
-					close: 'far fa-times-circle'
+					close: 'fas fa-check'
 				},
 				sideBySide: true,
 				keyBinds: {
diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php
index 0f087151..5839ad98 100644
--- a/views/components/datetimepicker.blade.php
+++ b/views/components/datetimepicker.blade.php
@@ -46,10 +46,8 @@
 				inputmode="numeric"
 				@endif
 				@if($isRequired)
-				@if($isRequired)
 				required
 				@endif
-				@endif
 				class="form-control datetimepicker-input @if(!empty($additionalCssClasses)){{ $additionalCssClasses }}@endif"
 				data-target="#{{ $id }}"
 				data-format="{{ $format }}"
diff --git a/views/components/datetimepicker2.blade.php b/views/components/datetimepicker2.blade.php
index 5ef55b17..10bce2c4 100644
--- a/views/components/datetimepicker2.blade.php
+++ b/views/components/datetimepicker2.blade.php
@@ -16,6 +16,7 @@
 @php if(!isset($nextInputSelector)) { $nextInputSelector = false; } @endphp
 @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
 @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
+@php if(empty($activateNumberPad)) { $activateNumberPad = false; } @endphp
 
 <div class="datetimepicker2-wrapper form-group {{ $additionalGroupCssClasses }}">
 	<label for="{{ $id }}">{{ $__t($label) }}
@@ -41,11 +42,12 @@
 				$additionalAttributes
 				!!}
 				type="text"
-				@if($isRequired)
+				@if($activateNumberPad)
+				inputmode="numeric"
+				@endif
 				@if($isRequired)
 				required
 				@endif
-				@endif
 				class="form-control datetimepicker2-input @if(!empty($additionalCssClasses)){{ $additionalCssClasses }}@endif"
 				data-target="#{{ $id }}"
 				data-format="{{ $format }}"