diff --git a/frontend/components/card-link.vue b/frontend/components/card-link.vue
index cf6a953..0c490a7 100644
--- a/frontend/components/card-link.vue
+++ b/frontend/components/card-link.vue
@@ -2,7 +2,7 @@
 
 <template>
     <NuxtLink :to="link">
-        <div class="w-[324px] h-[228px] border border-black rounded-lg p-6 flex flex-col justify-between">
+        <div class="w-[300px] h-[216px] border border-black rounded-lg p-6 flex flex-col justify-between gap-4">
             <div class="flex justify-between">
                 <div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
                     <Icon :name="iconName" style="color: black" size="44" />
@@ -12,12 +12,12 @@
                 </div>
             </div>
             <div class="uppercase font-bold">
-                <p class="text-3xl"> {{ label }} </p>
+                <p class="text-3xl text-primary-500">
+                    <slot name="label">{{ label }}</slot>
+                </p>
             </div>
         </div>
         </NuxtLink>
-
-
 </template>
 
 <script setup lang="ts">
@@ -27,4 +27,3 @@ const props = defineProps<{
     label: string
 }>()
 </script>
-
diff --git a/frontend/components/reception/reception-bovine-received.vue b/frontend/components/reception/reception-bovine-received.vue
index 9612bca..45bae0b 100644
--- a/frontend/components/reception/reception-bovine-received.vue
+++ b/frontend/components/reception/reception-bovine-received.vue
@@ -2,7 +2,7 @@
     <div
         v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
         class="flex flex-col items-center gap-16">
-        <h1 class="text-4xl uppercase font-bold">Sélection des races réceptionnées</h1>
+        <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des races réceptionnées</h1>
         <div
             class="flex flex-row gap-8 items-center">
             <div
diff --git a/frontend/components/reception/reception-form.vue b/frontend/components/reception/reception-form.vue
index 668a21b..75bb937 100644
--- a/frontend/components/reception/reception-form.vue
+++ b/frontend/components/reception/reception-form.vue
@@ -1,7 +1,7 @@
 <template>
     <form @submit.prevent="validate">
         <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
-            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Réception</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Réception</h1>
             <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="reception-user"
@@ -81,21 +81,8 @@
                 select-class="h-[34px]"
                 wrapper-class="col-start-2 row-start-3"
             />
-            <!--    Chauffeur (LIOT)        -->
-            <UiSelect
-                id="reception-driver"
-                v-model="form.driverId"
-                label="Nom du chauffeur si LIOT"
-                :options="filteredDrivers.map((driver) => ({
-                    value: String(driver.id),
-                    label: driver.name
-                }))"
-                :loading="isLoadingDrivers"
-                v-if="isLiotCarrier"
-                wrapper-class="col-start-2 row-start-4"
-            />
             <!--    Plaque d'immatriculation       -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                 <UiLicensePlateInput
                     v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
@@ -113,15 +100,28 @@
                 }))"
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
+                wrapper-class="col-start-2 row-start-4 h-[64px]"
+            />
+            <!--    Chauffeur (LIOT)        -->
+            <UiSelect
+                id="reception-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :loading="isLoadingDrivers"
+                v-if="isLiotCarrier"
                 wrapper-class="col-start-2 row-start-5"
             />
         </div>
         <div class="flex justify-center">
-            <button
+            <UiButton
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Valider
-            </button>
+            </UiButton>
         </div>
     </form>
 
diff --git a/frontend/components/reception/reception-product-received.vue b/frontend/components/reception/reception-product-received.vue
index 5808ccb..2deca6c 100644
--- a/frontend/components/reception/reception-product-received.vue
+++ b/frontend/components/reception/reception-product-received.vue
@@ -3,7 +3,7 @@
         <div
             v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
             class="flex flex-col gap-16 items-center w-full">
-            <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
+            <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des marchandises réceptionnnées</h1>
             <UiSelect
                 id="merchandise-type"
                 v-model="selectedMerchandiseTypeId"
@@ -47,7 +47,7 @@
             >
                 <div class="grid grid-cols-1 gap-10 md:grid-cols-4">
                     <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
-                        <p class="font-bold uppercase">{{ type.label }}</p>
+                        <p class="font-bold uppercase text-primary-500">{{ type.label }}</p>
                         <div
                             v-for="building in buildings"
                             :key="building.id"
diff --git a/frontend/components/reception/reception-weight.vue b/frontend/components/reception/reception-weight.vue
index 9ecb5dd..b5e9c32 100644
--- a/frontend/components/reception/reception-weight.vue
+++ b/frontend/components/reception/reception-weight.vue
@@ -1,9 +1,9 @@
 <template>
     <div class="flex justify-center">
         <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
+            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
 <!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
-            <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
+            <p class="text-primary-500 uppercase text-2xl text-primary-500 mt-2">Pont-bascule connecté</p>
             <div
                 v-if="showLoadingBox"
                 class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
@@ -11,27 +11,27 @@
             </div>
             <div v-else-if="displayWeight !== null" class="w-full">
                 <div
-                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
+                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
                     {{ displayWeight }} kg
                 </div>
             </div>
         </div>
     </div>
     <div class="flex justify-center mt-[54px]">
-        <button
+        <UiButton
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
-        <button
+        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
+        <UiButton
             v-if="displayWeight !== null && !showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="saveWeight"
-        >Valider</button>
-        <button
+        >Valider la pesée</UiButton>
+        <UiButton
             v-if="showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="printReceipt"
