From 65761776524de9415f047e96d0d7238f8199cb57 Mon Sep 17 00:00:00 2001
From: Nic D <n_drolet@hotmail.ca>
Date: Mon, 23 Mar 2026 14:35:51 -0400
Subject: [PATCH] fix(timesheet, approvals): overhaul of UI elements,
 standardized inputs and selects

---
 src/assets/circle.png                         | Bin 0 -> 2605 bytes
 src/assets/links/facturation-transparent.png  | Bin 2060 -> 2060 bytes
 src/assets/links/hydroQC_icon.png             | Bin 3121 -> 3121 bytes
 src/assets/links/logo_gmail.png               | Bin 1778 -> 1778 bytes
 src/css/app.scss                              |  18 +
 src/layouts/main-layout.vue                   |  14 +-
 .../components/employee/shortcut-card.vue     |  15 +-
 src/modules/shared/components/targo-input.vue | 152 +++---
 .../components/details-dialog-shift-menu.vue  |  44 +-
 .../components/overview-list.vue              |  26 +-
 .../components/expense-dialog-form.vue        | 211 +++++---
 .../components/expense-dialog-list-item.vue   |  13 +-
 .../timesheets/components/expense-dialog.vue  |  14 +-
 .../mobile/expense-dialog-form-mobile.vue     |   2 +-
 .../expense-dialog-list-item-mobile.vue       |  41 +-
 .../mobile/shift-list-day-mobile.vue          | 123 +++++
 .../mobile/shift-list-day-row-mobile.vue      | 466 ++++++++----------
 .../components/mobile/shift-list-mobile.vue   | 202 +-------
 .../components/shift-list-date-widget.vue     |  20 +-
 .../components/shift-list-day-row.vue         | 139 +++---
 .../timesheets/components/shift-list-day.vue  |  34 +-
 .../timesheets/components/shift-list.vue      |   9 +-
 .../components/timesheet-wrapper.vue          |  31 +-
 .../timesheets/composables/use-expense-api.ts |   1 -
 .../timesheets/models/expense.models.ts       |   8 +-
 src/modules/timesheets/utils/expense.util.ts  |  10 +-
 26 files changed, 819 insertions(+), 774 deletions(-)
 create mode 100644 src/assets/circle.png
 create mode 100644 src/modules/timesheets/components/mobile/shift-list-day-mobile.vue

