diff --git a/feature/home/src/commonMain/composeResources/values-ar/strings.xml b/feature/home/src/commonMain/composeResources/values-ar/strings.xml
index f190643ed7..03dc2d39e3 100644
--- a/feature/home/src/commonMain/composeResources/values-ar/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-ar/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">إلغاء</string>
     <string name="dialog_logout">هل أنت متأكد أنك تريد تسجيل الخروج؟</string>
 
-    <string name="feature_home_greet">مرحباً ‎%1$s،</string>
+    <string name="feature_home_greet">مرحباً، %1$s</string>
     <string name="feature_home_services">الخدمات</string>
     <string name="feature_home_saving_accounts">حسابات التوفير</string>
     <string name="feature_home_loan_accounts">حسابات القروض</string>
diff --git a/feature/home/src/commonMain/composeResources/values-bn/strings.xml b/feature/home/src/commonMain/composeResources/values-bn/strings.xml
index d7912688dd..926d2dff0e 100644
--- a/feature/home/src/commonMain/composeResources/values-bn/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-bn/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">বাতিল</string>
     <string name="dialog_logout">আপনি কি সত্যিই লগআউট করতে চান?</string>
 
-    <string name="feature_home_greet">হ্যালো %1$s,</string>
+    <string name="feature_home_greet">হ্যালো, %1$s</string>
     <string name="feature_home_services">সেবা</string>
     <string name="feature_home_saving_accounts">সঞ্চয় অ্যাকাউন্ট</string>
     <string name="feature_home_loan_accounts">ঋণ অ্যাকাউন্ট</string>
diff --git a/feature/home/src/commonMain/composeResources/values-es/strings.xml b/feature/home/src/commonMain/composeResources/values-es/strings.xml
index e0a594fbc4..2d8e5c9937 100644
--- a/feature/home/src/commonMain/composeResources/values-es/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-es/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">Cancelar</string>
     <string name="dialog_logout">¿Estás seguro de que quieres cerrar sesión?</string>
 
-    <string name="feature_home_greet">Hola %1$s,</string>
+    <string name="feature_home_greet">Hola, %1$s</string>
     <string name="feature_home_services">Servicios</string>
     <string name="feature_home_saving_accounts">Cuentas de ahorro</string>
     <string name="feature_home_loan_accounts">Cuentas de préstamo</string>
diff --git a/feature/home/src/commonMain/composeResources/values-fa/strings.xml b/feature/home/src/commonMain/composeResources/values-fa/strings.xml
index 2d9e81ece9..8f44cd7b2b 100644
--- a/feature/home/src/commonMain/composeResources/values-fa/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-fa/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">لغو</string>
     <string name="dialog_logout">آیا مطمئن هستید که می‌خواهید خارج شوید؟</string>
 
-    <string name="feature_home_greet">سلام %1$s،</string>
+    <string name="feature_home_greet">سلام، %1$s</string>
     <string name="feature_home_services">خدمات</string>
     <string name="feature_home_saving_accounts">حساب‌های پس‌انداز</string>
     <string name="feature_home_loan_accounts">حساب‌های وام</string>
diff --git a/feature/home/src/commonMain/composeResources/values-fr/strings.xml b/feature/home/src/commonMain/composeResources/values-fr/strings.xml
index 6587186150..5b5f9d2d6a 100644
--- a/feature/home/src/commonMain/composeResources/values-fr/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-fr/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">Annuler</string>
     <string name="dialog_logout">Êtes-vous sûr de vouloir vous déconnecter?</string>
 
-    <string name="feature_home_greet">Bonjour %1$s,</string>
+    <string name="feature_home_greet">Bonjour, %1$s</string>
     <string name="feature_home_services">Services</string>
     <string name="feature_home_saving_accounts">Comptes d'épargne</string>
     <string name="feature_home_loan_accounts">Comptes de prêt</string>