-        >Générer le bon</button>
+        >Générer le bon</UiButton>
     </div>
 </template>
 
diff --git a/frontend/components/reception/update-bovin.vue b/frontend/components/reception/update-bovin.vue
index 90ae35c..f8f827b 100644
--- a/frontend/components/reception/update-bovin.vue
+++ b/frontend/components/reception/update-bovin.vue
@@ -27,12 +27,12 @@
                 />
             </div>
         </div>
-        <button
+        <UiButton
             type="submit"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             :disabled="!auth.isAdmin"
         >Valider
-        </button>
+        </UiButton>
     </div>
     </form>
 </template>
diff --git a/frontend/components/reception/update-merchandise.vue b/frontend/components/reception/update-merchandise.vue
index b471192..cb09c09 100644
--- a/frontend/components/reception/update-merchandise.vue
+++ b/frontend/components/reception/update-merchandise.vue
@@ -67,13 +67,13 @@
                     </div>
                 </div>
             </div>
-            <button
+            <UiButton
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="!auth.isAdmin"
             >Valider
-            </button>
+            </UiButton>
         </div>
     </form>
 </template>
diff --git a/frontend/components/reception/update-weight.vue b/frontend/components/reception/update-weight.vue
index 182f390..e5ec053 100644
--- a/frontend/components/reception/update-weight.vue
+++ b/frontend/components/reception/update-weight.vue
@@ -30,14 +30,14 @@
         </div>
 
         <div class="flex justify-center">
-            <button
+            <UiButton
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
 
             >
                 Valider
-            </button>
+            </UiButton>
         </div>
 
     </form>
diff --git a/frontend/components/shipment/shipment-form.vue b/frontend/components/shipment/shipment-form.vue
index 1075247..0700b9d 100644
--- a/frontend/components/shipment/shipment-form.vue
+++ b/frontend/components/shipment/shipment-form.vue
@@ -1,7 +1,7 @@
 <template>
     <form @submit.prevent="validate">
         <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
-            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Expédition</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Expédition</h1>
             <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="shipment-user"
@@ -23,11 +23,11 @@
             />
             <!--    Type d'expédition        -->
             <div class="col-start-1 row-start-4 h-[64px]">
-                <div class="flex items-end gap-8">
+                <div class="flex items-end gap-8 justify-between">
                     <UiRadioGroup
                         id="shipment-type"
                         name="shipment-type"
-                        label="Type d'expédition"
+                        label="Type d'expédition bovine"
                         v-model="selectedShipmentTypeId"
                         :options="bovineShipment.map((type) => ({
                             value: String(type.id),
@@ -89,21 +89,8 @@
                 }))"
                 wrapper-class="col-start-2 row-start-3"
             />
-            <!--  Chauffeur (LIOT)        -->
-            <UiSelect
-                id="shipment-driver"
-                v-model="form.driverId"
-                label="Nom du chauffeur si LIOT"
-                :options="filteredDrivers.map((driver) => ({
-                    value: String(driver.id),
-                    label: driver.name
-                }))"
-                :loading="isLoadingDrivers"
-                wrapper-class="col-start-2 row-start-4"
-                v-if="isLiotCarrier"
-            />
             <!-- Plaque d'immatriculation (hors LIOT)        -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                 <UiLicensePlateInput
                     v-model="form.licencePlate"
                     v-model:allowAny="allowAnyLicensePlate"
@@ -121,15 +108,28 @@
                 }))"
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
+                wrapper-class="col-start-2 row-start-4"
+            />
+            <!--  Chauffeur (LIOT)        -->
+            <UiSelect
+                id="shipment-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :loading="isLoadingDrivers"
                 wrapper-class="col-start-2 row-start-5"
+                v-if="isLiotCarrier"
             />
         </div>
         <div class="flex justify-center">
-            <button
+            <UiButton
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
             >Valider
-            </button>
+            </UiButton>
         </div>
     </form>
 </template>
diff --git a/frontend/components/shipment/shipment-loading.vue b/frontend/components/shipment/shipment-loading.vue
index c685a4c..802e1b7 100644
--- a/frontend/components/shipment/shipment-loading.vue
+++ b/frontend/components/shipment/shipment-loading.vue
@@ -1,14 +1,14 @@
 <template>
-    <div class="flex flex-col items-center gap-16">
-        <h1 class="font-bold text-5xl uppercase">Charment des bovins</h1>
+    <div class="flex flex-col items-center gap-[118px]">
+        <h1 class="font-bold text-5xl uppercase text-primary-500">Charment des bovins</h1>
         <div
             class="w-full flex flex-col items-center justify-center">
             <UiLoadingDots />
         </div>
-        <button
+        <UiButton
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="goNext"
-        >Pesée</button>
+        >Peser</UiButton>
     </div>
 </template>
 
diff --git a/frontend/components/shipment/shipment-weight.vue b/frontend/components/shipment/shipment-weight.vue
index cf4d7f0..0876f79 100644
--- a/frontend/components/shipment/shipment-weight.vue
+++ b/frontend/components/shipment/shipment-weight.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="flex justify-center">
         <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
+            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
 <!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
             <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
             <div
@@ -11,27 +11,27 @@
             </div>
             <div v-else-if="displayWeight !== null" class="w-full">
                 <div
-                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
+                    class="w-full flex flex-col items-center justify-center border border-primary-500 h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
                     {{ displayWeight }} kg
                 </div>
             </div>
         </div>
     </div>
     <div class="flex justify-center mt-[54px]">
