diff --git a/frontend/components/time-tracking/TimeEntryBlock.vue b/frontend/components/time-tracking/TimeEntryBlock.vue
index e80adf1..121ad78 100644
--- a/frontend/components/time-tracking/TimeEntryBlock.vue
+++ b/frontend/components/time-tracking/TimeEntryBlock.vue
@@ -17,38 +17,33 @@
             <div class="absolute bottom-0 left-1/2 -translate-x-1/2 h-[3px] w-8 rounded-full bg-black/0 group-hover:bg-black/20 transition" />
         </div>
 
-        <div class="px-1.5 py-0.5 h-full overflow-hidden">
-            <!-- Full display: title + project + type dot + duration -->
-            <template v-if="sizeLevel >= 3">
-                <div class="flex items-center gap-1">
-                    <div class="font-semibold truncate">{{ entry.title || $t('common.untitled') }}</div>
-                    <span class="ml-auto shrink-0 text-[10px] tabular-nums opacity-80">{{ duration }}</span>
-                </div>
-                <div v-if="entry.project" class="truncate text-[10px] opacity-80">{{ entry.project.name }}</div>
-                <div v-if="entry.tags.length" class="mt-0.5 flex items-center gap-1 overflow-hidden">
+        <div class="flex flex-col h-full overflow-hidden px-1.5 py-1">
+            <!-- Top: title + project -->
+            <div class="min-w-0">
+                <div v-if="sizeLevel >= 1" class="font-bold truncate leading-tight" style="color: #0A2168">{{ entry.title || $t('common.untitled') }}</div>
+                <div v-if="sizeLevel >= 2 && entry.project" class="truncate text-[10px] font-semibold opacity-80 leading-tight">{{ entry.project.name }}</div>
+            </div>
+
+            <!-- Spacer -->
+            <div class="flex-1" />
+
+            <!-- Bottom: tags left, duration right -->
+            <div v-if="sizeLevel >= 3" class="flex items-end justify-between gap-1 min-w-0">
+                <div v-if="entry.tags.length" class="flex items-center gap-1 overflow-hidden min-w-0">
                     <span
                         v-for="tag in entry.tags"
                         :key="tag.id"
-                        class="inline-flex items-center gap-0.5 truncate text-[9px] opacity-90"
+                        class="inline-flex shrink-0 items-center gap-0.5 rounded-full px-1.5 py-0.5 text-[9px] font-bold text-white"
+                        :style="{ backgroundColor: tag.color }"
                     >
-                        <span class="inline-block h-1.5 w-1.5 shrink-0 rounded-full" :style="{ backgroundColor: tag.color }" />
                         {{ tag.label }}
                     </span>
                 </div>
-            </template>
-
-            <!-- Medium: title + duration -->
-            <template v-else-if="sizeLevel === 2">
-                <div class="font-semibold truncate">{{ entry.title || $t('common.untitled') }}</div>
-                <div class="text-[10px] tabular-nums opacity-80">{{ duration }}</div>
-            </template>
-
-            <!-- Small: title only -->
-            <template v-else-if="sizeLevel === 1">
-                <div class="font-semibold truncate text-[10px] leading-tight">{{ entry.title || $t('common.untitled') }}</div>
-            </template>
-
-            <!-- Tiny: just a colored bar, no text -->
+                <span class="shrink-0 text-[10px] tabular-nums font-bold" style="color: #0A2168">{{ duration }}</span>
+            </div>
+            <div v-else-if="sizeLevel === 2" class="flex items-end justify-end">
+                <span class="shrink-0 text-[10px] tabular-nums font-bold" style="color: #0A2168">{{ duration }}</span>
+            </div>
         </div>
 
         <!-- Resize handle bottom (outside block) -->
@@ -116,13 +111,11 @@ const sizeLevel = computed(() => {
     return 0
 })
 
