diff --git a/resources/js/Pages/Time.vue b/resources/js/Pages/Time.vue
index 1d011e6f..7d02016f 100644
--- a/resources/js/Pages/Time.vue
+++ b/resources/js/Pages/Time.vue
@@ -119,7 +119,8 @@ function deleteSelected() {
 </script>
 
 <template>
-    <TimeEntryCreateModal
+    <AppLayout title="Dashboard" data-testid="time_view">
+        <TimeEntryCreateModal
         v-model:show="showManualTimeEntryModal"
         :enable-estimated-time="isAllowedToPerformPremiumAction()"
         :create-project="createProject"
@@ -130,7 +131,6 @@ function deleteSelected() {
         :tasks
         :tags
         :clients></TimeEntryCreateModal>
-    <AppLayout title="Dashboard" data-testid="time_view">
         <MainContainer
             class="pt-5 lg:pt-8 pb-4 lg:pb-6">
             <div
diff --git a/resources/js/packages/ui/src/Input/DatePicker.vue b/resources/js/packages/ui/src/Input/DatePicker.vue
index 74bf6bb4..4d418512 100644
--- a/resources/js/packages/ui/src/Input/DatePicker.vue
+++ b/resources/js/packages/ui/src/Input/DatePicker.vue
@@ -1,76 +1,84 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue';
 import {
-    getDayJsInstance,
-    getLocalizedDayJs,
-} from '@/packages/ui/src/utils/time';
-import { twMerge } from 'tailwind-merge';
+    Popover,
+    PopoverContent,
+    PopoverTrigger,
+} from '@/Components/ui/popover';
+import { Button } from '@/Components/ui/button';
+import { Calendar } from '@/Components/ui/calendar';
+import { CalendarIcon } from 'lucide-vue-next';
+import { formatDateLocalized } from '@/packages/ui/src/utils/time';
+import { parseDate, type DateValue } from '@internationalized/date';
+import { computed, inject, type ComputedRef } from 'vue';
+import { type Organization } from '@/packages/api/src';
+import { getLocalizedDayJs } from '@/packages/ui/src/utils/time';
 
 const props = defineProps<{
     class?: string;
     tabindex?: string;
 }>();
 
-// This has to be a localized timestamp, not UTC
-const model = defineModel<string | null>({
-    default: null,
-});
+const model = defineModel<string | null>();
+const emit = defineEmits<{
+    changed: [string];
+}>();
 
-const tempDate = ref(getLocalizedDayJs(model.value).format('YYYY-MM-DD'));
-
-watch(model, (value) => {
-    tempDate.value = getLocalizedDayJs(value).format('YYYY-MM-DD');
-});
-
-function updateDate(event: Event) {
-    const target = event.target as HTMLInputElement;
-    const newValue = target.value;
-    const newDate = getDayJsInstance()(newValue);
-    if (newDate.isValid()) {
-        model.value = getLocalizedDayJs(model.value)
-            .set('year', newDate.year())
-            .set('month', newDate.month())
-            .set('date', newDate.date())
-            .format();
-        emit('changed', model.value);
+const handleChange = (date: DateValue | undefined) => {
+    if (!date) {
+        model.value = null;
+        return;
     }
-}
 
-const datePicker = ref<HTMLInputElement | null>(null);
+    const dayjs = getLocalizedDayJs(model.value);
+    model.value = dayjs
+        .year(date.year)
+        .month(date.month - 1) // CalendarDate uses 1-based months
+        .date(date.day)
+        .format();
+    emit('changed', model.value);
+};
 
-function updateTempValue(event: Event) {
-    const target = event.target as HTMLInputElement;
-    tempDate.value = target.value;
-}
+const date = computed(() => {
+    return model.value
+        ? parseDate(getLocalizedDayJs(model.value).format('YYYY-MM-DD'))
+        : undefined;
+});
 
-const emit = defineEmits(['changed']);
+const organization = inject<ComputedRef<Organization>>('organization');
 </script>
 
 <template>
-    <div class="flex items-center text-text-secondary">
-        <input
-            id="start"
-            ref="datePicker"
-            :tabindex="tabindex"
-            :class="
-                twMerge(
-                    'bg-input-background border text-text-primary border-input-border focus-visible:outline-0 focus-visible:border-input-border-active focus-visible:ring-0 rounded-md',
-                    props.class
-                )
-            "
-            type="date"
-            name="trip-start"
-            :value="tempDate"
-            @change="updateTempValue"
-            @blur="updateDate"
-            @keydown.enter="updateDate" />
-    </div>
+    <Popover>
+        <PopoverTrigger as-child>
+            <Button
+                variant="input"
+                size="sm"
+                :class="[
+                    'w-full gap-1.5 justify-center text-left font-normal',
+                    !model && 'text-muted-foreground',
+                    props.class,
+                ]"
+                :tabindex="tabindex">
+                <CalendarIcon class="h-3 w-3" />
+                <span class="text-center">
+                    {{
+                        model
+                            ? formatDateLocalized(
+                                  model,
+                                  organization?.date_format
+                              )
+                            : 'Pick a date'
+                    }}
+                </span>
+            </Button>
+        </PopoverTrigger>
+        <PopoverContent class="w-auto p-0">
+            <Calendar
+                mode="single"
+                :model-value="date"
+                :initial-focus="true"
+                @update:model-value="handleChange"
+                />
+        </PopoverContent>
+    </Popover>
 </template>
-
-<style scoped>
-input::-webkit-calendar-picker-indicator {
-    filter: invert(1);
-
-    opacity: 0.2;
-}
-</style>
diff --git a/resources/js/packages/ui/src/Input/TimePickerSimple.vue b/resources/js/packages/ui/src/Input/TimePickerSimple.vue
index ab0fc233..ad1af619 100644
--- a/resources/js/packages/ui/src/Input/TimePickerSimple.vue
+++ b/resources/js/packages/ui/src/Input/TimePickerSimple.vue
@@ -1,15 +1,18 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue';
-import { getLocalizedDayJs } from '@/packages/ui/src/utils/time';
+import { ref, watch, inject, type ComputedRef } from 'vue';
+import { getLocalizedDayJs, formatTime } from '@/packages/ui/src/utils/time';
 import { useFocus } from '@vueuse/core';
 import { TextInput } from '@/packages/ui/src';
 import { twMerge } from 'tailwind-merge';
+import type { Organization } from '@/packages/api/src';
 
 // This has to be a localized timestamp, not UTC
 const model = defineModel<string | null>({
     default: null,
 });
 
+const organization = inject<ComputedRef<Organization>>('organization');
+
 const props = withDefaults(
     defineProps<{
         size?: 'base' | 'large';
@@ -24,62 +27,95 @@ const props = withDefaults(
 function updateTime(event: Event) {
     const target = event.target as HTMLInputElement;
     const newValue = target.value.trim();
+
+    // Get current hours and minutes for comparison
+    const currentTime = model.value ? getLocalizedDayJs(model.value) : null;
+    const currentHours = currentTime?.hour() ?? 0;
+    const currentMinutes = currentTime?.minute() ?? 0;
+
+    // Handle AM/PM format
+    const amPmMatch = newValue.match(/^(\d{1,2}):?(\d{2})?\s*(AM|PM|am|pm)$/);
+    if (amPmMatch) {
+        let hours = amPmMatch[1];
+        const minutes = amPmMatch[2] ?? '00';
+        const period = amPmMatch[3];
+        
+        hours = parseInt(hours).toString();
+        if (period.toUpperCase() === 'PM' && hours !== '12') {
+            hours = (parseInt(hours) + 12).toString();
+        } else if (period.toUpperCase() === 'AM' && hours === '12') {
+            hours = '0';
+        }
+        
+        const newHours = parseInt(hours);
+        const newMinutes = parseInt(minutes);
+        
+        if (newHours !== currentHours || newMinutes !== currentMinutes) {
+            model.value = getLocalizedDayJs(model.value)
+                .set('hours', newHours)
+                .set('minutes', newMinutes)
+                .set('seconds', 0)
+                .format();
+            emit('changed', model.value);
+        }
+        return;
+    }
+
+    // Handle existing formats
     if (newValue.split(':').length === 2) {
         const [hours, minutes] = newValue.split(':');
         if (!isNaN(parseInt(hours)) && !isNaN(parseInt(minutes))) {
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(hours), 23))
-                .set('minutes', Math.min(parseInt(minutes), 59))
-                .format();
-            emit('changed', model.value);
+            const newHours = Math.min(parseInt(hours), 23);
+            const newMinutes = Math.min(parseInt(minutes), 59);
+            
+            if (newHours !== currentHours || newMinutes !== currentMinutes) {
+                model.value = getLocalizedDayJs(model.value)
+                    .set('hours', newHours)
+                    .set('minutes', newMinutes)
+                    .set('seconds', 0)
+                    .format();
+                emit('changed', model.value);
+            }
         }
     }
     // check if input is only numbers
     else if (/^\d+$/.test(newValue)) {
+        let newHours = currentHours;
+        let newMinutes = currentMinutes;
+
         if (newValue.length === 4) {
             // parse 1300 to 13:00
-            const [hours, minutes] = [
-                newValue.slice(0, 2),
-                newValue.slice(2, 4),
-            ];
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(hours), 23))
-                .set('minutes', Math.min(parseInt(minutes), 59))
-                .format();
-            emit('changed', model.value);
+            newHours = Math.min(parseInt(newValue.slice(0, 2)), 23);
+            newMinutes = Math.min(parseInt(newValue.slice(2, 4)), 59);
         } else if (newValue.length === 3) {
             // parse 130 to 01:30
-            const [hours, minutes] = [
-                newValue.slice(0, 1),
-                newValue.slice(1, 3),
-            ];
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(hours), 23))
-                .set('minutes', Math.min(parseInt(minutes), 59))
-                .format();
-            emit('changed', model.value);
+            newHours = Math.min(parseInt(newValue.slice(0, 1)), 23);
+            newMinutes = Math.min(parseInt(newValue.slice(1, 3)), 59);
         } else if (newValue.length === 2) {
             // parse 13 to 13:00
-            model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(newValue), 23))
-                .set('minutes', 0)
-                .format();
-            emit('changed', model.value);
+            newHours = Math.min(parseInt(newValue), 23);
+            newMinutes = 0;
         } else if (newValue.length === 1) {
             // parse 1 to 01:00
+            newHours = Math.min(parseInt(newValue), 23);
+            newMinutes = 0;
+        }
+
+        if (newHours !== currentHours || newMinutes !== currentMinutes) {
             model.value = getLocalizedDayJs(model.value)
-                .set('hours', Math.min(parseInt(newValue), 23))
-                .set('minutes', 0)
+                .set('hours', newHours)
+                .set('minutes', newMinutes)
+                .set('seconds', 0)
                 .format();
             emit('changed', model.value);
         }
     }
