diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
index e08b2689..427ecbc8 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
@@ -78,9 +78,8 @@ function updateProjectAndTask(projectId: string, taskId: string) {
 
 const expanded = ref(false);
 
-function onSelectChange(event: Event) {
-    const target = event.target as HTMLInputElement;
-    if (target.checked) {
+function onSelectChange(checked: boolean) {
+    if (checked) {
         emit('selected', [...props.timeEntry.timeEntries]);
     } else {
         emit('unselected', [...props.timeEntry.timeEntries]);
@@ -94,7 +93,7 @@ function onSelectChange(event: Event) {
         data-testid="time_entry_row">
         <MainContainer class="min-w-0">
             <div
-                class="sm:flex py-2 items-center min-w-0 justify-between group">
+                class="sm:flex py-1.5 items-center min-w-0 justify-between group">
                 <div class="flex space-x-3 items-center min-w-0">
                     <Checkbox
                         :checked="
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
index 4cdfacb4..fb75776a 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
@@ -20,6 +20,7 @@ import BillableToggleButton from '@/packages/ui/src/Input/BillableToggleButton.v
 import { computed } from 'vue';
 import TimeTrackerProjectTaskDropdown from '@/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue';
 import { Checkbox } from '@/packages/ui/src';
+import { twMerge } from 'tailwind-merge';
 
 const props = defineProps<{
     timeEntry: TimeEntry;
@@ -81,9 +82,8 @@ const memberName = computed(() => {
     return '';
 });
 
-function onSelectChange(event: Event) {
-    const target = event.target as HTMLInputElement;
-    if (target.checked) {
+function onSelectChange(checked : boolean) {
+    if (checked) {
         emit('selected');
     } else {
         emit('unselected');
@@ -137,7 +137,7 @@ function onSelectChange(event: Event) {
                         @changed="updateTimeEntryTags"></TimeEntryRowTagDropdown>
                     <BillableToggleButton
                         :model-value="timeEntry.billable"
-                        class="opacity-50 group-hover:opacity-100 focus-visible:opacity-100"
+                        :class="twMerge('opacity-50 group-hover:opacity-100 focus-visible:opacity-100')"
                         size="small"
                         @changed="
                             updateTimeEntryBillable