-        <button
+        <UiButton
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
             @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
-        <button
+        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
+        <UiButton
             v-if="displayWeight !== null && !showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="saveWeight"
-        >Valider la pesée</button>
-        <button
+        >Valider la pesée</UiButton>
+        <UiButton
             v-if="showGenerateReceipt"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
             @click="printReceipt"
-        >Générer le bon</button>
+        >Générer le bon</UiButton>
     </div>
 </template>
 
diff --git a/frontend/components/ui/UiButton.vue b/frontend/components/ui/UiButton.vue
new file mode 100644
index 0000000..429e00e
--- /dev/null
+++ b/frontend/components/ui/UiButton.vue
@@ -0,0 +1,39 @@
+<template>
+    <component
+        :is="'button'"
+        :type="type"
+        :disabled="isDisabled"
+        class="inline-flex items-center justify-center rounded-md"
+        :class="[
+            isDisabled ? 'cursor-not-allowed opacity-60' : 'cursor-pointer',
+            buttonClass
+        ]"
+        v-bind="attrs"
+    >
+        <slot v-if="!loading" />
+        <UiLoadingDots v-else />
+    </component>
+</template>
+
+<script setup lang="ts">
+import {computed, useAttrs} from 'vue'
+
+defineOptions({inheritAttrs: false})
+
+const props = withDefaults(
+    defineProps<{
+        type?: 'button' | 'submit' | 'reset'
+        disabled?: boolean
+        loading?: boolean
+        buttonClass?: string
+    }>(),
+    {
+        disabled: false,
+        loading: false,
+        buttonClass: ''
+    }
+)
+
+const attrs = useAttrs()
+const isDisabled = computed(() => props.disabled || props.loading)
+</script>
diff --git a/frontend/components/ui/UiCheckbox.vue b/frontend/components/ui/UiCheckbox.vue
index 9355ab5..39770b0 100644
--- a/frontend/components/ui/UiCheckbox.vue
+++ b/frontend/components/ui/UiCheckbox.vue
@@ -1,14 +1,14 @@
 <template>
     <div :class="wrapperClass">
         <label
-            class="flex items-center gap-2 cursor-pointer"
+            class="flex items-center gap-2 cursor-pointer text-primary-500"
             :class="labelClass"
         >
             <input
                 type="checkbox"
                 :checked="checked"
                 :disabled="disabled"
-                :class="['cursor-pointer', inputClass]"
+                :class="['cursor-pointer text-primary-500', inputClass]"
                 @change="onChange"
             >
             <span v-if="label">{{ label }}</span>
diff --git a/frontend/components/ui/UiDateInput.vue b/frontend/components/ui/UiDateInput.vue
index 7288e8d..e76e46c 100644
--- a/frontend/components/ui/UiDateInput.vue
+++ b/frontend/components/ui/UiDateInput.vue
@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl"
+            class="font-bold uppercase text-xl text-primary-500"
             :class="labelClass"
         >
             {{ label }}
@@ -14,7 +14,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl py-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black justify-self-start text-xl text-primary-500 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-pointer',
diff --git a/frontend/components/ui/UiNumberInput.vue b/frontend/components/ui/UiNumberInput.vue
index 717f0d6..11aa52d 100644
--- a/frontend/components/ui/UiNumberInput.vue
+++ b/frontend/components/ui/UiNumberInput.vue
@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="text-xl flex items-center gap-2"
+            class="text-xl flex items-center gap-2 text-primary-500"
             :class="labelClass"
         >
             <span
@@ -25,7 +25,7 @@
             :step="step"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl bg-transparent w-16"
+            class="border-b border-black text-xl bg-transparent w-16 text-primary-500"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',
diff --git a/frontend/components/ui/UiRadioGroup.vue b/frontend/components/ui/UiRadioGroup.vue
index f58cd67..a36a360 100644
--- a/frontend/components/ui/UiRadioGroup.vue
+++ b/frontend/components/ui/UiRadioGroup.vue
@@ -2,7 +2,7 @@
     <div :class="['flex flex-col', wrapperClass]">
         <label
             v-if="label"
-            class="font-bold uppercase text-xl"
+            class="font-bold uppercase text-xl text-primary-500"
             :class="labelClass"
         >
             {{ label }}
@@ -16,7 +16,7 @@
                 v-for="option in options"
                 :key="String(option.value)"
                 :for="`${id || 'radio'}-${option.value}`"
-                class="flex items-center gap-2"
+                class="flex items-center gap-2 text-primary-500"
                 :class="itemClass"
             >
                 <input
diff --git a/frontend/components/ui/UiSelect.vue b/frontend/components/ui/UiSelect.vue
index eb97016..91f6486 100644
--- a/frontend/components/ui/UiSelect.vue
+++ b/frontend/components/ui/UiSelect.vue
@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl"
+            class="font-bold uppercase text-xl text-primary-500"
             :class="labelClass"
         >
             {{ label }}
@@ -13,7 +13,7 @@
             :value="modelValue ?? ''"
             :disabled="disabled || loading"
             v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl py-[6px] bg-transparent"
+            class="border-b border-black justify-self-start text-xl text-primary-500 py-[6px] bg-transparent"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',
diff --git a/frontend/components/ui/UiTextInput.vue b/frontend/components/ui/UiTextInput.vue
index ed329d3..0926631 100644
--- a/frontend/components/ui/UiTextInput.vue
+++ b/frontend/components/ui/UiTextInput.vue
@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="font-bold uppercase text-xl"
+            class="font-bold uppercase text-xl text-primary-500"
             :class="labelClass"
         >
             {{ label }}