+const hasProject = computed(() => !!props.entry.project)
+
 const blockStyle = computed(() => {
     const startMinutes = startDate.value.getHours() * 60 + startDate.value.getMinutes() + resizeTopDeltaMinutes.value
     const topPx = ((startMinutes - props.dayStartHour * 60) / 60) * props.hourHeight
-    const hex = (props.entry.project?.color ?? '#94a3b8').replace('#', '')
-    const r = parseInt(hex.substring(0, 2), 16)
-    const g = parseInt(hex.substring(2, 4), 16)
-    const b = parseInt(hex.substring(4, 6), 16)
 
     const col = props.columnIndex ?? 0
     const total = props.totalColumns ?? 1
@@ -130,14 +123,28 @@ const blockStyle = computed(() => {
     const leftPercent = (col / total) * 100
     const widthPercent = (1 / total) * 100
 
-    return {
+    const base: Record<string, string> = {
         top: `${topPx}px`,
         height: `${heightPx.value}px`,
-        backgroundColor: `rgb(${Math.round(r + (255 - r) * 0.6)}, ${Math.round(g + (255 - g) * 0.6)}, ${Math.round(b + (255 - b) * 0.6)})`,
-        color: `rgb(${r}, ${g}, ${b})`,
         left: `calc(${leftPercent}% + ${gapPx}px)`,
         width: `calc(${widthPercent}% - ${gapPx * 2}px)`,
     }
+
+    if (hasProject.value) {
+        const hex = props.entry.project!.color.replace('#', '')
+        const r = parseInt(hex.substring(0, 2), 16)
+        const g = parseInt(hex.substring(2, 4), 16)
+        const b = parseInt(hex.substring(4, 6), 16)
+        base.backgroundColor = `rgb(${Math.round(r + (255 - r) * 0.6)}, ${Math.round(g + (255 - g) * 0.6)}, ${Math.round(b + (255 - b) * 0.6)})`
+        base.color = `rgb(${r}, ${g}, ${b})`
+    } else {
+        base.backgroundColor = '#e5e7eb'
+        base.backgroundImage = 'repeating-conic-gradient(#d1d5db 0% 25%, #f3f4f6 0% 50%)'
+        base.backgroundSize = '12px 12px'
+        base.color = '#6b7280'
+    }
+
+    return base
 })
 
 // --- Click / Drag detection ---
diff --git a/frontend/components/time-tracking/TimeTrackingCalendar.vue b/frontend/components/time-tracking/TimeTrackingCalendar.vue
index 6c41716..0de926a 100644
--- a/frontend/components/time-tracking/TimeTrackingCalendar.vue
+++ b/frontend/components/time-tracking/TimeTrackingCalendar.vue
@@ -1,27 +1,27 @@
 <template>
     <div ref="calendarEl" class="relative flex h-full flex-col rounded-lg border border-neutral-200 bg-white">
-        <!-- Day headers -->
-        <div
-            class="z-20 flex flex-shrink-0 border-b border-neutral-200 bg-white rounded-t-lg"
-        >
-            <div class="w-16 shrink-0 border-r border-neutral-200" />
-            <div
-                v-for="day in days"
-                :key="day.dateStr"
-                class="flex-1 border-r border-neutral-100 py-2 text-center"
-            >
-                <div class="text-lg font-bold" :class="isToday(day.date) ? 'text-orange-500' : 'text-neutral-900'">
-                    {{ day.dayNum }}
+        <!-- Grid body with sticky header -->
+        <div ref="gridBodyEl" class="relative min-h-0 flex-1 overflow-y-auto">
+            <!-- Day headers (sticky inside scroll container) -->
+            <div class="sticky top-0 z-20 flex border-b border-neutral-200 bg-white rounded-t-lg">
+                <div class="w-16 shrink-0 border-r border-neutral-200" />
+                <div
+                    v-for="day in days"
+                    :key="'header-' + day.dateStr"
+                    class="flex-1 border-r border-neutral-100 py-2 text-center"
+                >
+                    <div class="text-lg font-bold" :class="isToday(day.date) ? 'text-orange-500' : 'text-neutral-900'">
+                        {{ day.dayNum }}
+                    </div>
+                    <div class="text-xs" :class="isToday(day.date) ? 'text-orange-500' : 'text-neutral-500'">
+                        {{ day.label }}
+                    </div>
+                    <div class="text-[10px] text-neutral-400">{{ day.totalFormatted }}</div>
                 </div>
-                <div class="text-xs" :class="isToday(day.date) ? 'text-orange-500' : 'text-neutral-500'">
-                    {{ day.label }}
-                </div>
-                <div class="text-[10px] text-neutral-400">{{ day.totalFormatted }}</div>
             </div>
-        </div>
 
-        <!-- Grid body -->
-        <div ref="gridBodyEl" class="relative flex min-h-0 flex-1 overflow-y-auto">
+            <!-- Columns -->
+            <div class="relative flex">
             <!-- Hour labels -->
             <div class="w-16 shrink-0">
                 <div
@@ -134,7 +134,8 @@
                     <div class="text-[10px] opacity-90">{{ dragState.timeLabel }}</div>
                 </div>
             </div>
-        </div>
+        </div><!-- end columns flex -->
+        </div><!-- end gridBodyEl -->
     </div>
 </template>
 
diff --git a/frontend/components/ui/DateFilter.vue b/frontend/components/ui/DateFilter.vue
index 404f5d6..cd69acb 100644
--- a/frontend/components/ui/DateFilter.vue
+++ b/frontend/components/ui/DateFilter.vue
@@ -15,22 +15,6 @@
         >
             <template #trigger>
                 <div class="flex items-center gap-1">
-                    <div class="flex shrink-0 overflow-hidden rounded-md border border-neutral-300">
-                        <button
-                            class="px-2 py-[7px] text-xs font-medium transition"
-                            :class="mode === 'day' ? 'bg-primary-500 text-white' : 'text-neutral-500 hover:bg-neutral-100'"
-                            @click.stop="switchMode('day')"
-                        >
-                            {{ t('common.day') }}
-                        </button>
-                        <button
-                            class="px-2 py-[7px] text-xs font-medium transition"
-                            :class="mode === 'week' ? 'bg-primary-500 text-white' : 'text-neutral-500 hover:bg-neutral-100'"
-                            @click.stop="switchMode('week')"
-                        >
-                            {{ t('common.weekShort') }}
-                        </button>
-                    </div>
                     <div class="relative cursor-pointer">
                         <input
                             :value="displayValue"
@@ -85,6 +69,7 @@ const { t } = useI18n()
 const props = defineProps<{
     modelValue?: Date | [Date, Date] | null
     placeholder?: string
+    pickerMode?: 'day' | 'week'
 }>()
 
 const emit = defineEmits<{
@@ -92,7 +77,7 @@ const emit = defineEmits<{
 }>()
 
 const datepicker = ref<InstanceType<typeof VueDatePicker> | null>(null)
-const mode = ref<'day' | 'week'>('week')
+const mode = computed(() => props.pickerMode ?? 'week')
 const internalValue = ref<Date | Date[] | null>(null)
 
 const displayValue = computed(() => {
@@ -133,13 +118,6 @@ function formatShortDate(d: Date): string {
     return `${day}/${month}`
 }
 
-function switchMode(newMode: 'day' | 'week') {
-    if (mode.value === newMode) return
-    mode.value = newMode
-    internalValue.value = null
-    emit('update:modelValue', null)
-}
-
 function onUpdate(value: Date | Date[] | null) {
     if (!value) {
         emit('update:modelValue', null)
@@ -163,7 +141,6 @@ function onClear() {
 }
 
 function selectToday() {
-    mode.value = 'day'
     const today = new Date()
     today.setHours(0, 0, 0, 0)
     internalValue.value = today
@@ -171,7 +148,6 @@ function selectToday() {
 }
 
 function selectThisWeek() {
-    mode.value = 'week'
     const now = new Date()
     const day = now.getDay()
     const monday = new Date(now)
diff --git a/frontend/pages/time-tracking.vue b/frontend/pages/time-tracking.vue
index fca8573..936772c 100644
--- a/frontend/pages/time-tracking.vue
+++ b/frontend/pages/time-tracking.vue
@@ -17,20 +17,26 @@
                     {{ currentMonthLabel }}
                 </h2>
 
-                <div class="flex shrink-0 items-center gap-1 rounded-md border border-neutral-200">
-                    <button class="px-2 py-1 text-neutral-500 hover:text-neutral-700" @click="navigatePrev">
+                <div class="flex shrink-0 items-center gap-3">
+                    <button class="rounded-full p-1 text-neutral-400 hover:text-neutral-700 transition" @click="navigatePrev">
                         <Icon name="mdi:chevron-left" size="20" />
                     </button>
-                    <button
-                        v-for="mode in (['week', 'day', 'list'] as const)"
-                        :key="mode"
-                        class="px-3 py-1 text-sm font-semibold transition"
-                        :class="viewMode === mode ? 'bg-primary-500 text-white rounded' : 'text-neutral-500 hover:text-neutral-700'"
-                        @click="viewMode = mode"
-                    >
-                        {{ mode === 'week' ? 'Semaine' : mode === 'day' ? 'Jour' : 'Liste' }}
-                    </button>
-                    <button class="px-2 py-1 text-neutral-500 hover:text-neutral-700" @click="navigateNext">
+
+                    <div class="flex items-center rounded-full bg-neutral-100 p-1">
+                        <button
+                            v-for="mode in (['week', 'day', 'list'] as const)"
+                            :key="mode"
+                            class="rounded-full px-4 py-1.5 text-sm font-semibold transition-all"
+                            :class="viewMode === mode
+                                ? 'bg-primary-500 text-white shadow-sm'
+                                : 'text-neutral-500 hover:text-neutral-700'"
+                            @click="viewMode = mode"
+                        >
+                            {{ mode === 'week' ? 'Semaine' : mode === 'day' ? 'Jour' : 'Liste' }}
+                        </button>
+                    </div>
+
+                    <button class="rounded-full p-1 text-neutral-400 hover:text-neutral-700 transition" @click="navigateNext">
                         <Icon name="mdi:chevron-right" size="20" />
                     </button>
                 </div>
@@ -71,7 +77,7 @@
                     />
                 </div>
 
-                <DateFilter v-model="selectedDateFilter" />
+                <DateFilter v-model="selectedDateFilter" :picker-mode="viewMode === 'day' ? 'day' : 'week'" />
             </div>
         </div>
 
@@ -334,6 +340,7 @@ onMounted(async () => {
 })
 
 watch(viewMode, () => {
+    selectedDateFilter.value = null
     startDate.value = viewMode.value === 'day' ? startDate.value : getMonday(startDate.value)
     loadEntries()
 })