diff --git a/src/assets/circle.png b/src/assets/circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..373aeb72d3bba6ee2511418a0b40cff52063d689
GIT binary patch
literal 2605
zcmV+|3exq7P)<h;3K|Lk000e1NJLTq00GVb00AQe0{{R3NfP|u00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA03lFJR7C&)04ST}D4XOco8%~)<S3iuD4XOc
zo8%~)<S3iuD4XOgMn#YS000YgQchC<|28oL0lne}2@$lrnm_;m364obK~#90?VZWF
z>oyF9sbyAIt|7IgkL=RM>mpxjNiC_tas`S8TjBtKAPGq%<g>U7Ut8p_1A>DFcIF=H
zuC73+-n_=CUOz+kGl(6uBF?TKhv`rFk74<2D59=~^TGMjI2oO(>pA;@Nx5pwbM<1*
z1i)R-jNe?y+2@y?PI?(9lyDN18on2C7E+pIOE2IoXIzv9dM;=8^D;7&sgZj!rxc{A
z*-uHzdi~^5PD7p-=c{#c@&*Kh@dtMOYs7w<6u9SbGAQX<1Hn+8pRs`DR@fUqRmK^i
zOsnl<-0NEvCmpak1M=;N6>-vD=1^J(t*8GaCnTAai)K#~2l9t;cGLhb>^~Cqc=mO0
zQVp}j%3K}8Nl?P^_Lx6Tv?xiZa$;?2X~^U7SijSa2LK<yiDp?aUg2*)r;kO$Tb>ic
z^s7CU{L{VHW-%2kWQL{53JF<@lFY>PPxB?r88<U)C9@n>mJ`O@(@()tW+AC4C+O8)
zztZ)D5>iP{kYldg<GEZU$_!cmXju~EgfO1le};Y(DJysMFH!b#Ajr(ITU?wNSxY`#
zWw1(d5^eA4J3UU|@4-)A@fp|5q&TsW-rUhU|C=B`MfYok*HPYs9x?dGO(m7#q?hET
zNz^-REw0D`W7PZU;z@)P#@x^OQtPpMH!JQay+c<t7oESJ099v)e2>WU<{)I3n?fqU
z31AM^@VoG?k!~bl`K0BX0p{Dvhv>pVe0o5um@}xrr|2p7WZp9Ysr!Mix^QQ1rJO#d
zAX=!{G=chQS;?nj8f?_XD71(ZjoAZ*kD^JHaGq@@Tq>{Ne9j<*WH5jKFS%e&+4-E;
zxVaV`jtXO?XLI^z_2fnNz|=_jxttecn$&p8<h&j;5j2m}!#uHR;+3H5k;PdBrU7Pd
zcvuN=UWREB+D{IrcknCP<}PMsGB~Tk<XW1}$!-#7i3OU>Ssf-1G?lYLOv9;FB4<6B
z){{e8&gq`GO5B{~8W2`2jWc$%3l%XmiL+WaXSr85{1%nMSv6(^G=a0?pj{-ySv#h2
zNxceYa#qx%Sh6|28nQVXz@!XibH+O2I%L(-^@7W3+gYodhNvc&lW5}mcPg;i2DPih
z<m6!1Aq&(tl*idf)GmTSS)46l7I3zaYByQcweBs9|IX<->&LV~t-C=|e%3(LF4}9n
z*%Ie$s&TH`tDL~uPM5MPd<ZSdiFLeHYpXP$6CE*Dt*zD{Yhs*jVupbm;cT&SF7gef
zIh$;pi;_4S>{343s?OnTv~e!_)csv?inHCQo%IG~aDoHkX5<=5a3V9-R^+x&f)g6{
zHzapVgmbnXwZ=0P<!n4^4VSZdJ9h*oXQOtyV<L>x3forgbPUBffu)D`WObnk=Wb`S
zQEPSzoKuCJ_N#4RP91jIV_c9^MG~5|8wzqN=u=j8+heB@&bIB`NMJv;v`!P@)MMu!
zxFl!ucJ2um-~_HtG^;J)0-TEM<Z-rdC&d|FgK1a<r>3yo6H&maDGOOM7MxQ9CgG>I
zUf;SfPGxp(JU*u~J25|1bt<zyzIE`&TEZ6dQ(M>~?NeJ8!s1pRC+w%Xu!TAG*|{w!
z+=SEhQ(xG^{fd3TP>CQvt;;TI1o^3v6Y^7G*n)n#cTnjN;HSp0h5XFh@S}3!eyXw)
z8pmsFo`9b!!xr#UCuiuV%CHUdt;${nh+ExZ8~CZr&iitzPD9r9&+QHrRl@vKW@qT9
z&gOX+&V2#X<5bo>Q9qS&?t{D!r|vYg`>C6A^HX^m+WgenJgr;4?!md;XS{Oi4cohM
zs!X@`{qMKn+@I@MKhm0pd`?|{I*)DKf>U+ex(~^9_GhX%-Fp@Fa=JIb>*aKxXSe~U
z{oW6KdB}ShP^+K*vz=egw&g#=s-Dw%pOiYz;L&S`Q_uJ|c=Y-<oXa-B+Bm}(Ky=-_
zzpXM(;Kc|k<Mw`>-usNTa{BM#)^+m`^xhI@zM_N^dT)u#sUvW2!U?`TNgpTtHe1!4
zsGk}V5&XhT_d2fvPUH>g9%uW3i@g6-8)s~PBqfO`y5E&TPAAuRoUJD!be{%Yobi44
zbUcENZ(yK`lh}{KzdycdPR{<H3f@#hZ9o=0kJK)wgNg22+x{Dt$bHuIaQ5~i^~Ao?
ztv6757sT*6*G3H`TPMibq@fNble0xbou~x>fcGb~$m!Y%1SG`SVBk7-MmQUOBW%=8
z@cl#0fyR=MQNrm)ZIrXs{SI7AIJ+p|bfXqYqVRhPTS~beCgKqC-pPhQIZ;b+wi3BK
zOq{b3Lp@9;XLCD#axr~QV#TaRc{zxvGWx#p7B~Y;lfzj*s2{aNg^7I+ss~NL1ojOg
z7JKWGhdFjsZHawJW>pNzPPL1ueP-gnzD}KCr`q@T!;hkq*6Zb)8BHbhzFxJaqCTj0
z%no{=Hd85RU}rSyBKz){8bSTxfic4v{SEXXV;$l`g_w*a!r-hd6=h)}`<zw`8e+2I
z4d$#DG|x?xGdNr&q`8=!{j*aJcd&x~gp+C)VVnt5*z*Lq$vyulXVR?a6hV~iFvB@R
zP<*z2ih!Wyw<dx!JbzcV(IPiVPT&My2MU=f#aYnor3GT9WDJV48c;B1)2c#pf(0-;
zEJ4ATY5AY#1Ow*m4hC+TiM5Dvg6Hy7($WmHD#m#=s6f+PkCR!_Nu;ou8Obot87?8N
z0!aV(H@SSeWZ2A{lg!{mPilXxr^xxu>)JS+DCzKXASqI2W{cr*0t=?Aj_ORYh|Nw6
zOisMu14z+;HTn6E%SoMLSyU`^7G;k*`J8x*ktD^-Sab>}S&6}vvyxVtqB%qoXY6#B
z&1LY0A#nIa&RAUK)}@cvq-+G1${9WBIc+t5(Bgq+DkrZ}d|Mx5=kHZsc0fewoIKE3
zqj@cVLG?rb;vPs~72`<GkB0dNqnW{m$-bWFpe2FHQ3hu`83{{bNh*tTYE`+v%#g^+
zTS0A4a#dzVU%*KXx5XqiqAZEN$C_b|l-O!<31>GR8oNU;xF%khO%97)>1BV3tl1f9
zTKS6`LcK%s*n!jm*KovoK_SxT((L6W*xQ%3)kBxQrAIaSwjO)I@qp1=hOft8YZT@D
z>!0ngQ{NX`?U^+W{qQ*BT8$j%uV26Y{ipxoJj)!XSe|Fo>-6kX;5g-**LjzWPn&hD
zrENo;Ly{_0^0~!brZ1;1eK~dM%c)CWPF?zP>e81}m%g03^ySp0yKw#wHit)Hzq20F
P00000NkvXXu0mjfcFzyC

literal 0
HcmV?d00001

diff --git a/src/assets/links/facturation-transparent.png b/src/assets/links/facturation-transparent.png
index 1249e8ef13319dc54d9006beee454792533b661c..2db539418d45b29546b0c5499f91d20b25a5027e 100644
GIT binary patch
delta 608
ucmeAX=n<IUSI;xcdLU8#z*;}6en5Rc%X*;0KZM%hUpD7F<K}rxd8`2F_Ow#~

delta 608
jcmeAX=n<IUSO0%t!KnQM8~!2Gww`H?ZO!I+OnIyT$l_6E

diff --git a/src/assets/links/hydroQC_icon.png b/src/assets/links/hydroQC_icon.png
index b97e65f95e3935520743cff036c53b295d0046f2..2dbf4b391adc8947a4fd57687991ac07fa140478 100644
GIT binary patch
delta 743
tcmdleu~A}zUp>z(>w!e|18e=P`T_O*EbEaT{?W7wf6<IXn^l;3IRPM?+eZKZ

delta 743
jcmdleu~A}zU;Y1q1*7(l?C_7KmG^}|zTd3E%*zP?b-vhj

diff --git a/src/assets/links/logo_gmail.png b/src/assets/links/logo_gmail.png
index b75b0de40d8beac9a5d3a8fcee19f8d38aa4519a..957abed5910b8c5952e5e7797703572c23b192e5 100644
GIT binary patch
delta 557
ucmeyw`-yjgUp>z(>w!e|18e=P`T_O*EbD;|e?`3E|Ew+M=;myub`}6pm8OLN

delta 557
jcmeyw`-yjgU;Y1q1*7&4Z1^kUwO)n&N7d$Rrgjzp28tg?

diff --git a/src/css/app.scss b/src/css/app.scss
index dfb3916..ae674d8 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -42,6 +42,14 @@ body.body--dark {
     backdrop-filter: blur(5px);
 }
 
+.text-accent2 {
+    color: #95f0a1B0;
+}
+
+.bg-accent2 {
+    background-color: #95f0a1B0;
+}
+
 .q-btn--push::before {
     border-bottom: 4px solid rgba(0,0,0, 0.25);
 }
@@ -73,4 +81,14 @@ input[type=number] {
 .q-field--dark .q-field__control:hover::before, .q-field--outlined .q-field__control:hover::before {
     border-color: var(--q-accent2);
     border-width: 2px;
+}
+
+.text-border-white {
+  text-shadow: 2px 0 #fff, -2px 0 #fff, 0 2px #fff, 0 -2px #fff,
+               1px 1px #fff, -1px -1px #fff, 1px -1px #fff, -1px 1px #fff;
+}
+
+.text-border-dark {
+  text-shadow: 2px 0 var(--q-primary), -2px 0 var(--q-primary), 0 2px var(--q-primary), 0 -2px var(--q-primary),
+               1px 1px var(--q-primary), -1px -1px var(--q-primary), 1px -1px var(--q-primary), -1px 1px var(--q-primary);
 }
\ No newline at end of file
diff --git a/src/layouts/main-layout.vue b/src/layouts/main-layout.vue
index 0385b09..c0deac0 100644
--- a/src/layouts/main-layout.vue
+++ b/src/layouts/main-layout.vue
@@ -13,7 +13,7 @@
     import { useUiStore } from 'src/stores/ui-store';
     import { useAuthStore } from 'src/stores/auth-store';
 
-    setCssVar('accent2', '#36c45a44');
+    setCssVar('accent2', '#95f0a1B0');
     const ui_store = useUiStore();
     const auth_store = useAuthStore();
     const userPreferences = ref(ui_store.userPreferences);
@@ -47,14 +47,4 @@
 
         <FooterBar v-if="!$q.platform.is.mobile" />
     </q-layout>
-</template>
-
-<style lang="css">
-.text-accent2 {
-    color: '#36c45a44' !important;
-}
-
-.bg-accent2 {
-    background-color: '#36c45a44' !important;
-}
-</style>
\ No newline at end of file
+</template>
\ No newline at end of file
diff --git a/src/modules/dashboard/components/employee/shortcut-card.vue b/src/modules/dashboard/components/employee/shortcut-card.vue
index 4f3f7bd..11fbd61 100644
--- a/src/modules/dashboard/components/employee/shortcut-card.vue
+++ b/src/modules/dashboard/components/employee/shortcut-card.vue
@@ -15,7 +15,7 @@
 
 <template>
     <div
-        class="full-width cursor-pointer rounded-50 bg-accent text-white link-btn"
+        class="full-width cursor-pointer rounded-50 link-btn shadow-4"
         @click="onClickExternalShortcut"
     >
         <div class="row items-center q-px-lg q-py-xs rounded-50">
@@ -25,7 +25,7 @@
 
             <q-icon
                 round
-                color="dark"
+                color="accent"
                 size="md"
                 :name="iconImageSource"
                 class="col-auto"
@@ -39,16 +39,11 @@
     lang="css"
 >
 .link-btn {
-    box-shadow: 0 6px rgb(4, 77, 4);
-    transform: translateY(-6px);
+    background-color: var(--q-dark);
+    border: 2px solid var(--q-accent);
 }
 
 .link-btn:hover {
-    background-color: var(--q-accent2) !important;
-}
-
-.link-btn:active {
-    box-shadow: 0 2px rgb(4, 77, 4);
-    transform: translateY(2px);
+    background-color: var(--q-accent2);
 }
 </style>
\ No newline at end of file
diff --git a/src/modules/shared/components/targo-input.vue b/src/modules/shared/components/targo-input.vue
index 60c7227..71cad76 100644
--- a/src/modules/shared/components/targo-input.vue
+++ b/src/modules/shared/components/targo-input.vue
@@ -2,22 +2,43 @@
     setup
     lang="ts"
 >
+    import { colors, getCssVar } from 'quasar';
+    import { computed } from 'vue';
+
     const model = defineModel<string | number | null | undefined>({ required: true });
-    const is_date_picker_open = defineModel<boolean>('isDatePickerOpen', { default: false });
 
     defineProps<{
         label?: string | undefined;
         requiresDatePicker?: boolean | undefined;
         maxLength?: number;
         noTopPadding?: boolean;
-        backgroundColor?: 'bg-secondary' | 'bg-dark';
+        backgroundColor?: 'secondary' | 'dark' | 'white' | undefined;
+        inputTextColor?: string | undefined;
         appendContent?: string | number;
         autoFocus?: boolean;
+        error?: boolean;
+        dense?: boolean;
+        readonly?: boolean;
+        textAlign?: 'left' | 'right';
     }>();
 
     defineOptions({
         inheritAttrs: false
     })
+
+    defineEmits<{
+        'focus': [void];
+        'blur': [void];
+    }>();
+
+    const isDatePickerOpen = defineModel<boolean>('isDatePickerOpen', { default: false });
+
+    const bgLightGrey = computed(() => {
+        const secondary = getCssVar('secondary');
+        if (secondary === null) return;
+
+        return colors.lighten(secondary, 50);
+    });
 </script>
 
 <template>
@@ -25,68 +46,81 @@
         class="col q-px-sm"
         :class="noTopPadding ? '' : 'q-pt-md'"
     >
-        <q-input
-            v-model="model"
-            v-bind="$attrs"
-            dense
-            :autofocus="autoFocus"
-            borderless
-            color="accent"
-            label-color="white"
-            stack-label
-            label-slot
-            no-error-icon
-            hide-bottom-space
-            :maxlength="maxLength"
-            class="q-px-md rounded-5 inset-shadow"
-            :class="$q.dark.isActive ? 'bg-primary' : (backgroundColor ?? 'bg-secondary')"
-            :style="`border: 1px solid var(${$q.dark.isActive ? '--q-secondary' : '--q-primary'});`"
+        <transition
+            enter-active-class="animated shakeX"
+            :duration="{ enter: 200, leave: 0 }"
+            mode="out-in"
         >
-            <template #label>
-                <span
-                    class="text-weight-bold text-uppercase q-px-md"
-                    :class="$q.dark.isActive ? 'bg-secondary' : 'bg-primary'"
-                >
-                    {{ label }}
-                </span>
-            </template>
-
-            <template
-                #append
-                v-if="requiresDatePicker || !!appendContent"
+            <q-input
+                v-model="model"
+                v-bind="$attrs"
+                :key="error ? 1 : 2"
+                :dense="dense"
+                :autofocus="autoFocus"
+                :readonly="readonly"
+                borderless
+                color="accent"
+                label-color="white"
+                stack-label
+                label-slot
+                no-error-icon
+                hide-bottom-space
+                :error="error"
+                :maxlength="maxLength"
+                class="q-px-md rounded-5 inset-shadow"
+                :class="backgroundColor ? `bg-${backgroundColor ?? 'secondary'}` : ($q.dark.isActive ? 'bg-primary' : '')"
+                :style="`border: 1px solid ${error ? getCssVar('negative') : colors.getPaletteColor($q.dark.isActive ? 'black' : 'blue-grey-4')}; ${(backgroundColor || $q.dark.isActive) ? '' : `background-color: ${bgLightGrey}`}`"
+                :input-class="`text-${inputTextColor} text-${textAlign}`"
+                input-style="font-size: 1.3em; font-weight: 500;"
+                @focus="$emit('focus')"
+                @blur="$emit('blur')"
             >
-                <div v-if="requiresDatePicker">
-                    <q-btn
-                        flat
-                        dense
-                        size="lg"
-                        icon="calendar_month"
-                        color="accent"
-                        @click="is_date_picker_open = true"
+                <template #label>
+                    <span
+                        class="text-weight-bold text-uppercase q-px-md"
+                        :class="$q.dark.isActive ? 'bg-secondary' : 'bg-blue-grey-7'"
                     >
-                        <q-dialog
-                            v-model="is_date_picker_open"
-                            backdrop-filter="none"
-                        >
-                            <q-date
-                                v-model="model"
-                                mask="YYYY-MM-DD"
-                                color="accent"
-                                @update:model-value="is_date_picker_open = false"
-                            />
-                        </q-dialog>
-                    </q-btn>
-                </div>
+                        {{ label }}
+                    </span>
+                </template>
 
-                <div
-                    v-if="!!appendContent"
-                    class="self-end text-uppercase text-bold text-accent"
-                    style="font-size: 0.8em;"
+                <template
+                    #append
+                    v-if="requiresDatePicker || !!appendContent"
                 >
-                    {{ appendContent }}
-                </div>
-            </template>
-        </q-input>
+                    <div v-if="requiresDatePicker">
+                        <q-btn
+                            flat
+                            dense
+                            size="lg"
+                            icon="calendar_month"
+                            color="accent"
+                            @click="isDatePickerOpen = true"
+                        >
+                            <q-dialog
+                                v-model="isDatePickerOpen"
+                                backdrop-filter="none"
+                            >
+                                <q-date
+                                    v-model="model"
+                                    mask="YYYY-MM-DD"
+                                    color="accent"
+                                    @update:model-value="isDatePickerOpen = false"
+                                />
+                            </q-dialog>
+                        </q-btn>
+                    </div>
+
+                    <div
+                        v-if="!!appendContent"
+                        class="self-end text-uppercase text-weight-medium text-accent"
+                        style="font-size: 0.75em;"
+                    >
+                        {{ appendContent }}
+                    </div>
+                </template>
+            </q-input>
+        </transition>
     </div>
 </template>
 
diff --git a/src/modules/timesheet-approval/components/details-dialog-shift-menu.vue b/src/modules/timesheet-approval/components/details-dialog-shift-menu.vue
index 6224ad7..0fdc7cb 100644
--- a/src/modules/timesheet-approval/components/details-dialog-shift-menu.vue
+++ b/src/modules/timesheet-approval/components/details-dialog-shift-menu.vue
@@ -54,6 +54,26 @@
             color="accent"
             class="col-auto q-px-md"
         >
+            <q-tooltip
+                v-if="shift.comment && shift.comment.length > 0"
+                anchor="top middle"
+                self="center middle"
+                :offset="[0, 20]"
+                class="bg-dark shadow-24"
+                :class="$q.dark.isActive ? 'text-white' : 'text-primary'"
+                style="border: 1px solid var(--q-accent)"
+            >
+                <div class="row">
+                    <span
+                        class="text-uppercase text-bold text-accent q-pr-xs"
+                        style="font-size: 1.2em;"
+                    >
+                        {{ $t('timesheet.expense.employee_comment') }}:
+                    </span>
+                    <span style="font-size: 1.2em;">{{ shift.comment }}</span>
+                </div>
+            </q-tooltip>
+
             <q-badge
                 v-if="hasComment"
                 rounded
@@ -87,14 +107,34 @@
                         clickable
                         @click="onClickViewComments"
                     >
+                        <q-tooltip
+                            v-if="shift.comment && shift.comment.length > 0"
+                            anchor="top middle"
+                            self="center middle"
+                            :offset="[0, 20]"
+                            class="bg-dark shadow-24"
+                            :class="$q.dark.isActive ? 'text-white' : 'text-primary'"
+                            style="border: 1px solid var(--q-accent)"
+                        >
+                            <div class="row">
+                                <span
+                                    class="text-uppercase text-bold text-accent q-pr-xs"
+                                    style="font-size: 1.2em;"
+                                >
+                                    {{ $t('timesheet.expense.employee_comment') }}:
+                                </span>
+                                <span style="font-size: 1.2em;">{{ shift.comment }}</span>
+                            </div>
+                        </q-tooltip>
+
                         <q-item-section avatar>
-                            <q-avatar icon="las la-power-off" />
+                            <q-avatar icon="las la-comment" />
                         </q-item-section>
 
                         <q-item-section>
                             <div class="row items-center">
                                 <span class="col">{{ $t('timesheet.expense.employee_comment') }}</span>
-                                
+
                                 <div class="col-auto q-pl-sm">
                                     <q-badge
                                         v-if="hasComment"
diff --git a/src/modules/timesheet-approval/components/overview-list.vue b/src/modules/timesheet-approval/components/overview-list.vue
index 39a844a..e23d6ac 100644
--- a/src/modules/timesheet-approval/components/overview-list.vue
+++ b/src/modules/timesheet-approval/components/overview-list.vue
@@ -20,8 +20,8 @@
 
     // ========== constants ========================================
 
-    const WARNING_COLUMNS: OverviewColumns[] = ['EVENING', 'HOLIDAY', 'VACATION', 'SICK']
-    const NEGATIVE_COLUMNS: OverviewColumns[] = ['OVERTIME', 'EMERGENCY']
+    const WARNING_COLUMNS: OverviewColumns[] = ['EVENING']
+    const NEGATIVE_COLUMNS: OverviewColumns[] = ['EMERGENCY', 'OVERTIME']
     const TIME_COLUMNS: OverviewColumns[] = ['REGULAR', 'EVENING', 'EMERGENCY', 'OVERTIME', 'HOLIDAY', 'VACATION', 'SICK'];
     const VISIBLE_COLUMNS = ref<OverviewColumns[]>([
         'employee_first_name',
@@ -105,10 +105,14 @@
 
     const getListViewTimeCss = (column_name: OverviewColumns, value: number): { classes: string, style: string } => {
         if (WARNING_COLUMNS.includes(column_name) && value > 0)
-            return { classes: 'bg-warning text-white text-bold rounded-5', style: '' };
+            return { classes: 'bg-warning text-bold text-primary rounded-5', style: '' };
+        
+        if (NEGATIVE_COLUMNS.includes(column_name) && value > 0) {
+            if ((column_name === 'OVERTIME') && value < 4)
+                return { classes: 'bg-warning text-bold text-primary rounded-5', style: '' };
 
-        if (NEGATIVE_COLUMNS.includes(column_name) && value > 0)
             return { classes: 'bg-negative text-white text-bold rounded-5', style: '' };
+        }
 
         return { classes: '', style: '' }
     }
@@ -117,7 +121,7 @@
 <template>
     <div class="full-width">
         <LoadingOverlay v-model="timesheetStore.is_loading" />
-        
+
         <q-table
             dense
             row-key="email"
@@ -253,11 +257,15 @@
                             <!-- any other fields, though time fields will have their own conditional class to highlight abnormalities -->
                             <div
                                 v-else
-                                class="q-px-xs"
-                                :class="getListViewTimeCss(props.col.name, props.value).classes"
+                                class="q-px-xs row"
                             >
-                                {{ TIME_COLUMNS.includes(props.col.name) ?
-                                    getHoursMinutesStringFromHoursFloat(props.value) : props.value }}
+                                <div
+                                    class="col-auto q-px-sm"
+                                    :class="getListViewTimeCss(props.col.name, props.value)?.classes"
+                                >
+                                    {{ TIME_COLUMNS.includes(props.col.name) ?
+                                        getHoursMinutesStringFromHoursFloat(props.value) : props.value }}
+                                </div>
                             </div>
                         </div>
                     </transition>
diff --git a/src/modules/timesheets/components/expense-dialog-form.vue b/src/modules/timesheets/components/expense-dialog-form.vue
index 11ea0b6..889d830 100644
--- a/src/modules/timesheets/components/expense-dialog-form.vue
+++ b/src/modules/timesheets/components/expense-dialog-form.vue
@@ -4,23 +4,25 @@
 >
     import TargoInput from 'src/modules/shared/components/targo-input.vue';
 
+    import { colors } from 'quasar';
     import { useI18n } from 'vue-i18n';
     import { computed, onMounted, ref } from 'vue';
     import { useExpensesStore } from 'src/stores/expense-store';
     import { useTimesheetStore } from 'src/stores/timesheet-store';
     import { useExpensesApi } from 'src/modules/timesheets/composables/use-expense-api';
     import { getExpenseIcon, useExpenseRules } from 'src/modules/timesheets/utils/expense.util';
-    import { Expense, type ExpenseOption, TYPES_WITH_AMOUNT_ONLY } from 'src/modules/timesheets/models/expense.models';
+    import { type ExpenseOption, type ExpenseType, TYPES_WITH_AMOUNT_ONLY } from 'src/modules/timesheets/models/expense.models';
 
     // ================= state ======================
 
     const COMMENT_MAX_LENGTH = 280;
 
-    const expense = defineModel<Expense>({ default: new Expense(new Date().toISOString().slice(0, 10)) })
     const file = defineModel<File>('file');
-    const { email } = defineProps<{
+    const { expenseType, email } = defineProps<{
+        expenseType?: ExpenseType;
         email?: string | undefined;
         mode?: 'normal' | 'approval';
+        refreshKey?: number;
     }>();
     const emit = defineEmits<{
         'clickSave': [void];
@@ -30,8 +32,9 @@
     const timesheetStore = useTimesheetStore();
     const expenseStore = useExpensesStore();
     const expensesApi = useExpensesApi();
+    const rules = useExpenseRules();
     const isNavigatorOpen = ref(false);
-    const rules = useExpenseRules(t);
+    const isHoveringDisabledSave = ref(false);
 
 
     const expenseOptions: ExpenseOption[] = [
@@ -47,8 +50,11 @@
     const period_start_date = computed(() => timesheetStore.pay_period?.period_start.replaceAll('-', '/') ?? '');
     const period_end_date = computed(() => timesheetStore.pay_period?.period_end.replaceAll('-', '/') ?? '');
     const isSaveDisabled = computed(() =>
-        JSON.stringify(expenseStore.current_expense) === JSON.stringify(expenseStore.initial_expense)
+        (JSON.stringify(expenseStore.current_expense) === JSON.stringify(expenseStore.initial_expense)) ||
+        (!expenseStore.current_expense.amount && !expenseStore.current_expense.mileage) ||
+        expenseStore.current_expense.comment.length < 1
     );
+    const isTypeError = computed(() => isHoveringDisabledSave.value && !rules.typeRequired(expenseStore.current_expense.type))
 
     // ==================== method =======================
 
@@ -73,11 +79,23 @@
         }
     };
 
-    onMounted(() => {
-        if (expense.value)
-            expenseSelected.value = expenseOptions.find(expense_option => expense_option.value === expense.value.type);
+    const resetAmounts = (resetAmount?: number) => {
+        expenseStore.current_expense.amount = resetAmount ?? null;
+        expenseStore.current_expense.mileage = resetAmount ?? null;
+    }
+
+    const onAmountBlur = () => {
+        if (expenseStore.current_expense.type === 'MILEAGE' && expenseStore.current_expense.mileage)
+            expenseStore.current_expense.amount = null;
+        else if (expenseStore.current_expense.type !== 'MILEAGE' && expenseStore.current_expense.amount)
+            expenseStore.current_expense.mileage = null;
         else
-            expenseSelected.value = expenseOptions[0];
+            resetAmounts(0);
+    }
+
+    onMounted(() => {
+        if (expenseType)
+            expenseSelected.value = expenseOptions.find(opt => opt.value === expenseType);
     })
 </script>
 
@@ -121,65 +139,77 @@
                         <TargoInput
                             v-model="expenseStore.current_expense.date"
                             no-top-padding
+                            dense
+                            readonly
                             :label="$t('timesheet.expense.date')"
-                            background-color="bg-dark"
+                            background-color="dark"
                             class="col"
                         />
                     </div>
 
                     <!-- expenses type selection -->
-                    <div class="col">
-                        <q-select
-                            v-model="expenseSelected"
-                            dense
-                            borderless
-                            color="accent"
-                            label-color="white"
-                            stack-label
-                            label-slot
-                            :options="expenseOptions"
-                            hide-dropdown-icon
-                            lazy-rules
-                            no-error-icon
-                            hide-bottom-space
-                            options-selected-class="text-white text-bold bg-accent"
-                            class="q-px-md rounded-5 inset-shadow"
-                            :class="$q.dark.isActive ? 'bg-primary' : 'bg-dark'"
-                            popup-content-class="text-uppercase text-weight-medium rounded-5 shadow-12  z-top"
-                            popup-content-style="border: 1px solid var(--q-primary);"
-                            menu-anchor="bottom middle"
-                            menu-self="top middle"
-                            :menu-offset="[0, 5]"
-                            :style="`border: 1px solid var(${$q.dark.isActive ? '--q-secondary' : '--q-primary'});`"
-                            :rules="[rules.typeRequired]"
-                            @update:model-value="option => expenseStore.current_expense.type = option.value"
+                    <div
+                        class="col"
+                        :key="refreshKey ?? 0"
+                    >
+                        <transition
+                            enter-active-class="animated shakeX"
+                            :duration="{ enter: 200, leave: 0 }"
+                            mode="out-in"
                         >
-                            <template #label>
-                                <span
-                                    class="text-weight-medium text-uppercase q-px-sm no-pointer-events"
-                                    :class="$q.dark.isActive ? 'bg-secondary' : 'bg-primary'"
-                                >
-                                    {{ $t('timesheet.expense.type') }}
-                                </span>
-                            </template>
-
-                            <template #selected-item="scope">
-                                <div
-                                    class="row items-center text-weight-bold q-ma-none q-pa-none no-wrap ellipsis full-width"
-                                    :tabindex="scope.tabindex"
-                                >
-                                    <q-icon
-                                        :name="scope.opt.icon"
-                                        size="xs"
-                                        class="col-auto q-mx-xs"
-                                    />
+                            <q-select
+                                v-model="expenseSelected"
+                                :key="isTypeError ? 1 : 2"
+                                dense
+                                borderless
+                                color="accent"
+                                label-color="white"
+                                stack-label
+                                label-slot
+                                :options="expenseOptions"
+                                hide-dropdown-icon
+                                lazy-rules
+                                no-error-icon
+                                hide-bottom-space
+                                options-selected-class="text-white text-bold bg-accent"
+                                class="q-px-md rounded-5 inset-shadow"
+                                :class="$q.dark.isActive ? 'bg-primary' : 'bg-dark'"
+                                popup-content-class="text-uppercase text-weight-medium rounded-5 shadow-12  z-top"
+                                popup-content-style="border: 1px solid var(--q-primary);"
+                                menu-anchor="bottom middle"
+                                menu-self="top middle"
+                                :menu-offset="[0, 5]"
+                                :style="`border: 1px solid ${isTypeError ? 'var(--q-negative)' : ($q.dark.isActive ? 'var(--q-secondary)' : colors.getPaletteColor('blue-grey-4'))};`"
+                                :error="isTypeError"
+                                @update:model-value="option => expenseStore.current_expense.type = option.value"
+                            >
+                                <template #label>
                                     <span
-                                        style="line-height: 1em;"
-                                        class="col-auto ellipsis text-uppercase"
-                                    >{{ scope.opt.label }}</span>
-                                </div>
-                            </template>
-                        </q-select>
+                                        class="text-weight-medium text-uppercase q-px-sm no-pointer-events"
+                                        :class="$q.dark.isActive ? 'bg-secondary' : 'bg-blue-grey-7'"
+                                    >
+                                        {{ $t('timesheet.expense.type') }}
+                                    </span>
+                                </template>
+
+                                <template #selected-item="scope">
+                                    <div
+                                        class="row items-center text-weight-bold q-ma-none q-pa-none no-wrap ellipsis full-width"
+                                        :tabindex="scope.tabindex"
+                                    >
+                                        <q-icon
+                                            :name="scope.opt.icon"
+                                            size="xs"
+                                            class="col-auto q-mx-xs"
+                                        />
+                                        <span
+                                            style="line-height: 1em;"
+                                            class="col-auto ellipsis text-uppercase"
+                                        >{{ scope.opt.label }}</span>
+                                    </div>
+                                </template>
+                            </q-select>
+                        </transition>
                     </div>
 
                     <!-- amount input -->
@@ -188,22 +218,32 @@
                             v-if="TYPES_WITH_AMOUNT_ONLY.includes(expenseStore.current_expense?.type ?? 'EXPENSES')"
                             v-model.number="expenseStore.current_expense.amount"
                             no-top-padding
-                            background-color="bg-dark"
+                            dense
+                            background-color="dark"
                             type="number"
                             input-class="text-right"
                             append-content=" $"
                             :label="$t('timesheet.expense.amount')"
+                            text-align="right"
+                            :error="isHoveringDisabledSave && !rules.amountRequired(expenseStore.current_expense.amount)"
+                            @focus="resetAmounts()"
+                            @blur="onAmountBlur()"
                         />
 
                         <TargoInput
                             v-else
                             v-model.number="expenseStore.current_expense.mileage"
                             no-top-padding
-                            background-color="bg-dark"
+                            dense
+                            background-color="dark"
                             type="number"
                             input-class="text-right"
                             append-content=" km"
                             :label="$t('timesheet.expense.mileage')"
+                            text-align="right"
+                            :error="isHoveringDisabledSave && !rules.mileageRequired(expenseStore.current_expense.mileage)"
+                            @focus="resetAmounts()"
+                            @blur="onAmountBlur()"
                         />
                     </div>
                 </div>
@@ -213,9 +253,11 @@
                     <div class="col">
                         <TargoInput
                             v-model="expenseStore.current_expense.comment"
+                            dense
                             no-top-padding
-                            background-color="bg-dark"
+                            background-color="dark"
                             :max-length="COMMENT_MAX_LENGTH"
+                            :error="isHoveringDisabledSave && !rules.commentRequired(expenseStore.current_expense.comment)"
                             :label="$t('timesheet.expense.employee_comment')"
                         />
                     </div>
@@ -226,8 +268,9 @@
                     >
                         <TargoInput
                             v-model="expenseStore.current_expense.supervisor_comment"
+                            dense
                             no-top-padding
-                            background-color="bg-dark"
+                            background-color="dark"
                             :max-length="COMMENT_MAX_LENGTH"
                             :label="$t('timesheet.expense.supervisor_comment')"
                         />
@@ -247,7 +290,7 @@
                             accept="image/*"
                             class="q-px-md rounded-5 inset-shadow"
                             :class="$q.dark.isActive ? 'bg-primary' : 'bg-dark'"
-                            :style="`border: 1px solid var(${$q.dark.isActive ? '--q-secondary' : '--q-primary'});`"
+                            :style="`border: 1px solid ${$q.dark.isActive ? 'var(--q-secondary)' : colors.getPaletteColor('blue-grey-4')};`"
                         >
                             <template #append>
                                 <q-icon
@@ -260,7 +303,7 @@
                             <template #label>
                                 <span
                                     class="text-weight-medium text-uppercase q-px-sm no-pointer-events"
-                                    :class="$q.dark.isActive ? 'bg-secondary' : 'bg-primary'"
+                                    :class="$q.dark.isActive ? 'bg-secondary' : 'bg-blue-grey-7'"
                                 >
                                     {{ $t('timesheet.expense.hints.attach_file') }}
                                 </span>
@@ -273,16 +316,24 @@
             <div class="col row full-width items-center">
                 <q-space />
 
-                <q-btn
-                    push
-                    :disable="isSaveDisabled"
-                    :color="isSaveDisabled ? 'grey-5' : 'accent'"
-                    :icon="expenseStore.mode === 'update' ? 'save' : 'upload'"
-                    :label="expenseStore.mode === 'update' ? $t('shared.label.update') : $t('shared.label.add')"
-                    class="q-px-sm "
-                    :class="expenseStore.mode === 'create' ? 'q-mr-lg q-mb-md' : 'q-mb-sm q-ml-lg'"
-                    type="submit"
-                />
+                <transition
+                    enter-active-class="animated rubberBand fast"
+                    mode="out-in"
+                >
+                    <q-btn
+                        :key="isSaveDisabled ? 1 : 0"
+                        push
+                        :disable="isSaveDisabled"
+                        :color="isSaveDisabled ? 'grey-5' : 'accent'"
+                        :icon="expenseStore.mode === 'update' ? 'save' : 'upload'"
+                        :label="expenseStore.mode === 'update' ? $t('shared.label.update') : $t('shared.label.add')"
+                        class="q-px-xl"
+                        :class="expenseStore.mode === 'create' ? 'q-mr-lg q-my-md' : 'q-mb-sm q-ml-lg'"
+                        type="submit"
+                        @mouseenter="isHoveringDisabledSave = isSaveDisabled"
+                        @mouseleave="isHoveringDisabledSave = false"
+                    />
+                </transition>
             </div>
         </q-form>
     </div>
@@ -292,8 +343,8 @@
     scoped
     lang="css"
 >
-    :deep(.q-field--dense.q-field--float .q-field__label) {
-        transform: translate(-17px, -60%) scale(0.75) !important;
-        border-radius: 10px 10px 10px 0px;
-    }
+:deep(.q-field--dense.q-field--float .q-field__label) {
+    transform: translate(-17px, -60%) scale(0.75) !important;
+    border-radius: 10px 10px 10px 0px;
+}
 </style>
\ No newline at end of file
diff --git a/src/modules/timesheets/components/expense-dialog-list-item.vue b/src/modules/timesheets/components/expense-dialog-list-item.vue
index 69a4dd9..2ef96ef 100644
--- a/src/modules/timesheets/components/expense-dialog-list-item.vue
+++ b/src/modules/timesheets/components/expense-dialog-list-item.vue
@@ -133,8 +133,12 @@
                         }) }}
                     </span>
                 </div>
-                
-                <q-separator vertical spaced class="q-my-xs"/>
+
+                <q-separator
+                    vertical
+                    spaced
+                    class="q-my-xs"
+                />
 
                 <!-- comments section -->
                 <div class="col column">
@@ -154,7 +158,7 @@
                         </span>
                     </div>
 
-                    <q-separator class="q-mr-md"/>
+                    <q-separator class="q-mr-md" />
 
                     <div class="col row items-center">
                         <span
@@ -241,7 +245,8 @@
         </template>
 
         <ExpenseDialogForm
-            v-model="expense"
+            :key="isShowingUpdateForm ? 1 : 2"
+            :expense-type="expense.type"
             :email="getEmployeeEmail()"
             :mode="mode"
             @click-save="hideUpdateForm"
diff --git a/src/modules/timesheets/components/expense-dialog.vue b/src/modules/timesheets/components/expense-dialog.vue
index f44ef77..d9b48e1 100644
--- a/src/modules/timesheets/components/expense-dialog.vue
+++ b/src/modules/timesheets/components/expense-dialog.vue
@@ -11,7 +11,7 @@
     import { date } from 'quasar';
     import { useExpensesStore } from 'src/stores/expense-store';
     import { Expense } from 'src/modules/timesheets/models/expense.models';
-import { ref } from 'vue';
+    import { ref } from 'vue';
 
     const expense_store = useExpensesStore();
     const refreshKey = ref(0);
@@ -23,6 +23,7 @@ import { ref } from 'vue';
     const onClickExpenseCreate = () => {
         expense_store.mode = 'create';
         expense_store.current_expense = new Expense(date.formatDate(new Date(), 'YYYY-MM-DD'));
+        refreshKey.value += 1
     }
 </script>
 
@@ -49,7 +50,7 @@ import { ref } from 'vue';
             <q-card-section class="q-pa-none">
                 <ExpenseDialogHeader />
 
-                <ExpenseDialogList :key="refreshKey + 1" />
+                <ExpenseDialogList />
 
                 <q-expansion-item
                     v-if="!isApproved"
@@ -57,8 +58,7 @@ import { ref } from 'vue';
                     hide-expand-icon
                     :dense="!$q.platform.is.mobile"
                     group="expenses"
-                    @show="onClickExpenseCreate()"
-                    @after-hide="refreshKey += 1"
+                    @before-show="onClickExpenseCreate()"
                     header-class="bg-accent text-white"
                 >
                     <template #header>
@@ -77,10 +77,8 @@ import { ref } from 'vue';
                     </template>
 
                     <ExpenseDialogFormMobile v-if="$q.platform.is.mobile" />
-                    <ExpenseDialogForm
-                        v-else
-                        :key="refreshKey"
-                    />
+
+                    <ExpenseDialogForm v-else :key="refreshKey" :refresh-key="refreshKey" />
                 </q-expansion-item>
             </q-card-section>
         </q-card>
diff --git a/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue b/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue
index 773a19a..db974eb 100644
--- a/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue
+++ b/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue
@@ -32,7 +32,7 @@
     const is_navigator_open = ref(false);
     const is_showing_comment_dialog_mobile = ref(false);
 
-    const rules = useExpenseRules(t);
+    const rules = useExpenseRules();
 
     const period_start_date = computed(() => timesheet_store.pay_period?.period_start.replaceAll('-', '/') ?? '');
     const period_end_date = computed(() => timesheet_store.pay_period?.period_end.replaceAll('-', '/') ?? '');
diff --git a/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue b/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue
index f39a7b7..fa15969 100644
--- a/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue
+++ b/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue
@@ -102,23 +102,18 @@
                     <div class="column col q-px-sm q-py-xs">
                         <!-- date label and delete button -->
                         <div class="col-auto row items-center q-pl-xs">
-                            <q-icon
-                                name="calendar_month"
-                                size="sm"
-                                class="col-auto"
-                            />
-
                             <span
-                                class="col text-uppercase text-weight-light full-width q-pl-sm text-h6"
+                                class="col text-uppercase text-bold text-h5 full-width q-pl-sm"
                                 :class="approved_class"
                             >
                                 {{ $d(
                                     date.extractDate(expense.date, 'YYYY-MM-DD'),
-                                    { month: 'long', day: 'numeric' }
+                                    { month: 'long', day: 'numeric', year: 'numeric' }
                                 ) }}
                             </span>
 
                             <q-btn
+                                v-if="!expense.is_approved"
                                 flat
                                 dense
                                 icon="las la-trash"
@@ -130,7 +125,7 @@
                             />
                         </div>
 
-                        <div class="col row full-width items-center q-px-xs">
+                        <div class="col row full-width items-center q-px-xs no-wrap">
                             <!-- avatar type icon section -->
                             <q-icon
                                 :name="getExpenseIcon(expense.type)"
@@ -139,26 +134,28 @@
                             />
 
                             <!-- amount or mileage section -->
-                            <div class="col text-weight-bold text-h6">
+                            <div class="col text-h6">
                                 <q-item-label v-if="expense.type === 'MILEAGE'">
                                     {{ expense.mileage?.toFixed(1) }} km
                                 </q-item-label>
                                 <q-item-label v-else>
-                                    $ {{ expense.amount.toFixed(2) }}
+                                    $ {{ expense.amount?.toFixed(2) }}
                                 </q-item-label>
                             </div>
 
-                        </div>
-
-                        <!-- attachment file -->
-                        <div class="col-auto q-pa-xs full-width">
-                            <q-btn
-                                :color="expense.is_approved ? 'white' : 'accent'"
-                                :text-color="expense.is_approved ? 'accent' : 'white'"
-                                icon="las la-paperclip"
-                                :label="expense.attachment_name ?? `( ${$t('shared.label.empty')} )`"
-                                class="full-width text-lowercase q-mx-sm q-px-sm q-pb-sm inset-shadow"
-                            />
+                            <!-- attachment file -->
+                            <div class="col-6 q-pa-xs">
+                                <q-btn
+                                    push
+                                    :disable="!expense.attachment_key"
+                                    :color="expense.is_approved ? 'white' : 'accent'"
+                                    :text-color="expense.is_approved ? 'accent' : 'white'"
+                                    icon="las la-paperclip"
+                                    :label="expense.attachment_name ?? $t('timesheet.expense.no_attachment')"
+                                    class="full-width text-lowercase q-mx-sm q-px-sm q-pb-sm text-caption"
+                                    :style="expense.attachment_key ? '' : 'filter: grayscale(1); font-style: italic;'"
+                                />
+                            </div>
                         </div>
                     </div>
 
diff --git a/src/modules/timesheets/components/mobile/shift-list-day-mobile.vue b/src/modules/timesheets/components/mobile/shift-list-day-mobile.vue
new file mode 100644
index 0000000..1fc5450
--- /dev/null
+++ b/src/modules/timesheets/components/mobile/shift-list-day-mobile.vue
@@ -0,0 +1,123 @@
+<script
+    setup
+    lang="ts"
+>
+    import ShiftListDayRowMobile from 'src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue';
+
+    import { useI18n } from 'vue-i18n';
+    import { date } from 'quasar';
+    import { computed } from 'vue';
+    import { useUiStore } from 'src/stores/ui-store';
+    import { useTimesheetStore } from 'src/stores/timesheet-store';
+    import { Shift } from 'src/modules/timesheets/models/shift.models';
+    import type { TimesheetDay } from 'src/modules/timesheets/models/timesheet.models';
+    // import { useTimesheetApi } from 'src/modules/timesheets/composables/use-timesheet-api';
+
+    const { locale } = useI18n();
+    const uiStore = useUiStore();
+    const timesheetStore = useTimesheetStore();
+
+    const day = defineModel<TimesheetDay>({ required: true });
+
+    const { isTimesheetApproved = false } = defineProps<{
+        timesheetId: number;
+        isTimesheetApproved?: boolean;
+    }>();
+
+    const isDayApproved = computed(() => day.value.shifts.every(shift => shift.is_approved) && day.value.shifts.length > 1);
+
+    const addNewShift = (day_shifts: Shift[], date: string, timesheet_id: number) => {
+        uiStore.focusNextComponent = true;
+        const newShift = new Shift;
+        newShift.date = date;
+        newShift.timesheet_id = timesheet_id;
+        day_shifts.push(newShift);
+    };
+
+    const getHolidayName = (date: string) => {
+        const holiday = timesheetStore.federal_holidays.find(holiday => holiday.date === date);
+        if (!holiday) return;
+
+        if (locale.value === 'fr-FR')
+            return holiday.nameFr;
+
+        else if (locale.value === 'en-CA')
+            return holiday.nameEn;
+    };
+</script>
+
+<template>
+    <div class="row q-pa-sm full-width relative-position">
+
+        <!-- optional label indicating which holiday if today is a holiday -->
+        <span
+            v-if="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date)"
+            class="absolute-top-left text-uppercase text-weight-bolder text-purple-5"
+            style="transform: translate(25px, -7px);"
+        >
+            {{ getHolidayName(day.date) }}
+        </span>
+
+        <!-- mobile version in portrait mode -->
+        <div
+            v-if="$q.platform.is.mobile && ($q.screen.width < $q.screen.height)"
+            class="col-auto full-width q-px-md q-py-sm"
+        >
+            <div
+                class="shadow-12 rounded-10"
+                :class="(isDayApproved || isTimesheetApproved) ? 'bg-accent' : 'bg-dark'"
+            >
+                <div
+                    class="text-weight-bolder text-uppercase text-h6 q-py-sm text-center relative-position"
+                    :class="(isDayApproved || isTimesheetApproved) ? 'bg-accent rounded-10' : 'bg-primary'"
+                    style="line-height: 1em; border-radius: 10px 10px 0 0;"
+                >
+                    <span class="text-white">
+                        {{ $d(date.extractDate(day.date, 'YYYY-MM-DD'), {
+                            weekday: 'long', day: 'numeric', month: 'long'
+                        }) }}
+                    </span>
+
+                    <q-icon
+                        v-if="(isDayApproved || isTimesheetApproved)"
+                        name="verified"
+                        size="3em"
+                        color="white"
+                        class="absolute-top-left z-top"
+                        style="top: -0.2em; left: 0px;"
+                    />
+                </div>
+
+                <div
+                    v-if="day.shifts.filter(shift => shift.id !== 0).length > 0"
+                    class="q-pa-none transparent"
+                >
+                    <div
+                        v-for="_shift, shiftIndex in day.shifts"
+                        :key="shiftIndex"
+                    >
+                        <ShiftListDayRowMobile
+                            v-model:shift="day.shifts[shiftIndex]!"
+                            :current-shifts="day.shifts"
+                            :has-shift-after="shiftIndex < day.shifts.length - 1"
+                        />
+                    </div>
+                </div>
+
+                <div class="q-pa-none">
+                    <q-btn
+                        v-if="!(isDayApproved || isTimesheetApproved)"
+                        square
+                        dense
+                        size="xl"
+                        color="accent"
+                        icon="more_time"
+                        class="full-width"
+                        style="border-radius: 0 0 10px 10px;"
+                        @click="addNewShift(day.shifts, day.date, timesheetId)"
+                    />
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue b/src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue
index 2510e85..a036f85 100644
--- a/src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue
+++ b/src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue
@@ -2,34 +2,35 @@
     setup
     lang="ts"
 >
+    import TargoInput from 'src/modules/shared/components/targo-input.vue';
+
     import { computed, onMounted, ref } from 'vue';
-    import { QSelect, QInput } from 'quasar';
+    import { colors, getCssVar, QSelect } from 'quasar';
     import { useUiStore } from 'src/stores/ui-store';
-    import { getCurrentDailyMinutesWorked, getTimeStringFromMinutes, SHIFT_OPTIONS } from 'src/modules/timesheets/utils/shift.util';
+    import { getCurrentDailyMinutesWorked, getShiftOptions, getTimeStringFromMinutes, SHIFT_OPTIONS } from 'src/modules/timesheets/utils/shift.util';
     import type { Shift, ShiftOption, ShiftType } from 'src/modules/timesheets/models/shift.models';
     import { getHoursMinutesStringFromHoursFloat } from 'src/utils/date-and-time-utils';
 
     // ========== state ========================================
 
     const SHIFT_TYPES_WITH_PREDEFINED_TIMES: ShiftType[] = ['HOLIDAY', 'SICK', 'VACATION'];
-    const COMMENT_LENGTH_MAX = 280;
+    // const COMMENT_LENGTH_MAX = 280;
 
     const shift = defineModel<Shift>('shift', { required: true });
 
     const {
-        dense = false,
+        currentShifts,
         hasShiftAfter = false,
         isTimesheetApproved = false,
         errorMessage = undefined,
         expectedDailyHours = 8,
-        currentShifts,
     } = defineProps<{
-        dense?: boolean;
+        currentShifts: Shift[];
         hasShiftAfter?: boolean;
         isTimesheetApproved?: boolean;
         errorMessage?: string | undefined;
         expectedDailyHours?: number;
-        currentShifts: Shift[];
+        isHoliday?: boolean;
     }>();
 
     const emit = defineEmits<{
@@ -40,7 +41,7 @@
     const uiStore = useUiStore();
     const shiftTypeSelected = ref(SHIFT_OPTIONS.find(option => option.value == shift.value.type));
     const selectRef = ref<QSelect | null>(null);
-    const isShowingCommentPopup = ref(false);
+    // const isShowingCommentPopup = ref(false);
     const errorMessageRow = ref('');
     const isShowingPredefinedTime = ref(shift.value.type === 'HOLIDAY');
     const predefinedHoursString = ref('');
@@ -48,7 +49,9 @@
 
     // ========== computed ========================================
 
-    const comment_length = computed(() => shift.value.comment?.length ?? 0);
+    const commentLength = computed(() => shift.value.comment?.length ?? 0);
+    const isApproved = computed(() => isTimesheetApproved || shift.value.is_approved);
+    const hasPTO = computed(() => currentShifts.some(shift => SHIFT_TYPES_WITH_PREDEFINED_TIMES.includes(shift.type)));
 
     // ========== methods =========================================
 
@@ -71,12 +74,6 @@
         }
     }
 
-    const getCommentCounterColor = (comment_length: number) => {
-        if (comment_length < 200) return 'primary';
-        if (comment_length < 250) return 'warning';
-        return 'negative';
-    };
-
     const onShiftTypeChange = (option: ShiftOption) => {
         shift.value.type = option.value;
 
@@ -114,266 +111,216 @@
 </script>
 
 <template>
-    <div class="row q-px-xs">
-        <div class="col column">
-            <div class="col row items-center text-uppercase q-px-xs rounded-5">
-                <!-- comment button -->
-                <q-btn
-                    v-if="!dense"
-                    :icon="shift.comment ? 'chat' : 'chat_bubble_outline'"
-                    :text-color="shift.comment ? ((shift.is_approved && isTimesheetApproved) ? 'white' : 'accent') : 'grey-5'"
-                    class="col-auto full-height q-mx-xs rounded-5 shadow-1"
-                    @click="isShowingCommentPopup = true"
-                >
-                    <q-dialog v-model="isShowingCommentPopup">
-                        <q-input
-                            color="white"
-                            v-model="shift.comment"
-                            dense
-                            :readonly="(shift.is_approved || isTimesheetApproved)"
-                            autofocus
-                            counter
-                            bottom-slots
-                            stack-label
-                            :label="$t('timesheet.shift.fields.header_comment')"
-                            :maxlength="COMMENT_LENGTH_MAX"
-                            :class="(shift.is_approved || isTimesheetApproved) ? 'cursor-not-allowed' : ''"
-                        >
-                            <template #append>
-                                <q-icon name="edit" />
-                            </template>
-
-                            <template #counter>
-                                <div class="row flex-center">
-                                    <q-space />
-                                    <q-knob
-                                        v-model="comment_length"
-                                        readonly
-                                        :max="COMMENT_LENGTH_MAX"
-                                        size="1.6em"
-                                        :thickness="0.4"
-                                        :color="getCommentCounterColor(comment_length)"
-                                        track-color="grey-4"
-                                        class="col-auto q-mr-xs"
-                                    />
-                                    <span
-                                        :class="'col-auto text-weight-bolder text-' + getCommentCounterColor(comment_length)"
-                                    >{{ 280 - comment_length }}</span>
-                                </div>
-                            </template>
-                        </q-input>
-                    </q-dialog>
-                </q-btn>
-
-                <!-- shift type -->
-                <q-select
-                    ref="select"
-                    v-model="shiftTypeSelected"
-                    :standout="$q.dark.isActive ? 'bg-blue-grey-3' : 'bg-blue-grey-9'"
-                    dense
-                    :borderless="(shift.is_approved && isTimesheetApproved)"
-                    :readonly="(shift.is_approved && isTimesheetApproved)"
-                    options-dense
-                    hide-dropdown-icon
-                    :menu-offset="[0, 10]"
-                    menu-anchor="bottom middle"
-                    menu-self="top middle"
-                    :options="SHIFT_OPTIONS"
-                    class="col rounded-5 bg-dark"
-                    :class="!shift.is_approved && !isTimesheetApproved ? '' : 'inset-shadow'"
-                    popup-content-class="text-uppercase text-weight-bold text-center rounded-5"
-                    :style="shift.is_approved ? 'background-color: #0a7d32 !important;' : ''"
-                    popup-content-style="border: 2px solid var(--q-accent)"
-                    @blur="onBlurShiftTypeSelect"
-                    @update:model-value="onShiftTypeChange"
-                >
-                    <template #selected-item="scope">
-                        <div
-                            class="row items-center text-weight-bold q-ma-none q-pa-none no-wrap ellipsis fit"
-                            :tabindex="scope.tabindex"
-                        >
-                            <q-icon
-                                :name="scope.opt.icon"
-                                :color="scope.opt.icon_color"
-                                size="sm"
-                                class="col-auto"
-                                :class="shift.is_approved ? 'q-mx-xs' : 'q-mr-xs'"
-                            />
-                            <span
-                                style="line-height: 1.2em;"
-                                class="col-auto ellipsis"
-                                :class="!shift.is_approved ? '' : 'text-white'"
-                            >
-                                {{ $t(scope.opt.label) }}
-                            </span>
-                        </div>
-                    </template>
-
-                    <template #after>
-                        <q-icon
-                            v-if="shift.is_approved"
-                            :name="shift.is_remote ? 'las la-laptop' : 'las la-building'"
-                            size="1.2em"
-                            color="white"
-                            class="q-mr-sm"
-                        >
-                            <q-tooltip
-                                anchor="top middle"
-                                self="bottom middle"
-                                :offset="[0, 10]"
-                                :hide-delay="1000"
-                                class="text-uppercase text-weight-bold text-white bg-primary"
-                            >
-                                {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
-                                    $t('timesheet.shift.types.OFFICE') }}
-                            </q-tooltip>
-                        </q-icon>
-
-                        <q-toggle
-                            v-else
-                            v-model="shift.is_remote"
-                            :disable="shift.is_approved"
-                            dense
-                            keep-color
-                            size="3em"
-                            color="accent"
-                            icon="las la-building"
-                            checked-icon="las la-laptop"
-                        >
-                            <q-tooltip
-                                anchor="top middle"
-                                self="bottom middle"
-                                :offset="[0, 10]"
-                                :hide-delay="1000"
-                                class="text-uppercase text-weight-medium text-white bg-accent"
-                            >
-                                {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
-                                    $t('timesheet.shift.types.OFFICE') }}
-                            </q-tooltip>
-                        </q-toggle>
-                    </template>
-
-                    <template #option="scope">
-                        <q-item
-                            clickable
-                            v-bind="scope.itemProps"
-                        >
-                            <q-item-section avatar>
-                                <q-icon :name="scope.opt.icon" />
-                            </q-item-section>
-
-                            <q-item-section class="text-left">
-                                {{ $t(scope.label) }}
-                            </q-item-section>
-                        </q-item>
-                    </template>
-                </q-select>
-            </div>
-
-            <div
-                v-if="isShowingPredefinedTime"
-                class="col row items-start text-uppercase rounded-5 q-pa-xs relative-position"
-            >
-                <div
-                    class="absolute-full rounded-5 q-mx-sm q-my-xs"
-                    :class="predefinedHoursBgColor"
-                    style="opacity: 0.3;"
-                ></div>
-
-                <span class="col text-center text-uppercase text-h6 text-bold q-py-xs">
-                    {{ getHoursMinutesStringFromHoursFloat(expectedDailyHours) }}
-                </span>
-            </div>
-
-            <div
-                v-else
-                class="col row items-start text-uppercase rounded-5 q-pa-xs"
-            >
-                <!-- punch in field -->
-                <div class="col q-pr-xs">
-                    <q-input
-                        v-model="shift.start_time"
+    <div class="column">
+        <div class="row q-pa-sm">
+            <div class="col column">
+                <div class="row justify-center q-pb-xs q-px-sm full-width">
+                    <!-- shift type -->
+                    <q-select
+                        ref="selectRef"
+                        v-model="shiftTypeSelected"
                         dense
-                        :borderless="(shift.is_approved && isTimesheetApproved)"
-                        :readonly="(shift.is_approved && isTimesheetApproved)"
-                        type="time"
-                        :standout="$q.dark.isActive ? 'bg-blue-grey-3' : 'bg-blue-grey-9'"
+                        borderless
+                        color="accent"
+                        label-color="white"
+                        stack-label
                         label-slot
+                        hide-dropdown-icon
+                        :readonly="isApproved"
+                        :options="getShiftOptions(hasPTO, currentShifts.length > 1)"
                         lazy-rules
                         no-error-icon
                         hide-bottom-space
-                        :error="shift.has_error"
-                        :error-message="errorMessage || errorMessageRow !== '' ? $t(errorMessage ?? errorMessageRow) : ''"
-                        :label-color="!shift.is_approved ? 'accent' : 'white'"
-                        class="rounded-5 bg-dark"
-                        :class="(shift.id === -2 ? 'bg-negative ' : ' ') + (!shift.is_approved && !isTimesheetApproved ? '' : 'cursor-not-allowed inset-shadow')"
-                        :input-class="'text-weight-medium ' + (shift.id === -2 ? 'text-white ' : ' ') + (shift.is_approved ? 'text-white cursor-not-allowed q-px-sm' : '')"
-                        input-style="font-size: 1.2em;"
-                        :style="shift.is_approved ? 'background-color: #0a7d32 !important;' : ''"
-                        @blur="onTimeFieldBlur(shift.start_time)"
+                        options-selected-class="text-white text-bold bg-accent"
+                        class="col q-px-md rounded-5 inset-shadow text-uppercase"
+                        :class="isApproved ? 'bg-white' : ($q.dark.isActive ? 'bg-primary' : 'bg-secondary')"
+                        popup-content-class="text-uppercase text-weight-medium rounded-5 shadow-12 z-top"
+                        popup-content-style="border: 1px solid var(--q-primary)"
+                        menu-anchor="bottom middle"
+                        menu-self="top middle"
+                        :menu-offset="[0, 5]"
+                        :style="`border: 1px solid ${$q.dark.isActive ? 'var(--q-secondary)' : colors.getPaletteColor('blue-grey-4')}; background-color: ${colors.lighten(getCssVar('secondary')!, 50)}`"
+                        @blur="onBlurShiftTypeSelect"
+                        @update:model-value="onShiftTypeChange"
                     >
+                        <template #selected-item="scope">
+                            <div
+                                class="row items-center text-weight-bold q-pt-sm no-wrap ellipsis"
+                                :tabindex="scope.tabindex"
+                            >
+                                <q-icon
+                                    :name="scope.opt.icon"
+                                    :color="shift.is_approved ? 'accent' : scope.opt.icon_color"
+                                    size="sm"
+                                    class="col-auto"
+                                    :class="shift.is_approved ? 'q-mx-xs' : 'q-mr-xs'"
+                                />
+
+                                <span
+                                    style="font-size: 1.3em;"
+                                    class="col ellipsis"
+                                    :class="shift.is_approved ? 'text-accent' : ''"
+                                >
+                                    {{ $t(scope.opt.label) }}
+                                </span>
+                            </div>
+                        </template>
+
+                        <template #option="scope">
+                            <q-item
+                                clickable
+                                v-bind="scope.itemProps"
+                            >
+                                <q-item-section avatar>
+                                    <q-icon :name="scope.opt.icon" />
+                                </q-item-section>
+
+                                <q-item-section class="text-left">
+                                    {{ $t(scope.label) }}
+                                </q-item-section>
+                            </q-item>
+                        </template>
+
+                        <!-- work-from-home toggle -->
+                        <template #after>
+                            <q-icon
+                                v-if="shift.is_approved"
+                                :name="shift.is_remote ? 'las la-laptop' : 'las la-building'"
+                                size="1.2em"
+                                color="accent"
+                                class="q-mr-sm"
+                            >
+                                <q-tooltip
+                                    anchor="top middle"
+                                    self="bottom middle"
+                                    :offset="[0, 10]"
+                                    class="text-uppercase text-weight-bold text-white bg-primary"
+                                >
+                                    {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
+                                        $t('timesheet.shift.types.OFFICE') }}
+                                </q-tooltip>
+                            </q-icon>
+
+                            <q-toggle
+                                v-else
+                                v-model="shift.is_remote"
+                                :disable="shift.is_approved"
+                                dense
+                                keep-color
+                                size="3em"
+                                :color="isHoliday ? 'purple-5' : 'accent'"
+                                icon="las la-building"
+                                checked-icon="las la-laptop"
+                            >
+                                <q-tooltip
+                                    anchor="top middle"
+                                    self="bottom middle"
+                                    :offset="[0, 10]"
+                                    class="text-uppercase text-weight-medium text-white bg-accent"
+                                >
+                                    {{ shift.is_remote ? $t('timesheet.shift.types.REMOTE') :
+                                        $t('timesheet.shift.types.OFFICE') }}
+                                </q-tooltip>
+                            </q-toggle>
+                        </template>
+
                         <template #label>
                             <span
-                                class="text-weight-bolder"
-                                :class="shift.is_approved ? ' q-ml-md' : ''"
-                                style="font-size: 0.95em;"
-                            >{{ $t('shared.misc.in') }}</span>
+                                class="text-weight-medium text-uppercase q-px-sm no-pointer-events"
+                                :class="$q.dark.isActive ? 'bg-secondary' : 'bg-blue-grey-7'"
+                            >
+                                {{ $t('timesheet.shift.types.label') }}
+                            </span>
                         </template>
-                    </q-input>
-
+                    </q-select>
                 </div>
 
-                <!-- punch out field -->
-                <div class="col">
-                    <q-input
-                        v-model="shift.end_time"
-                        standout
+                <div
+                    v-if="isShowingPredefinedTime"
+                    class="col row items-start text-uppercase rounded-5 q-pa-xs relative-position"
+                >
+                    <div
+                        class="absolute-full rounded-5 q-mx-sm q-my-xs"
+                        :class="predefinedHoursBgColor"
+                        style="opacity: 0.3;"
+                    ></div>
+
+                    <span class="col text-center text-uppercase text-h6 text-bold q-py-xs">
+                        {{ getHoursMinutesStringFromHoursFloat(expectedDailyHours) }}
+                    </span>
+                </div>
+
+                <div
+                    v-else
+                    class="col row items-start text-uppercase rounded-5 q-pt-sm"
+                >
+                    <!-- punch in field -->
+                    <div class="col">
+                        <TargoInput
+                            v-model="shift.start_time"
+                            no-top-padding
+                            dense
+                            type="time"
+                            :readonly="isApproved"
+                            :background-color="isApproved ? 'white' : undefined"
+                            :input-text-color="isApproved ? 'accent' : ''"
+                            :label="$t('shared.misc.in')"
+                            :error="shift.has_error"
+                            @blur="onTimeFieldBlur(shift.start_time)"
+                        />
+                    </div>
+
+                    <!-- punch out field -->
+                    <div class="col">
+                        <TargoInput
+                            v-model="shift.end_time"
+                            no-top-padding
+                            dense
+                            type="time"
+                            :readonly="isApproved"
+                            :background-color="isApproved ? 'white' : undefined"
+                            :input-text-color="isApproved ? 'accent' : ''"
+                            :label="$t('shared.misc.out')"
+                            :error="shift.has_error"
+                            @blur="onTimeFieldBlur(shift.end_time)"
+                        />
+                    </div>
+                </div>
+
+                <div class="col-auto q-pt-md">
+                    <TargoInput
+                        v-model="shift.comment"
+                        no-top-padding
                         dense
-                        :borderless="(shift.is_approved && isTimesheetApproved)"
-                        :readonly="(shift.is_approved && isTimesheetApproved)"
-                        type="time"
-                        label-slot
-                        no-error-icon
-                        hide-bottom-space
-                        :error="shift.has_error"
-                        :error-message="errorMessage || errorMessageRow !== '' ? $t(errorMessage ?? errorMessageRow) : ''"
-                        :label-color="!shift.is_approved ? 'accent' : 'white'"
-                        :input-class="'text-weight-medium ' + (shift.id === -2 ? 'text-white ' : ' ') + (shift.is_approved ? 'text-white cursor-not-allowed q-px-sm' : '')"
-                        input-style="font-size: 1.2em;"
-                        class="rounded-5 bg-dark"
-                        :class="(shift.id === -2 ? 'bg-negative ' : ' ') + (shift.is_approved ? 'cursor-not-allowed q-px-xs transparent inset-shadow' : (isTimesheetApproved ? 'inset-shadow' : ''))"
-                        :style="shift.is_approved ? 'background-color: #0a7d32 !important;' : ''"
-                        @blur="onTimeFieldBlur(shift.end_time)"
-                    >
-                        <template #label>
-                            <span
-                                class="text-weight-bolder"
-                                :class="shift.is_approved ? ' q-ml-md' : ''"
-                                style="font-size: 0.95em;"
-                            >{{ $t('shared.misc.out') }}</span>
-                        </template>
-                    </q-input>
+                        :readonly="isApproved"
+                        :background-color="isApproved ? 'white' : undefined"
+                        :input-text-color="isApproved ? 'accent' : ''"
+                        :label="$t('timesheet.expense.employee_comment')"
+                        :append-content="isApproved ? '' : `${commentLength ?? 0}/280`"
+                    />
                 </div>
             </div>
-        </div>
 
-        <div class="col-auto">
-            <q-btn
-                v-if="!shift.is_approved"
-                flat
-                dense
-                color="negative"
-                icon="las la-trash"
-                size="lg"
-                class="full-height"
-                @click="$emit('requestDelete')"
-            />
+            <div class="col-auto">
+                <q-btn
+                    v-if="!shift.is_approved"
+                    outline
+                    dense
+                    color="negative"
+                    icon="las la-trash"
+                    size="lg"
+                    class="full-height rounded-5"
+                    @click="$emit('requestDelete')"
+                />
+            </div>
         </div>
 
         <q-separator
             v-if="hasShiftAfter"
             spaced
-            class="q-mx-md col-12"
+            size="2px"
+            :color="isApproved ? 'accent2' : 'accent'"
+            class="q-mx-lg"
         />
     </div>
 </template>
@@ -390,4 +337,13 @@
     padding-top: 0;
     align-items: center;
 }
+
+:deep(.q-field--float .q-field__label) {
+    transform: translate(-17px, -60%) scale(0.75) !important;
+    border-radius: 10px 10px 10px 0px;
+}
+
+:deep(.q-field--auto-height.q-field--labeled .q-field__control-container) {
+    padding: 0;
+}
 </style>
\ No newline at end of file
diff --git a/src/modules/timesheets/components/mobile/shift-list-mobile.vue b/src/modules/timesheets/components/mobile/shift-list-mobile.vue
index be8c29e..40e6ffe 100644
--- a/src/modules/timesheets/components/mobile/shift-list-mobile.vue
+++ b/src/modules/timesheets/components/mobile/shift-list-mobile.vue
@@ -2,17 +2,12 @@
     setup
     lang="ts"
 >
-    import ShiftListDay from 'src/modules/timesheets/components/shift-list-day.vue';
-    import ShiftListDateWidget from 'src/modules/timesheets/components/shift-list-date-widget.vue';
+    import ShiftListDayMobile from 'src/modules/timesheets/components/mobile/shift-list-day-mobile.vue';
 
-    import { date, useQuasar } from 'quasar';
-    import { ref, computed, watch, onMounted, inject } from 'vue';
-    import { useUiStore } from 'src/stores/ui-store';
+
+    import { useQuasar } from 'quasar';
+    import { ref, computed, watch, onMounted } from 'vue';
     import { useTimesheetStore } from 'src/stores/timesheet-store';
-    import { Shift } from 'src/modules/timesheets/models/shift.models';
-    import { useTimesheetApi } from 'src/modules/timesheets/composables/use-timesheet-api';
-    import type { TimesheetDay } from 'src/modules/timesheets/models/timesheet.models';
-    import { useI18n } from 'vue-i18n';
 
     // ========== constants ========================================
 
@@ -25,16 +20,11 @@
     }>();
 
     const q = useQuasar();
-    const { extractDate } = date;
-    const { locale } = useI18n();
-    const uiStore = useUiStore();
-    const timesheetApi = useTimesheetApi();
     const timesheetStore = useTimesheetStore();
 
     const mobileAnimationDirection = ref('fadeInLeft');
     const currentDayComponent = ref<HTMLElement[] | null>(null);
     const currentDayComponentWatcher = ref(currentDayComponent);
-    const employeeEmail = inject<string>('employeeEmail');
 
     // ========== computed ========================================
 
@@ -42,38 +32,10 @@
 
     // ========== methods ========================================
 
-    const addNewShift = (day_shifts: Shift[], date: string, timesheet_id: number) => {
-        uiStore.focusNextComponent = true;
-        const newShift = new Shift;
-        newShift.date = date;
-        newShift.timesheet_id = timesheet_id;
-        day_shifts.push(newShift);
-    };
-
-    const getDayApproval = (day: TimesheetDay) => {
-        if (day.shifts.length < 1) return false;
-        return day.shifts.every(shift => shift.is_approved === true);
-    };
-
     const getMobileDayRef = (iso_date_string: string): string => {
         return iso_date_string === CURRENT_DATE_STRING ? 'currentDayComponent' : '';
     };
 
-    const getHolidayName = (date: string) => {
-        const holiday = timesheetStore.federal_holidays.find(holiday => holiday.date === date);
-        if (!holiday) return;
-
-        if (locale.value === 'fr-FR')
-            return holiday.nameFr;
-
-        else if (locale.value === 'en-CA')
-            return holiday.nameEn;
-    };
-
-    const onClickApplyWeeklyPreset = async (timesheet_id: number) => {
-        await timesheetApi.applyPreset(timesheet_id, undefined, undefined, employeeEmail);
-    }
-
     onMounted(async () => {
         await timesheetStore.getCurrentFederalHolidays();
     });
@@ -86,166 +48,28 @@
 </script>
 
 <template>
-    <div
-        class="fit"
-        :class="$q.platform.is.mobile ? 'column no-wrap q-pb-lg' : 'row'"
-    >
+    <div class="fit column no-wrap q-pb-lg">
         <div
             v-for="timesheet of timesheetStore.timesheets"
             :key="timesheet.timesheet_id"
-            class="no-wrap"
-            :class="$q.platform.is.mobile ? 'col-auto column' : 'col column fit items-center'"
+            class="col-auto column no-wrap"
         >
-            <transition
-                appear
-                enter-active-class="animated fadeInDown"
-                leave-active-class="animated fadeOutUp"
-            >
-                <q-btn
-                    v-if="!$q.platform.is.mobile && timesheet.days.every(day => day.shifts.length < 1) && timesheetStore.has_timesheet_preset"
-                    :disable="!timesheet.days.every(day => day.shifts.length < 1)"
-                    flat
-                    dense
-                    :label="$t('timesheet.apply_preset_week')"
-                    class="col-auto text-uppercase text-weight-bold text-accent q-mx-lg q-py-none rounded-5"
-                    @click="onClickApplyWeeklyPreset(timesheet.timesheet_id)"
-                >
-                    <q-icon
-                        name="las la-calendar-week"
-                        color="accent"
-                        size="md"
-                    />
-                </q-btn>
-            </transition>
-
             <transition-group
                 appear
                 :enter-active-class="`animated ${animationStyle}`"
             >
                 <div
-                    v-for="day, day_index in timesheet.days"
+                    v-for="day, dayIndex in timesheet.days"
                     :key="day.date"
                     :ref="getMobileDayRef(day.date)"
                     class="col-auto row q-pa-sm full-width relative-position"
-                    :style="`animation-delay: ${day_index / 15}s;`"
+                    :style="`animation-delay: ${dayIndex / 15}s;`"
                 >
-                    <!-- optional label indicating which holiday if today is a holiday -->
-                    <span
-                        v-if="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date)"
-                        class="absolute-top-left text-uppercase text-weight-bolder text-purple-5"
-                        style="transform: translate(25px, -7px);"
-                    >
-                        {{ getHolidayName(day.date) }}
-                    </span>
-
-                    <!-- mobile version in portrait mode -->
-                    <div
-                        v-if="$q.platform.is.mobile && ($q.screen.width < $q.screen.height)"
-                        class="col-auto full-width q-px-md q-py-sm"
-                    >
-                        <q-card
-                            class="shadow-12"
-                            :class="(getDayApproval(day) || timesheet.is_approved) ? 'bg-accent rounded-10' : 'bg-dark mobile-rounded-10'"
-                        >
-                            <q-card-section
-                                class="text-weight-bolder text-uppercase text-h6 q-py-sm text-center relative-position"
-                                :class="(getDayApproval(day) || timesheet.is_approved) ? 'bg-accent text-white' : 'bg-primary text-white'"
-                                style="line-height: 1em;"
-                            >
-                                <span> {{ $d(extractDate(day.date, 'YYYY-MM-DD'), {
-                                    weekday: 'long', day: 'numeric', month:
-                                        'long'
-                                }) }}</span>
-
-                                <q-icon
-                                    v-if="(getDayApproval(day) || timesheet.is_approved)"
-                                    name="verified"
-                                    size="3em"
-                                    color="white"
-                                    class="absolute-top-left z-top"
-                                    style="top: -0.2em; left: 0px;"
-                                />
-                            </q-card-section>
-
-                            <q-card-section
-                                v-if="day.shifts.filter(shift => shift.id !== 0).length > 0"
-                                class="q-pa-none transparent"
-                            >
-                                <ShiftListDay
-                                    v-model="timesheet.days[day_index]!"
-                                    :timesheet-id="timesheet.timesheet_id"
-                                    :week-day-index="day_index"
-                                    :timesheet-approved="timesheet.is_approved"
-                                />
-                            </q-card-section>
-
-                            <q-card-section class="q-pa-none">
-                                <q-btn
-                                    v-if="!(getDayApproval(day) || timesheet.is_approved)"
-                                    square
-                                    dense
-                                    size="xl"
-                                    color="accent"
-                                    icon="more_time"
-                                    class="full-width"
-                                    style="border-radius: 0 0 10px 10px;"
-                                    @click="addNewShift(day.shifts, day.date, timesheet.timesheet_id)"
-                                />
-                            </q-card-section>
-                        </q-card>
-                    </div>
-
-                    <!-- desktop version -->
-                    <div
-                        v-else
-                        class="col row full-width rounded-10 ellipsis shadow-10"
-                        :style="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date) ? 'border: 2px solid #ab47bc' : ''"
-                    >
-                        <div
-                            class="col row"
-                            :class="(getDayApproval(day) || timesheet.is_approved) ? (timesheetStore.federal_holidays.some(holiday => holiday.date === day.date) ? 'bg-purple-5' : 'bg-accent') : 'bg-dark'"
-                        >
-                            <!-- Date block -->
-                            <ShiftListDateWidget
-                                :display-date="day.date"
-                                :approved="(getDayApproval(day) || timesheet.is_approved)"
-                                class="col-auto"
-                            />
-
-                            <ShiftListDay
-                                v-model="timesheet.days[day_index]!"
-                                :timesheet-id="timesheet.timesheet_id"
-                                :week-day-index="day_index"
-                                :approved="timesheet.is_approved"
-                                class="col"
-                            />
-                        </div>
-
-
-                        <div class="col-auto self-stretch">
-                            <q-icon
-                                v-if="(getDayApproval(day) || timesheet.is_approved)"
-                                name="verified"
-                                color="white"
-                                size="xl"
-                                class="full-height"
-                                :class="(getDayApproval(day) || timesheet.is_approved) ? (timesheetStore.federal_holidays.some(holiday => holiday.date === day.date) ? 'bg-purple-5' : 'bg-accent') : ''"
-                            />
-
-                            <q-btn
-                                v-else
-                                :dense="!$q.platform.is.mobile"
-                                square
-                                icon="more_time"
-                                size="lg"
-                                :color="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date) ? 'purple-5' : 'accent'"
-                                text-color="white"
-                                class="full-height"
-                                :class="$q.platform.is.mobile ? 'q-px-xs' : ''"
-                                @click="addNewShift(day.shifts, day.date, timesheet.timesheet_id)"
-                            />
-                        </div>
-                    </div>
+                    <ShiftListDayMobile
+                        v-model="timesheet.days[dayIndex]!"
+                        :timesheet-id="timesheet.timesheet_id"
+                        :is-timesheet-approved="timesheet.is_approved"
+                    />
                 </div>
             </transition-group>
         </div>
diff --git a/src/modules/timesheets/components/shift-list-date-widget.vue b/src/modules/timesheets/components/shift-list-date-widget.vue
index f841d35..1d1405a 100644
--- a/src/modules/timesheets/components/shift-list-date-widget.vue
+++ b/src/modules/timesheets/components/shift-list-date-widget.vue
@@ -24,16 +24,17 @@
 
 <template>
     <div
-        class="column flex-center rounded-10 text-center self-center bg-transparent"
+        class="column flex-center rounded-10 text-center self-center bg-transparent relative-position"
         :style="date_box_size"
     >
-        <span
+        <div
             v-if="today"
-            class="absolute-top-left text-uppercase text-weight-bolder q-pt-xs bordered-text"
-            style="transform: translate(20px, -8px);"
+            class="absolute fit q-px-sm q-py-md"
         >
-            {{ $t('shared.label.today') }}
-        </span>
+            <div class="fit" style="background-image: url('src/assets/circle.png'); background-size: 100% 100%; background-repeat: no-repeat; opacity: 0.65;">
+
+            </div>
+        </div>
 
         <span
             v-if="!dense"
@@ -46,7 +47,7 @@
 
         <span
             class="col-auto text-weight-bolder"
-            :class="today ? 'text-info' : (approved ? 'text-white' : '')"
+            :class="today ? 'text-accent' : (approved ? 'text-white' : '')"
             :style="'font-size: ' + date_font_size + '; line-height: 90% !important;'"
         >
             {{ display_date.getDate() }}
@@ -67,7 +68,8 @@
     lang="css"
 >
 .bordered-text {
-    text-shadow: 2px 0 var(--q-dark), -2px 0 var(--q-dark), 0 2px var(--q-dark), 0 -2px var(--q-dark),
-        1px 1px var(--q-dark), -1px -1px var(--q-dark), 1px -1px var(--q-dark), -1px 1px var(--q-dark);
+    text-shadow: 2px 0 white, -2px 0 white, 0 2px white, 0 -2px white,
+        1px 1px white, -1px -1px white, 1px -1px white, -1px 1px white;
+    font-size: 0.9em;
 }
 </style>
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-day-row.vue b/src/modules/timesheets/components/shift-list-day-row.vue
index 3cbfa62..87cd998 100644
--- a/src/modules/timesheets/components/shift-list-day-row.vue
+++ b/src/modules/timesheets/components/shift-list-day-row.vue
@@ -3,10 +3,10 @@
     lang="ts"
 >
     import DetailsDialogShiftMenu from 'src/modules/timesheet-approval/components/details-dialog-shift-menu.vue';
+    import TargoInput from 'src/modules/shared/components/targo-input.vue';
 
-    import { useI18n } from 'vue-i18n';
     import { computed, inject, onMounted, ref } from 'vue';
-    import { QSelect, QInput, useQuasar, type QSelectProps } from 'quasar';
+    import { QSelect, useQuasar, colors, getCssVar } from 'quasar';
     import { useUiStore } from 'src/stores/ui-store';
     import { useAuthStore } from 'src/stores/auth-store';
     import { getCurrentDailyMinutesWorked, getShiftOptions, getTimeStringFromMinutes, SHIFT_OPTIONS } from 'src/modules/timesheets/utils/shift.util';
@@ -23,7 +23,6 @@
     const shift = defineModel<Shift>('shift', { required: true });
 
     const {
-        errorMessage = undefined,
         isTimesheetApproved = false,
         currentShifts,
         holiday = false,
@@ -32,7 +31,7 @@
         currentShifts: Shift[];
         expectedDailyHours?: number;
         isTimesheetApproved?: boolean;
-        errorMessage?: string | undefined;
+        errorTimesheet?: boolean | undefined;
         holiday?: boolean | undefined;
     }>();
 
@@ -42,7 +41,6 @@
     }>();
 
     const q = useQuasar();
-    const { t } = useI18n();
     const uiStore = useUiStore();
     const authStore = useAuthStore();
 
@@ -59,41 +57,7 @@
     // ================== Computed ==================
 
     const hasPTO = computed(() => currentShifts.some(shift => SHIFT_TYPES_WITH_PREDEFINED_TIMES.includes(shift.type)));
-
-    const timeInputProps = computed(() => ({
-        dense: true,
-        borderless: shift.value.is_approved && isTimesheetApproved,
-        readonly: shift.value.is_approved && isTimesheetApproved,
-        standout: q.dark.isActive ? 'bg-blue-grey-3' : 'bg-blue-grey-9',
-        labelSlot: true,
-        lazyRules: true,
-        noErrorIcon: true,
-        hideBottomSpace: true,
-        error: shift.value.has_error,
-        errorMessage: errorMessage ? t(errorMessage) : (shiftErrorMessage.value ? t(shiftErrorMessage.value) : undefined),
-        labelColor: shift.value.is_approved ? 'white' : (holiday ? 'purple-5' : 'accent'),
-        class: `col rounded-5 bg-dark q-mx-xs ${shift.value.id === -2 ? 'bg-negative' : ''} ${shift.value.is_approved || isTimesheetApproved ? 'cursor-not-allowed inset-shadow' : ''}`,
-        inputClass: `text-weight-medium ${shift.value.id === -2 ? 'text-white ' : ' '} ${shift.value.is_approved ? 'text-white cursor-not-allowed q-px-sm' : ''}`,
-        style: shift.value.is_approved ? (holiday ? 'background-color: #7b1fa2 !important' : 'background-color: #0a7d32 !important;') : '',
-        inputStyle: "font-size: 1.2em;"
-    }));
-
-    const shiftTypeSelectProps = computed<Partial<QSelectProps>>(() => ({
-        standout: q.dark.isActive ? 'bg-blue-grey-3' : 'bg-blue-grey-9',
-        dense: true,
-        borderless: shift.value.is_approved && isTimesheetApproved,
-        readonly: shift.value.is_approved && isTimesheetApproved,
-        optionsDense: !q.platform.is.mobile,
-        hideDropdownIcon: true,
-        menuOffset: [0, 10],
-        menuAnchor: "bottom middle",
-        menuSelf: "top middle",
-        options: getShiftOptions(hasPTO.value, currentShifts.length > 1),
-        class: `col rounded-5 q-mx-xs bg-dark ${!shift.value.is_approved && !isTimesheetApproved ? '' : 'inset-shadow'}`,
-        popupContentClass: "text-uppercase text-weight-bold text-center rounded-5",
-        style: shift.value.is_approved ? (holiday ? 'background-color: #7b1fa2 !important' : 'background-color: #0a7d32 !important;') : '',
-        popupContentStyle: "border: 2px solid var(--q-accent)",
-    }));
+    const isApproved = computed(() => isTimesheetApproved || shift.value.is_approved);
 
     // ================== Methods ==================
 
@@ -170,7 +134,7 @@
 </script>
 
 <template>
-    <div class="row">
+    <div class="row full-width q-py-xs">
         <!-- delete shift confirmation dialog -->
         <q-dialog
             v-model="is_showing_delete_confirm"
@@ -203,34 +167,53 @@
         </q-dialog>
 
         <div
-            class="row items-center text-uppercase rounded-5"
+            class="row items-center text-uppercase rounded-5 no-wrap"
             :class="$q.platform.is.mobile ? 'col q-mb-xs q-px-xs' : 'col-4'"
         >
             <!-- shift type -->
             <q-select
                 ref="selectRef"
                 v-model="shiftTypeSelected"
-                v-bind="shiftTypeSelectProps"
+                dense
+                borderless
+                color="accent"
+                label-color="white"
+                stack-label
+                label-slot
+                hide-dropdown-icon
+                :readonly="isApproved"
+                :options="getShiftOptions(hasPTO, currentShifts.length > 1)"
+                lazy-rules
+                no-error-icon
+                hide-bottom-space
+                options-selected-class="text-white text-bold bg-accent"
+                class="col q-pl-md rounded-5 inset-shadow text-uppercase"
+                :class="isApproved ? 'bg-white' : ($q.dark.isActive ? 'bg-primary' : '')"
+                popup-content-class="text-uppercase text-weight-medium rounded-5 shadow-12 z-top"
+                popup-content-style="border: 1px solid var(--q-primary)"
+                menu-anchor="bottom middle"
+                menu-self="top middle"
+                :menu-offset="[0, 5]"
+                :style="`border: 1px solid ${q.dark.isActive ? 'var(--q-secondary)' : colors.getPaletteColor('blue-grey-4')}; background-color: ${colors.lighten(getCssVar('secondary')!, 50)}`"
                 @blur="onBlurShiftTypeSelect"
                 @update:model-value="onShiftTypeChange"
             >
                 <template #selected-item="scope">
                     <div
-                        class="row items-center text-weight-bold q-ma-none q-pa-none no-wrap ellipsis full-width"
-                        :class="$q.platform.is.mobile ? 'full-height' : ''"
+                        class="row items-center text-weight-bold no-wrap ellipsis"
                         :tabindex="scope.tabindex"
                     >
                         <q-icon
                             :name="scope.opt.icon"
-                            :color="shift.is_approved ? 'white' : scope.opt.icon_color"
+                            :color="scope.opt.icon_color"
                             size="sm"
                             class="col-auto"
                             :class="shift.is_approved ? 'q-mx-xs' : 'q-mr-xs'"
                         />
+
                         <span
-                            style="line-height: 1.2em;"
                             class="col-auto ellipsis"
-                            :class="!shift.is_approved ? '' : 'text-white'"
+                            :class="shift.is_approved ? 'text-accent' : ''"
                         >
                             {{ $t(scope.opt.label) }}
                         </span>
@@ -278,7 +261,7 @@
                         :disable="shift.is_approved"
                         dense
                         keep-color
-                        size="3em"
+                        size="2.75em"
                         :color="holiday ? 'purple-5' : 'accent'"
                         icon="las la-building"
                         checked-icon="las la-laptop"
@@ -294,6 +277,15 @@
                         </q-tooltip>
                     </q-toggle>
                 </template>
+
+                <template #label>
+                <span
+                    class="text-weight-medium text-uppercase q-px-sm no-pointer-events"
+                    :class="$q.dark.isActive ? 'bg-secondary' : 'bg-blue-grey-7'"
+                >
+                    {{ $t('timesheet.shift.types.label') }}
+                </span>
+            </template>
             </q-select>
         </div>
 
@@ -319,38 +311,32 @@
                 v-else
                 class="col row items-start text-uppercase rounded-5 q-pa-xs"
             >
-                <q-input
-                    ref="start_time"
+                <TargoInput
                     v-model="shift.start_time"
-                    v-bind="timeInputProps"
+                    no-top-padding
+                    dense
                     type="time"
+                    :readonly="isApproved"
+                    :background-color="isApproved ? 'white' : undefined"
+                    :input-text-color="isApproved ? 'accent' : ''"
+                    :label="$t('shared.misc.in')"
+                    :error="shift.has_error"
                     @blur="onTimeFieldBlur(shift.start_time)"
-                >
-                    <template #label>
-                        <span
-                            class="text-weight-bolder"
-                            :class="shift.is_approved ? ' q-ml-md' : ''"
-                            style="font-size: 0.95em;"
-                        >{{ $t('shared.misc.in') }}</span>
-                    </template>
-                </q-input>
+                />
 
                 <!-- punch out field -->
-                <q-input
-                    ref="end_time"
+                <TargoInput
                     v-model="shift.end_time"
-                    v-bind="timeInputProps"
+                    no-top-padding
+                    dense
                     type="time"
+                    :readonly="isApproved"
+                    :background-color="isApproved ? 'white' : undefined"
+                    :input-text-color="isApproved ? 'accent' : ''"
+                    :label="$t('shared.misc.out')"
+                    :error="shift.has_error"
                     @blur="onTimeFieldBlur(shift.end_time)"
-                >
-                    <template #label>
-                        <span
-                            class="text-weight-bolder"
-                            :class="shift.is_approved ? ' q-ml-md' : ''"
-                            style="font-size: 0.95em;"
-                        >{{ $t('shared.misc.out') }}</span>
-                    </template>
-                </q-input>
+                />
             </div>
 
             <div
@@ -387,7 +373,7 @@
                         style="border: 3px solid var(--q-accent);"
                     >
                         <q-input
-                            color="white"
+                            color="accent"
                             v-model="scope.value"
                             dense
                             :readonly="shift.is_approved"
@@ -469,4 +455,9 @@ drops down, rather than the standard floating red text only -->
     padding-top: 0;
     align-items: center;
 }
+
+:deep(.q-field--dense.q-field--float .q-field__label) {
+    transform: translate(-17px, -60%) scale(0.75) !important;
+    border-radius: 10px 10px 10px 0px;
+}
 </style>
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list-day.vue b/src/modules/timesheets/components/shift-list-day.vue
index 9c8f891..70aed74 100644
--- a/src/modules/timesheets/components/shift-list-day.vue
+++ b/src/modules/timesheets/components/shift-list-day.vue
@@ -95,24 +95,25 @@
 </script>
 
 <template>
-    <div class="row fit rounded-10 ellipsis no-wrap">
+    <div class="row fit rounded-10 ellipsis no-wrap shadow-6">
         <!-- optional label indicating which holiday if today is a holiday -->
         <span
             v-if="isHoliday"
-            class="absolute-top-left text-uppercase text-weight-bolder text-purple-5"
-            style="transform: translate(25px, -7px);"
+            class="absolute-top-left text-uppercase text-bold holiday-border text-white"
+            style="transform: translate(25px, -2px);"
         >
             {{ getHolidayName(day.date) }}
         </span>
 
         <div
-            class="col"
-            :class="isToday ? 'z-top' : 'shadow-12'"
-            :style="isHoliday ? 'border: 2px solid #ab47bc' : ''"
+            class="col rounded-10"
+            :class="isToday ? 'bg-accent' : ''"
+            :style="isToday ? 'padding: 3px; ' : ''"
         >
             <div
-                class="col row fit"
+                class="col row fit rounded-10"
                 :class="(isDayApproved || timesheetApproved) ? (isHoliday ? 'bg-purple-5' : 'bg-accent') : 'bg-dark'"
+                :style="isHoliday ? 'border: 3px solid #ab47bc' : ''"
             >
                 <!-- Date block -->
                 <ShiftListDateWidget
@@ -123,7 +124,7 @@
                 />
 
                 <div
-                    class="col column justify-center q-py-xs full-width"
+                    class="col column justify-center q-py-xs full-width q-my-xs"
                     @mouseenter="presetMouseover = true"
                     @mouseleave="presetMouseover = false"
                 >
@@ -134,7 +135,7 @@
                         leave-active-class="animated zoomOut fast"
                     >
                         <q-btn
-                            v-if="!$q.platform.is.mobile && day.shifts.length < 1 && presetMouseover && timesheetStore.has_timesheet_preset"
+                            v-if="day.shifts.length < 1 && presetMouseover && timesheetStore.has_timesheet_preset"
                             :disable="day.shifts.length > 0"
                             flat
                             dense
@@ -155,7 +156,7 @@
                     <div
                         v-for="shift, shiftIndex in day.shifts"
                         :key="shiftIndex"
-                        class="col-auto"
+                        class="col-auto row"
                     >
                         <ShiftListDayRow
                             v-model:shift="day.shifts[shiftIndex]!"
@@ -188,10 +189,21 @@
                         :color="isHoliday ? 'purple-5' : 'accent'"
                         text-color="white"
                         class="full-height"
+                        :style="isHoliday ? 'border-radius: 0 6px 6px 0;' : ''"
                         @click="addNewShift"
                     />
                 </div>
             </div>
         </div>
     </div>
-</template>
\ No newline at end of file
+</template>
+
+<style
+    scoped
+    lang="scss"
+>
+.holiday-border {
+    text-shadow: 2px 0 $purple-5, -2px 0 $purple-5, 0 2px $purple-5, 0 -2px $purple-5,
+        1px 1px $purple-5, -1px -1px $purple-5, 1px -1px $purple-5, -1px 1px $purple-5;
+}
+</style>
\ No newline at end of file
diff --git a/src/modules/timesheets/components/shift-list.vue b/src/modules/timesheets/components/shift-list.vue
index aa142b1..d5ea723 100644
--- a/src/modules/timesheets/components/shift-list.vue
+++ b/src/modules/timesheets/components/shift-list.vue
@@ -10,10 +10,6 @@
     import { useTimesheetApi } from 'src/modules/timesheets/composables/use-timesheet-api';
     import { TimesheetDayDisplay } from 'src/modules/timesheets/models/timesheet.models';
 
-    // ========== constants ========================================
-
-    const CURRENT_DATE_STRING = new Date().toISOString().slice(0, 10);
-
     // ========== state ========================================
 
     const emit = defineEmits<{
@@ -96,15 +92,14 @@
         >
             <div
                 v-for="row, rowIndex of timesheetRows"
-                :key="JSON.stringify(row)"
+                :key="rowIndex"
                 class="col-auto row items-stretch"
                 :style="`animation-delay: ${rowIndex / 10}s;`"
             >
                 <div
                     v-for="day, dayIndex in row"
                     :key="day.day.date"
-                    class="col row items-stretch q-pa-sm relative-position"
-                    :class="day.day.date === CURRENT_DATE_STRING ? 'bg-info rounded-15 shadow-6' : ''"
+                    class="col row items-stretch q-pa-xs relative-position"
                 >
                     <ShiftListDay 
                         v-model="row[dayIndex]!.day"
diff --git a/src/modules/timesheets/components/timesheet-wrapper.vue b/src/modules/timesheets/components/timesheet-wrapper.vue
index 68d34a4..a7c3fe2 100644
--- a/src/modules/timesheets/components/timesheet-wrapper.vue
+++ b/src/modules/timesheets/components/timesheet-wrapper.vue
@@ -20,7 +20,10 @@
     import { useTimesheetApi } from 'src/modules/timesheets/composables/use-timesheet-api';
     import { useExpensesStore } from 'src/stores/expense-store';
     import { useTimesheetStore } from 'src/stores/timesheet-store';
-import { RouteNames } from 'src/router/router-constants';
+    import { RouteNames } from 'src/router/router-constants';
+    import { getHoursMinutesBetweenTwoHHmm } from 'src/utils/date-and-time-utils';
+    import type { Shift } from 'src/modules/timesheets/models/shift.models';
+    import type { TimesheetDay } from 'src/modules/timesheets/models/timesheet.models';
 
     // ================= state ====================
 
@@ -39,18 +42,22 @@ import { RouteNames } from 'src/router/router-constants';
     // ================== computed ====================
 
     const hasShiftErrors = computed(() => timesheetStore.all_current_shifts.filter(shift => shift.has_error === true).length > 0);
+
     const isTimesheetsApproved = computed(() => timesheetStore.timesheets.every(timesheet => timesheet.is_approved));
 
-    const weeklyHours = computed(() => timesheetStore.timesheets.map(timesheet => 
-        Object.values(timesheet.weekly_hours).reduce((sum, hoursPerType) => sum += hoursPerType, 0) - timesheet.weekly_hours.sick
+    const weeklyHours = computed(() => timesheetStore.timesheets.map(timesheet =>
+        timesheet.days.reduce((daySum: number, day: TimesheetDay) => {
+            return daySum + day.shifts.reduce((shiftSum: number, shift: Shift) => {
+                if (!shift.end_time || !shift.start_time || shift.type === 'SICK') return shiftSum;
+                
+                const time = getHoursMinutesBetweenTwoHHmm(shift.start_time, shift.end_time);
+                return shiftSum + time.hours + Number(time.minutes / 60);
+            }, 0)
+        }, 0)
     ));
-    const totalHours = computed(() => timesheetStore.timesheets.reduce((sum, timesheet) =>
-        sum += timesheet.weekly_hours.regular
-        + timesheet.weekly_hours.evening
-        + timesheet.weekly_hours.emergency
-        + timesheet.weekly_hours.vacation
-        + timesheet.weekly_hours.holiday
-        + timesheet.weekly_hours.overtime,
+
+    const totalHours = computed(() => weeklyHours.value.reduce((sum, week) =>
+        sum += week,
         0 //initial value
     ));
 
@@ -82,7 +89,7 @@ import { RouteNames } from 'src/router/router-constants';
         timesheetStore.isShowingUnsavedWarning = false;
         timesheetStore.timesheets = [];
         timesheetStore.initial_timesheets = [];
-        await router.push({ name: timesheetStore.nextPageNameAfterUnsaveWarning ?? RouteNames.DASHBOARD});
+        await router.push({ name: timesheetStore.nextPageNameAfterUnsaveWarning ?? RouteNames.DASHBOARD });
     }
 
     const onClickSaveBeforeLeaving = async () => {
@@ -232,7 +239,7 @@ import { RouteNames } from 'src/router/router-constants';
                 style="min-height: 20vh;"
             >
                 <span class="text-uppercase text-weight-bolder text-center">{{ $t('shared.error.no_data_found')
-                }}</span>
+                    }}</span>
                 <q-icon
                     name="las la-calendar"
                     color="accent"
diff --git a/src/modules/timesheets/composables/use-expense-api.ts b/src/modules/timesheets/composables/use-expense-api.ts
index a596f0e..54e0b74 100644
--- a/src/modules/timesheets/composables/use-expense-api.ts
+++ b/src/modules/timesheets/composables/use-expense-api.ts
@@ -23,7 +23,6 @@ export const useExpensesApi = () => {
         const success = await expenses_store.upsertExpense(expense, employee_email);
 
         if (success) {
-            expenses_store.current_expense = new Expense(date.formatDate(new Date(), 'YYYY-MM-DD'));
             await timesheet_store.getTimesheetsByOptionalEmployeeEmail(employee_email);
 
             return true;
diff --git a/src/modules/timesheets/models/expense.models.ts b/src/modules/timesheets/models/expense.models.ts
index 67a7b4b..e60a452 100644
--- a/src/modules/timesheets/models/expense.models.ts
+++ b/src/modules/timesheets/models/expense.models.ts
@@ -1,4 +1,4 @@
-export type ExpenseType = 'PER_DIEM' | 'MILEAGE' | 'EXPENSES' | 'ON_CALL';
+export type ExpenseType = 'PER_DIEM' | 'MILEAGE' | 'EXPENSES' | 'ON_CALL' | undefined;
 
 export const EXPENSE_TYPE: ExpenseType[] = ['PER_DIEM', 'MILEAGE', 'EXPENSES', 'ON_CALL',];
 export const TYPES_WITH_MILEAGE_ONLY: Readonly<ExpenseType[]> = ['MILEAGE'];
@@ -9,8 +9,8 @@ export class Expense {
     timesheet_id: number;
     date: string;    //YYYY-MM-DD
     type: ExpenseType;
-    amount: number;
-    mileage?: number;
+    amount?: number | null;
+    mileage?: number | null;
     attachment_name?: string;
     attachment_key?: string;
     comment: string;
@@ -21,7 +21,7 @@ export class Expense {
         this.id = -1;
         this.timesheet_id = -1;
         this.date = date;
-        this.type = 'EXPENSES';
+        this.type = undefined;
         this.amount = 0;
         this.comment = '';
         this.is_approved = false;
diff --git a/src/modules/timesheets/utils/expense.util.ts b/src/modules/timesheets/utils/expense.util.ts
index 5b97777..e6a202b 100644
--- a/src/modules/timesheets/utils/expense.util.ts
+++ b/src/modules/timesheets/utils/expense.util.ts
@@ -10,12 +10,12 @@ export const getExpenseIcon = (type: ExpenseType) => {
     }
 };
 
-export const useExpenseRules = (t: (_key: string) => string) => {
+export const useExpenseRules = () => {
     const isPresent = (val: unknown) => val !== undefined && val !== null && val !== '';
-    const typeRequired = (val: unknown) => (!!val) || t('timesheet.expense.errors.type_required');
-    const amountRequired = (val: unknown) => (isPresent(val)) || t('timesheet.expense.errors.amount_required_for_type');
-    const mileageRequired = (val: unknown) => (isPresent(val)) || t('timesheet.expense.errors.mileage_required_for_type');
-    const commentRequired = (val: unknown) => (typeof val === 'string' ? val.trim().length > 0 : false) || t('timesheet.expense.hints.comment_required');
+    const typeRequired = (val: unknown) => isPresent(val);
+    const amountRequired = (val: number | null | undefined) => isPresent(val) && !!val && val > 0;
+    const mileageRequired = (val: number | null | undefined) => isPresent(val) && !!val && val > 0;
+    const commentRequired = (val: string | null | undefined) => typeof val === 'string' ? val.trim().length > 0 : false;
 
     return {
         typeRequired,