diff --git a/feature/home/src/commonMain/composeResources/values-hi/strings.xml b/feature/home/src/commonMain/composeResources/values-hi/strings.xml
index 2966867e22..073185fb4e 100644
--- a/feature/home/src/commonMain/composeResources/values-hi/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-hi/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">रद्द करें</string>
     <string name="dialog_logout">क्या आप वाकई लॉगआउट करना चाहते हैं?</string>
 
-    <string name="feature_home_greet">नमस्ते %1$s,</string>
+    <string name="feature_home_greet">नमस्ते, %1$s</string>
     <string name="feature_home_services">सेवाएँ</string>
     <string name="feature_home_saving_accounts">बचत खाते</string>
     <string name="feature_home_loan_accounts">ऋण खाते</string>
diff --git a/feature/home/src/commonMain/composeResources/values-id/strings.xml b/feature/home/src/commonMain/composeResources/values-id/strings.xml
index 57a936ac9a..f5c14ef3be 100644
--- a/feature/home/src/commonMain/composeResources/values-id/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-id/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">Batal</string>
     <string name="dialog_logout">Apakah Anda yakin ingin keluar?</string>
 
-    <string name="feature_home_greet">Halo %1$s,</string>
+    <string name="feature_home_greet">Halo, %1$s</string>
     <string name="feature_home_services">Layanan</string>
     <string name="feature_home_saving_accounts">Rekening Tabungan</string>
     <string name="feature_home_loan_accounts">Rekening Pinjaman</string>
diff --git a/feature/home/src/commonMain/composeResources/values-km/strings.xml b/feature/home/src/commonMain/composeResources/values-km/strings.xml
index 06e7fb6708..eeac97d8f2 100644
--- a/feature/home/src/commonMain/composeResources/values-km/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-km/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">បោះបង់</string>
     <string name="dialog_logout">តើអ្នកប្រាកដថាចង់ចេញពីប្រព័ន្ធមែនទេ?</string>
 
-    <string name="feature_home_greet">សួស្តី %1$s,</string>
+    <string name="feature_home_greet">សួស្តី, %1$s</string>
     <string name="feature_home_services">សេវាកម្ម</string>
     <string name="feature_home_saving_accounts">គណនីសន្សំ</string>
     <string name="feature_home_loan_accounts">គណនីប្រាក់កម្ចី</string>
diff --git a/feature/home/src/commonMain/composeResources/values-kn/strings.xml b/feature/home/src/commonMain/composeResources/values-kn/strings.xml
index 7c12c4a057..7b3fc37d7d 100644
--- a/feature/home/src/commonMain/composeResources/values-kn/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-kn/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">ರದ್ದುಮಾಡು</string>
     <string name="dialog_logout">ನೀವು ಲಾಗ್ ಔಟ್ ಮಾಡಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
 
-    <string name="feature_home_greet">ನಮಸ್ಕಾರ %1$s,</string>
+    <string name="feature_home_greet">ನಮಸ್ಕಾರ, %1$s</string>
     <string name="feature_home_services">ಸೇವೆಗಳು</string>
     <string name="feature_home_saving_accounts">ಉಳಿತಾಯ ಖಾತೆಗಳು</string>
     <string name="feature_home_loan_accounts">ಸಾಲ ಖಾತೆಗಳು</string>
diff --git a/feature/home/src/commonMain/composeResources/values-my/strings.xml b/feature/home/src/commonMain/composeResources/values-my/strings.xml
index 7352f0368d..6ea0eb5288 100644
--- a/feature/home/src/commonMain/composeResources/values-my/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-my/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">မလုပ်တော့ပါ</string>
     <string name="dialog_logout">ထွက်လိုသည်မှာ သေချာပါသလား?</string>
 
-    <string name="feature_home_greet">ဟယ်လို %1$s,</string>
+    <string name="feature_home_greet">ဟယ်လို, %1$s</string>
     <string name="feature_home_services">ဝန်ဆောင်မှုများ</string>
     <string name="feature_home_saving_accounts">စုဆောင်းငွေ အကောင့်များ</string>
     <string name="feature_home_loan_accounts">ချေးငွေ အကောင့်များ</string>