@@ -16,7 +16,7 @@
             :maxlength="maxlength"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl py-[6px] bg-transparent"
+            class="border-b border-black text-xl py-[6px] bg-transparent text-primary-500"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',
diff --git a/frontend/components/ui/license-plate-input.vue b/frontend/components/ui/license-plate-input.vue
index 2795076..b71bf57 100644
--- a/frontend/components/ui/license-plate-input.vue
+++ b/frontend/components/ui/license-plate-input.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col">
-    <label :for="inputId" class="font-bold uppercase text-xl">{{ label }}</label>
+    <label :for="inputId" class="font-bold uppercase text-xl text-primary-500">{{ label }}</label>
       <div class="flex items-end gap-8">
           <input
               :id="inputId"
@@ -9,7 +9,7 @@
               type="text"
               :maxlength="maxLength"
               :placeholder="placeholderText"
-              class="border-b border-black flex-1 min-w-0 text-xl uppercase h-[30px]"
+              class="border-b border-black flex-1 min-w-0 text-xl text-primary-500 uppercase h-[36px] py-[6px]"
               @input="handleInput"
           />
           <UiCheckbox
diff --git a/frontend/components/ui/stepper.vue b/frontend/components/ui/stepper.vue
index e72c7b6..dc94f68 100644
--- a/frontend/components/ui/stepper.vue
+++ b/frontend/components/ui/stepper.vue
@@ -4,7 +4,7 @@
             <div
                 v-for="(label, index) in labels"
                 :key="label"
-                class="absolute top-0 whitespace-nowrap"
+                class="absolute top-0 whitespace-nowrap text-primary-500"
                 :class="labelClass(index)"
                 :style="positionStyle(index)"
             >
diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue
index 38d4f25..d78d48e 100644
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -2,7 +2,7 @@
     <div class="min-h-screen text-neutral-900 flex flex-col">
         <!-- HEADER -->
         <header class="w-full bg-primary-500 py-5 px-6">
-            <div class="flex w-full items-center ">
+            <div class="flex w-full items-center justify-between">
                 <!-- Burger (mobile) -->
                 <button
                     type="button"
@@ -111,24 +111,23 @@
                 <div class="w-[44px] md:hidden"></div>
 
                 <!-- User dropdown à droite (desktop) -->
-                <div v-if="auth.isAuthenticated" class="ml-auto relative hidden md:flex items-center text-white">
+                <div v-if="auth.isAuthenticated" class="ml-auto relative hidden md:flex items-center text-white group">
                     <button
                         type="button"
-                        class="inline-flex items-center text-xl leading-none transition hover:opacity-80"
-                        @click="toggleUserMenu"
+                        class="inline-flex items-center py-2 -my-2 text-xl leading-none transition hover:opacity-80"
                         aria-haspopup="true"
-                        :aria-expanded="isUserMenuOpen ? 'true' : 'false'"
                     >
                         <span class="capitalize font-bold">{{ userDisplayName }}</span>
-                        <span class="ml-[6px] inline-flex items-center font-bold">
-                            <Icon v-if="isUserMenuOpen" name="mdi:chevron-up" size="20"/>
-                            <Icon v-else name="mdi:chevron-down" size="20"/>
+                        <span class="ml-[6px] inline-flex items-center font-bold transition-transform group-hover:rotate-180 group-focus-within:rotate-180">
+                            <Icon name="mdi:chevron-down" size="20"/>
                         </span>
                     </button>
 
                     <div
-                        v-if="isUserMenuOpen"
-                        class="absolute right-0 top-full z-10 mt-2 w-56 rounded-md bg-primary-500 py-2 border-neutral-300 border shadow-lg"
+                        class="absolute right-0 top-full z-10 w-56 rounded-md bg-primary-500 py-2 border-neutral-300 border shadow-lg
+                        opacity-0 invisible pointer-events-none transition
+                        group-hover:opacity-100 group-hover:visible group-hover:pointer-events-auto
+                        group-focus-within:opacity-100 group-focus-within:visible group-focus-within:pointer-events-auto"
                         role="menu"
                     >
                         <button
@@ -169,9 +168,7 @@
             >
                 <aside
                     v-if="isMenuOpen"
-                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-600 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
-                    role="dialog"
-                    aria-modal="true"
+                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-500 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
                 >
                     <div class="flex items-center justify-between">
                         <span class="text-2xl font-bold uppercase">Menu</span>
@@ -212,11 +209,9 @@
                 </aside>
             </transition>
         </header>
-
-        <main class="mx-auto w-full max-w-[1280px] py-2 flex-1">
+        <main class="mx-auto w-full max-w-[1280px] mt-16">
             <slot/>
         </main>
-
         <footer class="w-full mt-auto bg-primary-500 px-6 py-3">
             <p class="font-bold text-white text-right">v{{ version }}</p>
         </footer>
@@ -231,7 +226,6 @@ const auth = useAuthStore()
 const {version} = useAppVersion()
 
 const isMenuOpen = ref(false)
-const isUserMenuOpen = ref(false)
 
 const userDisplayName = computed(() => auth.user?.username ?? 'Utilisateur')
 
