diff --git a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/order_details/order_details_header.dart b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/order_details/order_details_header.dart
index 0b8e8022..705323ff 100644
--- a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/order_details/order_details_header.dart
+++ b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/order_details/order_details_header.dart
@@ -58,7 +58,7 @@ class OrderDetailsHeader extends StatelessWidget {
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
-        spacing: UiConstants.space4,
+        spacing: UiConstants.space6,
         children: <Widget>[
           Row(
             crossAxisAlignment: CrossAxisAlignment.center,
@@ -68,7 +68,7 @@ class OrderDetailsHeader extends StatelessWidget {
                 width: _kIconContainerSize,
                 height: _kIconContainerSize,
                 decoration: BoxDecoration(
-                  color: UiColors.tagInProgress,
+                  color: UiColors.primary.withAlpha(20),
                   borderRadius: UiConstants.radiusLg,
                   border: Border.all(color: UiColors.primary, width: 0.5),
                 ),
@@ -86,13 +86,12 @@ class OrderDetailsHeader extends StatelessWidget {
                   children: <Widget>[
                     Text(
                       order.roleName,
-                      style: UiTypography.body1m.textPrimary,
+                      style: UiTypography.headline1b.textPrimary,
+                    ),
+                    Text(
+                      order.clientName,
+                      style: UiTypography.body1m.textSecondary,
                     ),
-                    if (order.clientName.isNotEmpty)
-                      Text(
-                        order.clientName,
-                        style: UiTypography.body3r.textSecondary,
-                      ),
                   ],
                 ),
               ),
diff --git a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/shift_details/shift_details_header.dart b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/shift_details/shift_details_header.dart
index a225243e..d20226a2 100644
--- a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/shift_details/shift_details_header.dart
+++ b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/shift_details/shift_details_header.dart
@@ -17,56 +17,34 @@ class ShiftDetailsHeader extends StatelessWidget {
   Widget build(BuildContext context) {
     return Padding(
       padding: const EdgeInsets.all(UiConstants.space5),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.center,
         spacing: UiConstants.space4,
         children: <Widget>[
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            spacing: UiConstants.space4,
-            children: <Widget>[
-              Container(
-                width: _kIconContainerSize,
-                height: _kIconContainerSize,
-                decoration: BoxDecoration(
-                  color: UiColors.primary.withAlpha(20),
-                  borderRadius: UiConstants.radiusLg,
-                  border: Border.all(color: UiColors.primary, width: 0.5),
-                ),
-                child: const Center(
-                  child: Icon(
-                    UiIcons.briefcase,
-                    color: UiColors.primary,
-                    size: 20,
-                  ),
-                ),
+          Container(
+            width: _kIconContainerSize,
+            height: _kIconContainerSize,
+            decoration: BoxDecoration(
+              color: UiColors.primary.withAlpha(20),
+              borderRadius: UiConstants.radiusLg,
+              border: Border.all(color: UiColors.primary, width: 0.5),
+            ),
+            child: const Center(
+              child: Icon(
+                UiIcons.briefcase,
+                color: UiColors.primary,
+                size: 20,
               ),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
-                    Text(detail.roleName, style: UiTypography.headline1b.textPrimary),
-                    Text(detail.clientName, style: UiTypography.body1m.textSecondary),
-                  ],
-                ),
-              ),
-            ],
+            ),
           ),
-          Row(
-            spacing: UiConstants.space1,
-            children: <Widget>[
-              const Icon(
-                UiIcons.mapPin,
-                size: 16,
-                color: UiColors.textSecondary,
-              ),
-              Expanded(
-                child: Text(
-                  detail.address ?? detail.location,
-                  style: UiTypography.body2r.textSecondary,
-                ),
-              ),
-            ],
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                Text(detail.roleName, style: UiTypography.headline1b.textPrimary),
+                Text(detail.clientName, style: UiTypography.body1m.textSecondary),
+              ],
+            ),
           ),
         ],
       ),