diff --git a/feature/home/src/commonMain/composeResources/values-pl/strings.xml b/feature/home/src/commonMain/composeResources/values-pl/strings.xml
index ffcc5caa8b..152f21dc7f 100644
--- a/feature/home/src/commonMain/composeResources/values-pl/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-pl/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">Anuluj</string>
     <string name="dialog_logout">Czy na pewno chcesz się wylogować?</string>
 
-    <string name="feature_home_greet">Witaj %1$s,</string>
+    <string name="feature_home_greet">Witaj, %1$s</string>
     <string name="feature_home_services">Usługi</string>
     <string name="feature_home_saving_accounts">Konta oszczędnościowe</string>
     <string name="feature_home_loan_accounts">Konta kredytowe</string>
diff --git a/feature/home/src/commonMain/composeResources/values-pt/strings.xml b/feature/home/src/commonMain/composeResources/values-pt/strings.xml
index ea4a8026fb..b504f6e454 100644
--- a/feature/home/src/commonMain/composeResources/values-pt/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-pt/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">Cancelar</string>
     <string name="dialog_logout">Tem certeza de que deseja sair?</string>
 
-    <string name="feature_home_greet">Olá %1$s,</string>
+    <string name="feature_home_greet">Olá, %1$s</string>
     <string name="feature_home_services">Serviços</string>
     <string name="feature_home_saving_accounts">Contas de Poupança</string>
     <string name="feature_home_loan_accounts">Contas de Empréstimo</string>
diff --git a/feature/home/src/commonMain/composeResources/values-ru/strings.xml b/feature/home/src/commonMain/composeResources/values-ru/strings.xml
index ae3caff5e6..0680f50720 100644
--- a/feature/home/src/commonMain/composeResources/values-ru/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-ru/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">Отмена</string>
     <string name="dialog_logout">Вы уверены, что хотите выйти?</string>
 
-    <string name="feature_home_greet">Здравствуйте, %1$s,</string>
+    <string name="feature_home_greet">Здравствуйте, %1$s</string>
     <string name="feature_home_services">Услуги</string>
     <string name="feature_home_saving_accounts">Сберегательные счета</string>
     <string name="feature_home_loan_accounts">Кредитные счета</string>
diff --git a/feature/home/src/commonMain/composeResources/values-sw/strings.xml b/feature/home/src/commonMain/composeResources/values-sw/strings.xml
index 4e36b57ea9..ec843bb458 100644
--- a/feature/home/src/commonMain/composeResources/values-sw/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-sw/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">Ghairi</string>
     <string name="dialog_logout">Una uhakika unataka kutoka?</string>
 
-    <string name="feature_home_greet">Habari %1$s,</string>
+    <string name="feature_home_greet">Habari, %1$s</string>
     <string name="feature_home_services">Huduma</string>
     <string name="feature_home_saving_accounts">Akaunti za Akiba</string>
     <string name="feature_home_loan_accounts">Akaunti za Mikopo</string>
diff --git a/feature/home/src/commonMain/composeResources/values-te/strings.xml b/feature/home/src/commonMain/composeResources/values-te/strings.xml
index 798a0bc18a..69989d5c18 100644
--- a/feature/home/src/commonMain/composeResources/values-te/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-te/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">రద్దు</string>
     <string name="dialog_logout">మీరు నిజంగా లాగౌట్ అవ్వాలనుకుంటున్నారా?</string>
 
-    <string name="feature_home_greet">హలో %1$s,</string>
+    <string name="feature_home_greet">హలో, %1$s</string>
     <string name="feature_home_services">సేవలు</string>
     <string name="feature_home_saving_accounts">పొదుపు ఖాతాలు</string>
     <string name="feature_home_loan_accounts">రుణ ఖాతాలు</string>