@@ -241,14 +235,6 @@ const closeMenu = () => {
 
 const toggleMenu = () => {
     isMenuOpen.value = !isMenuOpen.value
-    // évite d’avoir deux menus ouverts en même temps
-    if (isMenuOpen.value) isUserMenuOpen.value = false
-}
-
-const toggleUserMenu = () => {
-    isUserMenuOpen.value = !isUserMenuOpen.value
-    // idem
-    if (isUserMenuOpen.value) isMenuOpen.value = false
 }
 
 const handleLogout = async () => {
@@ -256,7 +242,6 @@ const handleLogout = async () => {
         await auth.logout()
     } finally {
         closeMenu()
-        isUserMenuOpen.value = false
         await navigateTo('/login')
     }
 }
diff --git a/frontend/pages/admin/carrier/[[id]].vue b/frontend/pages/admin/carrier/[[id]].vue
index e0b9c3c..29e5276 100644
--- a/frontend/pages/admin/carrier/[[id]].vue
+++ b/frontend/pages/admin/carrier/[[id]].vue
@@ -1,19 +1,19 @@
 
 <template>
     <form @submit.prevent="validate">
-    <div class="flex items-center justify-between ">
+    <div class="flex items-center justify-between">
         <h1 class="text-3xl font-bold uppercase">
             {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
         </h1>
 
-        <button
+        <UiButton
             type="submit"
             class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
         >Enregistrer
-        </button>
+        </UiButton>
     </div>
 
-    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
+    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
         <UiTextInput
             label = "nom du fournisseur"
             id="carrier-name"
@@ -33,12 +33,20 @@
 <script setup lang="ts">
 import {createCarrier, getCarrier, updateCarrier} from "~/services/carrier";
 import type {CarrierData, CarrierFormData} from "~/services/dto/carrier-data";
+import {computed} from "vue";
 const router = useRouter()
 const route = useRoute()
-const idCarrier = Number(route.params.id)
+const idCarrier = computed(() => resolveId(route.params.id))
 const isLoading = ref(false)
 const isHydrating = ref(false)
 
+const resolveId = (param: unknown) => {
+    const idStr = Array.isArray(param) ? param[0] : param
+    if (!idStr) return null
+    const id = Number(idStr)
+    return Number.isFinite(id) ? id : null
+}
+
 const form = reactive<CarrierFormData>({
     code:'',
     name:''
@@ -59,7 +67,7 @@ const hydrateFromUser = (carrier: CarrierData | null) => {
 }
 
 watch(
-    () => idCarrier,
+    () => idCarrier.value,
     async (id) => {
         if (id === null) {
             return
@@ -85,8 +93,8 @@ async function validate() {
 
     }
 
-    if(idCarrier){
-        await updateCarrier(idCarrier, basePayload)
+    if(idCarrier.value){
+        await updateCarrier(idCarrier.value, basePayload)
         navigate()
         return
     }
diff --git a/frontend/pages/admin/carrier/carrier-list.vue b/frontend/pages/admin/carrier/carrier-list.vue
index a1bc276..de603a8 100644
--- a/frontend/pages/admin/carrier/carrier-list.vue
+++ b/frontend/pages/admin/carrier/carrier-list.vue
@@ -1,11 +1,13 @@
 <template>
 
     <div class="flex items-center justify-between ">
-            <h1 class="text-3xl font-bold uppercase">listes des transporteurs</h1>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
             <NuxtLink
                 to="/admin/carrier"
-                class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            >Ajouter
+                class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
+            >
+                <Icon name="mdi:plus" size="28"  />
+                Ajouter
             </NuxtLink>
     </div>
 
diff --git a/frontend/pages/admin/customer/[[id]].vue b/frontend/pages/admin/customer/[[id]].vue
index 7ac5fa0..cff99f0 100644
--- a/frontend/pages/admin/customer/[[id]].vue
+++ b/frontend/pages/admin/customer/[[id]].vue
@@ -5,13 +5,13 @@
                 {{ customerId ? "Modifications du client" : "Ajout d'un client" }}
             </h1>
 
-            <button
+            <UiButton
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
                 {{ customerId ? "Sauvegarder" : "Ajouter" }}
-            </button>
+            </UiButton>
         </div>
 
         <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
@@ -23,14 +23,14 @@
         <div class="mx-24 mb-4 py-6 border-t border-black"></div>
         <div class="flex items-center justify-between mb-4">
             <h2 class="text-3xl font-bold uppercase">Adresses client</h2>
-            <button
+            <UiButton
                 type="button"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="customerId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
                 Ajouter
-            </button>
+            </UiButton>
         </div>
         <div class="overflow-x-auto mb-10">
             <table class="w-full border-collapse">
diff --git a/frontend/pages/admin/customer/customer-list.vue b/frontend/pages/admin/customer/customer-list.vue
index aed9f89..cdd5eb1 100644
--- a/frontend/pages/admin/customer/customer-list.vue
+++ b/frontend/pages/admin/customer/customer-list.vue
@@ -1,12 +1,13 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Liste des Clients</h1>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
         <NuxtLink
             to="/admin/customer"
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
             :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
+            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
     </div>
diff --git a/frontend/pages/admin/supplier/[[id]].vue b/frontend/pages/admin/supplier/[[id]].vue
index 9b7e417..264be7b 100644
--- a/frontend/pages/admin/supplier/[[id]].vue
+++ b/frontend/pages/admin/supplier/[[id]].vue
@@ -5,13 +5,13 @@
                 {{ supplierId ? "Modifications du fournisseur" : "Ajout d'un fournisseur" }}
             </h1>
 
-            <button
+            <UiButton
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
             >
                 {{ supplierId ? "Sauvegarder" : "Ajouter" }}
-            </button>
+            </UiButton>
         </div>
 
         <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
@@ -23,14 +23,14 @@
         <div class="mx-24 mb-4 py-6 border-t border-black"></div>
         <div class="flex items-center justify-between mb-4">
             <h2 class="text-3xl font-bold uppercase">Adresses fournisseur</h2>
-            <button
+            <UiButton
                 type="button"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 :disabled="supplierId === null || !auth.isAdmin"
                 @click="goToAddAddress"
             >
                 Ajouter
-            </button>
+            </UiButton>
         </div>
         <div class="overflow-x-auto mb-10">
             <table class="w-full border-collapse">
diff --git a/frontend/pages/admin/supplier/supplier-list.vue b/frontend/pages/admin/supplier/supplier-list.vue
index 38e86dc..2008cb3 100644
--- a/frontend/pages/admin/supplier/supplier-list.vue
+++ b/frontend/pages/admin/supplier/supplier-list.vue
@@ -1,12 +1,13 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Liste des fournisseurs</h1>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
         <NuxtLink
             to="/admin/supplier"
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
             :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
             @click="handleAddClick"
         >
+            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
     </div>
diff --git a/frontend/pages/admin/user/[[id]].vue b/frontend/pages/admin/user/[[id]].vue
index 97dd8e3..14abbc4 100644
--- a/frontend/pages/admin/user/[[id]].vue
+++ b/frontend/pages/admin/user/[[id]].vue
@@ -5,15 +5,15 @@
             <h1 class="text-3xl font-bold uppercase">
                 {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
             </h1>
-            <button
+            <UiButton
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                 type="submit"
             >
                 {{ userId ? 'Sauvegarder' : 'Ajouter' }}
-            </button>
+            </UiButton>
         </div>
 
-        <div class="grid gap-y-16 gap-x-40 mb-16">
+        <div class="grid gap-y-16 gap-x-40 py-12">
             <UiTextInput
                 id="user-name"
                 v-model="form.username"
diff --git a/frontend/pages/admin/user/list.vue b/frontend/pages/admin/user/list.vue
index 172e7b2..71714ca 100644
--- a/frontend/pages/admin/user/list.vue
+++ b/frontend/pages/admin/user/list.vue
@@ -1,10 +1,11 @@
 <template>
     <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Liste des utilisateurs</h1>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
         <NuxtLink
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
             @click="router.push('/admin/user/')"
         >
+            <Icon name="mdi:plus" size="28"  />
             Ajouter
         </NuxtLink>
 
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index 4d7ef90..4311652 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -1,15 +1,27 @@
 <script setup lang="ts">
 </script>
 <template>
-    <div class="flex flex-wrap justify-center mt-8 gap-12 mb-8 md:mb-0">
+    <div class="flex flex-wrap justify-center pb-16 gap-12">
         <card-link label="NOUVELLE RÉCEPTION" link="/reception" iconName="mdi:truck-outline" />
         <card-link label="NOUVELLE EXPÉDITION" link="/shipment" iconName="mdi:truck-fast-outline" />
         <card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
-        <card-link label="RÉCEPTIONS EN ATTENTE" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline" />
-        <card-link label="EXPÉDITIONS EN ATTENTE" link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container" />
+        <card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
+            <template #label>
+                Réceptions<br>EN ATTENTE
+            </template>
+        </card-link>
+        <card-link link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
+            <template #label>
+                EXPÉDITIONS<br>EN ATTENTE
+            </template>
+        </card-link>
         <card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-outline" />
         <card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
         <card-link label="EXPÉDITIONS FINIES" link="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
-        <card-link label="PASSEPORT DU BOVIN" link="/" iconName="mdi:cow" />
+        <card-link link="/" iconName="mdi:cow">
+            <template #label>
+                PASSEPORT<br>DU BOVIN
+            </template>
+        </card-link>
     </div>
 </template>
diff --git a/frontend/pages/login.vue b/frontend/pages/login.vue
index 21d0c21..8313f59 100644
--- a/frontend/pages/login.vue
+++ b/frontend/pages/login.vue
@@ -39,13 +39,13 @@
         />
       </div>
 
-      <button
+      <UiButton
         type="submit"
         class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-primary-600 disabled:cursor-not-allowed disabled:opacity-60"
         :disabled="isSubmitting"
       >
         Connexion
-      </button>
+      </UiButton>
           <p class="font-bold">v{{ version }}</p>
       </form>
   </div>
diff --git a/frontend/pages/reception/[[id]].vue b/frontend/pages/reception/[[id]].vue
index e8c2deb..1de37c2 100644
--- a/frontend/pages/reception/[[id]].vue
+++ b/frontend/pages/reception/[[id]].vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="flex justify-between h-[52px] mt-16 mb-[80px]">
+    <div class="flex justify-between h-[52px] mb-[80px]">
         <div class="flex flex-1 mr-16">
             <UiStepper
                 :labels="RECEPTION_STEP_LABELS"
@@ -7,12 +7,12 @@
                 @select="handleStepSelect"
             />
         </div>
-        <button
+        <UiButton
             type="button"
             class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
             @click="saveAndHold"
         >Mettre en attente
-        </button>
+        </UiButton>
     </div>
     <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
     <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
diff --git a/frontend/pages/reception/finish-reception.vue b/frontend/pages/reception/finish-reception.vue
index bd8c1d0..65aa009 100644
--- a/frontend/pages/reception/finish-reception.vue
+++ b/frontend/pages/reception/finish-reception.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="flex items-center justify-start gap-10 mt-16">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
-            <h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
+    <div class="flex items-center justify-start gap-10">
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
     </div>
 
     <div class="px-[86px]">
@@ -27,7 +27,7 @@
                 <div>{{ reception.supplier?.name }}</div>
                 <div>{{ reception.address?.fullAddress }}</div>
                 <div>{{ reception.receptionType?.label }}</div>
-                <div>Plein : {{ formatWeighing(reception, 'gross') }} <br> Vide : {{ formatWeighing(reception, 'tare') }}</div>
+                <div>{{ formatWeighing(reception) }}</div>
             </div>
         </div>
     </div>
@@ -36,16 +36,20 @@
 <script setup lang="ts">
 import type {ReceptionData} from "~/services/dto/reception-data";
 import {getReceptionList} from "~/services/reception";
+import type {ShipmentData} from "~/services/dto/shipment-data";
 
 const receptionList = ref<ReceptionData[]>()
 const router = useRouter()
 
-const formatWeighing = (reception: ReceptionData, type: 'gross' | 'tare') => {
-    const entry = reception.weights?.find((weight) => weight.type === type)
-    if (!entry || entry.weight == null || entry.dsd == null) {
+const formatWeighing = (reception: ReceptionData) => {
+    const gross = reception.weights?.find((weight) => weight.type === 'gross')?.weight
+    const tare = reception.weights?.find((weight) => weight.type === 'tare')?.weight
+
+    if (gross == null || tare == null) {
         return '—'
     }
-    return `${entry.weight} kg`
+
+    return `${gross - tare} kg`
 }
 
 const goToReception = (id: number) => {
diff --git a/frontend/pages/reception/update/[[id]].vue b/frontend/pages/reception/update/[[id]].vue
index bc2ae96..19c2bbc 100644
--- a/frontend/pages/reception/update/[[id]].vue
+++ b/frontend/pages/reception/update/[[id]].vue
@@ -115,14 +115,14 @@
             />
         </div>
         <div class="flex justify-center mb-2">
-            <button
+            <UiButton
                 v-if="auth.isAdmin"
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
 
             >
                 Enregistrer
-            </button>
+            </UiButton>
         </div>
             <div class="flex justify-evenly gap-y-8 gap-x-40 mb-8 border-b border-slate-400">
                 <h1
diff --git a/frontend/pages/reception/waiting-reception.vue b/frontend/pages/reception/waiting-reception.vue
index 8b855be..b6db72c 100644
--- a/frontend/pages/reception/waiting-reception.vue
+++ b/frontend/pages/reception/waiting-reception.vue
@@ -1,13 +1,13 @@
 <template>
-    <div class="flex items-center justify-between mt-16">
+    <div class="flex items-center justify-between">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
-            <h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions en attente</h1>
         </div>
     </div>
 
     <div class="px-[86px]">
-        <div class="mt-6 border border-slate-200 mb-16 ">
+        <div class="mt-6 border border-slate-200 mb-16">
             <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                 <div>Fournisseur</div>
                 <div>Adresse</div>
diff --git a/frontend/pages/shipment/[[id]].vue b/frontend/pages/shipment/[[id]].vue
index 7d1cd05..6f6f3ae 100644
--- a/frontend/pages/shipment/[[id]].vue
+++ b/frontend/pages/shipment/[[id]].vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flex justify-between h-[52px] mt-16 mb-[80px]">
+        <div class="flex justify-between h-[52px] mb-[80px]">
             <div class="flex flex-1 mr-16">
                 <UiStepper
                     :labels="SHIPMENT_STEP_LABELS"
@@ -9,12 +9,12 @@
 
                 />
             </div>
-            <button
+            <UiButton
                 type="button"
                 class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
                 @click="saveAndHold"
             >Mettre en attente
-            </button>
+            </UiButton>
         </div>
         <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
         <ShipmentWeight v-if="storeShipment?.currentStep === 1" mode="gross"/>
diff --git a/frontend/pages/shipment/finish-shipment.vue b/frontend/pages/shipment/finish-shipment.vue
index 9a84ea0..4a0cee2 100644
--- a/frontend/pages/shipment/finish-shipment.vue
+++ b/frontend/pages/shipment/finish-shipment.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="flex items-center justify-start gap-10 mt-16">
-        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
-        <h1 class="text-3xl font-bold uppercase">listes des expéditions finie</h1>
+    <div class="flex items-center justify-start gap-10">
+        <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions finie</h1>
     </div>
 
     <div class="px-[86px]">
@@ -38,7 +38,7 @@
                         </div>
                     </template>
                 </div>
-                <div>Vide : {{ formatWeighing(shipment, 'tare') }} <br>  Plein :{{ formatWeighing(shipment, 'gross') }}</div>
+                <div>{{ formatWeighing(shipment) }}</div>
             </div>
         </div>
     </div>
@@ -51,12 +51,15 @@ import {getShipmentList} from "~/services/shipment";
 const shipmentList = ref<ShipmentData[]>()
 const router = useRouter()
 
-const formatWeighing = (shipment: ShipmentData, type: 'gross' | 'tare') => {
-    const entry = shipment.weights?.find((weight) => weight.type === type)
-    if (!entry || entry.weight == null || entry.dsd == null) {
+const formatWeighing = (shipment: ShipmentData) => {
+    const gross = shipment.weights?.find((weight) => weight.type === 'gross')?.weight
+    const tare = shipment.weights?.find((weight) => weight.type === 'tare')?.weight
+
+    if (gross == null || tare == null) {
         return '—'
     }
-    return `${entry.weight} kg`
+
+    return `${gross - tare} kg`
 }
 
 const formatBovinShipmentLines = (shipment: ShipmentData) => {
diff --git a/frontend/pages/shipment/waiting-shipment.vue b/frontend/pages/shipment/waiting-shipment.vue
index 26444d4..3274d4d 100644
--- a/frontend/pages/shipment/waiting-shipment.vue
+++ b/frontend/pages/shipment/waiting-shipment.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="flex items-center justify-between mt-16">
+    <div class="flex items-center justify-between">
         <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" class="cursor-pointer"/>
-            <h1 class="text-3xl font-bold uppercase">listes des expéditions en attente</h1>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions en attente</h1>
         </div>
     </div>
 
diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
index 4229a9e..6111269 100644
--- a/frontend/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -8,16 +8,7 @@ export default <Partial<Config>>{
       },
       colors: {
         primary: {
-          50: '#f6f9ea',
-          100: '#eaf2cf',
-          200: '#d6e3a4',
-          300: '#c1d47a',
-          400: '#afc85a',
-          500: '#9ebb43',
-          600: '#7e9735',
-          700: '#607228',
-          800: '#414d1a',
-          900: '#24290d'
+          500: '#456452',
         }
       }
     }
diff --git a/src/Command/SeedCommand.php b/src/Command/SeedCommand.php
index 2fe47df..d4e967c 100644
--- a/src/Command/SeedCommand.php
+++ b/src/Command/SeedCommand.php
@@ -251,8 +251,8 @@ class SeedCommand extends Command
     private function seedShipmentTypes(): void
     {
         $shipmentTypes = [
-            ['label' => 'Bovin de boucherie', 'code' => 'BDB'],
-            ['label' => "Bovin d'équarrissage", 'code' => 'BE'],
+            ['label' => 'Boucherie', 'code' => 'BDB'],
+            ['label' => 'Équarrissage', 'code' => 'BE'],
         ];
         foreach ($shipmentTypes as $type) {
             $this->upsertByCode(ShipmentType::class, $type['code'], static function (ShipmentType $entity) use ($type) {
@@ -540,10 +540,10 @@ class SeedCommand extends Command
                 'addresses' => [
                     [
                         'label'       => 'Les producteurs de la marche (LPM)',
-                        'street'      => 'Rue de Nexon',
+                        'street'      => 'Malonze',
                         'street2'     => null,
-                        'postalCode'  => '87000',
-                        'city'        => 'LIMOGES',
+                        'postalCode'  => '23300',
+                        'city'        => 'LA SOUTERRAINE',
                         'countryCode' => 'FR',
                     ],
                 ],
@@ -565,15 +565,15 @@ class SeedCommand extends Command
             ],
             [
                 'name'      => 'TERRENA',
-                'phone'     => '02.51.67.17.98',
-                'email'     => null,
+                'phone'     => '02.40.98.90.00',
+                'email'     => 'scouillaud@terrena.fr',
                 'addresses' => [
                     [
                         'label'       => 'TERRENA',
-                        'street'      => 'La Blanchardière',
-                        'street2'     => null,
-                        'postalCode'  => '44522',
-                        'city'        => 'MESANGER',
+                        'street'      => 'LA NOELLE',
+                        'street2'     => 'BP 20199',
+                        'postalCode'  => '44155',
+                        'city'        => 'ANCENIS CEDEX',
                         'countryCode' => 'FR',
                     ],
                 ],
diff --git a/src/DataFixtures/ReferenceFixtures.php b/src/DataFixtures/ReferenceFixtures.php
index 457be94..b8751e1 100644
--- a/src/DataFixtures/ReferenceFixtures.php
+++ b/src/DataFixtures/ReferenceFixtures.php
@@ -378,10 +378,10 @@ class ReferenceFixtures extends Fixture
                 'addresses' => [
                     [
                         'label'       => 'Les producteurs de la marche (LPM)',
-                        'street'      => 'Rue de Nexon',
+                        'street'      => 'Malonze',
                         'street2'     => null,
-                        'postalCode'  => '87000',
-                        'city'        => 'LIMOGES',
+                        'postalCode'  => '23300',
+                        'city'        => 'LA SOUTERRAINE',
                         'countryCode' => 'FR',
                     ],
                 ],
@@ -403,15 +403,15 @@ class ReferenceFixtures extends Fixture
             ],
             [
                 'name'      => 'TERRENA',
-                'phone'     => '02.51.67.17.98',
-                'email'     => null,
+                'phone'     => '02.40.98.90.00',
+                'email'     => 'scouillaud@terrena.fr',
                 'addresses' => [
                     [
                         'label'       => 'TERRENA',
-                        'street'      => 'La Blanchardière',
-                        'street2'     => null,
-                        'postalCode'  => '44522',
-                        'city'        => 'MESANGER',
+                        'street'      => 'LA NOELLE',
+                        'street2'     => 'BP 20199',
+                        'postalCode'  => '44155',
+                        'city'        => 'ANCENIS CEDEX',
                         'countryCode' => 'FR',
                     ],
                 ],