diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
index a7fc9efbd..6e89f265f 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
@@ -360,7 +360,7 @@ const FleetResourcePage = () => {
               {config.subtitle}
             </Text>
           </div>
-          <Button leftSection={<Plus size={16} />} fw={500} onClick={() => {
+          <Button leftSection={<Plus size={16} />} styles={{ label: { fontWeight: 500 } }} onClick={() => {
             setEditing(null);
             setFormOpen(true);
           }}>
@@ -392,7 +392,7 @@ const FleetResourcePage = () => {
                               radius="md"
                               variant={filter.value === option.value ? "filled" : "outline"}
                               color="green"
-                              fw={500}
+                              styles={{ label: { fontWeight: 500 } }}
                               onClick={() => {
                                 setListFilterValues((prev) => ({
                                   ...prev,
@@ -419,7 +419,7 @@ const FleetResourcePage = () => {
                           radius="md"
                           variant={statusFilter === option.value ? "filled" : "outline"}
                           color="green"
-                          fw={500}
+                          styles={{ label: { fontWeight: 500 } }}
                           onClick={() => setStatusFilter(option.value)}
                         >
                           {option.label}
diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
index 9040c2322..c875d157e 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -717,11 +717,11 @@ const FirstMilePage = () => {
                 />
                 <Group gap="sm">
                   {selectedIds.length > 0 && (
-                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} fw={500}>
+                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} styles={{ label: { fontWeight: 500 } }}>
                       Assign vehicle ({selectedIds.length})
                     </Button>
                   )}
-                  <Button leftSection={<Truck size={16} />} onClick={openAccept} fw={500}>
+                  <Button leftSection={<Truck size={16} />} onClick={openAccept} styles={{ label: { fontWeight: 500 } }}>
                     Assign Mile
                   </Button>
                 </Group>
@@ -734,7 +734,7 @@ const FirstMilePage = () => {
                       key={option.value}
                       size="xs"
                       variant={active ? "filled" : "default"}
-                      fw={500}
+                      styles={{ label: { fontWeight: 500 } }}
                       onClick={() => {
                         setStatusFilter(option.value);
                         setPagination((p) => ({ ...p, pageIndex: 0 }));
diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
index 6f2661f35..f7807f90a 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
@@ -629,11 +629,11 @@ const LastMilePage = () => {
                 />
                 <Group gap="sm">
                   {selectedIds.length > 0 && (
-                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} fw={500}>
+                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} styles={{ label: { fontWeight: 500 } }}>
                       Assign vehicle ({selectedIds.length})
                     </Button>
                   )}
-                  <Button leftSection={<Truck size={16} />} onClick={() => openAssign(null)} fw={500}>
+                  <Button leftSection={<Truck size={16} />} onClick={() => openAssign(null)} styles={{ label: { fontWeight: 500 } }}>
                     Assign Mile
                   </Button>
                 </Group>
@@ -646,7 +646,7 @@ const LastMilePage = () => {
                       key={option.value}
                       size="xs"
                       variant={active ? "filled" : "default"}
-                      fw={500}
+                      styles={{ label: { fontWeight: 500 } }}
                       onClick={() => {
                         setStatusFilter(option.value);
                         setPagination((p) => ({ ...p, pageIndex: 0 }));