diff --git a/feature/home/src/commonMain/composeResources/values-ur/strings.xml b/feature/home/src/commonMain/composeResources/values-ur/strings.xml
index 5898bd3eab..c33debefd8 100644
--- a/feature/home/src/commonMain/composeResources/values-ur/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values-ur/strings.xml
@@ -41,7 +41,7 @@
     <string name="cancel">منسوخ کریں</string>
     <string name="dialog_logout">کیا آپ واقعی لاگ آؤٹ کرنا چاہتے ہیں؟</string>
 
-    <string name="feature_home_greet">السلام علیکم ‎%1$s،</string>
+    <string name="feature_home_greet">السلام علیکم، %1$s</string>
     <string name="feature_home_services">سروسز</string>
     <string name="feature_home_saving_accounts">بچت اکاؤنٹس</string>
     <string name="feature_home_loan_accounts">قرض اکاؤنٹس</string>
diff --git a/feature/home/src/commonMain/composeResources/values/strings.xml b/feature/home/src/commonMain/composeResources/values/strings.xml
index 2e0d653ef8..5826394bf0 100644
--- a/feature/home/src/commonMain/composeResources/values/strings.xml
+++ b/feature/home/src/commonMain/composeResources/values/strings.xml
@@ -43,7 +43,7 @@
     <string name="cancel">Cancel</string>
     <string name="dialog_logout">Are you sure you want to logout?</string>
 
-    <string name="feature_home_greet">Hello %1$s,</string>
+    <string name="feature_home_greet">Hello, %1$s</string>
     <string name="feature_home_services">Services</string>
     <string name="feature_home_saving_accounts">Savings Accounts</string>
     <string name="feature_home_loan_accounts">Loan Accounts</string>
diff --git a/feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt b/feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt
index a32810f8c4..67e930053c 100644
--- a/feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt
+++ b/feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.rememberScrollState
@@ -229,25 +230,54 @@ internal fun ServiceBox(
     onAction: (HomeAction) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    FlowRow(
-        modifier = modifier
-            .fillMaxWidth(),
-        maxItemsInEachRow = 4,
-        horizontalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
-        verticalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
+    Column(
+        modifier = modifier.fillMaxWidth(),
     ) {
-        items.forEach { item ->
-            Box(
+        FlowRow(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
+            verticalArrangement = Arrangement.spacedBy(DesignToken.spacing.large),
+            maxItemsInEachRow = 4,
+        ) {
+            items
+                .filter { it != ServiceItem.Beneficiary && it != ServiceItem.Faq }
+                .forEach { item ->
+                    ServiceItemCard(
+                        title = item.title,
+                        icon = item.icon,
+                        onClick = { onAction(HomeAction.OnNavigate(item.route)) },
+                        modifier = Modifier
+                            .width(72.dp)
+                            .wrapContentHeight(),
+                    )
+                }
+        }
+
+        Spacer(modifier = Modifier.height(DesignToken.spacing.large))
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(
+                DesignToken.spacing.medium,
+                Alignment.Start,
+            ),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            ServiceItemCard(
+                title = ServiceItem.Beneficiary.title,
+                icon = ServiceItem.Beneficiary.icon,
+                onClick = { onAction(HomeAction.OnNavigate(ServiceItem.Beneficiary.route)) },
                 modifier = Modifier
-                    .weight(1f),
-                contentAlignment = Alignment.Center,
-            ) {
-                ServiceItemCard(
-                    title = item.title,
-                    icon = item.icon,
-                    onClick = { onAction(HomeAction.OnNavigate(item.route)) },
-                )
-            }
+                    .width(72.dp),
+            )
+
+            ServiceItemCard(
+                title = ServiceItem.Faq.title,
+                icon = ServiceItem.Faq.icon,
+                onClick = { onAction(HomeAction.OnNavigate(ServiceItem.Faq.route)) },
+                modifier = Modifier.width(72.dp),
+            )
         }
     }
 }