-
-    inputValue.value = getLocalizedDayJs(model.value).format('HH:mm');
 }
 
 watch(model, (value) => {
-    inputValue.value = value ? getLocalizedDayJs(value).format('HH:mm') : null;
+    inputValue.value = value
+        ? formatTime(value, organization?.value?.time_format || '24-hours')
+        : null;
 });
 
 const timeInput = ref<HTMLInputElement | null>(null);
@@ -88,7 +124,12 @@ const emit = defineEmits(['changed']);
 useFocus(timeInput, { initialValue: props.focus });
 
 const inputValue = ref(
-    model.value ? getLocalizedDayJs(model.value).format('HH:mm') : null
+    model.value
+        ? formatTime(
+              model.value,
+              organization?.value?.time_format || '24-hours'
+          )
+        : null
 );
 </script>
 
@@ -98,7 +139,7 @@ const inputValue = ref(
         ref="timeInput"
         v-model="inputValue"
         :class="
-            twMerge('text-center w-24 px-3 py-2', size === 'large' && 'w-28')
+            twMerge('text-center w-28 px-3 py-2', size === 'large' && 'w-28')
         "
         data-testid="time_picker_input"
         type="text"
diff --git a/resources/js/packages/ui/src/Input/TimeRangeSelector.vue b/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
index d4b94627..a6e4ffce 100644
--- a/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
+++ b/resources/js/packages/ui/src/Input/TimeRangeSelector.vue
@@ -52,26 +52,22 @@ watch(focused, (newValue, oldValue) => {
 </script>
 
 <template>
-    <div
+    <form
         ref="dropdownContent"
         class="grid grid-cols-2 divide-x divide-card-background-separator text-center py-2">
-        <div
-            class="px-2"
-            @keydown.enter.prevent="nextTick(() => emit('close'))">
-            <div class="font-semibold text-text-primary text-sm pb-2">Start</div>
+        <div class="px-2">
+            <div class="font-semibold text-text-primary text-sm pb-2">
+                Start
+            </div>
             <div class="space-y-2">
                 <TimePickerSimple
                     v-model="tempStart"
                     data-testid="time_entry_range_start"
                     tabindex="0"
                     :focus
+                    @keydown.enter.prevent="nextTick(() => emit('close'))"
                     @keydown.exact.tab.shift.stop.prevent="emit('close')"
                     @changed="updateTimeEntry"></TimePickerSimple>
-                <DatePicker
-                    v-model="tempStart"
-                    class="text-xs text-text-tertiary max-w-24 px-1.5 py-1.5"
-                    @changed="updateTimeEntry"
-                    @blur.stop.prevent="emit('close')"></DatePicker>
             </div>
         </div>
         <div class="px-2">
@@ -80,16 +76,29 @@ watch(focused, (newValue, oldValue) => {
                 <TimePickerSimple
                     v-model="tempEnd"
                     data-testid="time_entry_range_end"
+                    @keydown.enter.prevent="nextTick(() => emit('close'))"
                     @changed="updateTimeEntry"></TimePickerSimple>
-                <DatePicker
-                    v-model="tempEnd"
-                    class="text-xs text-text-tertiary max-w-24 px-1.5 py-1.5"
-                    @changed="updateTimeEntry"></DatePicker>
             </div>
             <div v-else class="text-text-secondary">-- : --</div>
-            <div tabindex="0" @focusin="emit('close')"></div>
         </div>
-    </div>
+        <div class="px-2 pt-2">
+            <DatePicker
+                v-model="tempStart"
+                class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"
+                @changed="updateTimeEntry"></DatePicker>
+        </div>
+        <div class="px-2 pt-2">
+            <DatePicker
+                v-if="tempEnd !== null"
+                v-model="tempEnd"
+                class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"
+                @changed="updateTimeEntry"></DatePicker>
+        </div>
+        <div
+            tabindex="0"
+            class="focus-visible:outline-none"
+            @focusin="emit('close')"></div>
+    </form>
 </template>
 
 <style></style>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
index 1e670dd6..ecce0a0e 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
@@ -29,7 +29,7 @@ import DurationHumanInput from '@/packages/ui/src/Input/DurationHumanInput.vue';
 
 import { InformationCircleIcon } from '@heroicons/vue/20/solid';
 import type { Tag, Task } from '@/packages/api/src';
-import TimePickerSimple from "@/packages/ui/src/Input/TimePickerSimple.vue";
+import TimePickerSimple from '@/packages/ui/src/Input/TimePickerSimple.vue';
 
 const show = defineModel('show', { default: false });
 const saving = ref(false);
@@ -148,9 +148,7 @@ type BillableOption = {
                     <div class="flex-1 min-w-0">
                         <TimeTrackerProjectTaskDropdown
                             v-model:project="timeEntry.project_id"
-                            v-model:task="
-                                timeEntry.task_id
-                            "
+                            v-model:task="timeEntry.task_id"
                             :clients
                             :create-project
                             :create-client
@@ -160,7 +158,9 @@ type BillableOption = {
                             class="bg-input-background"
                             :projects="projects"
                             :tasks="tasks"
-                            :enable-estimated-time="enableEstimatedTime"></TimeTrackerProjectTaskDropdown>
+                            :enable-estimated-time="
+                                enableEstimatedTime
+                            "></TimeTrackerProjectTaskDropdown>
                     </div>
                     <div class="flex items-center space-x-2">
                         <div class="flex-col">
@@ -242,37 +242,31 @@ type BillableOption = {
                         </div>
                     </div>
                 </div>
-                <div class="">
-                    <InputLabel>Start</InputLabel>
-                    <div class="flex flex-col items-center space-y-2 mt-1">
+                <div class="grid gap-2 grid-cols-2">
+                    <div class="space-y-1">
+                        <InputLabel>Start</InputLabel>
                         <TimePickerSimple
-
                             v-model="localStart"
                             size="large"></TimePickerSimple>
-                        <DatePicker
-                            v-model="localStart"
-                            tabindex="1"
-                            class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
                     </div>
-                </div>
-                <div class="">
-                    <InputLabel>End</InputLabel>
-                    <div class="flex flex-col items-center space-y-2 mt-1">
+                    <div class="space-y-1">
+                        <InputLabel>End</InputLabel>
                         <TimePickerSimple
                             v-model="localEnd"
                             size="large"></TimePickerSimple>
-                        <DatePicker
-                            v-model="localEnd"
-                            tabindex="1"
-                            class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
                     </div>
+                    <DatePicker
+                        v-model="localStart"
+                        class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
+                    <DatePicker
+                        v-model="localEnd"
+                        class="text-xs text-text-tertiary max-w-28 px-1.5 py-1.5"></DatePicker>
                 </div>
             </div>
         </template>
         <template #footer>
-            <SecondaryButton tabindex="2" @click="show = false"> Cancel</SecondaryButton>
+            <SecondaryButton @click="show = false">Cancel</SecondaryButton>
             <PrimaryButton
-                tabindex="2"
                 class="ms-3"
                 :class="{ 'opacity-25': saving }"
                 :disabled="saving"