diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index 8a4a7038b..5789de63f 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:name=".MifosSelfServiceApp"
         android:allowBackup="true"
         android:icon="@mipmap/core_common_mifos_icon"
-        android:label="@string/app_name"
+        android:label="@string/feature_about_app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
@@ -36,7 +36,7 @@
         <activity
             android:name=".ui.activities.LoginActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
+            android:label="@string/feature_about_app_name"
             android:windowSoftInputMode="adjustResize" />
 
         <activity android:name="com.canhub.cropper.CropImageActivity"
diff --git a/androidApp/src/main/java/org/mifos/mobile/utils/StatusUtils.kt b/androidApp/src/main/java/org/mifos/mobile/utils/StatusUtils.kt
index 93581dd9c..41f2edb55 100644
--- a/androidApp/src/main/java/org/mifos/mobile/utils/StatusUtils.kt
+++ b/androidApp/src/main/java/org/mifos/mobile/utils/StatusUtils.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.core.content.ContextCompat
 import org.mifos.mobile.R
 import org.mifos.mobile.core.model.entity.CheckboxStatus
-import org.mifos.mobile.ui.getThemeAttributeColor
 
 /**
  * Created by dilpreet on 3/7/17.
@@ -15,53 +14,53 @@ object StatusUtils {
         val arrayList = ArrayList<CheckboxStatus>()
         arrayList.add(
             CheckboxStatus(
-                context?.getString(R.string.deposit),
+                context?.getString(R.string.feature_account_deposit),
                 ContextCompat
                     .getColor(context!!, R.color.deposit_green),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.dividend_payout),
+                context.getString(R.string.feature_account_dividend_payout),
                 ContextCompat
                     .getColor(context, R.color.red_light),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.withdrawal),
+                context.getString(R.string.feature_account_withdrawal),
                 ContextCompat
                     .getColor(context, R.color.red_light),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.interest_posting),
+                context.getString(R.string.feature_account_interest_posting),
                 ContextCompat.getColor(context, R.color.green_light),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.fee_deduction),
+                context.getString(R.string.feature_account_fee_deduction),
                 ContextCompat
                     .getColor(context, R.color.red_light),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.withdrawal_transfer),
+                context.getString(R.string.feature_account_withdrawal_transfer),
                 ContextCompat.getColor(context, R.color.red_light),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.rejected_transfer),
+                context.getString(R.string.feature_account_rejected_transfer),
                 ContextCompat.getColor(context, R.color.green_light),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.overdraft_fee),
+                context.getString(R.string.feature_account_overdraft_fee),
                 ContextCompat
                     .getColor(context, R.color.red_light),
             ),
diff --git a/androidApp/src/main/java/org/mifos/mobile/utils/fcm/MifosFirebaseMessagingService.kt b/androidApp/src/main/java/org/mifos/mobile/utils/fcm/MifosFirebaseMessagingService.kt
index 3f2ef6ad4..39523e0cc 100644
--- a/androidApp/src/main/java/org/mifos/mobile/utils/fcm/MifosFirebaseMessagingService.kt
+++ b/androidApp/src/main/java/org/mifos/mobile/utils/fcm/MifosFirebaseMessagingService.kt
@@ -62,7 +62,7 @@ class MifosFirebaseMessagingService : FirebaseMessagingService() {
         val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
         val notificationBuilder = NotificationCompat.Builder(this)
             .setSmallIcon(R.mipmap.core_common_mifos_icon)
-            .setContentTitle(getString(R.string.app_name))
+            .setContentTitle(getString(R.string.feature_about_app_name))
             .setContentText(message)
             .setAutoCancel(true)
             .setSound(defaultSoundUri)
diff --git a/androidApp/src/main/res/drawable/ic_wrapped_lock_black_24dp.xml b/androidApp/src/main/res/drawable/ic_wrapped_lock_black_24dp.xml
index d2a2d1913..f0b49c99e 100644
--- a/androidApp/src/main/res/drawable/ic_wrapped_lock_black_24dp.xml
+++ b/androidApp/src/main/res/drawable/ic_wrapped_lock_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_lock_black_24dp" />
+    <item android:drawable="@drawable/feature_auth_lock" />
 </layer-list>
\ No newline at end of file
diff --git a/androidApp/src/main/res/drawable/ic_wrapped_person_black_24dp.xml b/androidApp/src/main/res/drawable/ic_wrapped_person_black_24dp.xml
index fde1e3a50..0b1822d0a 100644
--- a/androidApp/src/main/res/drawable/ic_wrapped_person_black_24dp.xml
+++ b/androidApp/src/main/res/drawable/ic_wrapped_person_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_person_black_24dp" />
+    <item android:drawable="@drawable/feature_auth_ic_person" />
 </layer-list>
\ No newline at end of file
diff --git a/androidApp/src/main/res/layout/activity_login.xml b/androidApp/src/main/res/layout/activity_login.xml
index 11d86841a..6d2c55418 100644
--- a/androidApp/src/main/res/layout/activity_login.xml
+++ b/androidApp/src/main/res/layout/activity_login.xml
@@ -19,13 +19,13 @@
             android:layout_height="@dimen/Mifos.DesignSystem.Size.LogoImageSize"
             android:layout_gravity="center_horizontal"
             android:layout_marginVertical="@dimen/Mifos.DesignSystem.Size.LogoImageVerticalMargin"
-            app:srcCompat="@drawable/mifos_logo" />
+            app:srcCompat="@drawable/feature_auth_mifos_logo" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/til_username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:startIconDrawable="@drawable/ic_person_black_24dp">
+            app:startIconDrawable="@drawable/feature_auth_ic_person">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/et_username"
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"
             app:passwordToggleEnabled="true"
-            app:startIconDrawable="@drawable/ic_lock_black_24dp">
+            app:startIconDrawable="@drawable/feature_auth_lock">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/et_password"
diff --git a/androidApp/src/main/res/layout/fragment_home_old.xml b/androidApp/src/main/res/layout/fragment_home_old.xml
index fa4664f36..5cde0d1e9 100644
--- a/androidApp/src/main/res/layout/fragment_home_old.xml
+++ b/androidApp/src/main/res/layout/fragment_home_old.xml
@@ -35,7 +35,7 @@
                     app:border="true"
                     app:border_width="1dp"
                     app:shapeAppearance="@dimen/Mifos.DesignSystem.Size.CircularUserImageSize"
-                    tools:src="@drawable/ic_person_black_24dp" />
+                    tools:src="@drawable/feature_auth_ic_person" />
 
                 <TextView
                     android:id="@+id/tv_user_name"
diff --git a/androidApp/src/main/res/layout/fragment_home_ui.xml b/androidApp/src/main/res/layout/fragment_home_ui.xml
index 23e547d0a..50002a55b 100644
--- a/androidApp/src/main/res/layout/fragment_home_ui.xml
+++ b/androidApp/src/main/res/layout/fragment_home_ui.xml
@@ -40,7 +40,7 @@
                         android:background="?selectableItemBackgroundBorderless"
                         android:clickable="true"
                         android:visibility="visible"
-                        app:srcCompat="@drawable/ic_person_black_24dp" />
+                        app:srcCompat="@drawable/feature_auth_ic_person" />
 
                     <com.google.android.material.imageview.ShapeableImageView
                         android:id="@+id/iv_circular_user_image"
@@ -52,7 +52,7 @@
                         android:clickable="true"
                         android:visibility="gone"
                         app:shapeAppearance="@style/Mifos.DesignSystem.Shape.roundedImage"
-                        tools:src="@drawable/ic_person_black_24dp" />
+                        tools:src="@drawable/feature_auth_ic_person" />
 
                     <TextView
                         android:id="@+id/tv_user_name"
diff --git a/androidApp/src/main/res/layout/fragment_saving_account_details.xml b/androidApp/src/main/res/layout/fragment_saving_account_details.xml
index 1ddd8769d..9e76469db 100644
--- a/androidApp/src/main/res/layout/fragment_saving_account_details.xml
+++ b/androidApp/src/main/res/layout/fragment_saving_account_details.xml
@@ -157,7 +157,7 @@
                             style="@style/Mifos.DesignSystem.Components.Button.Outline"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/deposit" />
+                            android:text="@string/feature_account_deposit" />
 
                         <Button
                             android:id="@+id/tv_make_a_transfer"
diff --git a/androidApp/src/main/res/layout/fragment_savings_make_transfer.xml b/androidApp/src/main/res/layout/fragment_savings_make_transfer.xml
index ea251f11e..d8f55c633 100644
--- a/androidApp/src/main/res/layout/fragment_savings_make_transfer.xml
+++ b/androidApp/src/main/res/layout/fragment_savings_make_transfer.xml
@@ -273,7 +273,7 @@
                             style="@style/Mifos.DesignSystem.Components.Button.Outline"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/cancel" />
+                            android:text="@string/feature_account_cancel" />
 
                     </LinearLayout>
 
diff --git a/androidApp/src/main/res/layout/fragment_third_party_transfer.xml b/androidApp/src/main/res/layout/fragment_third_party_transfer.xml
index 6e918acba..411f92920 100644
--- a/androidApp/src/main/res/layout/fragment_third_party_transfer.xml
+++ b/androidApp/src/main/res/layout/fragment_third_party_transfer.xml
@@ -311,7 +311,7 @@
                             android:layout_marginTop="@dimen/margin_10dp"
                             android:layout_marginBottom="@dimen/margin_16dp"
                             android:layout_weight="0.5"
-                            android:text="@string/cancel"
+                            android:text="@string/feature_account_cancel"
                             android:textColor="?attr/colorPrimary"
                             app:backgroundTint="@color/white" />
 
diff --git a/androidApp/src/main/res/layout/fragment_transfer_process.xml b/androidApp/src/main/res/layout/fragment_transfer_process.xml
index 405c776e1..912e5f323 100644
--- a/androidApp/src/main/res/layout/fragment_transfer_process.xml
+++ b/androidApp/src/main/res/layout/fragment_transfer_process.xml
@@ -143,7 +143,7 @@
                         style="@style/Widget.AppCompat.Button.Borderless"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/cancel"
+                        android:text="@string/feature_account_cancel"
                         android:textColor="?attr/colorPrimary" />
 
                     <Button
diff --git a/androidApp/src/main/res/layout/nav_drawer_header.xml b/androidApp/src/main/res/layout/nav_drawer_header.xml
index b6397e78c..ff081ec1f 100644
--- a/androidApp/src/main/res/layout/nav_drawer_header.xml
+++ b/androidApp/src/main/res/layout/nav_drawer_header.xml
@@ -15,7 +15,7 @@
         android:layout_height="@dimen/Mifos.DesignSystem.Size.BigView"
         app:shapeAppearance="@style/Mifos.DesignSystem.Shape.roundedImage"
         tools:background="?attr/colorTertiary"
-        tools:srcCompat="@drawable/ic_person_black_24dp" />
+        tools:srcCompat="@drawable/feature_auth_ic_person" />
 
     <TextView
         android:id="@+id/tv_user_name"
diff --git a/androidApp/src/main/res/layout/preference_configuration.xml b/androidApp/src/main/res/layout/preference_configuration.xml
index f5b25a0c6..31b696303 100644
--- a/androidApp/src/main/res/layout/preference_configuration.xml
+++ b/androidApp/src/main/res/layout/preference_configuration.xml
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"
         app:hintAnimationEnabled="false"
-        app:startIconDrawable="@drawable/ic_lock_black_24dp">
+        app:startIconDrawable="@drawable/feature_auth_lock">
 
         <EditText
             android:id="@+id/et_tenant"
diff --git a/androidApp/src/main/res/layout/row_share_account.xml b/androidApp/src/main/res/layout/row_share_account.xml
index 16e693aad..0fb401bb9 100644
--- a/androidApp/src/main/res/layout/row_share_account.xml
+++ b/androidApp/src/main/res/layout/row_share_account.xml
@@ -62,7 +62,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/Mifos.DesignSystem.Spacing.marginWords"
-                android:text="@string/approved" />
+                android:text="@string/feature_account_approved" />
 
             <TextView
                 android:id="@+id/tv_shares_approved"
diff --git a/androidApp/src/main/res/menu/menu_account.xml b/androidApp/src/main/res/menu/menu_account.xml
index ff73e0d7c..598be7372 100644
--- a/androidApp/src/main/res/menu/menu_account.xml
+++ b/androidApp/src/main/res/menu/menu_account.xml
@@ -26,19 +26,19 @@
     <item
         android:id="@+id/menu_filter_savings"
         android:icon="@drawable/ic_baseline_filter_list_24"
-        android:title="@string/savings_account"
+        android:title="@string/feature_account_savings_account"
         android:visible="false"
         app:showAsAction="always" />
     <item
         android:id="@+id/menu_filter_loan"
         android:icon="@drawable/ic_baseline_filter_list_24"
-        android:title="@string/loan_account"
+        android:title="@string/feature_account_loan_account"
         android:visible="false"
         app:showAsAction="always" />
     <item
         android:id="@+id/menu_filter_shares"
         android:icon="@drawable/ic_baseline_filter_list_24"
-        android:title="@string/share_account"
+        android:title="@string/feature_account_share_account"
         android:visible="false"
         app:showAsAction="always" />
 
diff --git a/androidApp/src/main/res/menu/menu_nav_drawer.xml b/androidApp/src/main/res/menu/menu_nav_drawer.xml
index 59f118c2a..656120b96 100644
--- a/androidApp/src/main/res/menu/menu_nav_drawer.xml
+++ b/androidApp/src/main/res/menu/menu_nav_drawer.xml
@@ -49,7 +49,7 @@
         <item
             android:id="@+id/item_about_us"
             android:icon="@drawable/ic_about_us_black_24dp"
-            android:title="@string/about_us" />
+            android:title="@string/feature_about_about_us" />
         <item
             android:id="@+id/item_help"
             android:icon="@drawable/ic_help_black_24dp"
@@ -57,7 +57,7 @@
         <item
             android:id="@+id/item_share"
             android:icon="@drawable/ic_share_black_24dp"
-            android:title="@string/share" />
+            android:title="@string/feature_account_share" />
         <item
             android:id="@+id/item_app_info"
             android:icon="@drawable/ic_info_black_24dp"
diff --git a/androidApp/src/main/res/values-ar/strings.xml b/androidApp/src/main/res/values-ar/strings.xml
index 97439d3c1..93860afdc 100644
--- a/androidApp/src/main/res/values-ar/strings.xml
+++ b/androidApp/src/main/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">ميفوس موبايل</string>
+    <string name="feature_about_app_name">ميفوس موبايل</string>
     <string name="login">تسجيل الدخول</string>
     <string name="toast_welcome">%1$s أهلا بك</string>
     <string name="unable_to_connect">غير متصل بالإنترنت</string>
@@ -16,9 +16,9 @@
     <string name="recent_transactions">التحويلات الاخيرة</string>
     <string name="charges">شحنة</string>
     <string name="questionnaire">استطلاع</string>
-    <string name="about_us">معلومات عنا</string>
+    <string name="feature_about_about_us">معلومات عنا</string>
     <string name="saving_account_details">حفظ تفاصيل الحساب</string>
-    <string name="savings_account">حساب التوفير</string>
+    <string name="feature_account_savings_account">حساب التوفير</string>
     <string name="error_loan_account_details_loading">خطأ في تحميل تفاصيل حسابات القروض</string>
     <string name="nominal_interest_rate">معدل الفائدة الاسمي</string>
     <string name="account_number">رقم حساب</string>
@@ -31,11 +31,11 @@
     <string name="small_text">نص صغير</string>
     <string name="client_accounts">حسابات العملاء</string>
     <string name="splash">دفقة</string>
-    <string name="savings">إنقاذ</string>
-    <string name="loan">قرض</string>
-    <string name="loan_account">حساب القرض</string>
-    <string name="share">شارك</string>
-    <string name="share_account">حصة الحساب</string>
+    <string name="feature_account_savings">إنقاذ</string>
+    <string name="feature_account_loan">قرض</string>
+    <string name="feature_account_loan_account">حساب القرض</string>
+    <string name="feature_account_share">شارك</string>
+    <string name="feature_account_share_account">حصة الحساب</string>
     <string name="clients_list">شيء العميل</string>
     <string name="core_common_working">العمل</string>
     <string name="status_image">صورة الحالة</string>
@@ -50,8 +50,8 @@
     <string name="remark">تعليق</string>
     <string name="expected_disbursement_date">تاريخ الصرف المتوقع</string>
     <string name="submission_date">تاريخ التقديم</string>
-    <string name="submitted">قدمت</string>
-    <string name="disbursement">إنفاق</string>
+    <string name="feature_account_submitted">قدمت</string>
+    <string name="feature_account_disbursement">إنفاق</string>
     <string name="transfer_date">تاريخ التحويل</string>
     <string name="apply_for_loan">التقدم بطلب للحصول على قرض</string>
     <string name="update_loan">تحديث القرض</string>
@@ -67,23 +67,23 @@
     <string name="repayment_strategy">استراتيجية السداد</string>
     <string name="pay_to">دفع إلى</string>
     <string name="pay_from">ادفع من</string>
-    <string name="cancel">إلغاء</string>
+    <string name="feature_account_cancel">إلغاء</string>
     <string name="review_transfer">إعادة النظر</string>
     <string name="transfer_to">حول إلى</string>
     <string name="transfer_from">تحويل من</string>
     <string name="making_transfer">جعل النقل</string>
-    <string name="deposit">الوديعة</string>
+    <string name="feature_account_deposit">الوديعة</string>
     <string name="enter_amount">أدخل المبلغ</string>
     <string name="remark_is_mandatory">ملاحظة إلزامية</string>
-    <string name="approved">وافق</string>
+    <string name="feature_account_approved">وافق</string>
     <string name="shares_pending">قيد الانتظار</string>
     <string name="loan_amount_paid">دفع</string>
     <string name="balance">توازن</string>
     <string name="rejected">مرفوض</string>
     <string name="waiting">انتظار</string>
-    <string name="overpaid">زائدة</string>
-    <string name="in_arrears">في المتأخرات</string>
-    <string name="select_you_want">حدد كل ما تريد تطبيقه</string>
+    <string name="feature_account_overpaid">زائدة</string>
+    <string name="feature_account_in_arrears">في المتأخرات</string>
+    <string name="feature_account_select_you_want">حدد كل ما تريد تطبيقه</string>
     <string name="filter_savings">تصفية حسابات التوفير</string>
     <string name="filter_loan">تصفية حسابات القروض</string>
     <string name="filter_share">تصفية حصة الحسابات</string>
@@ -99,12 +99,12 @@
     <string name="transfer_from_savings">نقل من الادخار</string>
     <string name="loan_charges">رسوم القرض</string>
     <string name="savings_charges">رسوم الادخار</string>
-    <string name="active">نشيط</string>
-    <string name="closed">مغلق</string>
-    <string name="withdrawn">سحب</string>
+    <string name="feature_account_active">نشيط</string>
+    <string name="feature_account_closed">مغلق</string>
+    <string name="feature_account_withdrawn">سحب</string>
     <string name="need_approval">تحتاج الى موافقة</string>
-    <string name="pending">قيد الانتظار</string>
-    <string name="matured">نضجت</string>
+    <string name="feature_account_pending">قيد الانتظار</string>
+    <string name="feature_account_matured">نضجت</string>
     <string name="create_an_account">انشئ حساب</string>
     <string name="first_name">الاسم الاول</string>
     <string name="last_name">الكنية</string>
@@ -135,9 +135,9 @@
     <string name="account_not_active_to_perform_deposit">يجب أن يكون الحساب نشطًا لتنفيذ الوديعة</string>
     <string name="account_not_active_to_perform_transfer">يجب أن يكون الحساب نشطًا لتنفيذ نقل</string>
 
-    <string name="empty_savings_accounts">لا يوجد حساب SavingsAccount مرتبط بك</string>
-    <string name="empty_loan_accounts">لا يوجد LoanAccount مرتبط بك</string>
-    <string name="empty_share_accounts">لا يوجد ShareAccount مرتبط بك</string>
+    <string name="feature_account_empty_savings_accounts">لا يوجد حساب SavingsAccount مرتبط بك</string>
+    <string name="feature_account_empty_loan_accounts">لا يوجد LoanAccount مرتبط بك</string>
+    <string name="feature_account_empty_share_accounts">لا يوجد ShareAccount مرتبط بك</string>
     <string name="empty_transactions">لا توجد معاملات مرتبطة بك</string>
     <string name="empty_repayment_schedule">لا يوجد جدول سداد مرتبط بك</string>
     <string name="no_more_transactions_available">لا مزيد من المعاملات المتاحة</string>
@@ -230,8 +230,8 @@
     <string name="repayment_schedule">جدول الدفع</string>
     <string name="transactions">المعاملات</string>
     <string name="transfer">نقل</string>
-    <string name="approval_pending">في انتظار الموافقة</string>
-    <string name="waiting_for_disburse">في انتظار الصرف</string>
+    <string name="feature_account_approval_pending">في انتظار الموافقة</string>
+    <string name="feature_account_disburse">في انتظار الصرف</string>
     <string name="closed_because_of_obligation">مغلقة بسبب بعض الالتزامات</string>
     <string name="loan_closed">القرض مغلق</string>
     <string name="due_date_in_charges">تاريخ الاستحقاق:</string>
@@ -255,7 +255,7 @@
     <string name="four_weeks">4 أسابيع</string>
     <string name="three_months">3 اشهر</string>
     <string name="six_months">6 اشهر</string>
-    <string name="filter">منقي</string>
+    <string name="feature_account_filter">منقي</string>
     <string name="start_date">تاريخ البدء</string>
     <string name="end_date">تاريخ الانتهاء</string>
     <string name="filtered">مصفى</string>
@@ -368,7 +368,7 @@
     <string name="hello_client">%1$s ،مرحبا</string>
     <string name="double_amount">%1$.2f</string>
     <string name="double_and_string">%2$s %1$.2f</string>
-    <string name="string_and_string">%2$s %1$s</string>
+    <string name="feature_account_string_and_string">%2$s %1$s</string>
     <string name="string_and_double">%2$.2f %1$s</string>
     <string name="string_and_int">%2$d :%1$s</string>
     <string name="invalid_amount">مبلغ غير صحيح</string>
@@ -392,7 +392,7 @@
     <string name="leave_email">اترك بريدًا إلكترونيًا</string>
     <string name="find_locations">البحث عن المواقع</string>
     <string name="no_withdrawals">لا انسحابات</string>
-    <string name="clear_filters">مسح مرشحات</string>
+    <string name="feature_account_clear_filters">مسح مرشحات</string>
     <string name="manage_accounts">إدارة الحسابات</string>
     <string name="more">أكثر من</string>
     <string name="settings">الإعدادات</string>
@@ -429,9 +429,9 @@
     <string name="confirm_password">تأكيد كلمة المرور</string>
     <string name="error_password_not_match">كلمة السر غير متطابقة.</string>
     <string name="app_version">%1$s الإصدار</string>
-    <string name="copy_right_mifos">©2016-%1$s Mifos Initiative.</string>
+    <string name="feature_about_copyright_mifos">©2016-%1$s Mifos Initiative.</string>
     <string name="all_rights_reserved">كل الحقوق محفوظة.</string>
-    <string name="licenses">تراخيص</string>
+    <string name="feature_about_licenses">تراخيص</string>
     <string name="transfer_error">يتعذر إكمال النقل ، يرجى المحاولة مرة أخرى في وقت لاحق</string>
     <string name="please_wait">ارجوك انتظر…</string>
     <string name="message">رسالة</string>
diff --git a/androidApp/src/main/res/values-bn/strings.xml b/androidApp/src/main/res/values-bn/strings.xml
index 0983e9c61..267a97235 100644
--- a/androidApp/src/main/res/values-bn/strings.xml
+++ b/androidApp/src/main/res/values-bn/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">সাম্প্রতিক লেনদেন</string>
     <string name="charges">ফি</string>
     <string name="questionnaire">প্রশ্নাবলী</string>
-    <string name="about_us">আমাদের সম্পর্কে</string>
+    <string name="feature_about_about_us">আমাদের সম্পর্কে</string>
     <string name="saving_account_details">অ্যাকাউন্ট বিবরণ সংরক্ষণ করা হচ্ছে</string>
-    <string name="savings_account">সঞ্চয় অ্যাকাউন্ট</string>
+    <string name="feature_account_savings_account">সঞ্চয় অ্যাকাউন্ট</string>
     <string name="error_loan_account_details_loading">ক্রেডিট অ্যাকাউন্ট তথ্য লোড করার সময় ত্রুটি</string>
     <string name="nominal_interest_rate">নামমাত্র সুদের হার</string>
     <string name="account_number">অ্যাকাউন্ট নম্বর</string>
@@ -29,11 +29,11 @@
     <string name="small_text">ছোট টেক্সট</string>
     <string name="client_accounts">গ্রাহক অ্যাকাউন্ট</string>
     <string name="splash">স্বাগতম পর্দা</string>
-    <string name="savings">সঞ্চয়</string>
-    <string name="loan">ঋণ</string>
-    <string name="loan_account">ক্রেডিট অ্যাকাউন্ট</string>
-    <string name="share">শেয়ার</string>
-    <string name="share_account">আপনার অ্যাকাউন্ট শেয়ার করুন</string>
+    <string name="feature_account_savings">সঞ্চয়</string>
+    <string name="feature_account_loan">ঋণ</string>
+    <string name="feature_account_loan_account">ক্রেডিট অ্যাকাউন্ট</string>
+    <string name="feature_account_share">শেয়ার</string>
+    <string name="feature_account_share_account">আপনার অ্যাকাউন্ট শেয়ার করুন</string>
     <string name="clients_list">একটি গ্রাহক চয়ন করুন</string>
     <string name="core_common_working">কাজ</string>
     <string name="status_image">রাষ্ট্রের ছবি</string>
@@ -48,8 +48,8 @@
     <string name="remark">সতর্কতা</string>
     <string name="expected_disbursement_date">প্রত্যাশিত বেতন তারিখ</string>
     <string name="submission_date">জমা দেওয়ার জন্য নির্দিষ্ট সময়সীমা</string>
-    <string name="submitted">আপলোড</string>
-    <string name="disbursement">ব্যয়</string>
+    <string name="feature_account_submitted">আপলোড</string>
+    <string name="feature_account_disbursement">ব্যয়</string>
     <string name="transfer_date">স্থানান্তর তারিখ</string>
     <string name="apply_for_loan">একটি ঋণ জন্য আবেদন করুন</string>
     <string name="update_loan">ঋণ আপডেট করুন</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">ঋণ পরিশোধের কৌশল</string>
     <string name="pay_to">পেমেন্ট</string>
     <string name="pay_from">থেকে পেমেন্ট</string>
-    <string name="cancel">বাতিল</string>
+    <string name="feature_account_cancel">বাতিল</string>
     <string name="review_transfer">পূর্বরূপ</string>
     <string name="transfer_to">স্থানান্তর</string>
     <string name="transfer_from">থেকে স্থানান্তর</string>
     <string name="making_transfer">একটি স্থানান্তর করা</string>
-    <string name="deposit">আমানত</string>
+    <string name="feature_account_deposit">আমানত</string>
     <string name="enter_amount">পরিমাণ লিখুন</string>
     <string name="remark_is_mandatory">নোট বাধ্যতামূলক</string>
-    <string name="approved">অনুমোদিত</string>
+    <string name="feature_account_approved">অনুমোদিত</string>
     <string name="shares_pending">প্রত্যাশা</string>
     <string name="loan_amount_paid">অর্থ প্রদান</string>
     <string name="balance">ভারসাম্য</string>
     <string name="rejected">প্রত্যাখ্যাত</string>
     <string name="waiting">প্রতীক্ষা</string>
-    <string name="overpaid">অতিরিক্ত</string>
-    <string name="in_arrears">বকেয়া</string>
-    <string name="select_you_want">আপনি আবেদন করতে চান সবকিছু চয়ন করুন</string>
+    <string name="feature_account_overpaid">অতিরিক্ত</string>
+    <string name="feature_account_in_arrears">বকেয়া</string>
+    <string name="feature_account_select_you_want">আপনি আবেদন করতে চান সবকিছু চয়ন করুন</string>
     <string name="filter_savings">ফিল্টার সঞ্চয় অ্যাকাউন্ট</string>
     <string name="filter_loan">ফিল্টার ক্রেডিট অ্যাকাউন্ট</string>
     <string name="filter_share">ফিল্টার অ্যাকাউন্ট শেয়ারিং</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">সঞ্চয় থেকে স্থানান্তর</string>
     <string name="loan_charges">ঋণের জন্য ফি</string>
     <string name="savings_charges">জমা</string>
-    <string name="active">সক্রিয়</string>
-    <string name="closed">বন্ধ</string>
-    <string name="withdrawn">অপসারিত</string>
+    <string name="feature_account_active">সক্রিয়</string>
+    <string name="feature_account_closed">বন্ধ</string>
+    <string name="feature_account_withdrawn">অপসারিত</string>
     <string name="need_approval">অনুমোদন প্রয়োজন</string>
-    <string name="pending">প্রত্যাশা</string>
-    <string name="matured">পরিণত</string>
+    <string name="feature_account_pending">প্রত্যাশা</string>
+    <string name="feature_account_matured">পরিণত</string>
     <string name="create_an_account">একটি অ্যাকাউন্ট তৈরি করুন</string>
     <string name="first_name">নাম</string>
     <string name="last_name">নাম</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">অ্যাকাউন্ট একটি আমানত করতে সক্রিয় করা উচিত</string>
     <string name="account_not_active_to_perform_transfer">অ্যাকাউন্ট একটি স্থানান্তর করতে সক্রিয় করা উচিত</string>
 
-    <string name="empty_savings_accounts">আপনার সাথে সংযুক্ত কোন সঞ্চয় অ্যাকাউন্ট আছে</string>
-    <string name="empty_loan_accounts">আপনার সাথে যুক্ত কোন ঋণ অ্যাকাউন্ট আছে</string>
-    <string name="empty_share_accounts">আপনার সাথে যুক্ত কোন ভাগ অ্যাকাউন্ট আছে</string>
+    <string name="feature_account_empty_savings_accounts">আপনার সাথে সংযুক্ত কোন সঞ্চয় অ্যাকাউন্ট আছে</string>
+    <string name="feature_account_empty_loan_accounts">আপনার সাথে যুক্ত কোন ঋণ অ্যাকাউন্ট আছে</string>
+    <string name="feature_account_empty_share_accounts">আপনার সাথে যুক্ত কোন ভাগ অ্যাকাউন্ট আছে</string>
     <string name="empty_transactions">আপনার সাথে কোন লেনদেন আছে</string>
     <string name="empty_repayment_schedule">আপনার সাথে যুক্ত কোন পরিশোধের সময়সূচী নেই</string>
     <string name="no_more_transactions_available">কোন লেনদেন উপলব্ধ নেই</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">পরিশোধের সময়সূচী</string>
     <string name="transactions">লেনদেন</string>
     <string name="transfer">হস্তান্তর</string>
-    <string name="approval_pending">অগ্রগতি অনুমোদন</string>
-    <string name="waiting_for_disburse">পেমেন্ট জন্য অপেক্ষা করছে</string>
+    <string name="feature_account_approval_pending">অগ্রগতি অনুমোদন</string>
+    <string name="feature_account_disburse">পেমেন্ট জন্য অপেক্ষা করছে</string>
     <string name="closed_because_of_obligation">কিছু বাধ্যবাধকতা কারণে বন্ধ</string>
     <string name="loan_closed">ঋণ বন্ধ</string>
     <string name="due_date_in_charges">তারিখ অনুসারে:</string>
@@ -247,7 +247,7 @@
     <string name="four_weeks">৪ সপ্তাহ</string>
     <string name="three_months">৩ মাস</string>
     <string name="six_months">৬ মাস</string>
-    <string name="filter">ফিল্টার</string>
+    <string name="feature_account_filter">ফিল্টার</string>
     <string name="start_date">শুরু তারিখ</string>
     <string name="end_date">সমাপ্তির তারিখ</string>
     <string name="filtered">ফিল্টার</string>
@@ -368,7 +368,7 @@
     <string name="leave_email">একটি ইমেইল বার্তা ছেড়ে দিন</string>
     <string name="find_locations">অবস্থান খুঁজুন</string>
     <string name="no_withdrawals">কোন পেমেন্ট</string>
-    <string name="clear_filters">ফিল্টার সাফ করুন</string>
+    <string name="feature_account_clear_filters">ফিল্টার সাফ করুন</string>
     <string name="manage_accounts">অ্যাকাউন্ট পরিচালনা করুন</string>
     <string name="more">অধিক</string>
     <string name="settings">সেটিংস</string>
@@ -406,7 +406,7 @@
     <string name="error_password_not_match">পাসওয়ার্ড মেলে না।</string>
     <string name="app_version">সংস্করণ %1$s</string>
     <string name="all_rights_reserved">সমস্ত অধিকার সংরক্ষিত।</string>
-    <string name="licenses">লাইসেন্সকরণ</string>
+    <string name="feature_about_licenses">লাইসেন্সকরণ</string>
     <string name="transfer_error">একটি স্থানান্তর করতে পারবেন না, পরে আবার চেষ্টা করুন</string>
     <string name="please_wait">অনুগ্রহ করে অপেক্ষা করুন …</string>
     <string name="message">বার্তা</string>
diff --git a/androidApp/src/main/res/values-es/strings.xml b/androidApp/src/main/res/values-es/strings.xml
index 0a0da8e94..708639a7e 100644
--- a/androidApp/src/main/res/values-es/strings.xml
+++ b/androidApp/src/main/res/values-es/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">Transacciones recientes</string>
     <string name="charges">Honorarios</string>
     <string name="questionnaire">Cuestionario</string>
-    <string name="about_us">Sobre nosotros</string>
+    <string name="feature_about_about_us">Sobre nosotros</string>
     <string name="saving_account_details">Guardar detalles de la cuenta</string>
-    <string name="savings_account">Cuenta de ahorros</string>
+    <string name="feature_account_savings_account">Cuenta de ahorros</string>
     <string name="error_loan_account_details_loading">Error al cargar la información de la cuenta de crédito</string>
     <string name="nominal_interest_rate">Tasas de interés nominales</string>
     <string name="account_number">Numero de cuenta</string>
@@ -29,11 +29,11 @@
     <string name="small_text">Texto pequeño</string>
     <string name="client_accounts">Cuentas de clientes</string>
     <string name="splash">Pantalla de bienvenida</string>
-    <string name="savings">Ahorro</string>
-    <string name="loan">Préstamo</string>
-    <string name="loan_account">Cuenta de credito</string>
-    <string name="share">Cuota</string>
-    <string name="share_account">Comparte tu cuenta</string>
+    <string name="feature_account_savings">Ahorro</string>
+    <string name="feature_account_loan">Préstamo</string>
+    <string name="feature_account_loan_account">Cuenta de credito</string>
+    <string name="feature_account_share">Cuota</string>
+    <string name="feature_account_share_account">Comparte tu cuenta</string>
     <string name="clients_list">Elige un cliente</string>
     <string name="core_common_working">Laboral</string>
     <string name="status_image">Imagen del estado</string>
@@ -48,8 +48,8 @@
     <string name="remark">Precaución</string>
     <string name="expected_disbursement_date">Fecha de pago esperada</string>
     <string name="submission_date">Plazo de presentación.</string>
-    <string name="submitted">Subidas</string>
-    <string name="disbursement">Gasto</string>
+    <string name="feature_account_submitted">Subidas</string>
+    <string name="feature_account_disbursement">Gasto</string>
     <string name="transfer_date">Fecha de transferencia</string>
     <string name="apply_for_loan">Solicitar un préstamo</string>
     <string name="update_loan">Actualizar el prestamo</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">Estrategia de pago</string>
     <string name="pay_to">Pago a</string>
     <string name="pay_from">Pago desde</string>
-    <string name="cancel">Cancelar</string>
+    <string name="feature_account_cancel">Cancelar</string>
     <string name="review_transfer">Preestreno</string>
     <string name="transfer_to">Transferir a</string>
     <string name="transfer_from">Transferencia de</string>
     <string name="making_transfer">Haciendo una transferencia</string>
-    <string name="deposit">Depósito</string>
+    <string name="feature_account_deposit">Depósito</string>
     <string name="enter_amount">Introduce la cantidad</string>
     <string name="remark_is_mandatory">Nota es obligatoria</string>
-    <string name="approved">Aprobado</string>
+    <string name="feature_account_approved">Aprobado</string>
     <string name="shares_pending">En anticipación</string>
     <string name="loan_amount_paid">Pagado</string>
     <string name="balance">Equilibrio</string>
     <string name="rejected">Rechazado</string>
     <string name="waiting">Espera</string>
-    <string name="overpaid">Pagado en exceso</string>
-    <string name="in_arrears">En mora</string>
-    <string name="select_you_want">Elige todo lo que quieras aplicar.</string>
+    <string name="feature_account_overpaid">Pagado en exceso</string>
+    <string name="feature_account_in_arrears">En mora</string>
+    <string name="feature_account_select_you_want">Elige todo lo que quieras aplicar.</string>
     <string name="filter_savings">Filtrar cuentas de ahorro.</string>
     <string name="filter_loan">Filtrar cuentas de crédito</string>
     <string name="filter_share">Filtrar el intercambio de cuentas</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">Transferencia de ahorros</string>
     <string name="loan_charges">Cargos por préstamos</string>
     <string name="savings_charges">Ahorros</string>
-    <string name="active">Activo</string>
-    <string name="closed">Cerrado</string>
-    <string name="withdrawn">Retirado</string>
+    <string name="feature_account_active">Activo</string>
+    <string name="feature_account_closed">Cerrado</string>
+    <string name="feature_account_withdrawn">Retirado</string>
     <string name="need_approval">Requiere aprobación</string>
-    <string name="pending">En anticipación</string>
-    <string name="matured">Maduro</string>
+    <string name="feature_account_pending">En anticipación</string>
+    <string name="feature_account_matured">Maduro</string>
     <string name="create_an_account">Crear una cuenta</string>
     <string name="first_name">Nombre</string>
     <string name="last_name">Nombre</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">La cuenta debe estar activa para hacer un depósito.</string>
     <string name="account_not_active_to_perform_transfer">La cuenta debe estar activa para realizar una transferencia.</string>
 
-    <string name="empty_savings_accounts">No hay cuentas de ahorro vinculadas a usted.</string>
-    <string name="empty_loan_accounts">No hay cuentas de préstamo asociadas con usted</string>
-    <string name="empty_share_accounts">No hay cuentas compartidas asociadas con usted</string>
+    <string name="feature_account_empty_savings_accounts">No hay cuentas de ahorro vinculadas a usted.</string>
+    <string name="feature_account_empty_loan_accounts">No hay cuentas de préstamo asociadas con usted</string>
+    <string name="feature_account_empty_share_accounts">No hay cuentas compartidas asociadas con usted</string>
     <string name="empty_transactions">No hay transacciones relacionadas con usted.</string>
     <string name="empty_repayment_schedule">No hay un calendario de pago asociado con usted</string>
     <string name="no_more_transactions_available">No hay transacciones disponibles</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">Calendario de reembolso</string>
     <string name="transactions">Transacciones</string>
     <string name="transfer">Transferencia</string>
-    <string name="approval_pending">Aprobación en curso</string>
-    <string name="waiting_for_disburse">Esperando el pago</string>
+    <string name="feature_account_approval_pending">Aprobación en curso</string>
+    <string name="feature_account_disburse">Esperando el pago</string>
     <string name="closed_because_of_obligation">Cerrado debido a algunas obligaciones.</string>
     <string name="loan_closed">Préstamo cerrado</string>
     <string name="due_date_in_charges">Por fecha:</string>
@@ -247,7 +247,7 @@
     <string name="four_weeks">4 semanas</string>
     <string name="three_months">Tres meses</string>
     <string name="six_months">6 meses</string>
-    <string name="filter">Filtro</string>
+    <string name="feature_account_filter">Filtro</string>
     <string name="start_date">Fecha de inicio</string>
     <string name="end_date">Fecha de finalización</string>
     <string name="filtered">Filtrado</string>
@@ -370,7 +370,7 @@
     <string name="leave_email">Deja un mensaje de correo electrónico</string>
     <string name="find_locations">Encontrar ubicaciones</string>
     <string name="no_withdrawals">Sin pagos</string>
-    <string name="clear_filters">Borrar filtros</string>
+    <string name="feature_account_clear_filters">Borrar filtros</string>
     <string name="manage_accounts">Administrar cuentas</string>
     <string name="more">Más</string>
     <string name="settings">Ajustes</string>
@@ -408,7 +408,7 @@
     <string name="error_password_not_match">La contraseña no coincide.</string>
     <string name="app_version">Versión%1$s</string>
     <string name="all_rights_reserved">Todos los derechos reservados.</string>
-    <string name="licenses">La concesión de licencias</string>
+    <string name="feature_about_licenses">La concesión de licencias</string>
     <string name="transfer_error">No se puede hacer una transferencia, por favor intente de nuevo más tarde</string>
     <string name="please_wait">Por favor espere&#8320;</string>
     <string name="message">Mensaje</string>
diff --git a/androidApp/src/main/res/values-fa-rAF/strings.xml b/androidApp/src/main/res/values-fa-rAF/strings.xml
index 0dda345c3..857819144 100644
--- a/androidApp/src/main/res/values-fa-rAF/strings.xml
+++ b/androidApp/src/main/res/values-fa-rAF/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Mifos Mobile</string>
-    <string name="about_us">درباره ما</string>
+    <string name="feature_about_app_name">Mifos Mobile</string>
+    <string name="feature_about_about_us">درباره ما</string>
     <string name="about_us_under_construction">"درباره ما در  ساخت و ساز "</string>
     <string name="account_balance">موجودی حساب</string>
     <string name="account_id">شناسه حساب</string>
@@ -14,7 +14,7 @@
     <string name="accounts">حساب ها</string>
     <string name="accounts_overview">نمای کلی حساب</string>
     <string name="activation_date">تاریخ فعال سازی</string>
-    <string name="active">فعال</string>
+    <string name="feature_account_active">فعال</string>
     <string name="active_uc">فعال</string>
     <string name="add">اضافه کردن</string>
     <string name="add_beneficiary">ذینفع اضافه کنید</string>
@@ -34,8 +34,8 @@
     <string name="apply">درخواست دادن</string>
     <string name="apply_for_loan">درخواست وام دهید</string>
     <string name="apply_savings_account">درخواست حساب پس انداز</string>
-    <string name="approval_pending">در انتظار تایید</string>
-    <string name="approved">تایید شده</string>
+    <string name="feature_account_approval_pending">در انتظار تایید</string>
+    <string name="feature_account_approved">تایید شده</string>
     <string name="appwidget_text">مثال</string>
     <string name="authentication_token">تأیید اعتبار</string>
     <string name="balance">تعادل</string>
@@ -48,7 +48,7 @@
     <string name="beneficiary_name">نام ذینفع</string>
     <string name="beneficiary_updated_successfully">ذینفع با موفقیت به روز شد</string>
     <string name="call_now">تماس بگیر</string>
-    <string name="cancel">لغو</string>
+    <string name="feature_account_cancel">لغو</string>
     <string name="cancel_transfer">آیا مطمئن هستید که می خواهید انتقال را لغو کنید؟</string>
     <string name="change_account_password">گذرواژه حساب خود را تغییر دهید</string>
     <string name="change_app_passcode">تغییر کد عبور برنامه</string>
@@ -60,7 +60,7 @@
     <string name="choose_language">زبان خود را انتخاب کنید</string>
     <string name="choose_option">گزینه را انتخاب کنید</string>
     <string name="choose_transfer_type">نوع انتقال را انتخاب کنید</string>
-    <string name="clear_filters">فیلترها را پاک کنید</string>
+    <string name="feature_account_clear_filters">فیلترها را پاک کنید</string>
     <string name="client_accounts">حساب های مشتری</string>
     <string name="client_charges">هزینه مشتری</string>
     <string name="client_classification">طبقه بندی مشتری</string>
@@ -70,7 +70,7 @@
     <string name="clients_list">مشتری را انتخاب کنید</string>
     <string name="close">بستن</string>
     <string name="close_drawer">کشو را ببندید</string>
-    <string name="closed">بسته شد</string>
+    <string name="feature_account_closed">بسته شد</string>
     <string name="closed_because_of_obligation">به دلیل برخی تعهدات بسته شد</string>
     <string name="confirm_password">رمز عبور را تأیید کنید</string>
     <string name="continue_str">ادامه هید</string>
@@ -82,7 +82,7 @@
     <string name="delete_beneficiary">ذینفع را حذف کنید</string>
     <string name="delete_beneficiary_confirmation">مطمئن هستید که می خواهید این مزایا را حذف کنید</string>
     <string name="delete_guarantor">ضمانت را حذف کنید</string>
-    <string name="deposit">سپرده</string>
+    <string name="feature_account_deposit">سپرده</string>
     <string name="details">جزئیات</string>
     <string name="dialog_action_app_settings">تنظیمات برنامه</string>
     <string name="dialog_action_back">بازگشت</string>
@@ -99,17 +99,17 @@
     <string name="dialog_message_storage_permission_denied_prompt">بدون اجازه ذخیره نمی توانید کد QR را برای اضافه کردن ذینفع بارگذاری کنید. آیا مطمئن هستید که می خواهید این مجوز را انکار کنید؟</string>
     <string name="dialog_message_write_storage_permission_never_ask_again">شما مجوز نوشتن در انبار را رد کرده اید ، بدون این مجوز قادر نخواهید بود با استفاده از QR Code ذینفع اضافه کنید. لطفاً آن را در تنظیمات فعال کنید</string>
     <string name="dialog_permission_denied">اجازه رد شد</string>
-    <string name="disbursement">پرداخت</string>
+    <string name="feature_account_disbursement">پرداخت</string>
     <string name="disbursement_date">تاریخ پرداخت</string>
-    <string name="dividend_payout">پرداخت سود سهام</string>
+    <string name="feature_account_dividend_payout">پرداخت سود سهام</string>
     <string name="due_date">سر رسید</string>
     <string name="due_date_in_charges">سر رسید:</string>
     <string name="edit">ویرایش</string>
     <string name="email">پست الکترونیک</string>
-    <string name="empty_loan_accounts">هیچ حساب قرضه مربوط به شما وجود ندارد</string>
+    <string name="feature_account_empty_loan_accounts">هیچ حساب قرضه مربوط به شما وجود ندارد</string>
     <string name="empty_repayment_schedule">هیچ برنامه ای بازپرداخت  وجود ندارد</string>
-    <string name="empty_savings_accounts">هیچ حساب پس انداز مرتبط با شما وجود ندارد</string>
-    <string name="empty_share_accounts">هیچ حساب اشتراکی مربوط به شما وجود ندارد</string>
+    <string name="feature_account_empty_savings_accounts">هیچ حساب پس انداز مرتبط با شما وجود ندارد</string>
+    <string name="feature_account_empty_share_accounts">هیچ حساب اشتراکی مربوط به شما وجود ندارد</string>
     <string name="empty_transactions">هیچ معاملات مربوط به شما وجود ندارد</string>
     <string name="end_date">تاریخ پایان</string>
     <string name="end_date_must_be_greater">تاریخ پایان باید بیشتر از تاریخ شروع باشد</string>
@@ -158,11 +158,11 @@
     <string name="exit_message">دوباره به عقب فشار دهید تا خارج شوید</string>
     <string name="expected_disbursement_date">تاریخ پرداخت پیش بینی شده</string>
     <string name="faq">سوالات متداول</string>
-    <string name="fee_deduction">کسر هزینه</string>
+    <string name="feature_account_fee_deduction">کسر هزینه</string>
     <string name="fees">هزینه</string>
     <string name="fees_waived">هزینه پرداخت</string>
     <string name="fetching_client">واگذاری مشتری</string>
-    <string name="filter">فیلتر</string>
+    <string name="feature_account_filter">فیلتر</string>
     <string name="filter_loan">حساب های قرضه را فیلتر کنید</string>
     <string name="filter_savings">حساب های پس انداز را فیلتر کنید</string>
     <string name="filter_share">حساب اشتراکی را فیلتر کنید</string>
@@ -181,7 +181,7 @@
     <string name="help_under_construction">راهنما در دست ساخت</string>
     <string name="home">خانه</string>
     <string name="import_qr">وارد QR</string>
-    <string name="in_arrears">در عقب افتادگی ها</string>
+    <string name="feature_account_in_arrears">در عقب افتادگی ها</string>
     <string name="inactive">غیر فعال</string>
     <string name="inactive_uc">غیر فعال</string>
     <string name="income_generating_loan">وام تولید درآمد</string>
@@ -191,7 +191,7 @@
     <string name="interest_calculation_period">دوره محاسبه ای سود</string>
     <string name="interest_charged">نرخ سود متهم شد</string>
     <string name="interest_paid">سود پرداخت شد</string>
-    <string name="interest_posting">ارسال علاقه</string>
+    <string name="feature_account_interest_posting">ارسال علاقه</string>
     <string name="interest_waived">امتناع کرد از سود</string>
     <string name="internet_not_connected">لطفاً مطمئن شوید که به اینترنت متصل هستید</string>
     <string name="invalid_amount">مقدار نامعتبر است</string>
@@ -203,9 +203,9 @@
     <string name="last_trans">آخرین جزئیات معامله</string>
     <string name="last_transaction">آخرین معامله</string>
     <string name="leave_email">یک ایمیل بگذارید</string>
-    <string name="licenses">مجوزها</string>
-    <string name="loan">قرضه</string>
-    <string name="loan_account">حساب قرضه</string>
+    <string name="feature_about_licenses">مجوزها</string>
+    <string name="feature_account_loan">قرضه</string>
+    <string name="feature_account_loan_account">حساب قرضه</string>
     <string name="loan_account_details">جزئیات حساب قرضه</string>
     <string name="loan_account_withdrawn_successfully">حساب قرضه با موفقیت برداشت شد</string>
     <string name="loan_amount_paid">پرداخت شده</string>
@@ -237,7 +237,7 @@
     <string name="manage_beneficiaries">ذینفعان را مدیریت کنید</string>
     <string name="map_marker_desc">خانه به صنعت بزرگ فناوری</string>
     <string name="map_marker_heading">سیاتل</string>
-    <string name="matured">بالغ</string>
+    <string name="feature_account_matured">بالغ</string>
     <string name="medium_text">متن متوسط</string>
     <string name="message">پیام</string>
     <string name="min_required_balance">حداقل تعادل مورد نیاز</string>
@@ -273,8 +273,8 @@
     <string name="open_drawer">کشوی باز</string>
     <string name="other">دیگر</string>
     <string name="outstanding_balance">"مقدار پرداخت نا شده "</string>
-    <string name="overdraft_fee">هزینه اضافه برداشت</string>
-    <string name="overpaid">اضافه پرداخت</string>
+    <string name="feature_account_overdraft_fee">هزینه اضافه برداشت</string>
+    <string name="feature_account_overpaid">اضافه پرداخت</string>
     <string name="passcode">کد عبور</string>
     <string name="passcode_does_not_match">کد عبور مطابقت ندارد.</string>
     <string name="passcode_setup">یک رمز عبور برای ورود به سیستم تنظیم کنید</string>
@@ -287,7 +287,7 @@
     <string name="pay_to">پرداخت به</string>
     <string name="penalties">مجازات</string>
     <string name="penalties_waived">مجازات برداشته شدند</string>
-    <string name="pending">در انتظار</string>
+    <string name="feature_account_pending">در انتظار</string>
     <string name="permission_denied_camera">اجازه استفاده از دوربین رد شد</string>
     <string name="permission_denied_storage">اجازه ذخیره سازی رد شد</string>
     <string name="phone_number">شماره تلفن</string>
@@ -297,7 +297,7 @@
     <string name="principal">" اصلی"</string>
     <string name="principal_amount">مقدار اصلی*</string>
     <string name="principal_disbursed">اصلی پرداخت شده</string>
-    <string name="privacy_policy">سیاست حفظ حریم خصوصی</string>
+    <string name="feature_about_privacy_policy">سیاست حفظ حریم خصوصی</string>
     <string name="proceed">ادامه دهید</string>
     <string name="product">تولید - محصول</string>
     <string name="progress_message_loading">بارگیری</string>
@@ -313,7 +313,7 @@
     <string name="refresh">تازه کردن</string>
     <string name="register">ثبت نام</string>
     <string name="rejected">رد شد</string>
-    <string name="rejected_transfer">انتقال رد شد</string>
+    <string name="feature_account_rejected_transfer">انتقال رد شد</string>
     <string name="remark">اظهار نظریه</string>
     <string name="remark_is_mandatory">اظهار نظر اجباری است</string>
     <string name="repayment">بازپرداخت</string>
@@ -327,8 +327,8 @@
     <string name="saving_account_transactions_details">معاملات در حساب صرفه جوی</string>
     <string name="saving_account_updated_successfully">" حساب پس انداز با موفقیت به روز شد "</string>
     <string name="saving_product_name">نام محصول</string>
-    <string name="savings">پس انداز</string>
-    <string name="savings_account">حساب پس انداز</string>
+    <string name="feature_account_savings">پس انداز</string>
+    <string name="feature_account_savings_account">حساب پس انداز</string>
     <string name="savings_account_transaction">معاملات حساب پس انداز</string>
     <string name="savings_account_withdraw_successful">حساب پس انداز برداشت موفقیت آمیز است</string>
     <string name="savings_charges">هزینه های پس انداز</string>
@@ -343,10 +343,10 @@
     <string name="select_pay_to">برای پرداخت به حساب خود را انتخاب کنید</string>
     <string name="select_product_id">شناسه محصول را انتخاب کنید *</string>
     <string name="select_region_qr">منطقه ای را با کد QR انتخاب کنید</string>
-    <string name="select_you_want">تمام آنچه را که می خواهید درخواست کنید را انتخاب کنید</string>
+    <string name="feature_account_select_you_want">تمام آنچه را که می خواهید درخواست کنید را انتخاب کنید</string>
     <string name="settings">تنظیمات</string>
-    <string name="share">اشتراک گذاری</string>
-    <string name="share_account">حساب اشتراکی</string>
+    <string name="feature_account_share">اشتراک گذاری</string>
+    <string name="feature_account_share_account">حساب اشتراکی</string>
     <string name="share_qr_code">کد QR را به اشتراک بگذارید</string>
     <string name="shares_pending">در انتظار</string>
     <string name="sign_up">ثبت نام</string>
@@ -359,7 +359,7 @@
     <string name="submit">ارسال</string>
     <string name="submit_beneficiary">ارسال ذینفع</string>
     <string name="submit_loan">" ارسال قرض"</string>
-    <string name="submitted">ارسال شده</string>
+    <string name="feature_account_submitted">ارسال شده</string>
     <string name="show_hide_total_saving_amount">نمایش یا پنهان کردن کل مبلغ پس انداز</string>
     <string name="show_hide_total_loan_amount">نمایش یا پنهان کردن کل مبلغ وام</string>
     <string name="hidden_amount">*****</string>
@@ -413,14 +413,14 @@
     <string name="view_repayment">مشاهده برنامه بازپرداخت</string>
     <string name="view_transactions">معاملات را مشاهده کنید</string>
     <string name="waiting">در انتظار</string>
-    <string name="waiting_for_disburse">منتظر اعزام</string>
+    <string name="feature_account_disburse">منتظر اعزام</string>
     <string name="withdraw_loan">برداشت قرضه</string>
     <string name="withdraw_loan_reason">دلیل برداشت قرضه</string>
     <string name="withdraw_savings_account">برداشت حساب پس انداز</string>
-    <string name="withdrawal">برداشت از حساب</string>
+    <string name="feature_account_withdrawal">برداشت از حساب</string>
     <string name="withdrawal_date">تاریخ برداشت</string>
-    <string name="withdrawal_transfer">انتقال برداشت</string>
-    <string name="withdrawn">برداشت</string>
+    <string name="feature_account_withdrawal_transfer">انتقال برداشت</string>
+    <string name="feature_account_withdrawn">برداشت</string>
     <string name="core_common_working">کار کردن</string>
     <string name="yes">بلي</string>
     <string name="app_info">اطلاعات برنامه</string>
diff --git a/androidApp/src/main/res/values-fr/strings.xml b/androidApp/src/main/res/values-fr/strings.xml
index e4d32e82b..212ee6be7 100644
--- a/androidApp/src/main/res/values-fr/strings.xml
+++ b/androidApp/src/main/res/values-fr/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">Transactions récentes</string>
     <string name="charges">Honoraires</string>
     <string name="questionnaire">Questionnaire</string>
-    <string name="about_us">À propos de nous</string>
+    <string name="feature_about_about_us">À propos de nous</string>
     <string name="saving_account_details">Enregistrer les détails du compte</string>
-    <string name="savings_account">Compte d\'épargne</string>
+    <string name="feature_account_savings_account">Compte d\'épargne</string>
     <string name="error_loan_account_details_loading">Erreur lors du chargement des informations du compte de crédit</string>
     <string name="nominal_interest_rate">Taux d\'intérêt nominaux</string>
     <string name="account_number">Numéro de compte</string>
@@ -29,11 +29,11 @@
     <string name="small_text">Petit texte</string>
     <string name="client_accounts">Comptes clients</string>
     <string name="splash">Écran de bienvenue</string>
-    <string name="savings">Économie</string>
-    <string name="loan">Prêt</string>
-    <string name="loan_account">Compte créditeur</string>
-    <string name="share">Part</string>
-    <string name="share_account">Partagez votre compte</string>
+    <string name="feature_account_savings">Économie</string>
+    <string name="feature_account_loan">Prêt</string>
+    <string name="feature_account_loan_account">Compte créditeur</string>
+    <string name="feature_account_share">Part</string>
+    <string name="feature_account_share_account">Partagez votre compte</string>
     <string name="clients_list">Choisissez un client</string>
     <string name="core_common_working">Travail</string>
     <string name="status_image">Image de l\'état</string>
@@ -48,8 +48,8 @@
     <string name="remark">Prudence</string>
     <string name="expected_disbursement_date">Date de paiement attendue</string>
     <string name="submission_date">Date limite de soumission</string>
-    <string name="submitted">Uploads</string>
-    <string name="disbursement">Frais</string>
+    <string name="feature_account_submitted">Uploads</string>
+    <string name="feature_account_disbursement">Frais</string>
     <string name="transfer_date">Date de transfert</string>
     <string name="apply_for_loan">Demander un prêt</string>
     <string name="update_loan">Mettre à jour le prêt</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">Stratégie de remboursement</string>
     <string name="pay_to">Paiement à</string>
     <string name="pay_from">Paiement de</string>
-    <string name="cancel">Annuler</string>
+    <string name="feature_account_cancel">Annuler</string>
     <string name="review_transfer">Avant-première</string>
     <string name="transfer_to">Transférer à</string>
     <string name="transfer_from">Transfert de</string>
     <string name="making_transfer">Faire un transfert</string>
-    <string name="deposit">Dépôt</string>
+    <string name="feature_account_deposit">Dépôt</string>
     <string name="enter_amount">Entrez la quantité</string>
     <string name="remark_is_mandatory">La note est obligatoire</string>
-    <string name="approved">Approuvé</string>
+    <string name="feature_account_approved">Approuvé</string>
     <string name="shares_pending">Par anticipation</string>
     <string name="loan_amount_paid">Payé</string>
     <string name="balance">Équilibre</string>
     <string name="rejected">Rejeté</string>
     <string name="waiting">Attente</string>
-    <string name="overpaid">Surpayé</string>
-    <string name="in_arrears">En retard</string>
-    <string name="select_you_want">Choisissez tout ce que vous voulez appliquer</string>
+    <string name="feature_account_overpaid">Surpayé</string>
+    <string name="feature_account_in_arrears">En retard</string>
+    <string name="feature_account_select_you_want">Choisissez tout ce que vous voulez appliquer</string>
     <string name="filter_savings">Filtrer les comptes d\'épargne</string>
     <string name="filter_loan">Filtrer les comptes de crédit</string>
     <string name="filter_share">Filtrer le partage de compte</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">Virement d\'épargne</string>
     <string name="loan_charges">Frais de prêt</string>
     <string name="savings_charges">Épargnes</string>
-    <string name="active">Actif</string>
-    <string name="closed">Fermé</string>
-    <string name="withdrawn">Retiré</string>
+    <string name="feature_account_active">Actif</string>
+    <string name="feature_account_closed">Fermé</string>
+    <string name="feature_account_withdrawn">Retiré</string>
     <string name="need_approval">Nécessite l\'approbation</string>
-    <string name="pending">Par anticipation</string>
-    <string name="matured">Mature</string>
+    <string name="feature_account_pending">Par anticipation</string>
+    <string name="feature_account_matured">Mature</string>
     <string name="create_an_account">Créer un compte</string>
     <string name="first_name">Nom</string>
     <string name="last_name">Nom</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">Le compte doit être actif pour effectuer un dépôt</string>
     <string name="account_not_active_to_perform_transfer">Le compte doit être actif pour effectuer un transfert</string>
 
-    <string name="empty_savings_accounts">Il n\'y a pas de compte d\'épargne lié à vous</string>
-    <string name="empty_loan_accounts">Aucun compte de prêt ne vous est associé.</string>
-    <string name="empty_share_accounts">Aucun compte partagé ne vous est associé.</string>
+    <string name="feature_account_empty_savings_accounts">Il n\'y a pas de compte d\'épargne lié à vous</string>
+    <string name="feature_account_empty_loan_accounts">Aucun compte de prêt ne vous est associé.</string>
+    <string name="feature_account_empty_share_accounts">Aucun compte partagé ne vous est associé.</string>
     <string name="empty_transactions">Il n\'y a aucune transaction liée à vous</string>
     <string name="empty_repayment_schedule">Aucun calendrier de remboursement ne vous est associé.</string>
     <string name="no_more_transactions_available">Aucune transaction disponible</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">Calendrier de remboursement</string>
     <string name="transactions">Transactions</string>
     <string name="transfer">Transfert</string>
-    <string name="approval_pending">Approbation en cours</string>
-    <string name="waiting_for_disburse">En attente de paiement</string>
+    <string name="feature_account_approval_pending">Approbation en cours</string>
+    <string name="feature_account_disburse">En attente de paiement</string>
     <string name="closed_because_of_obligation">Fermé en raison d\'obligations</string>
     <string name="loan_closed">Prêt fermé</string>
     <string name="due_date_in_charges">Par date:</string>
@@ -246,7 +246,7 @@
     <string name="four_weeks">4 semaines</string>
     <string name="three_months">Trois mois</string>
     <string name="six_months">6 mois</string>
-    <string name="filter">Filtre</string>
+    <string name="feature_account_filter">Filtre</string>
     <string name="start_date">Date de début</string>
     <string name="end_date">Date de fin</string>
     <string name="filtered">Filtré</string>
@@ -367,7 +367,7 @@
     <string name="leave_email">Laisser un message électronique</string>
     <string name="find_locations">Trouver des lieux</string>
     <string name="no_withdrawals">Aucun paiement</string>
-    <string name="clear_filters">Effacer les filtres</string>
+    <string name="feature_account_clear_filters">Effacer les filtres</string>
     <string name="manage_accounts">Gérer les comptes</string>
     <string name="more">Plus</string>
     <string name="settings">Paramètres</string>
@@ -405,7 +405,7 @@
     <string name="error_password_not_match">Le mot de passe ne correspond pas.</string>
     <string name="app_version">Version %1$s</string>
     <string name="all_rights_reserved">Tous droits réservés.</string>
-    <string name="licenses">Licence</string>
+    <string name="feature_about_licenses">Licence</string>
     <string name="transfer_error">Impossible d\'effectuer un transfert, veuillez réessayer ultérieurement</string>
     <string name="please_wait">S\'il vous plaît attendez…</string>
     <string name="message">Message</string>
diff --git a/androidApp/src/main/res/values-hi/strings.xml b/androidApp/src/main/res/values-hi/strings.xml
index 8f9c3a10e..6df2e0a64 100644
--- a/androidApp/src/main/res/values-hi/strings.xml
+++ b/androidApp/src/main/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Mifos Mobile</string>
+    <string name="feature_about_app_name">Mifos Mobile</string>
     <string name="login">लॉग इन करें</string>
     <string name="toast_welcome">स्वागत हे %1$s</string>
     <string name="unable_to_connect">इंटरनेट से कनेक्ट नहीं है</string>
@@ -16,9 +16,9 @@
     <string name="recent_transactions">हाल ही के लेनदेन</string>
     <string name="charges">प्रभार</string>
     <string name="questionnaire">प्रश्नावली</string>
-    <string name="about_us">हमारे बारे में</string>
+    <string name="feature_about_about_us">हमारे बारे में</string>
     <string name="saving_account_details">बचत खाते का विवरण</string>
-    <string name="savings_account">बचत खाता</string>
+    <string name="feature_account_savings_account">बचत खाता</string>
     <string name="error_loan_account_details_loading">ऋण खातों के विवरण में लोड करने में त्रुटि</string>
     <string name="nominal_interest_rate">मामूली ब्याज दर</string>
     <string name="create_an_account">खाता बनाएं</string>
@@ -32,16 +32,16 @@
     <string name="small_text">Small Text</string>
     <string name="client_accounts">ग्राहक खाते</string>
     <string name="splash">Splash</string>
-    <string name="savings">बचत</string>
-    <string name="loan">ऋण</string>
-    <string name="loan_account">ऋण खाता</string>
+    <string name="feature_account_savings">बचत</string>
+    <string name="feature_account_loan">ऋण</string>
+    <string name="feature_account_loan_account">ऋण खाता</string>
     <string name="savings_charges">बचत प्रभार</string>
-    <string name="share">शेयर</string>
-    <string name="share_account">शेयर खाता</string>
+    <string name="feature_account_share">शेयर</string>
+    <string name="feature_account_share_account">शेयर खाता</string>
     <string name="clients_list">एक ग्राहक चुनें</string>
     <string name="core_common_working">काम कर रहे</string>
-    <string name="submitted">जमा किया गया</string>
-    <string name="disbursement">अदायगी</string>
+    <string name="feature_account_submitted">जमा किया गया</string>
+    <string name="feature_account_disbursement">अदायगी</string>
     <string name="status_image">स्थिति छवि</string>
     <string name="loan_repayment_schedule">पुनः भुगतान कार्यक्रम</string>
     <string name="last_transaction">पिछले लेनदेन</string>
@@ -75,17 +75,17 @@
     <string name="repayment_strategy">चुकौती रणनीति</string>
     <string name="pay_to">को भुगतान करें</string>
     <string name="pay_from">से भुगतान करें</string>
-    <string name="cancel">रद्द करें</string>
+    <string name="feature_account_cancel">रद्द करें</string>
     <string name="review_transfer">ट्रांसफर की समीक्षा</string>
     <string name="transfer_to"> के लिए ट्रांसफर</string>
     <string name="transfer_from">इससे ट्रांसफर करें</string>
     <string name="making_transfer">ट्रांसफर कर रहे हैं</string>
-    <string name="deposit">जमा</string>
+    <string name="feature_account_deposit">जमा</string>
     <string name="enter_amount">राशी डालें</string>
     <string name="enter_remarks">ट्रांसफर के लिए टिप्पणी दर्ज करें</string>
     <string name="select_beneficiary">लाभार्थी का चयन करें</string>
     <string name="remark_is_mandatory">टिप्पणी अनिवार्य है</string>
-    <string name="approved">मंजूर</string>
+    <string name="feature_account_approved">मंजूर</string>
     <string name="shares_pending">अपूर्ण</string>
     <string name="loan_amount_paid">भुगतान किया गया</string>
     <string name="balance">शेष</string>
@@ -93,24 +93,24 @@
     <string name="waiting">इंतज़ार</string>
     <string name="register">रजिस्टर</string>
     <string name="request_id">अनुरोध आईडी</string>
-    <string name="overpaid">अधिक भुगतान</string>
-    <string name="in_arrears">बकाया राशि में</string>
-    <string name="select_you_want">उन सभी का चयन करें जिन्हें आप आवेदन करना चाहते हैं</string>
+    <string name="feature_account_overpaid">अधिक भुगतान</string>
+    <string name="feature_account_in_arrears">बकाया राशि में</string>
+    <string name="feature_account_select_you_want">उन सभी का चयन करें जिन्हें आप आवेदन करना चाहते हैं</string>
     <string name="filter_savings">बचत खाते को फ़िल्टर करें</string>
     <string name="filter_loan">ऋण खातों को फ़िल्टर करें</string>
     <string name="filter_share">शेयर खाते फ़िल्टर करें</string>
     <string name="search">खोजें</string>
     <string name="choose_transfer_type">ट्रांसफर टाइप चुनें</string>
-    <string name="active">सक्रिय</string>
-    <string name="closed">बन्द है</string>
+    <string name="feature_account_active">सक्रिय</string>
+    <string name="feature_account_closed">बन्द है</string>
     <string name="need_approval">अनुमोदन आवश्यक</string>
-    <string name="pending">अपूर्ण</string>
-    <string name="matured">परिपक्व</string>
+    <string name="feature_account_pending">अपूर्ण</string>
+    <string name="feature_account_matured">परिपक्व</string>
     <string name="continue_str">आगे बढ़ें</string>
     <string name="close">बंद करें</string>
     <string name="transfer_to_savings">बचत खाते में स्थानांतरण</string>
     <string name="transfer_from_savings">बचत खाते से स्थानांतरण</string>
-    <string name="withdrawn">Withdrawn</string>
+    <string name="feature_account_withdrawn">Withdrawn</string>
     <string name="blank">&#160;</string>
     <string name="import_qr">क्यूआर आयात करें</string>
     <string name="authentication_token">प्रमाणीकरण चिह्न</string>
@@ -149,9 +149,9 @@
     <string name="no">नहीं</string>
     <string name="found">मिला</string>x
 
-    <string name="empty_savings_accounts">आपके पास कोई बचत खाता नहीं है </string>
-    <string name="empty_loan_accounts">आपके पास कोई ऋण खाता नहीं है</string>
-    <string name="empty_share_accounts">आपके साथ कोई साझा खाता नहीं है</string>
+    <string name="feature_account_empty_savings_accounts">आपके पास कोई बचत खाता नहीं है </string>
+    <string name="feature_account_empty_loan_accounts">आपके पास कोई ऋण खाता नहीं है</string>
+    <string name="feature_account_empty_share_accounts">आपके साथ कोई साझा खाता नहीं है</string>
     <string name="empty_transactions">आपके साथ कोई लेन-देन जुड़े नहीं है</string>
     <string name="empty_repayment_schedule">आपके साथ संबद्ध कोई भी पुनर्भुगतान शेड्यूल नहीं है</string>
     <string name="no_more_transactions_available">कोई और लेनदेन उपलब्ध नहीं है</string>
@@ -280,8 +280,8 @@
     <string name="repayment_schedule">पुनः भुगतान कार्यक्रम</string>
     <string name="transactions">लेन-देन</string>
     <string name="transfer">ट्रांसफर</string>
-    <string name="approval_pending">स्वीकृति लंबित</string>
-    <string name="waiting_for_disburse">व्यय की प्रतीक्षा की जा रही है</string>
+    <string name="feature_account_approval_pending">स्वीकृति लंबित</string>
+    <string name="feature_account_disburse">व्यय की प्रतीक्षा की जा रही है</string>
     <string name="closed_because_of_obligation">कुछ दायित्वों के कारण बंद</string>
     <string name="loan_closed">ऋण बंद</string>
     <string name="due_date_in_charges">नियत तारीख:</string>
@@ -305,7 +305,7 @@
     <string name="four_weeks">4 सप्ताह</string>
     <string name="three_months">3 महीने</string>
     <string name="six_months">6 महीने</string>
-    <string name="filter">फिल्टर</string>
+    <string name="feature_account_filter">फिल्टर</string>
     <string name="start_date">आरंभ करने की तिथि</string>
     <string name="end_date">अंतिम तिथि</string>
     <string name="filtered">फ़िल्टर दकर िया गया</string>
@@ -407,7 +407,7 @@
     <!--Format Strings-->
     <string name="hello_client">नमस्ते, %1$s</string>
     <string name="double_and_string">%1$.2f %2$s</string>
-    <string name="string_and_string">%1$s %2$s</string>
+    <string name="feature_account_string_and_string">%1$s %2$s</string>
     <string name="string_and_double">%1$s: %2$.2f</string>
     <string name="string_and_int">%1$s: %2$d</string>
     <string name="invalid_amount">अवैध राशि</string>
@@ -435,7 +435,7 @@
 
     <string name="permission_denied_camera">कैमरे का उपयोग करने के लिए अनुमति अस्वीकृत</string>
     <string name="no_withdrawals">No withdrawals</string>
-    <string name="clear_filters">फ़िल्टर हटाएँ</string>
+    <string name="feature_account_clear_filters">फ़िल्टर हटाएँ</string>
     <string name="notification">सूचनाएं</string>
     <string name="base_url">आधार यूआरएल</string>
     <string name="tenant">किराएदार</string>
@@ -460,10 +460,10 @@
     <string name="confirm_password">Confirm Password</string>
     <string name="error_password_not_match">Password doesnot match.</string>
     <string name="app_version">Version %1$s</string>
-    <string name="copy_right_mifos">©2016-%1$s Mifos Initiative.</string>
+    <string name="feature_about_copyright_mifos">©2016-%1$s Mifos Initiative.</string>
     <string name="all_rights_reserved">All rights reserved.</string>
-    <string name="licenses">Licenses</string>
-    <string name="privacy_policy">गोपनीयता नीति</string>
+    <string name="feature_about_licenses">Licenses</string>
+    <string name="feature_about_privacy_policy">गोपनीयता नीति</string>
     <string name="change_passcode">पासकोड बदलें</string>
     <string name="change_app_passcode">ऐप पासवर्ड बदलें</string>
     <string name="change_password">पासवर्ड बदलें</string>
@@ -518,13 +518,13 @@
     <string name="details">विवरण</string>
     <string name="product">उत्पाद</string>
 
-    <string name="dividend_payout">लाभांश भुगतान</string>
-    <string name="withdrawal">निकासी</string>
-    <string name="interest_posting">रुचि पोस्टिंग</string>
-    <string name="fee_deduction">शुल्क कटौती</string>
-    <string name="withdrawal_transfer">निकासी स्थानांतरण</string>
-    <string name="rejected_transfer">अस्वीकृत स्थानांतरण</string>
-    <string name="overdraft_fee">ओवरड्राफ्ट शुल्क</string>
+    <string name="feature_account_dividend_payout">लाभांश भुगतान</string>
+    <string name="feature_account_withdrawal">निकासी</string>
+    <string name="feature_account_interest_posting">रुचि पोस्टिंग</string>
+    <string name="feature_account_fee_deduction">शुल्क कटौती</string>
+    <string name="feature_account_withdrawal_transfer">निकासी स्थानांतरण</string>
+    <string name="feature_account_rejected_transfer">अस्वीकृत स्थानांतरण</string>
+    <string name="feature_account_overdraft_fee">ओवरड्राफ्ट शुल्क</string>
     <string name="savings_account_transaction">बचत खाता लेनदेन</string>
     <string name="transaction_period">लेन-देन की अवधि</string>
     <string name="transaction_type">सौदे का प्रकार</string>
diff --git a/androidApp/src/main/res/values-in/strings.xml b/androidApp/src/main/res/values-in/strings.xml
index 3ae88b999..af697ed4f 100644
--- a/androidApp/src/main/res/values-in/strings.xml
+++ b/androidApp/src/main/res/values-in/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">Transaksi terbaru</string>
     <string name="charges">Biaya</string>
     <string name="questionnaire">Daftar pertanyaan</string>
-    <string name="about_us">Tentang kami</string>
+    <string name="feature_about_about_us">Tentang kami</string>
     <string name="saving_account_details">Menyimpan detail akun</string>
-    <string name="savings_account">Rekening Tabungan</string>
+    <string name="feature_account_savings_account">Rekening Tabungan</string>
     <string name="error_loan_account_details_loading">Kesalahan memuat informasi akun kredit</string>
     <string name="nominal_interest_rate">Suku bunga nominal</string>
     <string name="account_number">Nomor akun</string>
@@ -29,11 +29,11 @@
     <string name="small_text">Teks kecil</string>
     <string name="client_accounts">Akun pelanggan</string>
     <string name="splash">Layar selamat datang</string>
-    <string name="savings">Hemat</string>
-    <string name="loan">Pinjaman</string>
-    <string name="loan_account">Akun kredit</string>
-    <string name="share">Saham</string>
-    <string name="share_account">Bagikan akun Anda</string>
+    <string name="feature_account_savings">Hemat</string>
+    <string name="feature_account_loan">Pinjaman</string>
+    <string name="feature_account_loan_account">Akun kredit</string>
+    <string name="feature_account_share">Saham</string>
+    <string name="feature_account_share_account">Bagikan akun Anda</string>
     <string name="clients_list">Pilih pelanggan</string>
     <string name="core_common_working">Kerja</string>
     <string name="status_image">Citra negara</string>
@@ -48,8 +48,8 @@
     <string name="remark">Hati-hati</string>
     <string name="expected_disbursement_date">Tanggal pembayaran yang diharapkan</string>
     <string name="submission_date">Batas waktu untuk pengiriman</string>
-    <string name="submitted">Upload</string>
-    <string name="disbursement">Biaya</string>
+    <string name="feature_account_submitted">Upload</string>
+    <string name="feature_account_disbursement">Biaya</string>
     <string name="transfer_date">Tanggal transfer</string>
     <string name="apply_for_loan">Ajukan pinjaman</string>
     <string name="update_loan">Perbarui pinjaman</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">Strategi pembayaran kembali</string>
     <string name="pay_to">Pembayaran ke</string>
     <string name="pay_from">Pembayaran dari</string>
-    <string name="cancel">Membatalkan</string>
+    <string name="feature_account_cancel">Membatalkan</string>
     <string name="review_transfer">Preview</string>
     <string name="transfer_to">Transfer ke</string>
     <string name="transfer_from">Transfer dari</string>
     <string name="making_transfer">Melakukan transfer</string>
-    <string name="deposit">Deposito</string>
+    <string name="feature_account_deposit">Deposito</string>
     <string name="enter_amount">Masukkan jumlahnya</string>
     <string name="remark_is_mandatory">Catatan adalah wajib</string>
-    <string name="approved">Disetujui</string>
+    <string name="feature_account_approved">Disetujui</string>
     <string name="shares_pending">Dalam antisipasi</string>
     <string name="loan_amount_paid">Dibayar</string>
     <string name="balance">Keseimbangan</string>
     <string name="rejected">Ditolak</string>
     <string name="waiting">Menunggu</string>
-    <string name="overpaid">Membayar lebih</string>
-    <string name="in_arrears">Tunggakan</string>
-    <string name="select_you_want">Pilih semua yang ingin Anda terapkan</string>
+    <string name="feature_account_overpaid">Membayar lebih</string>
+    <string name="feature_account_in_arrears">Tunggakan</string>
+    <string name="feature_account_select_you_want">Pilih semua yang ingin Anda terapkan</string>
     <string name="filter_savings">Filter rekening tabungan</string>
     <string name="filter_loan">Filter akun kredit</string>
     <string name="filter_share">Filter berbagi akun</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">Transfer dari tabungan</string>
     <string name="loan_charges">Biaya pinjaman</string>
     <string name="savings_charges">Tabungan</string>
-    <string name="active">Aktif</string>
-    <string name="closed">Tertutup</string>
-    <string name="withdrawn">Pendiam</string>
+    <string name="feature_account_active">Aktif</string>
+    <string name="feature_account_closed">Tertutup</string>
+    <string name="feature_account_withdrawn">Pendiam</string>
     <string name="need_approval">Membutuhkan persetujuan</string>
-    <string name="pending">Dalam antisipasi</string>
-    <string name="matured">Dewasa</string>
+    <string name="feature_account_pending">Dalam antisipasi</string>
+    <string name="feature_account_matured">Dewasa</string>
     <string name="create_an_account">Buat akun</string>
     <string name="first_name">Nama</string>
     <string name="last_name">Nama</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">Akun harus aktif untuk melakukan setoran</string>
     <string name="account_not_active_to_perform_transfer">Akun harus aktif untuk melakukan transfer</string>
 
-    <string name="empty_savings_accounts">Tidak ada rekening tabungan yang terhubung dengan Anda</string>
-    <string name="empty_loan_accounts">Tidak ada rekening pinjaman yang terkait dengan Anda</string>
-    <string name="empty_share_accounts">Tidak ada akun bersama yang dikaitkan dengan Anda</string>
+    <string name="feature_account_empty_savings_accounts">Tidak ada rekening tabungan yang terhubung dengan Anda</string>
+    <string name="feature_account_empty_loan_accounts">Tidak ada rekening pinjaman yang terkait dengan Anda</string>
+    <string name="feature_account_empty_share_accounts">Tidak ada akun bersama yang dikaitkan dengan Anda</string>
     <string name="empty_transactions">Tidak ada transaksi yang terkait dengan Anda</string>
     <string name="empty_repayment_schedule">Tidak ada jadwal pembayaran kembali yang terkait dengan Anda</string>
     <string name="no_more_transactions_available">Tidak ada transaksi yang tersedia</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">Jadwal pembayaran kembali</string>
     <string name="transactions">Transaksi</string>
     <string name="transfer">Transfer</string>
-    <string name="approval_pending">Persetujuan sedang berlangsung</string>
-    <string name="waiting_for_disburse">Menunggu pembayaran</string>
+    <string name="feature_account_approval_pending">Persetujuan sedang berlangsung</string>
+    <string name="feature_account_disburse">Menunggu pembayaran</string>
     <string name="closed_because_of_obligation">Ditutup karena beberapa kewajiban</string>
     <string name="loan_closed">Pinjaman ditutup</string>
     <string name="due_date_in_charges">Menurut tanggal:</string>
@@ -247,7 +247,7 @@
     <string name="four_weeks">4 minggu</string>
     <string name="three_months">Tiga bulan</string>
     <string name="six_months">6 bulan</string>
-    <string name="filter">Filter</string>
+    <string name="feature_account_filter">Filter</string>
     <string name="start_date">Tanggal mulai</string>
     <string name="end_date">Tanggal berakhir</string>
     <string name="filtered">Tersaring</string>
@@ -369,7 +369,7 @@
     <string name="leave_email">Tinggalkan pesan e-mail</string>
     <string name="find_locations">Temukan lokasi</string>
     <string name="no_withdrawals">Tidak ada pembayaran</string>
-    <string name="clear_filters">Hapus filter</string>
+    <string name="feature_account_clear_filters">Hapus filter</string>
     <string name="manage_accounts">Kelola akun</string>
     <string name="more">Lebih</string>
     <string name="settings">Pengaturan</string>
@@ -407,7 +407,7 @@
     <string name="error_password_not_match">Kata Sandi Tidak cocok.</string>
     <string name="app_version">Versi %1$s</string>
     <string name="all_rights_reserved">Hak cipta dilindungi.</string>
-    <string name="licenses">Perizinan</string>
+    <string name="feature_about_licenses">Perizinan</string>
     <string name="transfer_error">Tidak dapat melakukan transfer, silakan coba lagi nanti</string>
     <string name="please_wait">Tolong tunggu…</string>
     <string name="message">Pesan</string>
diff --git a/androidApp/src/main/res/values-km/strings.xml b/androidApp/src/main/res/values-km/strings.xml
index 8f98e003e..3bd44e730 100644
--- a/androidApp/src/main/res/values-km/strings.xml
+++ b/androidApp/src/main/res/values-km/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">ប្រតិបត្តិការថ្មីៗ</string>
     <string name="charges">ថ្លៃសេវា</string>
     <string name="questionnaire">សំណួរ</string>
-    <string name="about_us">អំពីយើង</string>
+    <string name="feature_about_about_us">អំពីយើង</string>
     <string name="saving_account_details">ការរក្សាទុកព័ត៌មានលម្អិតគណនី</string>
-    <string name="savings_account">គណនីសន្សំ</string>
+    <string name="feature_account_savings_account">គណនីសន្សំ</string>
     <string name="error_loan_account_details_loading">កំហុសក្នុងការផ្ទុកព័ត៌មានគណនីឥណទាន</string>
     <string name="nominal_interest_rate">អត្រាការប្រាក់នាមករណ៍</string>
     <string name="account_number">លេខគណនី</string>
@@ -29,11 +29,11 @@
     <string name="small_text">អត្ថបទតូច</string>
     <string name="client_accounts">គណនីអតិថិជន</string>
     <string name="splash">អេក្រង់ស្វាគមន៍</string>
-    <string name="savings">ការរក្សាទុក</string>
-    <string name="loan">ប្រាក់កម្ចី</string>
-    <string name="loan_account">គណនីឥណទាន</string>
-    <string name="share">ចែករំលែក</string>
-    <string name="share_account">ចែករំលែកគណនីរបស់អ្នក</string>
+    <string name="feature_account_savings">ការរក្សាទុក</string>
+    <string name="feature_account_loan">ប្រាក់កម្ចី</string>
+    <string name="feature_account_loan_account">គណនីឥណទាន</string>
+    <string name="feature_account_share">ចែករំលែក</string>
+    <string name="feature_account_share_account">ចែករំលែកគណនីរបស់អ្នក</string>
     <string name="clients_list">ជ្រើសរើសអតិថិជន</string>
     <string name="core_common_working">ធ្វើការ</string>
     <string name="status_image">រូបភាពរបស់រដ្ឋ</string>
@@ -48,8 +48,8 @@
     <string name="remark">ការប្រុងប្រយ័ត្ន</string>
     <string name="expected_disbursement_date">កាលបរិច្ឆេទទូទាត់ដែលរំពឹងទុក</string>
     <string name="submission_date">ថ្ងៃផុតកំណត់សម្រាប់ការដាក់ស្នើ</string>
-    <string name="submitted">ផ្ទុកឡើង</string>
-    <string name="disbursement">ចំណាយ</string>
+    <string name="feature_account_submitted">ផ្ទុកឡើង</string>
+    <string name="feature_account_disbursement">ចំណាយ</string>
     <string name="transfer_date">កាលបរិច្ឆេទផ្ទេរ</string>
     <string name="apply_for_loan">ដាក់ពាក្យសុំប្រាក់កម្ចី</string>
     <string name="update_loan">ធ្វើបច្ចុប្បន្នភាពប្រាក់កម្ចី</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">យុទ្ធសាស្ត្រសងប្រាក់</string>
     <string name="pay_to">ការទូទាត់ទៅ</string>
     <string name="pay_from">ការទូទាត់ពី</string>
-    <string name="cancel">បោះបង់</string>
+    <string name="feature_account_cancel">បោះបង់</string>
     <string name="review_transfer">មើលជាមុន</string>
     <string name="transfer_to">ផ្ទេរទៅ</string>
     <string name="transfer_from">ផ្ទេរពី</string>
     <string name="making_transfer">ធ្វើការផ្ទេរ</string>
-    <string name="deposit">ការដាក់ប្រាក់</string>
+    <string name="feature_account_deposit">ការដាក់ប្រាក់</string>
     <string name="enter_amount">បញ្ចូលបរិមាណ</string>
     <string name="remark_is_mandatory">ចំណាំគឺជាកាតព្វកិច្ច</string>
-    <string name="approved">បានអនុម័ត</string>
+    <string name="feature_account_approved">បានអនុម័ត</string>
     <string name="shares_pending">នៅក្នុងការស្មានទុកជាមុន</string>
     <string name="loan_amount_paid">បានបង់ប្រាក់</string>
     <string name="balance">តុល្យភាព</string>
     <string name="rejected">ច្រានចោល</string>
     <string name="waiting">ការរង់ចាំ</string>
-    <string name="overpaid">ប្រាក់</string>
-    <string name="in_arrears">នៅបំណុល</string>
-    <string name="select_you_want">ជ្រើសរើសអ្វីគ្រប់យ៉ាងដែលអ្នកចង់អនុវត្ត</string>
+    <string name="feature_account_overpaid">ប្រាក់</string>
+    <string name="feature_account_in_arrears">នៅបំណុល</string>
+    <string name="feature_account_select_you_want">ជ្រើសរើសអ្វីគ្រប់យ៉ាងដែលអ្នកចង់អនុវត្ត</string>
     <string name="filter_savings">ត្រងគណនីសន្សំ</string>
     <string name="filter_loan">ត្រងគណនីឥណទាន</string>
     <string name="filter_share">តម្រងការចែករំលែកគណនី</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">ផ្ទេរពីការសន្សំ</string>
     <string name="loan_charges">កម្រៃសម្រាប់ប្រាក់កម្ចី</string>
     <string name="savings_charges">សន្សំ</string>
-    <string name="active">សកម្ម</string>
-    <string name="closed">បិទ</string>
-    <string name="withdrawn">ដក</string>
+    <string name="feature_account_active">សកម្ម</string>
+    <string name="feature_account_closed">បិទ</string>
+    <string name="feature_account_withdrawn">ដក</string>
     <string name="need_approval">តម្រូវឱ្យមានការយល់ព្រម</string>
-    <string name="pending">នៅក្នុងការស្មានទុកជាមុន</string>
-    <string name="matured">ចាស់ទុំ</string>
+    <string name="feature_account_pending">នៅក្នុងការស្មានទុកជាមុន</string>
+    <string name="feature_account_matured">ចាស់ទុំ</string>
     <string name="create_an_account">បង្កើតគណនី</string>
     <string name="first_name">ឈ្មោះ</string>
     <string name="last_name">ឈ្មោះ</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">គណនីគួរតែសកម្មដើម្បីដាក់ប្រាក់</string>
     <string name="account_not_active_to_perform_transfer">គណនីគួរតែសកម្មដើម្បីធ្វើការផ្ទេរ</string>
 
-    <string name="empty_savings_accounts">មិនមានគណនីសន្សំមានទំនាក់ទំនងជាមួយអ្នកទេ</string>
-    <string name="empty_loan_accounts">មិនមានគណនីប្រាក់កម្ចីដែលជាប់ទាក់ទងជាមួយអ្នកទេ</string>
-    <string name="empty_share_accounts">មិនមានគណនីចែករំលែកត្រូវបានភ្ជាប់ជាមួយអ្នកទេ</string>
+    <string name="feature_account_empty_savings_accounts">មិនមានគណនីសន្សំមានទំនាក់ទំនងជាមួយអ្នកទេ</string>
+    <string name="feature_account_empty_loan_accounts">មិនមានគណនីប្រាក់កម្ចីដែលជាប់ទាក់ទងជាមួយអ្នកទេ</string>
+    <string name="feature_account_empty_share_accounts">មិនមានគណនីចែករំលែកត្រូវបានភ្ជាប់ជាមួយអ្នកទេ</string>
     <string name="empty_transactions">មិនមានប្រតិបត្តិការទាក់ទងនឹងអ្នកទេ</string>
     <string name="empty_repayment_schedule">មិនមានកាលវិភាគសងប្រាក់ដែលជាប់ទាក់ទងជាមួយអ្នកទេ</string>
     <string name="no_more_transactions_available">មិនមានប្រតិបត្តិការទេ</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">កាលវិភាគសងប្រាក់</string>
     <string name="transactions">ប្រតិបតិ្តការ</string>
     <string name="transfer">ការផ្ទេរប្រាក់</string>
-    <string name="approval_pending">ការអនុម័តនៅក្នុងដំណើរការ</string>
-    <string name="waiting_for_disburse">រង់ចាំការទូទាត់</string>
+    <string name="feature_account_approval_pending">ការអនុម័តនៅក្នុងដំណើរការ</string>
+    <string name="feature_account_disburse">រង់ចាំការទូទាត់</string>
     <string name="closed_because_of_obligation">បានបិទដោយសារតែកាតព្វកិច្ចមួយចំនួន</string>
     <string name="loan_closed">ឥណទានបានបិទ</string>
     <string name="due_date_in_charges">តាមកាលបរិច្ឆេទ:</string>
@@ -247,7 +247,7 @@
     <string name="four_weeks">4 សប្តាហ៍</string>
     <string name="three_months">បីខែ</string>
     <string name="six_months">6 ខែ</string>
-    <string name="filter">តម្រង</string>
+    <string name="feature_account_filter">តម្រង</string>
     <string name="start_date">កាលបរិច្ឆេទចាប់ផ្ដើម</string>
     <string name="end_date">កាលបរិច្ឆេទបញ្ចប់</string>
     <string name="filtered">ត្រង</string>
@@ -369,7 +369,7 @@
     <string name="leave_email">ទុកសារអេឡិចត្រូនិច</string>
     <string name="find_locations">រកទីតាំង</string>
     <string name="no_withdrawals">គ្មានការទូទាត់</string>
-    <string name="clear_filters">ជម្រះតម្រង</string>
+    <string name="feature_account_clear_filters">ជម្រះតម្រង</string>
     <string name="manage_accounts">គ្រប់គ្រងគណនី</string>
     <string name="more">ច្រើនទៀត</string>
     <string name="settings">ការកំណត់</string>
@@ -407,7 +407,7 @@
     <string name="error_password_not_match">ពាក្យសម្ងាត់មិនត្រូវគ្នា។</string>
     <string name="app_version">កំណែ %1$s</string>
     <string name="all_rights_reserved">រក្សាសិទ្ធិគ្រប់យ៉ាង។</string>
-    <string name="licenses">អាជ្ញាបណ្ណ</string>
+    <string name="feature_about_licenses">អាជ្ញាបណ្ណ</string>
     <string name="transfer_error">មិនអាចផ្ទេរបានសូមព្យាយាមម្តងទៀតពេលក្រោយ</string>
     <string name="please_wait">សូមរង់ចាំ…</string>
     <string name="message">សារ</string>
diff --git a/androidApp/src/main/res/values-kn/strings.xml b/androidApp/src/main/res/values-kn/strings.xml
index fe5a70411..57f2705a5 100644
--- a/androidApp/src/main/res/values-kn/strings.xml
+++ b/androidApp/src/main/res/values-kn/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">ಇತ್ತೀಚಿನ ವಹಿವಾಟುಗಳು</string>
     <string name="charges">ಶುಲ್ಕ</string>
     <string name="questionnaire">ಪ್ರಶ್ನಾವಳಿಯನ್ನು</string>
-    <string name="about_us">ನಮ್ಮ ಬಗ್ಗೆ</string>
+    <string name="feature_about_about_us">ನಮ್ಮ ಬಗ್ಗೆ</string>
     <string name="saving_account_details">ಖಾತೆ ವಿವರಗಳನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="savings_account">ಉಳಿತಾಯ ಖಾತೆ</string>
+    <string name="feature_account_savings_account">ಉಳಿತಾಯ ಖಾತೆ</string>
     <string name="error_loan_account_details_loading">ಕ್ರೆಡಿಟ್ ಖಾತೆ ಮಾಹಿತಿಯನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ</string>
     <string name="nominal_interest_rate">ನಾಮಮಾತ್ರ ಬಡ್ಡಿ ದರಗಳು</string>
     <string name="account_number">ಖಾತೆ ಸಂಖ್ಯೆ</string>
@@ -29,11 +29,11 @@
     <string name="small_text">ಸಣ್ಣ ಪಠ್ಯ</string>
     <string name="client_accounts">ಗ್ರಾಹಕ ಖಾತೆಗಳು</string>
     <string name="splash">ಸ್ವಾಗತ ಪರದೆಯ</string>
-    <string name="savings">ಉಳಿಸುವ</string>
-    <string name="loan">ಸಾಲ</string>
-    <string name="loan_account">ಕ್ರೆಡಿಟ್ ಖಾತೆ</string>
-    <string name="share">ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="share_account">ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
+    <string name="feature_account_savings">ಉಳಿಸುವ</string>
+    <string name="feature_account_loan">ಸಾಲ</string>
+    <string name="feature_account_loan_account">ಕ್ರೆಡಿಟ್ ಖಾತೆ</string>
+    <string name="feature_account_share">ಹಂಚಿಕೊಳ್ಳಿ</string>
+    <string name="feature_account_share_account">ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
     <string name="clients_list">ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
     <string name="core_common_working">ಕೆಲಸ</string>
     <string name="status_image">ರಾಜ್ಯದ ಚಿತ್ರ</string>
@@ -48,8 +48,8 @@
     <string name="remark">ಎಚ್ಚರಿಕೆ</string>
     <string name="expected_disbursement_date">ನಿರೀಕ್ಷಿತ ಪಾವತಿಯ ದಿನಾಂಕ</string>
     <string name="submission_date">ಸಲ್ಲಿಕೆಗಾಗಿ ಅಂತಿಮ ದಿನಾಂಕ</string>
-    <string name="submitted">ಅಪ್ಲೋಡ್ಗಳನ್ನು</string>
-    <string name="disbursement">ವೆಚ್ಚದಲ್ಲಿ</string>
+    <string name="feature_account_submitted">ಅಪ್ಲೋಡ್ಗಳನ್ನು</string>
+    <string name="feature_account_disbursement">ವೆಚ್ಚದಲ್ಲಿ</string>
     <string name="transfer_date">ವರ್ಗಾವಣೆಯ ದಿನಾಂಕ</string>
     <string name="apply_for_loan">ಸಾಲದ ಅರ್ಜಿ</string>
     <string name="update_loan">ಸಾಲವನ್ನು ನವೀಕರಿಸಿ</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">ಮರುಪಾವತಿ ತಂತ್ರ</string>
     <string name="pay_to">ಗೆ ಪಾವತಿ</string>
     <string name="pay_from">ನಿಂದ ಪಾವತಿ</string>
-    <string name="cancel">ರದ್ದು</string>
+    <string name="feature_account_cancel">ರದ್ದು</string>
     <string name="review_transfer">ಮುನ್ನೋಟ</string>
     <string name="transfer_to">ವರ್ಗಾಯಿಸಿ</string>
     <string name="transfer_from">ರಿಂದ ವರ್ಗಾಯಿಸಿ</string>
     <string name="making_transfer">ವರ್ಗಾವಣೆ ಮಾಡುವುದು</string>
-    <string name="deposit">ಠೇವಣಿ</string>
+    <string name="feature_account_deposit">ಠೇವಣಿ</string>
     <string name="enter_amount">ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ</string>
     <string name="remark_is_mandatory">ಗಮನಿಸಿ ಕಡ್ಡಾಯವಾಗಿದೆ</string>
-    <string name="approved">ಅನುಮೋದನೆ</string>
+    <string name="feature_account_approved">ಅನುಮೋದನೆ</string>
     <string name="shares_pending">ನಿರೀಕ್ಷೆಯಲ್ಲಿ</string>
     <string name="loan_amount_paid">ಹಣ</string>
     <string name="balance">ಸಮತೋಲನ</string>
     <string name="rejected">ತಿರಸ್ಕರಿಸಿದರು</string>
     <string name="waiting">ಕಾಯುವ</string>
-    <string name="overpaid">ಓವರ್ಪೇಯ್ಡ್</string>
-    <string name="in_arrears">ಬಾಕಿಗಳಲ್ಲಿ</string>
-    <string name="select_you_want">ನೀವು ಅನ್ವಯಿಸಲು ಬಯಸುವ ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆ ಮಾಡಿ</string>
+    <string name="feature_account_overpaid">ಓವರ್ಪೇಯ್ಡ್</string>
+    <string name="feature_account_in_arrears">ಬಾಕಿಗಳಲ್ಲಿ</string>
+    <string name="feature_account_select_you_want">ನೀವು ಅನ್ವಯಿಸಲು ಬಯಸುವ ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆ ಮಾಡಿ</string>
     <string name="filter_savings">ಫಿಲ್ಟರ್ ಉಳಿತಾಯ ಖಾತೆಗಳು</string>
     <string name="filter_loan">ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಫಿಲ್ಟರ್ ಮಾಡಿ</string>
     <string name="filter_share">ಫಿಲ್ಟರ್ ಖಾತೆ ಹಂಚಿಕೆ</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">ಉಳಿತಾಯದಿಂದ ವರ್ಗಾವಣೆ</string>
     <string name="loan_charges">ಸಾಲಗಳಿಗೆ ಶುಲ್ಕ</string>
     <string name="savings_charges">ಉಳಿತಾಯ</string>
-    <string name="active">ಸಕ್ರಿಯ</string>
-    <string name="closed">ಮುಚ್ಚಲಾಗಿದೆ</string>
-    <string name="withdrawn">ಹಿಂದಕ್ಕೆ</string>
+    <string name="feature_account_active">ಸಕ್ರಿಯ</string>
+    <string name="feature_account_closed">ಮುಚ್ಚಲಾಗಿದೆ</string>
+    <string name="feature_account_withdrawn">ಹಿಂದಕ್ಕೆ</string>
     <string name="need_approval">ಅನುಮೋದನೆ ಅಗತ್ಯವಿದೆ</string>
-    <string name="pending">ನಿರೀಕ್ಷೆಯಲ್ಲಿ</string>
-    <string name="matured">ಪ್ರೌಢ</string>
+    <string name="feature_account_pending">ನಿರೀಕ್ಷೆಯಲ್ಲಿ</string>
+    <string name="feature_account_matured">ಪ್ರೌಢ</string>
     <string name="create_an_account">ಖಾತೆಯನ್ನು ರಚಿಸಿ</string>
     <string name="first_name">ಹೆಸರು</string>
     <string name="last_name">ಹೆಸರು</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">ಠೇವಣಿ ಮಾಡಲು ಖಾತೆ ಸಕ್ರಿಯವಾಗಿರಬೇಕು</string>
     <string name="account_not_active_to_perform_transfer">ವರ್ಗಾವಣೆ ಮಾಡಲು ಖಾತೆ ಸಕ್ರಿಯವಾಗಿರಬೇಕು</string>
 
-    <string name="empty_savings_accounts">ನಿಮ್ಮೊಂದಿಗೆ ಯಾವುದೇ ಉಳಿತಾಯ ಖಾತೆಗಳಿಲ್ಲ</string>
-    <string name="empty_loan_accounts">ನಿಮ್ಮೊಂದಿಗೆ ಯಾವುದೇ ಸಾಲ ಖಾತೆಗಳಿಲ್ಲ</string>
-    <string name="empty_share_accounts">ನಿಮ್ಮೊಂದಿಗೆ ಸಂಯೋಜಿತವಾಗಿರುವ ಯಾವುದೇ ಖಾತೆಗಳಿಲ್ಲ</string>
+    <string name="feature_account_empty_savings_accounts">ನಿಮ್ಮೊಂದಿಗೆ ಯಾವುದೇ ಉಳಿತಾಯ ಖಾತೆಗಳಿಲ್ಲ</string>
+    <string name="feature_account_empty_loan_accounts">ನಿಮ್ಮೊಂದಿಗೆ ಯಾವುದೇ ಸಾಲ ಖಾತೆಗಳಿಲ್ಲ</string>
+    <string name="feature_account_empty_share_accounts">ನಿಮ್ಮೊಂದಿಗೆ ಸಂಯೋಜಿತವಾಗಿರುವ ಯಾವುದೇ ಖಾತೆಗಳಿಲ್ಲ</string>
     <string name="empty_transactions">ನಿಮಗೆ ಸಂಬಂಧಿಸಿದ ಯಾವುದೇ ವಹಿವಾಟುಗಳಿಲ್ಲ</string>
     <string name="empty_repayment_schedule">ನಿಮ್ಮೊಂದಿಗೆ ಯಾವುದೇ ಮರುಪಾವತಿಯ ವೇಳಾಪಟ್ಟಿ ಇಲ್ಲ</string>
     <string name="no_more_transactions_available">ಯಾವುದೇ ವ್ಯವಹಾರ ಲಭ್ಯವಿಲ್ಲ</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">ಮರುಪಾವತಿಯ ವೇಳಾಪಟ್ಟಿ</string>
     <string name="transactions">ವ್ಯವಹಾರ</string>
     <string name="transfer">ವರ್ಗಾವಣೆ</string>
-    <string name="approval_pending">ಅನುಮೋದನೆ ಪ್ರಗತಿಯಲ್ಲಿದೆ</string>
-    <string name="waiting_for_disburse">ಪಾವತಿಗಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ</string>
+    <string name="feature_account_approval_pending">ಅನುಮೋದನೆ ಪ್ರಗತಿಯಲ್ಲಿದೆ</string>
+    <string name="feature_account_disburse">ಪಾವತಿಗಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ</string>
     <string name="closed_because_of_obligation">ಕೆಲವು ಜವಾಬ್ದಾರಿಗಳಿಂದಾಗಿ ಮುಚ್ಚಲಾಗಿದೆ</string>
     <string name="loan_closed">ಸಾಲ ಮುಚ್ಚಲಾಗಿದೆ</string>
     <string name="due_date_in_charges">ದಿನಾಂಕದಂದು:</string>
@@ -247,7 +247,7 @@
     <string name="four_weeks">4 ವಾರಗಳು</string>
     <string name="three_months">ಮೂರು ತಿಂಗಳು</string>
     <string name="six_months">6 ತಿಂಗಳು</string>
-    <string name="filter">ಫಿಲ್ಟರ್</string>
+    <string name="feature_account_filter">ಫಿಲ್ಟರ್</string>
     <string name="start_date">ಪ್ರಾರಂಭ ದಿನಾಂಕ</string>
     <string name="end_date">ಅಂತ್ಯದ ದಿನಾಂಕ</string>
     <string name="filtered">ಫಿಲ್ಟರ್</string>
@@ -369,7 +369,7 @@
     <string name="leave_email">ಇ-ಮೇಲ್ ಸಂದೇಶವನ್ನು ಬಿಡಿ</string>
     <string name="find_locations">ಸ್ಥಳಗಳನ್ನು ಹುಡುಕಿ</string>
     <string name="no_withdrawals">ಪಾವತಿಗಳು ಇಲ್ಲ</string>
-    <string name="clear_filters">ಫಿಲ್ಟರ್ಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ</string>
+    <string name="feature_account_clear_filters">ಫಿಲ್ಟರ್ಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ</string>
     <string name="manage_accounts">ಖಾತೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ</string>
     <string name="more">ಹೆಚ್ಚು</string>
     <string name="settings">ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು</string>
@@ -407,7 +407,7 @@
     <string name="error_password_not_match">ಪಾಸ್ವರ್ಡ್ ಹೊಂದುತ್ತಿಲ್ಲ.</string>
     <string name="app_version">ಆವೃತ್ತಿ%1$s</string>
     <string name="all_rights_reserved">ಎಲ್ಲಾ ಹಕ್ಕುಗಳನ್ನು ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ.</string>
-    <string name="licenses">ಪರವಾನಗಿ</string>
+    <string name="feature_about_licenses">ಪರವಾನಗಿ</string>
     <string name="transfer_error">ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ, ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ</string>
     <string name="please_wait">ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ…</string>
     <string name="message">ಸಂದೇಶ</string>
diff --git a/androidApp/src/main/res/values-my/strings.xml b/androidApp/src/main/res/values-my/strings.xml
index 02cf85e6a..d9f033632 100644
--- a/androidApp/src/main/res/values-my/strings.xml
+++ b/androidApp/src/main/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Mifos မိုဘိုင်း</string>
+    <string name="feature_about_app_name">Mifos မိုဘိုင်း</string>
     <string name="login">လော့ဂ်အင်</string>
     <string name="toast_welcome">%1$s ကိုမှလှိုက်လှဲစွာကြိုဆိုပါသည်</string>
     <string name="unable_to_connect">အင်တာနက်ချိတ်ဆက်မ</string>
@@ -16,9 +16,9 @@
     <string name="recent_transactions">မကြာမီကအရောင်းအဝယ်</string>
     <string name="charges">စွဲချက်</string>
     <string name="questionnaire">မေးခွန်းပုံစံ</string>
-    <string name="about_us">ကျွန်ုပ်တို့အကြောင်း</string>
+    <string name="feature_about_about_us">ကျွန်ုပ်တို့အကြောင်း</string>
     <string name="saving_account_details">အကောင့်အသေးစိတ်ကိုသိမ်းဆည်းနေ</string>
-    <string name="savings_account">ငွေစုဘဏ်စာရင်း</string>
+    <string name="feature_account_savings_account">ငွေစုဘဏ်စာရင်း</string>
     <string name="error_loan_account_details_loading">ချေးငွေအတွက်တင်ပေးမှုအမှားအသေးစိတ်အကောင့်</string>
     <string name="nominal_interest_rate">အမည်ခံအတိုးနှုန်း</string>
     <string name="account_number">အကောင့်နံပါတ်</string>
@@ -31,11 +31,11 @@
     <string name="small_text">အသေးစားစာသား</string>
     <string name="client_accounts">client Accounts ကို</string>
     <string name="splash">ရေပက်</string>
-    <string name="savings">သိမ်းဆည်းနေ</string>
-    <string name="loan">ခြေးငှေ</string>
-    <string name="loan_account">ချေးငွေအကောင့်</string>
-    <string name="share">ဝေစု</string>
-    <string name="share_account">ဝေမျှမယ်အကောင့်</string>
+    <string name="feature_account_savings">သိမ်းဆည်းနေ</string>
+    <string name="feature_account_loan">ခြေးငှေ</string>
+    <string name="feature_account_loan_account">ချေးငွေအကောင့်</string>
+    <string name="feature_account_share">ဝေစု</string>
+    <string name="feature_account_share_account">ဝေမျှမယ်အကောင့်</string>
     <string name="clients_list">တစ်ဦးကို client ကို ရွေးချယ်.</string>
     <string name="core_common_working">အလုပ်အဖွဲ့</string>
     <string name="status_image">အဆင့်အတန်းပုံရိပ်</string>
@@ -50,8 +50,8 @@
     <string name="remark">ပွောဆို</string>
     <string name="expected_disbursement_date">မျှော်လင့်ထားသည့်ငွေပေးချေနေ့စွဲ</string>
     <string name="submission_date">တင်သွင်းခဲ့တဲ့နေ့စွဲ</string>
-    <string name="submitted">Submitted</string>
-    <string name="disbursement">ငွေပေးချေ</string>
+    <string name="feature_account_submitted">Submitted</string>
+    <string name="feature_account_disbursement">ငွေပေးချေ</string>
     <string name="transfer_date">လွှဲပြောင်းနေ့စွဲ</string>
     <string name="apply_for_loan">ချေးငွေအဘို့အ Apply</string>
     <string name="update_loan">Update ကိုချေးငွေ</string>
@@ -67,23 +67,23 @@
     <string name="repayment_strategy">ပြန်ဆပ်မဟာဗျူဟာ</string>
     <string name="pay_to">ရန်ပေးဆောင်</string>
     <string name="pay_from">မှစ. ပေးဆောင်</string>
-    <string name="cancel">Cancel</string>
+    <string name="feature_account_cancel">Cancel</string>
     <string name="review_transfer">ဆန်းစစ်ခြင်း</string>
     <string name="transfer_to">ရန်လွှဲပြောင်း</string>
     <string name="transfer_from">မှစ. လွှဲပြောင်း</string>
     <string name="making_transfer">လွှဲပြောင်း Making</string>
-    <string name="deposit">အပျငှေ</string>
+    <string name="feature_account_deposit">အပျငှေ</string>
     <string name="enter_amount">ငွေပမာဏကိုရိုက်ထည့်</string>
     <string name="remark_is_mandatory">မှတ်ချက်မဖြစ်မနေဖြစ်ပါသည်</string>
-    <string name="approved">approved</string>
+    <string name="feature_account_approved">approved</string>
     <string name="shares_pending">လာမည့်</string>
     <string name="loan_amount_paid">paid</string>
     <string name="balance">ချိန်ခွင်လျှာ</string>
     <string name="rejected">ပယ်ချ</string>
     <string name="waiting">စောင့်ဆိုင်းနေ</string>
-    <string name="overpaid">Overpaid</string>
-    <string name="in_arrears">ကြွေးကျန်အတွက်</string>
-    <string name="select_you_want">သငျသညျလျှောက်ထားချင်အားလုံးကို Select လုပ်ပါ</string>
+    <string name="feature_account_overpaid">Overpaid</string>
+    <string name="feature_account_in_arrears">ကြွေးကျန်အတွက်</string>
+    <string name="feature_account_select_you_want">သငျသညျလျှောက်ထားချင်အားလုံးကို Select လုပ်ပါ</string>
     <string name="filter_savings">ချွေတာသုံးစွဲ Accounts ကို Filter</string>
     <string name="filter_loan">ချေးငွေ Accounts ကို Filter</string>
     <string name="filter_share">filter ဝေမျှမယ် Accounts ကို</string>
@@ -99,12 +99,12 @@
     <string name="transfer_from_savings">ချွေတာသုံးစွဲရာမှလွှဲပြောင်း</string>
     <string name="loan_charges">ချေးငွေစွပ်စွဲချက်</string>
     <string name="savings_charges">ချွေတာသုံးစွဲစွပ်စွဲချက်</string>
-    <string name="active">active</string>
-    <string name="closed">ပိတ်သိမ်း</string>
-    <string name="withdrawn">ဆုတ်ခွာ</string>
+    <string name="feature_account_active">active</string>
+    <string name="feature_account_closed">ပိတ်သိမ်း</string>
+    <string name="feature_account_withdrawn">ဆုတ်ခွာ</string>
     <string name="need_approval">အတည်ပြုချက်လိုအပ်</string>
-    <string name="pending">လာမည့်</string>
-    <string name="matured">ရင့်ကျက်</string>
+    <string name="feature_account_pending">လာမည့်</string>
+    <string name="feature_account_matured">ရင့်ကျက်</string>
     <string name="create_an_account">အကောင့်တစ်ခုဖန်တီးသည်</string>
     <string name="first_name">နာမည်</string>
     <string name="last_name">မျိုးနွယ်အမည်</string>
@@ -135,9 +135,9 @@
     <string name="account_not_active_to_perform_deposit">အကောင့်တစ်ခုဖျော်ဖြေဖို့ Active ကိုဖြစ်သင့်တယ်အပျငှေ</string>
     <string name="account_not_active_to_perform_transfer">အကောင့်တစ်ခုဖျော်ဖြေဖို့ Active ကိုဖြစ်သင့်တယ်လွှဲပြောင်း</string>
 
-    <string name="empty_savings_accounts">သင်နှင့်အတူဆက်နွယ်ခြင်းမရှိ SavingsAccount ရှိပါတယ်</string>
-    <string name="empty_loan_accounts">သင်နှင့်အတူဆက်နွယ်ခြင်းမရှိ LoanAccount ရှိပါတယ်</string>
-    <string name="empty_share_accounts">သင်နှင့်အတူဆက်နွယ်ခြင်းမရှိ ShareAccount ရှိပါတယ်</string>
+    <string name="feature_account_empty_savings_accounts">သင်နှင့်အတူဆက်နွယ်ခြင်းမရှိ SavingsAccount ရှိပါတယ်</string>
+    <string name="feature_account_empty_loan_accounts">သင်နှင့်အတူဆက်နွယ်ခြင်းမရှိ LoanAccount ရှိပါတယ်</string>
+    <string name="feature_account_empty_share_accounts">သင်နှင့်အတူဆက်နွယ်ခြင်းမရှိ ShareAccount ရှိပါတယ်</string>
     <string name="empty_transactions">သင်နှင့်အတူဆက်နွယ်ခြင်းမရှိငွေကြေးလွှဲပြောင်းမှုမှာရှိပါတယ်</string>
     <string name="empty_repayment_schedule">သင်နှင့်အတူဆက်နွယ်ခြင်းမရှိပြန်ဆပ်အချိန်ဇယားရှိပါတယ်     </string>
     <string name="no_more_transactions_available">ရရှိနိုင်ပါကပိုအရောင်းအဘယ်သူမျှမက</string>
@@ -228,8 +228,8 @@
     <string name="repayment_schedule">ပြန်ဆပ်ဇယား</string>
     <string name="transactions">အရောင်းအ</string>
     <string name="transfer">လွှဲပြောင်း</string>
-    <string name="approval_pending">ခွင့်ပြုချက်ဆိုင်းငံ့ထား</string>
-    <string name="waiting_for_disburse">ငွေပေးချေဘို့စောင့်ဆိုင်းနေ</string>
+    <string name="feature_account_approval_pending">ခွင့်ပြုချက်ဆိုင်းငံ့ထား</string>
+    <string name="feature_account_disburse">ငွေပေးချေဘို့စောင့်ဆိုင်းနေ</string>
     <string name="closed_because_of_obligation">ဘာဖြစ်လို့လဲဆိုတော့တချို့တာဝန်၏အပိတ်</string>
     <string name="loan_closed">ချေးငွေပိတ်သည်</string>
     <string name="due_date_in_charges">နောက်ဆုံးရက်:</string>
@@ -253,7 +253,7 @@
     <string name="four_weeks">၄ သီတင်းပါတ်</string>
     <string name="three_months">၃ လ</string>
     <string name="six_months">၆ လ</string>
-    <string name="filter">ရေစစ်</string>
+    <string name="feature_account_filter">ရေစစ်</string>
     <string name="start_date">စတင်သည့်ရက်စွဲ</string>
     <string name="end_date">အဆုံးနေ့စွဲ</string>
     <string name="filtered">စစ်ထုတ်သည်</string>
@@ -366,7 +366,7 @@
     <string name="hello_client">မင်္ဂလာပါ %1$s ကို</string>
     <string name="double_amount">%1$.2f</string>
     <string name="double_and_string">%1$.2f %2$s ကို</string>
-    <string name="string_and_string">%1$s ကို %2$s ကို</string>
+    <string name="feature_account_string_and_string">%1$s ကို %2$s ကို</string>
     <string name="string_and_double">%1$s ကို %2$.2f</string>
     <string name="string_and_int">%1$s ကို: %2$ ဃ</string>
     <string name="invalid_amount">မှားနေသောငွေပမာဏ</string>
@@ -390,7 +390,7 @@
     <string name="leave_email">အီးမေးလ်တစ်စောင် Leave</string>
     <string name="find_locations">တည်နေရာကိုရှာပါ</string>
     <string name="no_withdrawals">အဘယ်သူမျှမထုတ်ယူ</string>
-    <string name="clear_filters">Clear ကိုစိစစ်မှုများ</string>
+    <string name="feature_account_clear_filters">Clear ကိုစိစစ်မှုများ</string>
     <string name="manage_accounts">Manage Accounts ကို</string>
     <string name="more">နောက်ထပ်</string>
     <string name="settings">Settings များ</string>
@@ -427,9 +427,9 @@
     <string name="confirm_password">စကားဝှက်ကိုအတည်ပြုပါ</string>
     <string name="error_password_not_match">Password ကိုမကိုက်ညီပါဘူး။</string>
     <string name="app_version">ဗားရှင်း %1$s ကို</string>
-    <string name="copy_right_mifos">©2016-%1$s Mifos Initiative.</string>
+    <string name="feature_about_copyright_mifos">©2016-%1$s Mifos Initiative.</string>
     <string name="all_rights_reserved">မူပိုင်ခွင့်များရယူပြီး။</string>
-    <string name="licenses">လိုင်စင်</string>
+    <string name="feature_about_licenses">လိုင်စင်</string>
     <string name="transfer_error">လွှဲပြောင်းဖြည့်စွက်ဖို့မအောင်မြင်ဘူး, နောက်မှာထပ်ကြိုးစားကြည့်ပါ</string>
     <string name="please_wait">ကျေးဇူးပြုပြီးခဏစောင့်ပါ…</string>
     <string name="message">မက်ဆေ့ခ်ျကို</string>
diff --git a/androidApp/src/main/res/values-pl/strings.xml b/androidApp/src/main/res/values-pl/strings.xml
index ffadcfa0d..2a798576a 100644
--- a/androidApp/src/main/res/values-pl/strings.xml
+++ b/androidApp/src/main/res/values-pl/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">Ostatnie transakcje</string>
     <string name="charges">Opłaty</string>
     <string name="questionnaire">Ankieta</string>
-    <string name="about_us">O nas</string>
+    <string name="feature_about_about_us">O nas</string>
     <string name="saving_account_details">Zapisywanie szczegółów konta</string>
-    <string name="savings_account">Konto oszczędnościowe</string>
+    <string name="feature_account_savings_account">Konto oszczędnościowe</string>
     <string name="error_loan_account_details_loading">Błąd podczas ładowania danych konta kredytowego</string>
     <string name="nominal_interest_rate">Nominalne stopy procentowe</string>
     <string name="account_number">Numer konta</string>
@@ -29,11 +29,11 @@
     <string name="small_text">Mały tekst</string>
     <string name="client_accounts">Konta klientów</string>
     <string name="splash">Ekran powitalny</string>
-    <string name="savings">Oszczędność</string>
-    <string name="loan">Pożyczka</string>
-    <string name="loan_account">Konto kredytowe</string>
-    <string name="share">Udostępnij</string>
-    <string name="share_account">Udostępnij konto</string>
+    <string name="feature_account_savings">Oszczędność</string>
+    <string name="feature_account_loan">Pożyczka</string>
+    <string name="feature_account_loan_account">Konto kredytowe</string>
+    <string name="feature_account_share">Udostępnij</string>
+    <string name="feature_account_share_account">Udostępnij konto</string>
     <string name="clients_list">Wybierz klienta</string>
     <string name="core_common_working">Pracujący</string>
     <string name="status_image">Obraz stanu</string>
@@ -48,8 +48,8 @@
     <string name="remark">Uwaga</string>
     <string name="expected_disbursement_date">Oczekiwana data wypłaty</string>
     <string name="submission_date">Termin składania</string>
-    <string name="submitted">Przesłane</string>
-    <string name="disbursement">Wydatek</string>
+    <string name="feature_account_submitted">Przesłane</string>
+    <string name="feature_account_disbursement">Wydatek</string>
     <string name="transfer_date">Data przelewu</string>
     <string name="apply_for_loan">Złóż wniosek o pożyczkę</string>
     <string name="update_loan">Zaktualizuj pożyczkę</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">Strategia spłaty</string>
     <string name="pay_to">Wpłata do</string>
     <string name="pay_from">Wpłata od</string>
-    <string name="cancel">Anuluj</string>
+    <string name="feature_account_cancel">Anuluj</string>
     <string name="review_transfer">Podgląd</string>
     <string name="transfer_to">Przelew do</string>
     <string name="transfer_from">Przelew od</string>
     <string name="making_transfer">Dokonywanie przelewu</string>
-    <string name="deposit">Kaucja</string>
+    <string name="feature_account_deposit">Kaucja</string>
     <string name="enter_amount">Wprowadź ilość</string>
     <string name="remark_is_mandatory">Uwaga jest obowiązkowa</string>
-    <string name="approved">Zatwierdzony</string>
+    <string name="feature_account_approved">Zatwierdzony</string>
     <string name="shares_pending">W oczekiwaniu</string>
     <string name="loan_amount_paid">Płatny</string>
     <string name="balance">Saldo</string>
     <string name="rejected">Odrzucono</string>
     <string name="waiting">Czekanie</string>
-    <string name="overpaid">Nadpłacony</string>
-    <string name="in_arrears">W zaległości</string>
-    <string name="select_you_want">Wybierz wszystko, co chcesz zastosować</string>
+    <string name="feature_account_overpaid">Nadpłacony</string>
+    <string name="feature_account_in_arrears">W zaległości</string>
+    <string name="feature_account_select_you_want">Wybierz wszystko, co chcesz zastosować</string>
     <string name="filter_savings">Filtruj konta oszczędnościowe</string>
     <string name="filter_loan">Filtruj konta kredytowe</string>
     <string name="filter_share">Filtruj udostępnianie kont</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">Przelew z oszczędności</string>
     <string name="loan_charges">Opłaty za pożyczki</string>
     <string name="savings_charges">Oszczędności</string>
-    <string name="active">Aktywny</string>
-    <string name="closed">Zamknięte</string>
-    <string name="withdrawn">Wycofane</string>
+    <string name="feature_account_active">Aktywny</string>
+    <string name="feature_account_closed">Zamknięte</string>
+    <string name="feature_account_withdrawn">Wycofane</string>
     <string name="need_approval">Wymaga zatwierdzenia</string>
-    <string name="pending">W oczekiwaniu</string>
-    <string name="matured">Dojrzałe</string>
+    <string name="feature_account_pending">W oczekiwaniu</string>
+    <string name="feature_account_matured">Dojrzałe</string>
     <string name="create_an_account">Utwórz konto</string>
     <string name="first_name">Imię</string>
     <string name="last_name">Nazwisko</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">Konto powinno być aktywne, aby dokonać kaucji</string>
     <string name="account_not_active_to_perform_transfer">Konto powinno być aktywne, aby wykonać przelew</string>
 
-    <string name="empty_savings_accounts">Brak powiązanych z tobą kont oszczędnościowych</string>
-    <string name="empty_loan_accounts">Brak powiązanych z tobą kont pożyczkowych</string>
-    <string name="empty_share_accounts">Brak powiązanych z tobą kont współdzielonych</string>
+    <string name="feature_account_empty_savings_accounts">Brak powiązanych z tobą kont oszczędnościowych</string>
+    <string name="feature_account_empty_loan_accounts">Brak powiązanych z tobą kont pożyczkowych</string>
+    <string name="feature_account_empty_share_accounts">Brak powiązanych z tobą kont współdzielonych</string>
     <string name="empty_transactions">Brak powiązanych z tobą transakcji</string>
     <string name="empty_repayment_schedule">Brak powiązanego z tobą harmonogramu spłat</string>
     <string name="no_more_transactions_available">Brak dostępnych transakcji</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">Harmonogram spłaty</string>
     <string name="transactions">Transakcje</string>
     <string name="transfer">Przelew</string>
-    <string name="approval_pending">Zatwierdzenie w toku</string>
-    <string name="waiting_for_disburse">Oczekiwanie na wypłatę</string>
+    <string name="feature_account_approval_pending">Zatwierdzenie w toku</string>
+    <string name="feature_account_disburse">Oczekiwanie na wypłatę</string>
     <string name="closed_because_of_obligation">Zamknięte z powodu niektórych zobowiązań</string>
     <string name="loan_closed">Pożyczka zamknięta</string>
     <string name="due_date_in_charges">Według daty:</string>
@@ -247,7 +247,7 @@
     <string name="four_weeks">4 tygodnie</string>
     <string name="three_months">3 miesiące</string>
     <string name="six_months">6 miesięcy</string>
-    <string name="filter">Filtr</string>
+    <string name="feature_account_filter">Filtr</string>
     <string name="start_date">Data rozpoczęcia</string>
     <string name="end_date">Data zakonczenia</string>
     <string name="filtered">Przefiltrowany</string>
@@ -370,7 +370,7 @@
     <string name="leave_email">Pozostaw wiadomość e-mail</string>
     <string name="find_locations">Znajdź lokalizacje</string>
     <string name="no_withdrawals">Brak wypłat</string>
-    <string name="clear_filters">Wyczyść filtry</string>
+    <string name="feature_account_clear_filters">Wyczyść filtry</string>
     <string name="manage_accounts">Zarządzaj kontami</string>
     <string name="more">Więcej</string>
     <string name="settings">Ustawienia</string>
@@ -408,7 +408,7 @@
     <string name="error_password_not_match">Hasło Nie pasuje.</string>
     <string name="app_version">Wersja %1$s</string>
     <string name="all_rights_reserved">Wszelkie prawa zastrzeżone.</string>
-    <string name="licenses">Licencje</string>
+    <string name="feature_about_licenses">Licencje</string>
     <string name="transfer_error">Nie można wykonać przelewu, spróbuj ponownie później</string>
     <string name="please_wait">Proszę czekać…</string>
     <string name="message">wiadomość</string>
diff --git a/androidApp/src/main/res/values-pt/strings.xml b/androidApp/src/main/res/values-pt/strings.xml
index 921920efa..e5d74b0f8 100644
--- a/androidApp/src/main/res/values-pt/strings.xml
+++ b/androidApp/src/main/res/values-pt/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Mifos Mobile</string>
+    <string name="feature_about_app_name">Mifos Mobile</string>
     <string name="login">Entrar</string>
     <string name="toast_welcome">Bem-vindo %1$s</string>
     <string name="unable_to_connect">Não conectado à internet</string>
@@ -15,9 +15,9 @@
     <string name="recent_transactions">Transações recentes</string>
     <string name="charges">Cobranças</string>
     <string name="questionnaire">Questionário</string>
-    <string name="about_us">Sobre nós</string>
+    <string name="feature_about_about_us">Sobre nós</string>
     <string name="saving_account_details">Detalhes da conta de poupança</string>
-    <string name="savings_account">Conta Poupança</string>
+    <string name="feature_account_savings_account">Conta Poupança</string>
     <string name="nominal_interest_rate">Taxa de Interesse Nominal</string>
     <string name="account_number">Número da conta</string>
     <string name="account_balance">Saldo da Conta</string>
@@ -29,11 +29,11 @@
     <string name="small_text">Texto pequeno</string>
     <string name="client_accounts">Contas de Clientes</string>
     <string name="splash">esguicho</string>
-    <string name="savings">Poupança</string>
-    <string name="loan">Empréstimo</string>
-    <string name="loan_account">Conta de Empréstimos</string>
-    <string name="share">Partilhar</string>
-    <string name="share_account">Partilhar conta</string>
+    <string name="feature_account_savings">Poupança</string>
+    <string name="feature_account_loan">Empréstimo</string>
+    <string name="feature_account_loan_account">Conta de Empréstimos</string>
+    <string name="feature_account_share">Partilhar</string>
+    <string name="feature_account_share_account">Partilhar conta</string>
     <string name="clients_list">Escolheu um cliente</string>
     <string name="core_common_working">A trabalhar</string>
     <string name="status_image">Imagem de Status</string>
@@ -48,8 +48,8 @@
     <string name="remark">Observação</string>
     <string name="expected_disbursement_date">Data de desembolso esperada</string>
     <string name="submission_date">Data de submissão</string>
-    <string name="submitted">Submetido</string>
-    <string name="disbursement">Desembolso</string>
+    <string name="feature_account_submitted">Submetido</string>
+    <string name="feature_account_disbursement">Desembolso</string>
     <string name="transfer_date">Data de transferência</string>
     <string name="apply_for_loan">Solicitar empréstimo</string>
     <string name="update_loan">Atualizar empréstimo</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">Estratégia de Reembolso</string>
     <string name="pay_to">Pagar para</string>
     <string name="pay_from">Pagar da</string>
-    <string name="cancel">Cancelar</string>
+    <string name="feature_account_cancel">Cancelar</string>
     <string name="review_transfer">Rever</string>
     <string name="transfer_to">Transferir para</string>
     <string name="transfer_from">Transferir da</string>
     <string name="making_transfer">Fazendo Transferência</string>
-    <string name="deposit">Depositar</string>
+    <string name="feature_account_deposit">Depositar</string>
     <string name="enter_amount">Digite Montante</string>
     <string name="remark_is_mandatory">Observação é obrigatória</string>
-    <string name="approved">Aprovado</string>
+    <string name="feature_account_approved">Aprovado</string>
     <string name="shares_pending">Pendente</string>
     <string name="loan_amount_paid">Pago</string>
     <string name="balance">Saldo</string>
     <string name="rejected">Rejeitado</string>
     <string name="waiting">À espera</string>
-    <string name="overpaid">Excesso de pagamento</string>
-    <string name="in_arrears">Em atraso</string>
-    <string name="select_you_want">Selecione tudo o que você deseja aplicar</string>
+    <string name="feature_account_overpaid">Excesso de pagamento</string>
+    <string name="feature_account_in_arrears">Em atraso</string>
+    <string name="feature_account_select_you_want">Selecione tudo o que você deseja aplicar</string>
     <string name="filter_savings">Filtrar Contas Poupança</string>
     <string name="filter_loan">Filtrar Contas Empréstimo</string>
     <string name="filter_share">Filtrar contas de compartilhamento</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">Transferir da poupança</string>
     <string name="loan_charges">Cobranças de empréstimos</string>
     <string name="savings_charges">Cobranças de poupanças</string>
-    <string name="active">Ativo</string>
-    <string name="closed">Fechado</string>
-    <string name="withdrawn">Retirada</string>
+    <string name="feature_account_active">Ativo</string>
+    <string name="feature_account_closed">Fechado</string>
+    <string name="feature_account_withdrawn">Retirada</string>
     <string name="need_approval">Necessita de aprovação</string>
-    <string name="pending">Pendente</string>
-    <string name="matured">Amadurecido</string>
+    <string name="feature_account_pending">Pendente</string>
+    <string name="feature_account_matured">Amadurecido</string>
     <string name="create_an_account">Crie uma conta</string>
     <string name="first_name">Primeiro Nome</string>
     <string name="last_name">Último Nome</string>
@@ -136,9 +136,9 @@
     <string name="account_not_active_to_perform_transfer">Conta deve estar ativa para transferir</string>
 
 
-    <string name="empty_savings_accounts">Não existe nenhuma Conta Poupança associada</string>
-    <string name="empty_loan_accounts">Não existe nenhuma Conta de Empréstimo associada</string>
-    <string name="empty_share_accounts">Não existe nenhuma Conta Partilha associada</string>
+    <string name="feature_account_empty_savings_accounts">Não existe nenhuma Conta Poupança associada</string>
+    <string name="feature_account_empty_loan_accounts">Não existe nenhuma Conta de Empréstimo associada</string>
+    <string name="feature_account_empty_share_accounts">Não existe nenhuma Conta Partilha associada</string>
     <string name="empty_transactions">Não existem transações associadas</string>
     <string name="empty_repayment_schedule">Não existe nenhum cronograma de reembolso associado</string>
     <string name="no_more_transactions_available">Não há mais transações disponíveis</string>
@@ -238,8 +238,8 @@
     <string name="repayment_schedule">Cronograma de pagamento</string>
     <string name="transactions">Transações</string>
     <string name="transfer">Transferência</string>
-    <string name="approval_pending">Aprovação pendente</string>
-    <string name="waiting_for_disburse">À espera de desembolso</string>
+    <string name="feature_account_approval_pending">Aprovação pendente</string>
+    <string name="feature_account_disburse">À espera de desembolso</string>
     <string name="closed_because_of_obligation">Fechado devido a algumas obrigações</string>
     <string name="loan_closed">Empréstimo fechado</string>
     <string name="due_date_in_charges">Data de vencimento:</string>
@@ -265,7 +265,7 @@
     <string name="four_weeks">4 Semanas</string>
     <string name="three_months">3 Meses</string>
     <string name="six_months">6 Meses</string>
-    <string name="filter">Filtro</string>
+    <string name="feature_account_filter">Filtro</string>
     <string name="start_date">Data inicial</string>
     <string name="end_date">Data final</string>
     <string name="filtered">Filtrado</string>
@@ -408,7 +408,7 @@
     <string name="hello_client">Olá, %1$s</string>
     <string name="double_amount">%1$.2f</string>
     <string name="double_and_string">%1$.2f %2$s</string>
-    <string name="string_and_string">%1$s%2$s</string>
+    <string name="feature_account_string_and_string">%1$s%2$s</string>
     <string name="string_and_double">%1$s: %2$.2f</string>
     <string name="string_and_int">%1$s: %2$d</string>
     <string name="invalid_amount">Quantia inválida</string>
@@ -432,7 +432,7 @@
     <string name="leave_email">Deixar um email</string>
     <string name="find_locations">Procurar Lugares</string>
     <string name="no_withdrawals">Nenhum levantamento</string>
-    <string name="clear_filters">Limpar os Filtros</string>
+    <string name="feature_account_clear_filters">Limpar os Filtros</string>
     <string name="manage_accounts">Gerir contas</string>
     <string name="more">Mais</string>
     <string name="settings">Definições</string>
@@ -487,9 +487,9 @@
     <string name="confirm_password">Confirme a palavra-passe</string>
     <string name="error_password_not_match">A palavra-passe não coincide.</string>
     <string name="app_version">Versão %1$s</string>
-    <string name="copy_right_mifos">©2016-%1$s Inicitiva Mifos.</string>
+    <string name="feature_about_copyright_mifos">©2016-%1$s Inicitiva Mifos.</string>
     <string name="all_rights_reserved">Todos os direitos reservados.</string>
-    <string name="licenses">Licenças</string>
+    <string name="feature_about_licenses">Licenças</string>
     <string name="transfer_error">Não é possível concluir a transferência, por favor, tente novamente mais tarde</string>
     <string name="please_wait">Por favor espere…</string>
     <string name="message">mensagem</string>
diff --git a/androidApp/src/main/res/values-ru/strings.xml b/androidApp/src/main/res/values-ru/strings.xml
index 5bf402599..d46a6f9d5 100644
--- a/androidApp/src/main/res/values-ru/strings.xml
+++ b/androidApp/src/main/res/values-ru/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">Последние транзакции</string>
     <string name="charges">Сборы</string>
     <string name="questionnaire">Вопросник</string>
-    <string name="about_us">О КОМПАНИИ</string>
+    <string name="feature_about_about_us">О КОМПАНИИ</string>
     <string name="saving_account_details">Сохранение данных учетной записи</string>
-    <string name="savings_account">Сберегательный счет</string>
+    <string name="feature_account_savings_account">Сберегательный счет</string>
     <string name="error_loan_account_details_loading">Ошибка при загрузке информации об учетной записи</string>
     <string name="nominal_interest_rate">Номинальные процентные ставки</string>
     <string name="account_number">Номер счета</string>
@@ -29,11 +29,11 @@
     <string name="small_text">Маленький текст</string>
     <string name="client_accounts">Счета клиентов</string>
     <string name="splash">Экран приветствия</string>
-    <string name="savings">Экономия</string>
-    <string name="loan">Ссуда</string>
-    <string name="loan_account">Кредитный счет</string>
-    <string name="share">Доля</string>
-    <string name="share_account">Поделитесь своим аккаунтом</string>
+    <string name="feature_account_savings">Экономия</string>
+    <string name="feature_account_loan">Ссуда</string>
+    <string name="feature_account_loan_account">Кредитный счет</string>
+    <string name="feature_account_share">Доля</string>
+    <string name="feature_account_share_account">Поделитесь своим аккаунтом</string>
     <string name="clients_list">Выберите клиента</string>
     <string name="core_common_working">Работа</string>
     <string name="status_image">Изображение государства</string>
@@ -48,8 +48,8 @@
     <string name="remark">Предосторожность</string>
     <string name="expected_disbursement_date">Ожидаемая дата выплаты</string>
     <string name="submission_date">Крайний срок подачи</string>
-    <string name="submitted">Добавления</string>
-    <string name="disbursement">Расходы</string>
+    <string name="feature_account_submitted">Добавления</string>
+    <string name="feature_account_disbursement">Расходы</string>
     <string name="transfer_date">Дата передачи</string>
     <string name="apply_for_loan">Подать заявку на кредит</string>
     <string name="update_loan">Обновить кредит</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">Стратегия погашения</string>
     <string name="pay_to">Оплата</string>
     <string name="pay_from">Оплата с</string>
-    <string name="cancel">Отменить</string>
+    <string name="feature_account_cancel">Отменить</string>
     <string name="review_transfer">Предварительный просмотр</string>
     <string name="transfer_to">Передача</string>
     <string name="transfer_from">Перевод с</string>
     <string name="making_transfer">Создание перевода</string>
-    <string name="deposit">Депозит</string>
+    <string name="feature_account_deposit">Депозит</string>
     <string name="enter_amount">Введите количество</string>
     <string name="remark_is_mandatory">Примечание обязательное</string>
-    <string name="approved">Утвержденный</string>
+    <string name="feature_account_approved">Утвержденный</string>
     <string name="shares_pending">В ожидании</string>
     <string name="loan_amount_paid">Оплаченный</string>
     <string name="balance">Баланс</string>
     <string name="rejected">Отвергнуто</string>
     <string name="waiting">Ожидание</string>
-    <string name="overpaid">Переплатил</string>
-    <string name="in_arrears">Задолженность</string>
-    <string name="select_you_want">Выберите все, что вы хотите применить</string>
+    <string name="feature_account_overpaid">Переплатил</string>
+    <string name="feature_account_in_arrears">Задолженность</string>
+    <string name="feature_account_select_you_want">Выберите все, что вы хотите применить</string>
     <string name="filter_savings">Фильтровать сберегательные счета</string>
     <string name="filter_loan">Фильтрация кредитных счетов</string>
     <string name="filter_share">Слияние фильтров</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">Переход от сбережений</string>
     <string name="loan_charges">Сборы за кредиты</string>
     <string name="savings_charges">Экономия</string>
-    <string name="active">Активный</string>
-    <string name="closed">Закрыто</string>
-    <string name="withdrawn">Отозваны</string>
+    <string name="feature_account_active">Активный</string>
+    <string name="feature_account_closed">Закрыто</string>
+    <string name="feature_account_withdrawn">Отозваны</string>
     <string name="need_approval">Требуется разрешение</string>
-    <string name="pending">В ожидании</string>
-    <string name="matured">Зрелый</string>
+    <string name="feature_account_pending">В ожидании</string>
+    <string name="feature_account_matured">Зрелый</string>
     <string name="create_an_account">Создать учетную запись</string>
     <string name="first_name">Имя</string>
     <string name="last_name">Имя</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">Аккаунт должен быть активным для внесения депозита</string>
     <string name="account_not_active_to_perform_transfer">Аккаунт должен быть активным, чтобы сделать передачу</string>
 
-    <string name="empty_savings_accounts">Нет сберегательных счетов, связанных с вами</string>
-    <string name="empty_loan_accounts">С вами не связаны ссудные счета</string>
-    <string name="empty_share_accounts">С вами не связаны общие аккаунты</string>
+    <string name="feature_account_empty_savings_accounts">Нет сберегательных счетов, связанных с вами</string>
+    <string name="feature_account_empty_loan_accounts">С вами не связаны ссудные счета</string>
+    <string name="feature_account_empty_share_accounts">С вами не связаны общие аккаунты</string>
     <string name="empty_transactions">Нет транзакций, связанных с вами</string>
     <string name="empty_repayment_schedule">График погашения, связанный с вами, не существует</string>
     <string name="no_more_transactions_available">Нет доступных транзакций</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">График погашения</string>
     <string name="transactions">Операции</string>
     <string name="transfer">Перевод</string>
-    <string name="approval_pending">Продвинутое одобрение</string>
-    <string name="waiting_for_disburse">Ожидание платежа</string>
+    <string name="feature_account_approval_pending">Продвинутое одобрение</string>
+    <string name="feature_account_disburse">Ожидание платежа</string>
     <string name="closed_because_of_obligation">Закрыто из-за некоторых обязательств</string>
     <string name="loan_closed">Кредит закрыт</string>
     <string name="due_date_in_charges">По дате:</string>
@@ -247,7 +247,7 @@
     <string name="four_weeks">4 недели</string>
     <string name="three_months">Три месяца</string>
     <string name="six_months">6 месяцев</string>
-    <string name="filter">Фильтр</string>
+    <string name="feature_account_filter">Фильтр</string>
     <string name="start_date">Дата начала</string>
     <string name="end_date">Дата окончания</string>
     <string name="filtered">Отфильтрованный</string>
@@ -370,7 +370,7 @@
     <string name="leave_email">Оставьте сообщение электронной почты</string>
     <string name="find_locations">Поиск местоположений</string>
     <string name="no_withdrawals">Нет выплат</string>
-    <string name="clear_filters">Очистить фильтры</string>
+    <string name="feature_account_clear_filters">Очистить фильтры</string>
     <string name="manage_accounts">Управление аккаунтами</string>
     <string name="more">Более</string>
     <string name="settings">Настройки</string>
@@ -408,7 +408,7 @@
     <string name="error_password_not_match">Пароль не соответствует.</string>
     <string name="app_version">Версия %1$s</string>
     <string name="all_rights_reserved">Все права сохранены.</string>
-    <string name="licenses">Лицензирование</string>
+    <string name="feature_about_licenses">Лицензирование</string>
     <string name="transfer_error">Невозможно осуществить перевод, повторите попытку позже</string>
     <string name="please_wait">Пожалуйста, подождите …</string>
     <string name="message">Сообщение</string>
diff --git a/androidApp/src/main/res/values-sw/strings.xml b/androidApp/src/main/res/values-sw/strings.xml
index abed6f814..f71df8311 100644
--- a/androidApp/src/main/res/values-sw/strings.xml
+++ b/androidApp/src/main/res/values-sw/strings.xml
@@ -14,9 +14,9 @@
     <string name="recent_transactions">Shughuli za hivi karibuni</string>
     <string name="charges">Ada</string>
     <string name="questionnaire">Dodoso</string>
-    <string name="about_us">Kuhusu sisi</string>
+    <string name="feature_about_about_us">Kuhusu sisi</string>
     <string name="saving_account_details">Inahifadhi maelezo ya akaunti</string>
-    <string name="savings_account">Akaunti ya akiba</string>
+    <string name="feature_account_savings_account">Akaunti ya akiba</string>
     <string name="error_loan_account_details_loading">Hitilafu kupakua habari ya akaunti ya mikopo</string>
     <string name="nominal_interest_rate">Vigezo vya riba</string>
     <string name="account_number">Nambari ya Akaunti</string>
@@ -29,11 +29,11 @@
     <string name="small_text">Nakala ndogo</string>
     <string name="client_accounts">Akaunti ya Wateja</string>
     <string name="splash">Karibu skrini</string>
-    <string name="savings">Kuokoa</string>
-    <string name="loan">Mkopo</string>
-    <string name="loan_account">Akaunti ya mikopo</string>
-    <string name="share">Kushiriki</string>
-    <string name="share_account">Shiriki akaunti yako</string>
+    <string name="feature_account_savings">Kuokoa</string>
+    <string name="feature_account_loan">Mkopo</string>
+    <string name="feature_account_loan_account">Akaunti ya mikopo</string>
+    <string name="feature_account_share">Kushiriki</string>
+    <string name="feature_account_share_account">Shiriki akaunti yako</string>
     <string name="clients_list">Chagua mteja</string>
     <string name="core_common_working">Kazi</string>
     <string name="status_image">Picha ya hali</string>
@@ -48,8 +48,8 @@
     <string name="remark">Tahadhari</string>
     <string name="expected_disbursement_date">Tarehe inayotarajiwa ya kulipa</string>
     <string name="submission_date">Mwisho wa kuwasilisha</string>
-    <string name="submitted">Uploads</string>
-    <string name="disbursement">Gharama</string>
+    <string name="feature_account_submitted">Uploads</string>
+    <string name="feature_account_disbursement">Gharama</string>
     <string name="transfer_date">Tarehe ya uhamisho</string>
     <string name="apply_for_loan">Tumia mkopo</string>
     <string name="update_loan">Sasisha mkopo</string>
@@ -65,23 +65,23 @@
     <string name="repayment_strategy">Mkakati wa kulipa</string>
     <string name="pay_to">Malipo kwa</string>
     <string name="pay_from">Malipo kutoka</string>
-    <string name="cancel">Kufuta</string>
+    <string name="feature_account_cancel">Kufuta</string>
     <string name="review_transfer">Preview</string>
     <string name="transfer_to">Tuma kwa</string>
     <string name="transfer_from">Uhamisho kutoka</string>
     <string name="making_transfer">Kufanya uhamisho</string>
-    <string name="deposit">Amana</string>
+    <string name="feature_account_deposit">Amana</string>
     <string name="enter_amount">Ingiza wingi</string>
     <string name="remark_is_mandatory">Kumbuka ni lazima</string>
-    <string name="approved">Kupitishwa</string>
+    <string name="feature_account_approved">Kupitishwa</string>
     <string name="shares_pending">Kwa kutarajia</string>
     <string name="loan_amount_paid">Kulipwa</string>
     <string name="balance">Usawa</string>
     <string name="rejected">Kukataliwa</string>
     <string name="waiting">Kusubiri</string>
-    <string name="overpaid">Kulipwa zaidi</string>
-    <string name="in_arrears">Katika madeni</string>
-    <string name="select_you_want">Chagua kila kitu unachotaka kuomba</string>
+    <string name="feature_account_overpaid">Kulipwa zaidi</string>
+    <string name="feature_account_in_arrears">Katika madeni</string>
+    <string name="feature_account_select_you_want">Chagua kila kitu unachotaka kuomba</string>
     <string name="filter_savings">Akaunti za akiba za kuchuja</string>
     <string name="filter_loan">Chuja akaunti za mikopo</string>
     <string name="filter_share">Chuja kugawana akaunti</string>
@@ -97,12 +97,12 @@
     <string name="transfer_from_savings">Uhamisho kutoka kwa akiba</string>
     <string name="loan_charges">Malipo ya mikopo</string>
     <string name="savings_charges">Akiba</string>
-    <string name="active">Kazi</string>
-    <string name="closed">C.</string>
-    <string name="withdrawn">Kuondoka</string>
+    <string name="feature_account_active">Kazi</string>
+    <string name="feature_account_closed">C.</string>
+    <string name="feature_account_withdrawn">Kuondoka</string>
     <string name="need_approval">Inahitaji idhini</string>
-    <string name="pending">Kwa kutarajia</string>
-    <string name="matured">Kukomaa</string>
+    <string name="feature_account_pending">Kwa kutarajia</string>
+    <string name="feature_account_matured">Kukomaa</string>
     <string name="create_an_account">Unda akaunti</string>
     <string name="first_name">Jina</string>
     <string name="last_name">Jina</string>
@@ -133,9 +133,9 @@
     <string name="account_not_active_to_perform_deposit">Akaunti inapaswa kuwa hai kufanya amana</string>
     <string name="account_not_active_to_perform_transfer">Akaunti inapaswa kuwa hai kufanya uhamisho</string>
 
-    <string name="empty_savings_accounts">Hakuna akaunti za akiba zilizounganishwa na wewe</string>
-    <string name="empty_loan_accounts">Hakuna akaunti za mkopo zilizohusishwa na wewe</string>
-    <string name="empty_share_accounts">Hakuna akaunti zilizoshirikiwa zinazohusiana na wewe</string>
+    <string name="feature_account_empty_savings_accounts">Hakuna akaunti za akiba zilizounganishwa na wewe</string>
+    <string name="feature_account_empty_loan_accounts">Hakuna akaunti za mkopo zilizohusishwa na wewe</string>
+    <string name="feature_account_empty_share_accounts">Hakuna akaunti zilizoshirikiwa zinazohusiana na wewe</string>
     <string name="empty_transactions">Hakuna shughuli zinazohusiana na wewe</string>
     <string name="empty_repayment_schedule">Hakuna ratiba ya kulipa yanayohusiana na wewe</string>
     <string name="no_more_transactions_available">Hakuna shughuli zinazopatikana</string>
@@ -225,8 +225,8 @@
     <string name="repayment_schedule">Ratiba ya kulipa</string>
     <string name="transactions">Shughuli</string>
     <string name="transfer">Uhamisho</string>
-    <string name="approval_pending">Idhini inaendelea</string>
-    <string name="waiting_for_disburse">Inasubiri malipo</string>
+    <string name="feature_account_approval_pending">Idhini inaendelea</string>
+    <string name="feature_account_disburse">Inasubiri malipo</string>
     <string name="closed_because_of_obligation">Ilifungwa kwa sababu ya majukumu fulani</string>
     <string name="loan_closed">Mkopo ulifungwa</string>
     <string name="due_date_in_charges">Kwa tarehe:</string>
@@ -247,7 +247,7 @@
     <string name="four_weeks">Wiki 4</string>
     <string name="three_months">Miezi mitatu</string>
     <string name="six_months">Miezi 6</string>
-    <string name="filter">Chuja</string>
+    <string name="feature_account_filter">Chuja</string>
     <string name="start_date">Tarehe ya kuanza</string>
     <string name="end_date">Tarehe ya kumaliza</string>
     <string name="filtered">Kuchujwa</string>
@@ -369,7 +369,7 @@
     <string name="leave_email">Acha ujumbe wa barua pepe</string>
     <string name="find_locations">Pata maeneo</string>
     <string name="no_withdrawals">Hakuna malipo</string>
-    <string name="clear_filters">Kuchuja wazi</string>
+    <string name="feature_account_clear_filters">Kuchuja wazi</string>
     <string name="manage_accounts">Dhibiti akaunti</string>
     <string name="more">Zaidi</string>
     <string name="settings">Mazingira</string>
@@ -407,7 +407,7 @@
     <string name="error_password_not_match">Nenosiri hailingani.</string>
     <string name="app_version">Toleo la %1$s</string>
     <string name="all_rights_reserved">Haki zote zimehifadhiwa.</string>
-    <string name="licenses">Leseni</string>
+    <string name="feature_about_licenses">Leseni</string>
     <string name="transfer_error">Haiwezi kufanya uhamisho, tafadhali jaribu tena baadaye</string>
     <string name="please_wait">Tafadhali subiri…</string>
     <string name="message">Ujumbe</string>
diff --git a/androidApp/src/main/res/values-te/strings.xml b/androidApp/src/main/res/values-te/strings.xml
index df1cca528..fea90700b 100644
--- a/androidApp/src/main/res/values-te/strings.xml
+++ b/androidApp/src/main/res/values-te/strings.xml
@@ -1,8 +1,8 @@
 <resources>
-    <string name="app_name">Mifos Mobile</string>
+    <string name="feature_about_app_name">Mifos Mobile</string>
     <string name="login">లాగిన్</string>
     <string name="toast_welcome">స్వాగతం %1$s</string>
-    <string name="about_us">మా గురించి</string>
+    <string name="feature_about_about_us">మా గురించి</string>
     <string name="unable_to_connect">ఇంటర్నెట్కి కనెక్ట్ చేయబడలేదు</string>
     <string name="basic">ప్రాథమిక</string>
     <string name="username">వాడుకరి పేరు</string>
@@ -17,7 +17,7 @@
     <string name="charges">ఆరోపణలు</string>
     <string name="questionnaire">ప్రశ్నాపత్రం</string>
     <string name="saving_account_details">పొదుపు ఖాతా వివరాలు</string>
-    <string name="savings_account">పొదుపు ఖాతా</string>
+    <string name="feature_account_savings_account">పొదుపు ఖాతా</string>
     <string name="error_loan_account_details_loading">రుణ ఖాతాల వివరాలను లోడ్ చేయడంలో లోపం</string>
     <string name="nominal_interest_rate">నామమాత్ర వడ్డీ రేటు</string>
     <string name="account_number">ఖాతా సంఖ్య</string>
@@ -30,11 +30,11 @@
     <string name="small_text">చిన్న వచనం</string>
     <string name="client_accounts">క్లయింట్ ఖాతాలు</string>
     <string name="splash">స్క్రీన్ స్వాగతం</string>
-    <string name="savings">పొదుపు</string>
-    <string name="loan">ఋణం</string>
-    <string name="loan_account">రుణ ఖాతా</string>
-    <string name="share">వాటా</string>
-    <string name="share_account">వాటా ఖాతా</string>
+    <string name="feature_account_savings">పొదుపు</string>
+    <string name="feature_account_loan">ఋణం</string>
+    <string name="feature_account_loan_account">రుణ ఖాతా</string>
+    <string name="feature_account_share">వాటా</string>
+    <string name="feature_account_share_account">వాటా ఖాతా</string>
     <string name="clients_list">ఒక క్లయింట్ ఎంచుకోండి</string>
     <string name="core_common_working">వర్కింగ్</string>
     <string name="status_image">స్థితి చిత్రం</string>
@@ -49,8 +49,8 @@
     <string name="remark">వ్యాఖ్య</string>
     <string name="expected_disbursement_date">ఊహించిన చెల్లింపు తేదీ</string>
     <string name="submission_date">సమర్పణ తేదీ</string>
-    <string name="submitted">సమర్పించిన</string>
-    <string name="disbursement">చెల్లించుట</string>
+    <string name="feature_account_submitted">సమర్పించిన</string>
+    <string name="feature_account_disbursement">చెల్లించుట</string>
     <string name="transfer_date">బదిలీ తేదీ</string>
     <string name="apply_for_loan">రుణ కోసం దరఖాస్తు</string>
     <string name="update_loan">రుణాన్ని నవీకరించండి</string>
@@ -66,23 +66,23 @@
     <string name="repayment_strategy">తిరిగి చెల్లించే వ్యూహం</string>
     <string name="pay_to">చెల్లించండి</string>
     <string name="pay_from">చెల్లింపు</string>
-    <string name="cancel">రద్దు</string>
+    <string name="feature_account_cancel">రద్దు</string>
     <string name="review_transfer">సమీక్ష</string>
     <string name="transfer_to">బదిలీ చేయుట</string>
     <string name="transfer_from">బదిలీ నుండి</string>
     <string name="making_transfer">బదిలీని చేస్తోంది</string>
-    <string name="deposit">జమ</string>
+    <string name="feature_account_deposit">జమ</string>
     <string name="enter_amount">మొత్తాన్ని నమోదు చేయండి</string>
     <string name="remark_is_mandatory">గమనిక తప్పనిసరి</string>
-    <string name="approved">ఆమోదించబడింది</string>
+    <string name="feature_account_approved">ఆమోదించబడింది</string>
     <string name="shares_pending">పెండింగ్</string>
     <string name="loan_amount_paid">చెల్లించిన</string>
     <string name="balance">సంతులనం</string>
     <string name="rejected">తిరస్కరించింది</string>
     <string name="waiting">వేచి</string>
-    <string name="overpaid">జీతాలు చెల్లించిందన్న</string>
-    <string name="in_arrears">పెండింగ్లో ఉంది</string>
-    <string name="select_you_want">మీరు దరఖాస్తు చేయదలచిన అన్నింటిని ఎంచుకోండి</string>
+    <string name="feature_account_overpaid">జీతాలు చెల్లించిందన్న</string>
+    <string name="feature_account_in_arrears">పెండింగ్లో ఉంది</string>
+    <string name="feature_account_select_you_want">మీరు దరఖాస్తు చేయదలచిన అన్నింటిని ఎంచుకోండి</string>
     <string name="filter_savings">ఫిల్టర్ సేవింగ్స్ ఖాతాలు</string>
     <string name="filter_loan">వడపోత రుణ ఖాతాలు</string>
     <string name="filter_share">ఫిల్టర్ భాగస్వామ్యం ఖాతాలు</string>
@@ -98,12 +98,12 @@
     <string name="transfer_from_savings">సేవింగ్స్ నుండి బదిలీ</string>
     <string name="loan_charges">రుణ ఆరోపణలు</string>
     <string name="savings_charges">సేవింగ్స్ ఛార్జీలు</string>
-    <string name="active">చురుకుగా</string>
-    <string name="closed">మూసివేయబడింది</string>
-    <string name="withdrawn">ఉపసంహరించుకున్నారు</string>
+    <string name="feature_account_active">చురుకుగా</string>
+    <string name="feature_account_closed">మూసివేయబడింది</string>
+    <string name="feature_account_withdrawn">ఉపసంహరించుకున్నారు</string>
     <string name="need_approval">ఆమోదం అవసరం</string>
-    <string name="pending">పెండింగ్</string>
-    <string name="matured">పక్వమైనది</string>
+    <string name="feature_account_pending">పెండింగ్</string>
+    <string name="feature_account_matured">పక్వమైనది</string>
     <string name="create_an_account">ఒక ఖాతాను సృష్టించండి</string>
     <string name="first_name">మొదటి పేరు</string>
     <string name="last_name">చివరి పేరు</string>
@@ -134,9 +134,9 @@
     <string name="account_not_active_to_perform_deposit">ఖాతా డిపాజిట్ కోసం చురుకుగా ఉండాలి</string>
     <string name="account_not_active_to_perform_transfer">బదిలీ కోసం ఖాతా క్రియాశీలకంగా ఉండాలి</string>
 
-    <string name="empty_savings_accounts">మీకు పొదుపు ఖాతాలు లేవు</string>
-    <string name="empty_loan_accounts">మీకు రుణ ఖాతాలు లేవు</string>
-    <string name="empty_share_accounts">మీతో సంబంధం ఉన్న ఖాతాలు ఏవీ లేవు</string>
+    <string name="feature_account_empty_savings_accounts">మీకు పొదుపు ఖాతాలు లేవు</string>
+    <string name="feature_account_empty_loan_accounts">మీకు రుణ ఖాతాలు లేవు</string>
+    <string name="feature_account_empty_share_accounts">మీతో సంబంధం ఉన్న ఖాతాలు ఏవీ లేవు</string>
     <string name="empty_transactions">మీకు సంబంధం ఉన్న లావాదేవీలు లేవు</string>
     <string name="empty_repayment_schedule">మీకు తిరిగి చెల్లింపు షెడ్యూల్ లేదు</string>
     <string name="no_more_transactions_available">మరిన్ని లావాదేవీలు లేవు</string>
@@ -227,8 +227,8 @@
     <string name="repayment_schedule">తిరిగి చెల్లింపు షెడ్యూల్</string>
     <string name="transactions">లావాదేవీలు</string>
     <string name="transfer">బదిలీ</string>
-    <string name="approval_pending">ఆమోదం పెండింగ్లో ఉంది</string>
-    <string name="waiting_for_disburse">డిస్బర్స్ కోసం వేచి ఉంది</string>
+    <string name="feature_account_approval_pending">ఆమోదం పెండింగ్లో ఉంది</string>
+    <string name="feature_account_disburse">డిస్బర్స్ కోసం వేచి ఉంది</string>
     <string name="closed_because_of_obligation">కొన్ని ఆబ్లిగేషన్స్ కారణంగా మూసివేయబడింది</string>
     <string name="loan_closed">రుణ మూసివేయబడింది</string>
     <string name="due_date_in_charges">గడువు తేది:</string>
@@ -249,7 +249,7 @@
     <string name="four_weeks">4 వారాలు</string>
     <string name="three_months">3 నెలలు</string>
     <string name="six_months">6 నెలలు</string>
-    <string name="filter">వడపోత</string>
+    <string name="feature_account_filter">వడపోత</string>
     <string name="start_date">ప్రారంబపు తేది</string>
     <string name="end_date">ఆఖరి తేది</string>
     <string name="filtered">ఫిల్టర్</string>
@@ -371,7 +371,7 @@
     <string name="leave_email">ఒక ఇమెయిల్ను వదిలేయండి</string>
     <string name="find_locations">స్థానాలను కనుగొనండి</string>
     <string name="no_withdrawals">ఉపసంహరణలు లేవు</string>
-    <string name="clear_filters">ఫిల్టర్లను క్లియర్ చేయండి</string>
+    <string name="feature_account_clear_filters">ఫిల్టర్లను క్లియర్ చేయండి</string>
     <string name="manage_accounts">ఖాతాలను నిర్వహించండి</string>
     <string name="more">మరింత</string>
     <string name="settings">సెట్టింగ్</string>
@@ -408,7 +408,7 @@
     <string name="confirm_password">పాస్వర్డ్ను నిర్ధారించండి</string>
     <string name="error_password_not_match">పాస్వర్డ్ సరిపోలడం లేదు.</string>
     <string name="all_rights_reserved">అన్ని హక్కులూ ప్రత్యేకించుకోవడమైనది.</string>
-    <string name="licenses">లైసెన్సుల</string>
+    <string name="feature_about_licenses">లైసెన్సుల</string>
     <string name="transfer_error">బదిలీని పూర్తి చేయడం సాధ్యం కాదు, దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి</string>
     <string name="please_wait">దయచేసి వేచి ఉండండి ...</string>
     <string name="message">సందేశం</string>
diff --git a/androidApp/src/main/res/values-ur/strings.xml b/androidApp/src/main/res/values-ur/strings.xml
index bc4e91a34..f6db476fb 100644
--- a/androidApp/src/main/res/values-ur/strings.xml
+++ b/androidApp/src/main/res/values-ur/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Mifos موبائل</string>
+    <string name="feature_about_app_name">Mifos موبائل</string>
     <string name="login">لاگ ان کریں</string>
     <string name="toast_welcome">خوش آمدید %1$s</string>
     <string name="unable_to_connect">انٹرنیٹ سے منسلک نہیں</string>
@@ -15,9 +15,9 @@
     <string name="recent_transactions">حالیہ ٹرانزیکشنز</string>
     <string name="charges">چارجز</string>
     <string name="questionnaire">سوالنامہ</string>
-    <string name="about_us">ہمارے بارے میں</string>
+    <string name="feature_about_about_us">ہمارے بارے میں</string>
     <string name="saving_account_details">اکاؤنٹ کی تفصیلات ذخیرہ کر رہے ہیں</string>
-    <string name="savings_account">بچت اکاونٹ</string>
+    <string name="feature_account_savings_account">بچت اکاونٹ</string>
     <string name="error_loan_account_details_loading">قرض اکاؤنٹس کی تفصیلات لوڈ کرنے میں خرابی</string>
     <string name="nominal_interest_rate">نامیاتی سود کی شرح</string>
     <string name="account_number">اکاؤنٹ نمبر</string>
@@ -30,11 +30,11 @@
     <string name="small_text">چھوٹے متن</string>
     <string name="client_accounts">کلائنٹ اکاؤنٹس</string>
     <string name="splash">سپلیش</string>
-    <string name="savings">بچت</string>
-    <string name="loan">قرض</string>
-    <string name="loan_account">قرض کااکاؤنٹ</string>
-    <string name="share">اشتراک کریں</string>
-    <string name="share_account">اکاؤنٹ کا اشتراک کریں</string>
+    <string name="feature_account_savings">بچت</string>
+    <string name="feature_account_loan">قرض</string>
+    <string name="feature_account_loan_account">قرض کااکاؤنٹ</string>
+    <string name="feature_account_share">اشتراک کریں</string>
+    <string name="feature_account_share_account">اکاؤنٹ کا اشتراک کریں</string>
     <string name="clients_list">کسٹمر چیز</string>
     <string name="core_common_working">کام کر رہے ہیں</string>
     <string name="status_image">موجودہ حالت کی تصویر</string>
@@ -49,8 +49,8 @@
     <string name="remark">تبصرہ</string>
     <string name="expected_disbursement_date">متوقع معاوضہ کی تاریخ</string>
     <string name="submission_date">جمع کروانے کی تازیخ</string>
-    <string name="submitted">پیش کردی گی</string>
-    <string name="disbursement">ادائیگی</string>
+    <string name="feature_account_submitted">پیش کردی گی</string>
+    <string name="feature_account_disbursement">ادائیگی</string>
     <string name="transfer_date">منتقلی کی تاریخ</string>
     <string name="apply_for_loan">قرض کے لئے درخواست کریں</string>
     <string name="update_loan">قرضہ اپ ڈیٹ کریں</string>
@@ -66,23 +66,23 @@
     <string name="repayment_strategy">واپسی کی حکمت عملی</string>
     <string name="pay_to">ادایگی لینے والے ہیں</string>
     <string name="pay_from">ادایگی دینے والے ہیں</string>
-    <string name="cancel">منسوخ کریں</string>
+    <string name="feature_account_cancel">منسوخ کریں</string>
     <string name="review_transfer">منتقلی کا جائزہ لیں</string>
     <string name="transfer_to">کو منتقلی</string>
     <string name="transfer_from">سے منتقلی</string>
     <string name="making_transfer">منتقلی کی جا رہی ہے</string>
-    <string name="deposit">جمع</string>
+    <string name="feature_account_deposit">جمع</string>
     <string name="enter_amount">رقم درج کریں</string>
     <string name="remark_is_mandatory">تبصرہ ضروری ہے</string>
-    <string name="approved">منظورشدہ</string>
+    <string name="feature_account_approved">منظورشدہ</string>
     <string name="shares_pending">منتقلی</string>
     <string name="loan_amount_paid">ادا کیا</string>
     <string name="balance">توازن</string>
     <string name="rejected">مسترد کردیا گیا</string>
     <string name="waiting">انتظار کر رہا ہے</string>
-    <string name="overpaid">اضافی رقم دی گئی</string>
-    <string name="in_arrears">بقایاجات</string>
-    <string name="select_you_want">جو چاہے منتخب کریں</string>
+    <string name="feature_account_overpaid">اضافی رقم دی گئی</string>
+    <string name="feature_account_in_arrears">بقایاجات</string>
+    <string name="feature_account_select_you_want">جو چاہے منتخب کریں</string>
     <string name="filter_savings">بچت کے کھاتے چھانے</string>
     <string name="filter_loan">قرض کے کھاتے چھانے</string>
     <string name="filter_share">اشتراک کے کھاتے چھانے</string>
@@ -98,12 +98,12 @@
     <string name="transfer_from_savings">بچت سے منتقلی</string>
     <string name="loan_charges">قرض چارج</string>
     <string name="savings_charges">بچت کے چارجز</string>
-    <string name="active">فعال</string>
-    <string name="closed">بند</string>
-    <string name="withdrawn">واپس لے لیا</string>
+    <string name="feature_account_active">فعال</string>
+    <string name="feature_account_closed">بند</string>
+    <string name="feature_account_withdrawn">واپس لے لیا</string>
     <string name="need_approval">منظوری کی ضرورت ہے</string>
-    <string name="pending">منتقلی</string>
-    <string name="matured">متوازن</string>
+    <string name="feature_account_pending">منتقلی</string>
+    <string name="feature_account_matured">متوازن</string>
     <string name="create_an_account">کھاتا کھولیں</string>
     <string name="first_name">پہلا نام</string>
     <string name="last_name">آخری نام</string>
@@ -134,9 +134,9 @@
     <string name="account_not_active_to_perform_deposit">جمع کرنے کے لئے اکاؤنٹ فعال ہونا چاہئے</string>
     <string name="account_not_active_to_perform_transfer">منتقلی انجام دینے کے لئے اکاؤنٹ ہونا چاہئے</string>
 
-    <string name="empty_savings_accounts">آپ کے ساتھ منسلک کوئی بچت اکاؤنٹ نہیں ہے</string>
-    <string name="empty_loan_accounts">آپ کے ساتھ منسلک کوئی قرض اکاؤنٹ نہیں ہے</string>
-    <string name="empty_share_accounts">آپ کے ساتھ منسلک کوئی شریک اکاؤنٹ نہیں ہے</string>
+    <string name="feature_account_empty_savings_accounts">آپ کے ساتھ منسلک کوئی بچت اکاؤنٹ نہیں ہے</string>
+    <string name="feature_account_empty_loan_accounts">آپ کے ساتھ منسلک کوئی قرض اکاؤنٹ نہیں ہے</string>
+    <string name="feature_account_empty_share_accounts">آپ کے ساتھ منسلک کوئی شریک اکاؤنٹ نہیں ہے</string>
     <string name="empty_transactions">آپ کے ساتھ کسی منتقلی کا تعلق نہیں ہے</string>
     <string name="empty_repayment_schedule">آپ کے ساتھ منسلک کوئی ادائیگی کی شیڈول نہیں ہے</string>
     <string name="no_more_transactions_available">مزید ٹرانزیکشنز دستیاب نہیں ہیں</string>
@@ -227,8 +227,8 @@
     <string name="repayment_schedule">ادائیگی کی شیڈول</string>
     <string name="transactions">ٹرانسمیشن</string>
     <string name="transfer">منتقلی</string>
-    <string name="approval_pending">ابھی منظور نہیں ہوا</string>
-    <string name="waiting_for_disburse">تباہی کے انتظار میں</string>
+    <string name="feature_account_approval_pending">ابھی منظور نہیں ہوا</string>
+    <string name="feature_account_disburse">تباہی کے انتظار میں</string>
     <string name="closed_because_of_obligation">کچھ مکلفات کی وجہ سے بند</string>
     <string name="loan_closed">قرض بند</string>
     <string name="due_date_in_charges">واجب الادا تاریخ:</string>
@@ -252,7 +252,7 @@
     <string name="four_weeks">۴ ہفتوں</string>
     <string name="three_months">۳ ماہ</string>
     <string name="six_months">٦ ماہ</string>
-    <string name="filter">فلٹر</string>
+    <string name="feature_account_filter">فلٹر</string>
     <string name="start_date">آغاز کی تاریخ</string>
     <string name="end_date">ختم ہونے کی تاریخ</string>
     <string name="filtered">فلٹرڈ</string>
@@ -366,7 +366,7 @@
     <string name="hello_client">%1$s ،خوش آمدید</string>
     <string name="double_amount">%1$.2f</string>
     <string name="double_and_string">%2$s %1$.2f</string>
-    <string name="string_and_string">%2$s %1$s</string>
+    <string name="feature_account_string_and_string">%2$s %1$s</string>
     <string name="string_and_double">%2$.2f %1$s</string>
     <string name="string_and_int">%2$d :%1$s</string>
     <string name="invalid_amount">ناجایز رقم</string>
@@ -390,7 +390,7 @@
     <string name="leave_email">ای میل چھوڑ دو</string>
     <string name="find_locations">مقامات تلاش کریں</string>
     <string name="no_withdrawals">کوئی واپسی نہیں</string>
-    <string name="clear_filters">فلٹر صاف کریں</string>
+    <string name="feature_account_clear_filters">فلٹر صاف کریں</string>
     <string name="manage_accounts">اکاؤنٹس کا نظم کریں</string>
     <string name="more">مزید</string>
     <string name="settings">ترتیبات</string>
@@ -427,9 +427,9 @@
     <string name="confirm_password">پاس ورڈ کی توثیق کریں</string>
     <string name="error_password_not_match">پاس ورڈ میچ نہیں کرتا.</string>
     <string name="app_version">ورژن٪ 1 $ s</string>
-    <string name="copy_right_mifos">© 2016 - %1$s Mifos نوٹیفیکیشن.</string>
+    <string name="feature_about_copyright_mifos">© 2016 - %1$s Mifos نوٹیفیکیشن.</string>
     <string name="all_rights_reserved">جملہ حقوق محفوظ ہیں.</string>
-    <string name="licenses">لائسنس</string>
+    <string name="feature_about_licenses">لائسنس</string>
     <string name="transfer_error">منتقلی مکمل کرنے میں ناکام، براہ کرم بعد میں دوبارہ کوشش کریں</string>
     <string name="please_wait">برائے مہربانی انتظار کریں…</string>
     <string name="message">پیغام</string>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 2e45841c6..0fbff8a0a 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Mifos Mobile</string>
+    <string name="feature_about_app_name">Mifos Mobile</string>
     <string name="login">Login</string>
     <string name="toast_welcome">Welcome %1$s</string>
     <string name="unable_to_connect">Not connected to internet</string>
@@ -15,9 +15,9 @@
     <string name="recent_transactions">Recent Transactions</string>
     <string name="charges">Charges</string>
     <string name="questionnaire">Questionnaire</string>
-    <string name="about_us">About Us</string>
+    <string name="feature_about_about_us">About Us</string>
     <string name="saving_account_details">Saving Account Details</string>
-    <string name="savings_account">Savings Account</string>
+    <string name="feature_account_savings_account">Savings Account</string>
     <string name="error_loan_account_details_loading">Error loading in loan accounts detail</string>
     <string name="nominal_interest_rate">Nominal Interest Rate</string>
     <string name="account_number">Account Number</string>
@@ -31,11 +31,11 @@
     <string name="small_text">Small Text</string>
     <string name="client_accounts">Client Accounts</string>
     <string name="splash">Splash</string>
-    <string name="savings">Saving</string>
-    <string name="loan">Loan</string>
-    <string name="loan_account">Loan Account</string>
-    <string name="share">Share</string>
-    <string name="share_account">Share Account</string>
+    <string name="feature_account_savings">Saving</string>
+    <string name="feature_account_loan">Loan</string>
+    <string name="feature_account_loan_account">Loan Account</string>
+    <string name="feature_account_share">Share</string>
+    <string name="feature_account_share_account">Share Account</string>
     <string name="clients_list">Chose a client</string>
     <string name="core_common_working">Working</string>
     <string name="status_image">Status Image</string>
@@ -50,8 +50,8 @@
     <string name="remark">Remark</string>
     <string name="expected_disbursement_date">Expected Disbursement Date</string>
     <string name="submission_date">Submission Date</string>
-    <string name="submitted">Submitted</string>
-    <string name="disbursement">Disbursement</string>
+    <string name="feature_account_submitted">Submitted</string>
+    <string name="feature_account_disbursement">Disbursement</string>
     <string name="transfer_date">Transfer Date</string>
     <string name="apply_for_loan">Apply for Loan</string>
     <string name="update_loan">Update Loan</string>
@@ -68,23 +68,23 @@
     <string name="repayment_strategy">Repayment Strategy</string>
     <string name="pay_to">Pay To</string>
     <string name="pay_from">Pay From</string>
-    <string name="cancel">Cancel</string>
+    <string name="feature_account_cancel">Cancel</string>
     <string name="review_transfer">Review</string>
     <string name="transfer_to">Transfer To</string>
     <string name="transfer_from">Transfer From</string>
     <string name="making_transfer">Making Transfer</string>
-    <string name="deposit">Deposit</string>
+    <string name="feature_account_deposit">Deposit</string>
     <string name="enter_amount">Enter Amount</string>
     <string name="remark_is_mandatory">Remark is mandatory</string>
-    <string name="approved">Approved</string>
+    <string name="feature_account_approved">Approved</string>
     <string name="shares_pending">Pending</string>
     <string name="loan_amount_paid">Paid</string>
     <string name="balance">Balance</string>
     <string name="rejected">Rejected</string>
     <string name="waiting">Waiting</string>
-    <string name="overpaid">Overpaid</string>
-    <string name="in_arrears">In Arrears</string>
-    <string name="select_you_want">Select all filters you want to apply</string>
+    <string name="feature_account_overpaid">Overpaid</string>
+    <string name="feature_account_in_arrears">In Arrears</string>
+    <string name="feature_account_select_you_want">Select all filters you want to apply</string>
     <string name="filter_savings">Filter Savings Accounts</string>
     <string name="filter_loan">Filter Loan Accounts</string>
     <string name="filter_share">Filter Share Accounts</string>
@@ -100,12 +100,12 @@
     <string name="transfer_from_savings">Transfer from Savings</string>
     <string name="loan_charges">Loan Charges</string>
     <string name="savings_charges">Savings Charges</string>
-    <string name="active">Active</string>
-    <string name="closed">Closed</string>
-    <string name="withdrawn">Withdrawn</string>
+    <string name="feature_account_active">Active</string>
+    <string name="feature_account_closed">Closed</string>
+    <string name="feature_account_withdrawn">Withdrawn</string>
     <string name="need_approval">Need Approval</string>
-    <string name="pending">Pending</string>
-    <string name="matured">Matured</string>
+    <string name="feature_account_pending">Pending</string>
+    <string name="feature_account_matured">Matured</string>
     <string name="create_an_account">Create an account</string>
     <string name="first_name">First Name</string>
     <string name="last_name">Last Name</string>
@@ -169,9 +169,9 @@
 
     <string name="empty_requestid">Request ID cannot be empty</string>
     <string name="empty_authentication_token">Authentication Token cannot be empty</string>
-    <string name="empty_savings_accounts">There is no SavingsAccount associated with you</string>
-    <string name="empty_loan_accounts">There is no LoanAccount associated with you</string>
-    <string name="empty_share_accounts">There is no ShareAccount associated with you</string>
+    <string name="feature_account_empty_savings_accounts">There is no SavingsAccount associated with you</string>
+    <string name="feature_account_empty_loan_accounts">There is no LoanAccount associated with you</string>
+    <string name="feature_account_empty_share_accounts">There is no ShareAccount associated with you</string>
     <string name="empty_transactions">There is no transactions associated with you</string>
     <string name="empty_repayment_schedule">There is no repayment schedule associated with you
     </string>
@@ -273,8 +273,8 @@
     <string name="repayment_schedule">Repayment Schedule</string>
     <string name="transactions">Transactions</string>
     <string name="transfer">Transfer</string>
-    <string name="approval_pending">Approval Pending</string>
-    <string name="waiting_for_disburse">Waiting for Disburse</string>
+    <string name="feature_account_approval_pending">Approval Pending</string>
+    <string name="feature_account_disburse">Waiting for Disburse</string>
     <string name="closed_because_of_obligation">Closed because of some Obligations</string>
     <string name="loan_closed">Loan Closed</string>
     <string name="due_date_in_charges">Due Date:</string>
@@ -301,7 +301,7 @@
     <string name="four_weeks">4 Weeks</string>
     <string name="three_months">3 Months</string>
     <string name="six_months">6 Months</string>
-    <string name="filter">Filter</string>
+    <string name="feature_account_filter">Filter</string>
     <string name="start_date">Start Date</string>
     <string name="end_date">End Date</string>
     <string name="filtered">Filtered</string>
@@ -466,7 +466,7 @@
     <string name="hello_client">Hello, %1$s</string>
     <string name="double_amount">%1$.2f</string>
     <string name="double_and_string">%1$.2f %2$s</string>
-    <string name="string_and_string">%1$s %2$s</string>
+    <string name="feature_account_string_and_string">%1$s %2$s</string>
     <string name="playstore_link">%1$s%2$s</string>
     <string name="string_and_double">%1$s %2$.2f</string>
     <string name="string_and_int">%1$s: %2$d</string>
@@ -492,7 +492,7 @@
     <string name="leave_email">Leave an email</string>
     <string name="find_locations">Find Locations</string>
     <string name="no_withdrawals">No withdrawals</string>
-    <string name="clear_filters">Clear Filters</string>
+    <string name="feature_account_clear_filters">Clear Filters</string>
     <string name="manage_accounts">Manage Accounts</string>
     <string name="more">More</string>
     <string name="settings">Settings</string>
@@ -523,12 +523,12 @@
     <string name="confirm_password">Confirm Password</string>
     <string name="error_password_not_match">Password does not match.</string>
     <string name="app_version">Version %1$s</string>
-    <string name="copy_right_mifos">©2016-%1$s Mifos Initiative.</string>
+    <string name="feature_about_copyright_mifos">©2016-%1$s Mifos Initiative.</string>
     <string name="all_rights_reserved">All rights reserved.</string>
-    <string name="licenses">Licenses</string>
-    <string name="privacy_policy">Privacy Policy</string>
-    <string name="privacy_policy_host" translatable="false">openmf.github.io/privacy_policy_mifos_mobile.html</string>
-    <string name="privacy_policy_host_url" translatable="false">https://openmf.github.io/privacy_policy_mifos_mobile.html</string>
+    <string name="feature_about_licenses">Licenses</string>
+    <string name="feature_about_privacy_policy">Privacy Policy</string>
+    <string name="feature_about_policy_host" translatable="false">openmf.github.io/privacy_policy_mifos_mobile.html</string>
+    <string name="feature_about_policy_url" translatable="false">https://openmf.github.io/privacy_policy_mifos_mobile.html</string>
     <string name="transfer_error">Unable to complete transfer, please try again later</string>
     <string name="please_wait">Please Wait...</string>
     <string name="message">message</string>
@@ -553,13 +553,13 @@
     <string name="details">Details</string>
     <string name="product">Product</string>
 
-    <string name="dividend_payout">Dividend Payout</string>
-    <string name="withdrawal">Withdrawal</string>
-    <string name="interest_posting">Interest Posting</string>
-    <string name="fee_deduction">Fee Deduction</string>
-    <string name="withdrawal_transfer">Withdrawal Transfer</string>
-    <string name="rejected_transfer">Rejected Transfer</string>
-    <string name="overdraft_fee">Overdraft Fee</string>
+    <string name="feature_account_dividend_payout">Dividend Payout</string>
+    <string name="feature_account_withdrawal">Withdrawal</string>
+    <string name="feature_account_interest_posting">Interest Posting</string>
+    <string name="feature_account_fee_deduction">Fee Deduction</string>
+    <string name="feature_account_withdrawal_transfer">Withdrawal Transfer</string>
+    <string name="feature_account_rejected_transfer">Rejected Transfer</string>
+    <string name="feature_account_overdraft_fee">Overdraft Fee</string>
     <string name="savings_account_transaction">Savings Account Transaction</string>
     <string name="transaction_period">Transaction Period</string>
     <string name="transaction_type">Transaction Type</string>
@@ -568,11 +568,11 @@
 
     <string name="dialog_cancel_registration_message">Do you want to cancel registering New Account ?</string>
     <string name="dialog_cancel_registration_title">Cancel Registration</string>
-    <string name="sources">Source Code</string>
-    <string name="official_website">Official Website</string>
-    <string name="app_version_text">App version  1.0</string>
-    <string name="license_string_with_value">License: MPL-2.0</string>
-    <string name="about_app_description">An Android Application built on top of the MifosX Self-Service platform for end-user customers to view/transact on the accounts and loans they hold.</string>
+    <string name="feature_about_sources">Source Code</string>
+    <string name="feature_about_official_website">Official Website</string>
+    <string name="feature_about_app_version">App version  1.0</string>
+    <string name="feature_about_license">License: MPL-2.0</string>
+    <string name="feature_about_description">An Android Application built on top of the MifosX Self-Service platform for end-user customers to view/transact on the accounts and loans they hold.</string>
     <string name="or">or</string>
     <string name="no_app_to_support_action">There is no application that support this action</string>
     <string name="theme">Theme</string>
diff --git a/androidApp/src/main/res/xml/settings_preference.xml b/androidApp/src/main/res/xml/settings_preference.xml
index 7c93988fd..77beb21c9 100644
--- a/androidApp/src/main/res/xml/settings_preference.xml
+++ b/androidApp/src/main/res/xml/settings_preference.xml
@@ -3,7 +3,7 @@
 
     <PreferenceCategory android:title="@string/accounts">
         <Preference
-            android:icon="@drawable/ic_lock_black_24dp"
+            android:icon="@drawable/feature_auth_lock"
             android:key="@string/password_key"
             android:persistent="false"
             android:summary="@string/change_account_password"
diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
index 55b99987f..b92960134 100644
--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -24,6 +24,8 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                 add("implementation", project(":core:designsystem"))
                 add("implementation", project(":core:ui"))
                 add("implementation", project(":core:data"))
+                add("implementation", project(":core:model"))
+                add("implementation", project(":core:common"))
 
                 add("implementation", libs.findLibrary("kotlinx.collections.immutable").get())
 
diff --git a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
index 4614a16ab..007ce8f34 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
@@ -1,3 +1,4 @@
+
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.dsl.Lint
@@ -29,8 +30,10 @@ private fun Lint.configure() {
     xmlReport = true
     checkDependencies = true
     abortOnError = false
+    enable += "ComposeM2Api"
+    error += "ComposeM2Api"
     // Disable this rule until we ship the libraries to some maven.
-    disable += "ResourceName"
+//    disable += "ResourceName"
     baseline = File("lint-baseline.xml")
     explainIssues = true
     htmlReport = true
diff --git a/ci-prebuild.sh b/ci-prebuild.sh
index 2bcc5ce8e..a56fccd05 100644
--- a/ci-prebuild.sh
+++ b/ci-prebuild.sh
@@ -28,7 +28,7 @@ tasks=(
     "spotlessApply --no-configuration-cache"
     "dependencyGuardBaseline"
     "detekt"
-    "testDemoDebug :lint:test :lint:lint :androidApp:lintProdRelease"
+    "testDemoDebug :lint:test :lint:lint :androidApp:lintRelease"
     "build"
     "updateProdReleaseBadging"
 )
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
index 915c5a1ee..88af51a88 100644
--- a/config/detekt/detekt.yml
+++ b/config/detekt/detekt.yml
@@ -146,7 +146,7 @@ complexity:
     ignoreOverloaded: false
   CyclomaticComplexMethod:
     active: true
-    threshold: 15
+    threshold: 20
     ignoreSingleWhenExpression: false
     ignoreSimpleWhenEntries: false
     ignoreNestingFunctions: false
@@ -674,7 +674,7 @@ style:
     active: false
   DestructuringDeclarationWithTooManyEntries:
     active: true
-    maxDestructuringEntries: 3
+    maxDestructuringEntries: 4
   DoubleNegativeLambda:
     active: false
     negativeFunctions:
diff --git a/core/common/src/main/java/org/mifos/mobile/core/common/utils/DateHelper.kt b/core/common/src/main/java/org/mifos/mobile/core/common/utils/DateHelper.kt
index 34dd3075c..2895dac1c 100755
--- a/core/common/src/main/java/org/mifos/mobile/core/common/utils/DateHelper.kt
+++ b/core/common/src/main/java/org/mifos/mobile/core/common/utils/DateHelper.kt
@@ -124,7 +124,7 @@ object DateHelper {
     }
 
     fun getDateAsLongFromString(dateStr: String?, pattern: String?): Long? {
-        val sdf = SimpleDateFormat(pattern)
+        val sdf = SimpleDateFormat(pattern, Locale.getDefault())
         var date: Date? = null
         try {
             date = sdf.parse(dateStr)
@@ -153,13 +153,13 @@ object DateHelper {
     }
 
     fun getDateAsStringFromLong(timeInMillis: Long?): String {
-        val sdf = SimpleDateFormat("dd MMM yyyy")
+        val sdf = SimpleDateFormat("dd MMM yyyy", Locale.getDefault())
         return sdf.format(timeInMillis?.let { Date(it) })
     }
 
     @JvmStatic
     fun getDateAndTimeAsStringFromLong(timeInMillis: Long?): String {
-        val sdf = SimpleDateFormat("HH:mm a dd MMM yyyy")
+        val sdf = SimpleDateFormat("HH:mm a dd MMM yyyy", Locale.getDefault())
         return sdf.format(timeInMillis?.let { Date(it) })
     }
 }
diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosTextButton.kt b/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosButton.kt
similarity index 84%
rename from core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosTextButton.kt
rename to core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosButton.kt
index 364185cf5..5dd442be3 100644
--- a/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosTextButton.kt
+++ b/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosButton.kt
@@ -31,15 +31,29 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 
 @Composable
-fun MifosTextButton(
+fun MifosButton(
     @StringRes
     textResId: Int,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    shape: Shape = ButtonDefaults. shape,
+    colors: ButtonColors = ButtonDefaults. buttonColors(),
+    elevation: ButtonElevation? = ButtonDefaults. buttonElevation(),
+    border: BorderStroke? = null,
+    contentPadding: PaddingValues = ButtonDefaults. ContentPadding,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
 ) {
     Button(
         modifier = modifier,
         onClick = onClick,
+        enabled = enabled,
+        shape = shape,
+        colors = colors,
+        elevation = elevation,
+        border = border,
+        contentPadding = contentPadding,
+        interactionSource = interactionSource,
         content = {
             Text(text = stringResource(id = textResId))
         },
diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosOutlinedTextField.kt b/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosOutlinedTextField.kt
index 3626b472a..1cc09ed86 100644
--- a/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosOutlinedTextField.kt
+++ b/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosOutlinedTextField.kt
@@ -14,7 +14,6 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.OutlinedTextFieldDefaults
@@ -35,7 +34,6 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MifosOutlinedTextField(
     label: Int,
diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosSearchTextField.kt b/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosSearchTextField.kt
index 0dcba14ff..ab7fba6af 100644
--- a/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosSearchTextField.kt
+++ b/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/components/MifosSearchTextField.kt
@@ -9,16 +9,17 @@
  */
 package org.mifos.mobile.core.designsystem.components
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
@@ -30,7 +31,6 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MifosSearchTextField(
     value: TextFieldValue,
@@ -53,16 +53,18 @@ fun MifosSearchTextField(
         onValueChange = onValueChange,
         textStyle = MaterialTheme.typography.bodyLarge,
         trailingIcon = {
-            IconButton(onClick = onSearchDismiss) {
-                Icon(
-                    imageVector = Icons.Default.Close,
-                    contentDescription = "Close Icon",
-                    tint = Color.DarkGray,
-                )
+            AnimatedVisibility(visible = value.text.isNotEmpty()) {
+                IconButton(onClick = onSearchDismiss) {
+                    Icon(
+                        imageVector = Icons.Default.Close,
+                        contentDescription = "Close Icon",
+                    )
+                }
             }
         },
         colors = TextFieldDefaults.colors().copy(
             focusedContainerColor = Color.Transparent,
+            unfocusedContainerColor = Color.Transparent,
             focusedIndicatorColor = Color.LightGray,
             unfocusedIndicatorColor = Color.LightGray,
             focusedTextColor = if (isSystemInDarkTheme()) Color.White else Color.Black,
@@ -86,11 +88,13 @@ private fun MifosSearchTextFieldPreview(
     modifier: Modifier = Modifier,
 ) {
     MifosMobileTheme {
-        MifosSearchTextField(
-            value = TextFieldValue("Search"),
-            onValueChange = {},
-            onSearchDismiss = {},
-            modifier = modifier,
-        )
+        Surface {
+            MifosSearchTextField(
+                value = TextFieldValue("Search"),
+                onValueChange = {},
+                onSearchDismiss = {},
+                modifier = modifier,
+            )
+        }
     }
 }
diff --git a/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/icons/MifosIcons.kt b/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/icons/MifosIcons.kt
index 7b7db2da1..78ed0e46c 100644
--- a/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/icons/MifosIcons.kt
+++ b/core/designsystem/src/main/kotlin/org/mifos/mobile/core/designsystem/icons/MifosIcons.kt
@@ -21,12 +21,18 @@ import androidx.compose.material.icons.filled.FlashOff
 import androidx.compose.material.icons.filled.FlashOn
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.material.icons.filled.WifiOff
 import androidx.compose.ui.graphics.vector.ImageVector
 
 object MifosIcons {
+    val MoreVert: ImageVector = Icons.Filled.MoreVert
+    val VisibilityOff: ImageVector = Icons.Filled.VisibilityOff
+    val Visibility: ImageVector = Icons.Filled.Visibility
     val Info: ImageVector = Icons.Default.Info
     val ArrowDropUp: ImageVector = Icons.Default.ArrowDropUp
     val ArrowDropDown: ImageVector = Icons.Default.ArrowDropDown
diff --git a/core/ui/src/main/java/org/mifos/mobile/core/ui/utils/ColorUtils.kt b/core/ui/src/main/java/org/mifos/mobile/core/ui/utils/ColorUtils.kt
new file mode 100644
index 000000000..f4dedc245
--- /dev/null
+++ b/core/ui/src/main/java/org/mifos/mobile/core/ui/utils/ColorUtils.kt
@@ -0,0 +1,24 @@
+package org.mifos.mobile.core.ui.utils
+
+import android.app.Activity
+import android.content.Context
+import android.util.TypedValue
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.core.graphics.ColorUtils
+import androidx.core.view.WindowCompat
+
+fun Activity.setStatusBarColor(@ColorInt color: Int) {
+    if (!window.decorView.isInEditMode) {
+        window.statusBarColor = color
+        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
+            ColorUtils.calculateLuminance(color) > 0.5
+    }
+}
+
+@ColorInt
+fun Context.getThemeAttributeColor(@AttrRes colorAttribute: Int): Int {
+    val typedValue = TypedValue()
+    theme.resolveAttribute(colorAttribute, typedValue, true)
+    return typedValue.data
+}
\ No newline at end of file
diff --git a/feature/about/build.gradle.kts b/feature/about/build.gradle.kts
index 02a961385..71087e7cb 100644
--- a/feature/about/build.gradle.kts
+++ b/feature/about/build.gradle.kts
@@ -17,5 +17,5 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.model)
+
 }
\ No newline at end of file
diff --git a/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsHeader.kt b/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsHeader.kt
index 8aedf7907..685640604 100644
--- a/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsHeader.kt
+++ b/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsHeader.kt
@@ -28,7 +28,7 @@ import org.mifos.mobile.feature.about.R
 
 @DevicePreviews
 @Composable
-fun AboutUsHeader(
+internal fun AboutUsHeader(
     modifier: Modifier = Modifier,
 ) {
     Column(modifier) {
@@ -42,7 +42,7 @@ fun AboutUsHeader(
         )
 
         Text(
-            text = stringResource(id = R.string.app_name),
+            text = stringResource(id = R.string.feature_about_app_name),
             style = MaterialTheme.typography.headlineMedium,
             color = MaterialTheme.colorScheme.onSurface,
             textAlign = TextAlign.Center,
@@ -52,7 +52,7 @@ fun AboutUsHeader(
         )
 
         Text(
-            text = stringResource(id = R.string.about_app_description),
+            text = stringResource(id = R.string.feature_about_description),
             style = MaterialTheme.typography.titleSmall.copy(),
             color = MaterialTheme.colorScheme.onSurface,
             textAlign = TextAlign.Center,
diff --git a/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt b/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt
index 40a671e43..0b7a009de 100644
--- a/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt
+++ b/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt
@@ -30,7 +30,7 @@ import org.mifos.mobile.feature.about.R
 import java.util.Calendar
 
 @Composable
-fun AboutUsScreen(
+internal fun AboutUsScreen(
     navigateToItem: (AboutUsItem) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -61,38 +61,38 @@ fun AboutUsScreen(
     }
 }
 
-fun getAboutUsItem(context: Context): List<AboutUsItem> {
+private fun getAboutUsItem(context: Context): List<AboutUsItem> {
     val currentYear = Calendar.getInstance().get(Calendar.YEAR)
-    val copyrightText = context.getString(R.string.copy_right_mifos).replace("%1\$s", currentYear.toString())
+    val copyrightText = context.getString(R.string.feature_about_copyright_mifos).replace("%1\$s", currentYear.toString())
 
     return listOf(
         AboutUsItem(
-            title = context.getString(R.string.app_version_text),
+            title = context.getString(R.string.feature_about_app_version),
             itemId = AboutUsListItemId.APP_VERSION_TEXT,
         ),
         AboutUsItem(
-            title = context.getString(R.string.official_website),
-            iconUrl = R.drawable.ic_website,
+            title = context.getString(R.string.feature_about_official_website),
+            iconUrl = R.drawable.feature_about_website,
             itemId = AboutUsListItemId.OFFICE_WEBSITE,
         ),
         AboutUsItem(
-            title = context.getString(R.string.licenses),
-            iconUrl = R.drawable.ic_law_icon,
+            title = context.getString(R.string.feature_about_licenses),
+            iconUrl = R.drawable.feature_about_law_icon,
             itemId = AboutUsListItemId.LICENSES,
         ),
         AboutUsItem(
-            title = context.getString(R.string.privacy_policy),
-            iconUrl = R.drawable.ic_privacy_policy,
+            title = context.getString(R.string.feature_about_privacy_policy),
+            iconUrl = R.drawable.feature_about_privacy_policy,
             itemId = AboutUsListItemId.PRIVACY_POLICY,
         ),
         AboutUsItem(
-            title = context.getString(R.string.sources),
-            iconUrl = R.drawable.ic_source_code,
+            title = context.getString(R.string.feature_about_sources),
+            iconUrl = R.drawable.feature_about_source_code,
             itemId = AboutUsListItemId.SOURCE_CODE,
         ),
         AboutUsItem(
             title = copyrightText,
-            subtitle = R.string.license_string_with_value,
+            subtitle = R.string.feature_about_license,
             itemId = AboutUsListItemId.LICENSES_STRING_WITH_VALUE,
         ),
     )
diff --git a/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/PrivacyPolicyScreen.kt b/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/PrivacyPolicyScreen.kt
index 3b5996561..77a1dcc80 100644
--- a/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/PrivacyPolicyScreen.kt
+++ b/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/PrivacyPolicyScreen.kt
@@ -33,18 +33,18 @@ import org.mifos.mobile.core.ui.component.MifosProgressIndicator
 import org.mifos.mobile.feature.about.R
 
 @Composable
-fun PrivacyPolicyScreen(
+internal fun PrivacyPolicyScreen(
     navigateBack: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
     MifosScaffold(
-        topBarTitleResId = R.string.privacy_policy,
+        topBarTitleResId = R.string.feature_about_privacy_policy,
         navigateBack = navigateBack,
         modifier = modifier,
         content = {
             WebView(
-                url = context.getString(R.string.privacy_policy_host_url),
+                url = context.getString(R.string.feature_about_policy_url),
             )
         },
     )
@@ -52,7 +52,7 @@ fun PrivacyPolicyScreen(
 
 @SuppressLint("SetJavaScriptEnabled")
 @Composable
-fun WebView(
+private fun WebView(
     url: String,
     modifier: Modifier = Modifier,
 ) {
@@ -67,6 +67,7 @@ fun WebView(
                     settings.domStorageEnabled = true
                     overScrollMode = WebView.OVER_SCROLL_NEVER
                     this.webViewClient = object : WebViewClient() {
+                        @Deprecated("Deprecated in Java")
                         override fun shouldOverrideUrlLoading(
                             view: WebView,
                             url: String,
@@ -101,5 +102,5 @@ fun WebView(
 }
 
 private fun Context.checkUri(uri: String): Boolean {
-    return Uri.parse(uri)?.host?.endsWith(this.getString(R.string.privacy_policy_host)) == true
+    return Uri.parse(uri)?.host?.endsWith(this.getString(R.string.feature_about_policy_host)) == true
 }
diff --git a/feature/about/src/main/res/drawable/ic_law_icon.xml b/feature/about/src/main/res/drawable/feature_about_law_icon.xml
similarity index 100%
rename from feature/about/src/main/res/drawable/ic_law_icon.xml
rename to feature/about/src/main/res/drawable/feature_about_law_icon.xml
diff --git a/feature/about/src/main/res/drawable/ic_privacy_policy.xml b/feature/about/src/main/res/drawable/feature_about_privacy_policy.xml
similarity index 100%
rename from feature/about/src/main/res/drawable/ic_privacy_policy.xml
rename to feature/about/src/main/res/drawable/feature_about_privacy_policy.xml
diff --git a/feature/about/src/main/res/drawable/ic_source_code.xml b/feature/about/src/main/res/drawable/feature_about_source_code.xml
similarity index 100%
rename from feature/about/src/main/res/drawable/ic_source_code.xml
rename to feature/about/src/main/res/drawable/feature_about_source_code.xml
diff --git a/feature/about/src/main/res/drawable/ic_website.xml b/feature/about/src/main/res/drawable/feature_about_website.xml
similarity index 100%
rename from feature/about/src/main/res/drawable/ic_website.xml
rename to feature/about/src/main/res/drawable/feature_about_website.xml
diff --git a/feature/about/src/main/res/values/strings.xml b/feature/about/src/main/res/values/strings.xml
index 706d11e39..43ff0ad18 100644
--- a/feature/about/src/main/res/values/strings.xml
+++ b/feature/about/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright 2024 Mifos Initiative
 
     This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,16 +8,16 @@
     See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
 -->
 <resources>
-    <string name="app_name">Mifos Mobile</string>
-    <string name="about_app_description">An Android Application built on top of the MifosX Self-Service platform for end-user customers to view/transact on the accounts and loans they hold.</string>
-    <string name="copy_right_mifos">©2016-%1$s Mifos Initiative.</string>
-    <string name="app_version_text">App version  1.0</string>
-    <string name="official_website">Official Website</string>
-    <string name="licenses">Licenses</string>
-    <string name="privacy_policy">Privacy Policy</string>
-    <string name="sources">Source Code</string>
-    <string name="license_string_with_value">License: MPL-2.0</string>
-    <string name="about_us">About Us</string>
-    <string name="privacy_policy_host" translatable="false">openmf.github.io/privacy_policy_mifos_mobile.html</string>
-    <string name="privacy_policy_host_url" translatable="false">https://openmf.github.io/privacy_policy_mifos_mobile.html</string>
+    <string name="feature_about_app_name">Mifos Mobile</string>
+    <string name="feature_about_description">An Android Application built on top of the MifosX Self-Service platform for end-user customers to view/transact on the accounts and loans they hold.</string>
+    <string name="feature_about_copyright_mifos">©2016-%1$s Mifos Initiative.</string>
+    <string name="feature_about_app_version">App version  1.0</string>
+    <string name="feature_about_official_website">Official Website</string>
+    <string name="feature_about_licenses">Licenses</string>
+    <string name="feature_about_privacy_policy">Privacy Policy</string>
+    <string name="feature_about_sources">Source Code</string>
+    <string name="feature_about_license">License: MPL-2.0</string>
+    <string name="feature_about_about_us">About Us</string>
+    <string name="feature_about_policy_host" translatable="false">openmf.github.io/privacy_policy_mifos_mobile.html</string>
+    <string name="feature_about_policy_url" translatable="false">https://openmf.github.io/privacy_policy_mifos_mobile.html</string>
 </resources>
\ No newline at end of file
diff --git a/feature/account/build.gradle.kts b/feature/account/build.gradle.kts
index 5930b9c54..b0f912380 100644
--- a/feature/account/build.gradle.kts
+++ b/feature/account/build.gradle.kts
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 plugins {
     alias(libs.plugins.mifos.android.feature)
     alias(libs.plugins.mifos.android.library.compose)
@@ -8,15 +17,5 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.ui)
-    implementation(projects.core.common)
-    implementation(projects.core.model)
-    implementation(projects.core.data)
-    implementation(libs.reactivex.rxjava2.android)
-    implementation(libs.reactivex.rxjava2)
-    api(libs.androidx.compose.material)
-    implementation("com.github.rahul-gill.mifos-ui-library:uihouse:alpha-2.1")
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.espresso.core)
+    implementation(projects.libs.pullrefresh)
 }
\ No newline at end of file
diff --git a/feature/account/src/main/AndroidManifest.xml b/feature/account/src/main/AndroidManifest.xml
index a5918e68a..4ee22a4fb 100644
--- a/feature/account/src/main/AndroidManifest.xml
+++ b/feature/account/src/main/AndroidManifest.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/AccountsScreen.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/AccountsScreen.kt
index 4234d6ea7..9fc6f8072 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/AccountsScreen.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/AccountsScreen.kt
@@ -1,13 +1,18 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.account.screens
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -19,6 +24,9 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.mifos.library.pullrefresh.PullRefreshIndicator
+import com.mifos.library.pullrefresh.pullRefresh
+import com.mifos.library.pullrefresh.rememberPullRefreshState
 import org.mifos.mobile.core.common.Network
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.model.entity.accounts.loan.LoanAccount
@@ -31,14 +39,15 @@ import org.mifos.mobile.feature.account.R
 import org.mifos.mobile.feature.account.utils.AccountState
 import org.mifos.mobile.feature.account.viewmodel.AccountsViewModel
 
-
 @Composable
-fun AccountsScreen(
-    viewModel: AccountsViewModel = hiltViewModel(),
+internal fun AccountsScreen(
     accountType: String,
-    onItemClick: (accountType: String, accountId: Long) -> Unit
+    onItemClick: (accountType: String, accountId: Long) -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: AccountsViewModel = hiltViewModel(),
 ) {
     val context = LocalContext.current
+
     val uiState by viewModel.accountsUiState.collectAsStateWithLifecycle()
     val isRefreshing by viewModel.isRefreshing.collectAsStateWithLifecycle()
     val isSearching by viewModel.isSearching.collectAsStateWithLifecycle()
@@ -52,63 +61,63 @@ fun AccountsScreen(
 
     AccountsScreen(
         uiState = uiState,
-        isSearching = isSearching,
-        isFiltered = isFiltered,
-        onRetry = { viewModel.loadAccounts(accountType) },
         isRefreshing = isRefreshing,
+        isFiltered = isFiltered,
+        isSearching = isSearching,
         onRefresh = { viewModel.refresh(accountType) },
+        onRetry = { viewModel.loadAccounts(accountType) },
+        modifier = modifier,
         searchSavingsAccountList = { accountsList ->
             viewModel.searchInSavingsList(
                 accountsList,
-                searchQuery
+                searchQuery,
             )
         },
         searchLoanAccountList = { accountsList ->
             viewModel.searchInLoanList(
                 accountsList,
-                searchQuery
+                searchQuery,
             )
         },
         searchShareAccountList = { accountsList ->
             viewModel.searchInSharesList(
                 accountsList,
-                searchQuery
+                searchQuery,
             )
         },
         filterSavingsAccountList = { accountsList ->
             viewModel.getFilterSavingsAccountList(
                 accountsList = accountsList,
                 filterList = filterList,
-                context = context
+                context = context,
             )
         },
-        filterLoanAccountList =  { accountsList ->
+        filterLoanAccountList = { accountsList ->
             viewModel.getFilterLoanAccountList(
                 accountsList = accountsList,
                 filterList = filterList,
-                context = context
+                context = context,
             )
         },
-        filterShareAccountList =  { accountsList ->
+        filterShareAccountList = { accountsList ->
             viewModel.getFilterShareAccountList(
                 accountsList = accountsList,
                 filterList = filterList,
-                context = context
+                context = context,
             )
         },
-        onItemClick = { accType, accountId -> onItemClick.invoke(accType, accountId) },
+        onItemClick = onItemClick,
     )
 }
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
-fun AccountsScreen(
+private fun AccountsScreen(
     uiState: AccountState,
-    onRetry: () -> Unit,
     isRefreshing: Boolean,
-    onRefresh: () -> Unit,
-    isSearching: Boolean,
     isFiltered: Boolean,
+    isSearching: Boolean,
+    onRefresh: () -> Unit,
+    onRetry: () -> Unit,
     searchSavingsAccountList: (accountsList: List<SavingAccount>) -> List<SavingAccount>,
     searchLoanAccountList: (accountsList: List<LoanAccount>) -> List<LoanAccount>,
     searchShareAccountList: (accountsList: List<ShareAccount>) -> List<ShareAccount>,
@@ -116,26 +125,25 @@ fun AccountsScreen(
     filterLoanAccountList: (accountsList: List<LoanAccount>) -> List<LoanAccount>,
     filterShareAccountList: (accountsList: List<ShareAccount>) -> List<ShareAccount>,
     onItemClick: (accountType: String, accountId: Long) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
     val pullRefreshState = rememberPullRefreshState(
         refreshing = isRefreshing,
-        onRefresh = onRefresh
+        onRefresh = onRefresh,
     )
 
     Column(
-        modifier = Modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.Center
+        modifier = modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
     ) {
-
-        Box(modifier = Modifier.pullRefresh(pullRefreshState))
-        {
+        Box(modifier = Modifier.pullRefresh(pullRefreshState)) {
             when (uiState) {
                 is AccountState.Error -> {
                     MifosErrorComponent(
                         isNetworkConnected = Network.isConnected(context),
                         isRetryEnabled = true,
-                        onRetry = onRetry
+                        onRetry = onRetry,
                     )
                 }
 
@@ -146,9 +154,9 @@ fun AccountsScreen(
                 is AccountState.ShowSavingsAccounts -> {
                     if ((uiState.savingAccounts.isNullOrEmpty())) {
                         EmptyDataView(
-                            icon = R.drawable.ic_error_black_24dp,
-                            error = R.string.empty_savings_accounts,
-                            modifier = Modifier.fillMaxSize()
+                            icon = R.drawable.feature_account_error_black,
+                            error = R.string.feature_account_empty_savings_accounts,
+                            modifier = Modifier.fillMaxSize(),
                         )
                     } else {
                         SavingsAccountContent(
@@ -157,7 +165,7 @@ fun AccountsScreen(
                             isFiltered = isFiltered,
                             getUpdatedSearchList = searchSavingsAccountList,
                             onItemClick = onItemClick,
-                            getUpdatedFilterList = filterSavingsAccountList
+                            getUpdatedFilterList = filterSavingsAccountList,
                         )
                     }
                 }
@@ -165,9 +173,9 @@ fun AccountsScreen(
                 is AccountState.ShowLoanAccounts -> {
                     if ((uiState.loanAccounts.isNullOrEmpty())) {
                         EmptyDataView(
-                            icon = R.drawable.ic_error_black_24dp,
-                            error = R.string.empty_loan_accounts,
-                            modifier = Modifier.fillMaxSize()
+                            icon = R.drawable.feature_account_error_black,
+                            error = R.string.feature_account_empty_loan_accounts,
+                            modifier = Modifier.fillMaxSize(),
                         )
                     } else {
                         LoanAccountContent(
@@ -176,7 +184,7 @@ fun AccountsScreen(
                             isFiltered = isFiltered,
                             getUpdatedSearchList = searchLoanAccountList,
                             onItemClick = onItemClick,
-                            getUpdatedFilterList = filterLoanAccountList
+                            getUpdatedFilterList = filterLoanAccountList,
                         )
                     }
                 }
@@ -184,9 +192,9 @@ fun AccountsScreen(
                 is AccountState.ShowShareAccounts -> {
                     if ((uiState.shareAccounts.isNullOrEmpty())) {
                         EmptyDataView(
-                            icon = R.drawable.ic_error_black_24dp,
-                            error = R.string.empty_share_accounts,
-                            modifier = Modifier.fillMaxSize()
+                            icon = R.drawable.feature_account_error_black,
+                            error = R.string.feature_account_empty_share_accounts,
+                            modifier = Modifier.fillMaxSize(),
                         )
                     } else {
                         AccountScreenShareContent(
@@ -194,7 +202,7 @@ fun AccountsScreen(
                             isSearching = isSearching,
                             isFiltered = isFiltered,
                             getUpdatedSearchList = searchShareAccountList,
-                            getUpdatedFilterList = filterShareAccountList
+                            getUpdatedFilterList = filterShareAccountList,
                         )
                     }
                 }
@@ -203,13 +211,13 @@ fun AccountsScreen(
             PullRefreshIndicator(
                 refreshing = isRefreshing,
                 state = pullRefreshState,
-                modifier = Modifier.align(Alignment.TopCenter)
+                modifier = Modifier.align(Alignment.TopCenter),
             )
         }
     }
 }
 
-class AccountsScreenPreviewProvider : PreviewParameterProvider<AccountState> {
+internal class AccountsScreenPreviewProvider : PreviewParameterProvider<AccountState> {
 
     override val values: Sequence<AccountState>
         get() = sequenceOf(
@@ -224,23 +232,23 @@ class AccountsScreenPreviewProvider : PreviewParameterProvider<AccountState> {
 @Preview(showSystemUi = true)
 @Composable
 private fun AccountSavingsScreenPreview(
-    @PreviewParameter(AccountsScreenPreviewProvider::class) accountUiState: AccountState
+    @PreviewParameter(AccountsScreenPreviewProvider::class) accountUiState: AccountState,
 ) {
     MifosMobileTheme {
         AccountsScreen(
             uiState = accountUiState,
-            isSearching = true,
-            isFiltered = true,
-            onRetry = { },
             isRefreshing = true,
+            isFiltered = true,
+            isSearching = true,
             onRefresh = { },
+            onRetry = { },
+            searchSavingsAccountList = { _ -> listOf() },
+            searchLoanAccountList = { _ -> listOf() },
+            searchShareAccountList = { _ -> listOf() },
             filterSavingsAccountList = { _ -> listOf() },
             filterLoanAccountList = { _ -> listOf() },
             filterShareAccountList = { _ -> listOf() },
-            searchLoanAccountList = { _ -> listOf() },
-            searchSavingsAccountList = { _ -> listOf() },
-            searchShareAccountList = { _ -> listOf() },
             onItemClick = { _, _ -> },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/LoanAccountContent.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/LoanAccountContent.kt
index a333988d1..e7c54d781 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/LoanAccountContent.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/LoanAccountContent.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.account.screens
 
 import androidx.compose.foundation.clickable
@@ -22,25 +31,26 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.mifos.mobile.feature.account.R
-import org.mifos.mobile.feature.account.account.utils.AccountTypeItemIndicator
-import org.mifos.mobile.core.model.entity.accounts.loan.LoanAccount
+import org.mifos.mobile.core.common.Constants
 import org.mifos.mobile.core.common.utils.CurrencyUtil
 import org.mifos.mobile.core.common.utils.DateHelper
+import org.mifos.mobile.core.model.entity.accounts.loan.LoanAccount
+import org.mifos.mobile.feature.account.R
+import org.mifos.mobile.feature.account.account.utils.AccountTypeItemIndicator
 
 @Composable
-fun LoanAccountContent(
-    accountsList: List<LoanAccount>,
+internal fun LoanAccountContent(
     isSearching: Boolean,
-    getUpdatedSearchList: (accountsList: List<LoanAccount>) -> List<LoanAccount>,
     isFiltered: Boolean,
+    accountsList: List<LoanAccount>,
+    getUpdatedSearchList: (accountsList: List<LoanAccount>) -> List<LoanAccount>,
     getUpdatedFilterList: (accountsList: List<LoanAccount>) -> List<LoanAccount>,
     onItemClick: (accountType: String, accountId: Long) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
+    val lazyColumnState = rememberLazyListState()
 
-    var accounts by rememberSaveable {
-        mutableStateOf(accountsList)
-    }
+    var accounts by rememberSaveable { mutableStateOf(accountsList) }
 
     accounts = when {
         isFiltered && isSearching -> {
@@ -60,25 +70,24 @@ fun LoanAccountContent(
         }
     }
 
-    val lazyColumnState = rememberLazyListState()
-
     LazyColumn(
-        modifier = Modifier.fillMaxSize(),
-        state = lazyColumnState
+        modifier = modifier.fillMaxSize(),
+        state = lazyColumnState,
     ) {
         items(items = accounts) { loanAccount ->
             AccountScreenLoanListItem(
                 loanAccount = loanAccount,
-                onItemClick = onItemClick
+                onItemClick = onItemClick,
             )
         }
     }
 }
 
 @Composable
-fun AccountScreenLoanListItem(
+private fun AccountScreenLoanListItem(
     loanAccount: LoanAccount,
-    onItemClick: (accountType: String, accountId: Long) -> Unit
+    onItemClick: (accountType: String, accountId: Long) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
 
@@ -86,59 +95,72 @@ fun AccountScreenLoanListItem(
         loanAccount.status?.active == true && loanAccount.inArrears == true -> {
             Triple(
                 colorResource(R.color.red),
-                "${stringResource(id = R.string.disbursement)} ${DateHelper.getDateAsString(loanAccount.timeline?.actualDisbursementDate)}",
-                colorResource(R.color.red)
+                "${stringResource(id = R.string.feature_account_disbursement)} " +
+                    DateHelper.getDateAsString(loanAccount.timeline?.actualDisbursementDate),
+                colorResource(R.color.red),
             )
         }
+
         loanAccount.status?.active == true -> {
             Triple(
                 colorResource(R.color.deposit_green),
-                "${stringResource(id = R.string.disbursement)} ${DateHelper.getDateAsString(loanAccount.timeline?.actualDisbursementDate)}",
-                colorResource(R.color.deposit_green)
+                "${stringResource(id = R.string.feature_account_disbursement)} " +
+                    DateHelper.getDateAsString(loanAccount.timeline?.actualDisbursementDate),
+                colorResource(R.color.deposit_green),
             )
         }
+
         loanAccount.status?.waitingForDisbursal == true -> {
             Triple(
                 colorResource(R.color.blue),
-                "${stringResource(id = R.string.approved)} ${DateHelper.getDateAsString(loanAccount.timeline?.approvedOnDate)}",
-                null
+                "${stringResource(id = R.string.feature_account_approved)} " +
+                    DateHelper.getDateAsString(loanAccount.timeline?.approvedOnDate),
+                null,
             )
         }
+
         loanAccount.status?.pendingApproval == true -> {
             Triple(
                 colorResource(R.color.light_yellow),
-                "${stringResource(id = R.string.submitted)} ${DateHelper.getDateAsString(loanAccount.timeline?.submittedOnDate)}",
-                null
+                "${stringResource(id = R.string.feature_account_submitted)} " +
+                    DateHelper.getDateAsString(loanAccount.timeline?.submittedOnDate),
+                null,
             )
         }
+
         loanAccount.status?.overpaid == true -> {
             Triple(
                 colorResource(R.color.purple),
-                "${stringResource(id = R.string.approved)} ${DateHelper.getDateAsString(loanAccount.timeline?.actualDisbursementDate)}",
-                colorResource(R.color.purple)
+                "${stringResource(id = R.string.feature_account_approved)} " +
+                    DateHelper.getDateAsString(loanAccount.timeline?.actualDisbursementDate),
+                colorResource(R.color.purple),
             )
         }
+
         loanAccount.status?.closed == true -> {
             Triple(
                 colorResource(R.color.black),
-                "${stringResource(id = R.string.closed)} ${DateHelper.getDateAsString(loanAccount.timeline?.closedOnDate)}",
-                null
+                "${stringResource(id = R.string.feature_account_closed)} " +
+                    DateHelper.getDateAsString(loanAccount.timeline?.closedOnDate),
+                null,
             )
         }
+
         else -> {
             Triple(
                 colorResource(R.color.gray_dark),
-                "${stringResource(id = R.string.withdrawn)} ${DateHelper.getDateAsString(loanAccount.timeline?.withdrawnOnDate)}",
-                null
+                "${stringResource(id = R.string.feature_account_withdrawn)} " +
+                    DateHelper.getDateAsString(loanAccount.timeline?.withdrawnOnDate),
+                null,
             )
         }
     }
 
     Row(
-        modifier = Modifier.clickable {
-            onItemClick.invoke(org.mifos.mobile.core.common.Constants.LOAN_ACCOUNTS, loanAccount.id)
+        modifier = modifier.clickable {
+            onItemClick.invoke(Constants.LOAN_ACCOUNTS, loanAccount.id)
         },
-        verticalAlignment = Alignment.CenterVertically
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         AccountTypeItemIndicator(color)
 
@@ -146,7 +168,7 @@ fun AccountScreenLoanListItem(
             loanAccount.accountNo?.let {
                 Text(
                     text = it,
-                    style = MaterialTheme.typography.bodyLarge
+                    style = MaterialTheme.typography.bodyLarge,
                 )
             }
 
@@ -154,7 +176,7 @@ fun AccountScreenLoanListItem(
                 Text(
                     text = it,
                     style = MaterialTheme.typography.labelLarge,
-                    color = colorResource(id = R.color.gray_dark)
+                    color = colorResource(id = R.color.gray_dark),
                 )
             }
 
@@ -174,7 +196,7 @@ fun AccountScreenLoanListItem(
                 modifier = Modifier
                     .align(Alignment.CenterVertically)
                     .padding(end = 16.dp),
-                color = it
+                color = it,
             )
         }
     }
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/SavingsAccountContent.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/SavingsAccountContent.kt
index dd1302839..bb1168f5e 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/SavingsAccountContent.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/SavingsAccountContent.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.account.screens
 
 import androidx.compose.foundation.clickable
@@ -22,25 +31,26 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.mifos.mobile.feature.account.R
-import org.mifos.mobile.feature.account.account.utils.AccountTypeItemIndicator
-import org.mifos.mobile.core.model.entity.accounts.savings.SavingAccount
+import org.mifos.mobile.core.common.Constants
 import org.mifos.mobile.core.common.utils.CurrencyUtil
 import org.mifos.mobile.core.common.utils.DateHelper
+import org.mifos.mobile.core.model.entity.accounts.savings.SavingAccount
+import org.mifos.mobile.feature.account.R
+import org.mifos.mobile.feature.account.account.utils.AccountTypeItemIndicator
 
 @Composable
-fun SavingsAccountContent(
+internal fun SavingsAccountContent(
     accountsList: List<SavingAccount>,
     isSearching: Boolean,
-    getUpdatedSearchList: (accountsList: List<SavingAccount>) -> List<SavingAccount>,
     isFiltered: Boolean,
+    getUpdatedSearchList: (accountsList: List<SavingAccount>) -> List<SavingAccount>,
     getUpdatedFilterList: (accountsList: List<SavingAccount>) -> List<SavingAccount>,
     onItemClick: (accountType: String, accountId: Long) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
+    val lazyColumnState = rememberLazyListState()
 
-    var accounts by rememberSaveable {
-        mutableStateOf(accountsList)
-    }
+    var accounts by rememberSaveable { mutableStateOf(accountsList) }
 
     accounts = when {
         isFiltered && isSearching -> {
@@ -60,25 +70,24 @@ fun SavingsAccountContent(
         }
     }
 
-    val lazyColumnState = rememberLazyListState()
-
     LazyColumn(
-        modifier = Modifier.fillMaxSize(),
-        state = lazyColumnState
+        modifier = modifier.fillMaxSize(),
+        state = lazyColumnState,
     ) {
         items(items = accounts) { savingAccount ->
             AccountScreenSavingsListItem(
                 savingAccount = savingAccount,
-                onItemClick = onItemClick
+                onItemClick = onItemClick,
             )
         }
     }
 }
 
 @Composable
-fun AccountScreenSavingsListItem(
+private fun AccountScreenSavingsListItem(
     savingAccount: SavingAccount,
-    onItemClick: (accountType: String, accountId: Long) -> Unit
+    onItemClick: (accountType: String, accountId: Long) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
 
@@ -87,44 +96,47 @@ fun AccountScreenSavingsListItem(
             Triple(
                 colorResource(R.color.deposit_green),
                 DateHelper.getDateAsString(savingAccount.lastActiveTransactionDate),
-                colorResource(R.color.deposit_green)
+                colorResource(R.color.deposit_green),
             )
         }
         savingAccount.status?.approved == true -> {
             Triple(
                 colorResource(R.color.light_green),
-                "${stringResource(id = R.string.approved)} ${DateHelper.getDateAsString(savingAccount.timeLine?.approvedOnDate)}",
-                null
+                "${stringResource(id = R.string.feature_account_approved)} " +
+                    DateHelper.getDateAsString(savingAccount.timeLine?.approvedOnDate),
+                null,
             )
         }
         savingAccount.status?.submittedAndPendingApproval == true -> {
             Triple(
                 colorResource(R.color.light_yellow),
-                "${stringResource(id = R.string.submitted)} ${DateHelper.getDateAsString(savingAccount.timeLine?.submittedOnDate)}",
-                null
+                "${stringResource(id = R.string.feature_account_submitted)} " +
+                    DateHelper.getDateAsString(savingAccount.timeLine?.submittedOnDate),
+                null,
             )
         }
         savingAccount.status?.matured == true -> {
             Triple(
                 colorResource(R.color.red_light),
                 DateHelper.getDateAsString(savingAccount.lastActiveTransactionDate),
-                colorResource(R.color.red_light)
+                colorResource(R.color.red_light),
             )
         }
         else -> {
             Triple(
                 colorResource(R.color.light_yellow),
-                "${stringResource(id = R.string.closed)} ${DateHelper.getDateAsString(savingAccount?.timeLine?.closedOnDate)}",
-                null
+                "${stringResource(id = R.string.feature_account_closed)} " +
+                    DateHelper.getDateAsString(savingAccount.timeLine?.closedOnDate),
+                null,
             )
         }
     }
 
     Row(
-        modifier = Modifier.clickable {
-            onItemClick.invoke(org.mifos.mobile.core.common.Constants.SAVINGS_ACCOUNTS, savingAccount.id)
+        modifier = modifier.clickable {
+            onItemClick.invoke(Constants.SAVINGS_ACCOUNTS, savingAccount.id)
         },
-        verticalAlignment = Alignment.CenterVertically
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         AccountTypeItemIndicator(color)
 
@@ -132,7 +144,7 @@ fun AccountScreenSavingsListItem(
             savingAccount.accountNo?.let {
                 Text(
                     text = it,
-                    style = MaterialTheme.typography.bodyLarge
+                    style = MaterialTheme.typography.bodyLarge,
                 )
             }
 
@@ -155,9 +167,9 @@ fun AccountScreenSavingsListItem(
 
         numColor?.let {
             val amountBalance = context.getString(
-                R.string.string_and_string,
+                R.string.feature_account_string_and_string,
                 savingAccount.currency?.displaySymbol ?: savingAccount.currency?.code,
-                CurrencyUtil.formatCurrency(context, savingAccount.accountBalance)
+                CurrencyUtil.formatCurrency(context, savingAccount.accountBalance),
             )
 
             Text(
@@ -165,7 +177,7 @@ fun AccountScreenSavingsListItem(
                 modifier = Modifier
                     .align(Alignment.CenterVertically)
                     .padding(end = 16.dp),
-                color = it
+                color = it,
             )
         }
     }
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/ShareAccountContent.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/ShareAccountContent.kt
index 5586f19cf..8aa9712f7 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/ShareAccountContent.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/screens/ShareAccountContent.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.account.screens
 
 import androidx.compose.foundation.layout.Arrangement
@@ -22,22 +31,22 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import org.mifos.mobile.feature.account.R
 import org.mifos.mobile.core.model.entity.accounts.share.ShareAccount
+import org.mifos.mobile.feature.account.R
 import org.mifos.mobile.feature.account.account.utils.AccountTypeItemIndicator
 
 @Composable
-fun AccountScreenShareContent(
-    accountsList: List<ShareAccount>,
+internal fun AccountScreenShareContent(
     isSearching: Boolean,
-    getUpdatedSearchList: (accountsList: List<ShareAccount>) -> List<ShareAccount>,
     isFiltered: Boolean,
-    getUpdatedFilterList: (accountsList: List<ShareAccount>) -> List<ShareAccount>
+    accountsList: List<ShareAccount>,
+    getUpdatedSearchList: (accountsList: List<ShareAccount>) -> List<ShareAccount>,
+    getUpdatedFilterList: (accountsList: List<ShareAccount>) -> List<ShareAccount>,
+    modifier: Modifier = Modifier,
 ) {
+    val lazyColumnState = rememberLazyListState()
 
-    var accounts by rememberSaveable {
-        mutableStateOf(accountsList)
-    }
+    var accounts by rememberSaveable { mutableStateOf(accountsList) }
 
     when {
         isFiltered && isSearching -> {
@@ -57,47 +66,52 @@ fun AccountScreenShareContent(
         }
     }
 
-    val lazyColumnState = rememberLazyListState()
-
     LazyColumn(
-        modifier = Modifier.fillMaxSize(),
-        state = lazyColumnState
+        modifier = modifier.fillMaxSize(),
+        state = lazyColumnState,
     ) {
         items(items = accounts) { shareAccount ->
             AccountScreenShareListItem(
-                shareAccount = shareAccount
+                shareAccount = shareAccount,
             )
         }
     }
 }
 
 @Composable
-fun AccountScreenShareListItem(
-    shareAccount: ShareAccount
+private fun AccountScreenShareListItem(
+    shareAccount: ShareAccount,
+    modifier: Modifier = Modifier,
 ) {
     val (color, setSharingAccountDetail) = when {
         shareAccount.status?.active == true -> {
             Pair(colorResource(R.color.deposit_green), true)
         }
+
         shareAccount.status?.approved == true -> {
             Pair(colorResource(R.color.light_green), false)
         }
+
         shareAccount.status?.submittedAndPendingApproval == true -> {
             Pair(colorResource(R.color.light_yellow), false)
         }
+
         else -> {
             Pair(colorResource(R.color.light_blue), false)
         }
     }
 
-    Row(verticalAlignment = Alignment.CenterVertically) {
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
         AccountTypeItemIndicator(color)
 
         Column(modifier = Modifier.padding(all = 12.dp)) {
             shareAccount.accountNo?.let {
                 Text(
                     text = it,
-                    style = MaterialTheme.typography.bodyLarge
+                    style = MaterialTheme.typography.bodyLarge,
                 )
             }
 
@@ -111,11 +125,11 @@ fun AccountScreenShareListItem(
 
             Row(
                 modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween
+                horizontalArrangement = Arrangement.SpaceBetween,
             ) {
                 Row {
                     Text(
-                        text = stringResource(id = R.string.pending),
+                        text = stringResource(id = R.string.feature_account_pending),
                         style = MaterialTheme.typography.labelLarge,
                         color = colorResource(id = R.color.gray_dark),
                     )
@@ -130,7 +144,7 @@ fun AccountScreenShareListItem(
                 if (setSharingAccountDetail) {
                     Row {
                         Text(
-                            text = stringResource(id = R.string.approved),
+                            text = stringResource(id = R.string.feature_account_approved),
                             style = MaterialTheme.typography.labelLarge,
                             color = colorResource(id = R.color.gray_dark),
                         )
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/utils/AccountTypeItemIndicator.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/utils/AccountTypeItemIndicator.kt
index dc398e899..cc7e808ac 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/utils/AccountTypeItemIndicator.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/utils/AccountTypeItemIndicator.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.account.utils
 
 import androidx.compose.foundation.Canvas
@@ -13,14 +22,18 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun AccountTypeItemIndicator(color: Color) {
+internal fun AccountTypeItemIndicator(
+    color: Color,
+    modifier: Modifier = Modifier,
+) {
     Box(
-        modifier = Modifier.background(Color.Transparent)
+        modifier = modifier
+            .background(Color.Transparent),
     ) {
         Canvas(
             modifier = Modifier
                 .height(60.dp)
-                .width(5.dp)
+                .width(5.dp),
         ) {
             val radius = 10.dp.toPx()
             val path = androidx.compose.ui.graphics.Path().apply {
@@ -29,29 +42,29 @@ fun AccountTypeItemIndicator(color: Color) {
                 arcTo(
                     rect = androidx.compose.ui.geometry.Rect(
                         offset = Offset(size.width - radius, 0f),
-                        size = Size(radius, radius)
+                        size = Size(radius, radius),
                     ),
                     startAngleDegrees = -90f,
                     sweepAngleDegrees = 90f,
-                    forceMoveTo = false
+                    forceMoveTo = false,
                 )
                 lineTo(size.width, size.height - radius)
                 arcTo(
                     rect = androidx.compose.ui.geometry.Rect(
                         offset = Offset(size.width - radius, size.height - radius),
-                        size = Size(radius, radius)
+                        size = Size(radius, radius),
                     ),
                     startAngleDegrees = 0f,
                     sweepAngleDegrees = 90f,
-                    forceMoveTo = false
+                    forceMoveTo = false,
                 )
                 lineTo(0f, size.height)
                 close()
             }
             drawPath(
                 path = path,
-                color = color
+                color = color,
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/utils/AccountsFilterUtil.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/utils/AccountsFilterUtil.kt
index bc40f2f96..76f6bbdb8 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/account/utils/AccountsFilterUtil.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/account/utils/AccountsFilterUtil.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.account.utils
 
 import android.content.Context
@@ -6,27 +15,27 @@ import org.mifos.mobile.feature.account.R
 data class AccountsFilterUtil(
     var activeString: String? = null,
     var approvedString: String? = null,
-    var approvalPendingString : String? = null,
-    var maturedString : String? = null,
-    var waitingForDisburseString : String? = null,
+    var approvalPendingString: String? = null,
+    var maturedString: String? = null,
+    var waitingForDisburseString: String? = null,
     var overpaidString: String? = null,
-    var closedString : String? = null,
-    var withdrawnString : String? = null,
-    var inArrearsString : String? = null
+    var closedString: String? = null,
+    var withdrawnString: String? = null,
+    var inArrearsString: String? = null,
 ) {
     companion object {
         fun getFilterStrings(context: Context): AccountsFilterUtil {
             return AccountsFilterUtil(
-                activeString = context.getString(R.string.active),
-                approvedString = context.getString(R.string.approved),
-                approvalPendingString = context.getString(R.string.approval_pending),
-                maturedString = context.getString(R.string.matured),
-                waitingForDisburseString = context.getString(R.string.waiting_for_disburse),
-                overpaidString = context.getString(R.string.overpaid),
-                closedString = context.getString(R.string.closed),
-                withdrawnString = context.getString(R.string.withdrawn),
-                inArrearsString = context.getString(R.string.in_arrears),
+                activeString = context.getString(R.string.feature_account_active),
+                approvedString = context.getString(R.string.feature_account_approved),
+                approvalPendingString = context.getString(R.string.feature_account_approval_pending),
+                maturedString = context.getString(R.string.feature_account_matured),
+                waitingForDisburseString = context.getString(R.string.feature_account_disburse),
+                overpaidString = context.getString(R.string.feature_account_overpaid),
+                closedString = context.getString(R.string.feature_account_closed),
+                withdrawnString = context.getString(R.string.feature_account_withdrawn),
+                inArrearsString = context.getString(R.string.feature_account_in_arrears),
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/screens/ClientAccountsScreen.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/screens/ClientAccountsScreen.kt
similarity index 70%
rename from feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/screens/ClientAccountsScreen.kt
rename to feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/screens/ClientAccountsScreen.kt
index 737a46c6f..72ab7d77b 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/screens/ClientAccountsScreen.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/screens/ClientAccountsScreen.kt
@@ -1,4 +1,13 @@
-package org.mifos.mobile.feature.account.client_account.screens
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.account.clientAccount.screens
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -18,7 +27,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.mifos.mobile.core.common.Constants
@@ -29,24 +37,28 @@ import org.mifos.mobile.core.designsystem.icons.MifosIcons
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.model.entity.CheckboxStatus
 import org.mifos.mobile.core.model.enums.AccountType
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.account.R
 import org.mifos.mobile.feature.account.account.screens.AccountsScreen
-import org.mifos.mobile.feature.account.client_account.utils.ClientAccountFilterDialog
-import org.mifos.mobile.feature.account.client_account.utils.ClientAccountsScreenTopBar
+import org.mifos.mobile.feature.account.clientAccount.utils.ClientAccountFilterDialog
+import org.mifos.mobile.feature.account.clientAccount.utils.ClientAccountsScreenTopBar
 import org.mifos.mobile.feature.account.viewmodel.AccountsViewModel
 
 @Composable
-fun ClientAccountsScreen(
-    viewModel: AccountsViewModel = hiltViewModel(),
-    navigateBack: () -> Unit?,
+internal fun ClientAccountsScreen(
+    navigateBack: () -> Unit,
     navigateToLoanApplicationScreen: () -> Unit,
     navigateToSavingsApplicationScreen: () -> Unit,
-    onItemClick: (accountType: AccountType, accountId: Long) -> Unit
+    onItemClick: (accountType: AccountType, accountId: Long) -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: AccountsViewModel = hiltViewModel(),
 ) {
     val context = LocalContext.current
+
     var isDialogActive by rememberSaveable { mutableStateOf(false) }
-    val accountType by viewModel.accountType.collectAsStateWithLifecycle()
     var currentPage by rememberSaveable { mutableIntStateOf(0) }
+
+    val accountType by viewModel.accountType.collectAsStateWithLifecycle()
     val filterList by viewModel.filterList.collectAsStateWithLifecycle()
 
     LaunchedEffect(key1 = accountType) {
@@ -62,63 +74,65 @@ fun ClientAccountsScreen(
     }
 
     ClientAccountsScreen(
-        navigateBack = navigateBack,
-        navigateToLoanApplicationScreen = navigateToLoanApplicationScreen,
-        navigateToSavingsApplicationScreen = navigateToSavingsApplicationScreen,
-        onItemClick = { accountType, accountId -> onItemClick.invoke(accountType, accountId) },
-        cancelFilterDialog = { isDialogActive = false },
+        currentPage = currentPage,
+        isDialogActive = isDialogActive,
+        filterList = filterList,
+        openSearch = { isDialogActive = true },
+        closeSearch = viewModel::stoppedSearching,
+        onSearchQueryChange = viewModel::updateSearchQuery,
+        pageChanged = { index -> currentPage = index },
         clearFilter = {
             viewModel.setFilterList(
                 checkBoxList = emptyList(),
                 currentPage = currentPage,
-                context = context
+                context = context,
             )
             isDialogActive = false
         },
+        cancelFilterDialog = { isDialogActive = false },
         filterAccounts = {
             viewModel.setFilterList(checkBoxList = it, currentPage = currentPage, context = context)
             isDialogActive = false
         },
-        onSearchQueryChange = { viewModel.updateSearchQuery(query = it) },
-        openSearch = { isDialogActive = true },
-        closeSearch = { viewModel.stoppedSearching() },
-        currentPage = currentPage,
-        pageChanged = { index -> currentPage = index },
-        isDialogActive = isDialogActive,
-        filterList = filterList,
+        modifier = modifier,
+        navigateBack = navigateBack,
+        navigateToLoanApplicationScreen = navigateToLoanApplicationScreen,
+        navigateToSavingsApplicationScreen = navigateToSavingsApplicationScreen,
+        onItemClick = onItemClick,
     )
 }
 
 @Composable
-fun ClientAccountsScreen(
-    navigateBack: () -> Unit?,
-    navigateToLoanApplicationScreen: () -> Unit,
-    navigateToSavingsApplicationScreen: () -> Unit,
-    onItemClick: (accountType: AccountType, accountId: Long) -> Unit,
-    cancelFilterDialog: () -> Unit,
-    clearFilter: () -> Unit,
-    filterAccounts: (checkBoxList: List<CheckboxStatus>) -> Unit,
-    onSearchQueryChange: (String) -> Unit,
-    openSearch: () -> Unit,
-    closeSearch: () -> Unit,
+private fun ClientAccountsScreen(
     currentPage: Int,
-    pageChanged: (index: Int) -> Unit,
     isDialogActive: Boolean,
     filterList: List<CheckboxStatus>,
+    openSearch: () -> Unit,
+    closeSearch: () -> Unit,
+    onSearchQueryChange: (String) -> Unit,
+    pageChanged: (index: Int) -> Unit,
+    clearFilter: () -> Unit,
+    cancelFilterDialog: () -> Unit,
+    filterAccounts: (checkBoxList: List<CheckboxStatus>) -> Unit,
+    navigateBack: () -> Unit,
+    navigateToLoanApplicationScreen: () -> Unit,
+    navigateToSavingsApplicationScreen: () -> Unit,
+    onItemClick: (accountType: AccountType, accountId: Long) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val tabs = listOf(
-        stringResource(id = R.string.savings_account),
-        stringResource(id = R.string.loan_account),
-        stringResource(id = R.string.share_account)
+        stringResource(id = R.string.feature_account_savings_account),
+        stringResource(id = R.string.feature_account_loan_account),
+        stringResource(id = R.string.feature_account_share_account),
     )
 
     if (isDialogActive) {
         ClientAccountFilterDialog(
+            title = tabs[currentPage],
             filterList = filterList,
             cancelDialog = { cancelFilterDialog.invoke() },
             clearFilter = { clearFilter.invoke() },
             updateFilterList = { list -> filterAccounts(list) },
-            title = tabs[currentPage]
         )
     }
 
@@ -126,12 +140,11 @@ fun ClientAccountsScreen(
         topBar = {
             ClientAccountsScreenTopBar(
                 navigateBack = navigateBack,
-                onChange = { onSearchQueryChange(it) },
-                clickDialog = { openSearch.invoke() },
-                closeSearch = { closeSearch.invoke() }
+                onChange = onSearchQueryChange,
+                clickDialog = openSearch,
+                closeSearch = closeSearch,
             )
         },
-
         floatingActionButtonContent = FloatingActionButtonContent(
             onClick = {
                 when (currentPage) {
@@ -144,119 +157,115 @@ fun ClientAccountsScreen(
                 Icon(
                     imageVector = MifosIcons.Add,
                     contentDescription = "Create Account",
-                    tint = if (isSystemInDarkTheme()) Color.Black else Color.White
+                    tint = if (isSystemInDarkTheme()) Color.Black else Color.White,
                 )
-            }
+            },
         ),
-
         content = {
             ClientAccountsTabRow(
                 modifier = Modifier.padding(it),
-                pageChanged = { index -> pageChanged.invoke(index) },
-                onItemClick = { accountType, accountId ->
-                    onItemClick.invoke(
-                        accountType,
-                        accountId
-                    )
-                },
-                currentPage = currentPage
+                pageChanged = pageChanged,
+                onItemClick = onItemClick,
+                currentPage = currentPage,
             )
-        }
+        },
+        modifier = modifier,
     )
 }
 
-
-
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun ClientAccountsTabRow(
-    modifier: Modifier,
+private fun ClientAccountsTabRow(
+    currentPage: Int,
     pageChanged: (index: Int) -> Unit,
     onItemClick: (accountType: AccountType, accountId: Long) -> Unit,
-    currentPage: Int
+    modifier: Modifier = Modifier,
 ) {
-    var currentPage by remember { mutableIntStateOf(currentPage) }
+    var page by remember { mutableIntStateOf(currentPage) }
     val pagerState = rememberPagerState(pageCount = { 3 })
+
     val tabs = listOf(
-        stringResource(id = R.string.savings),
-        stringResource(id = R.string.loan),
-        stringResource(id = R.string.share)
+        stringResource(id = R.string.feature_account_savings),
+        stringResource(id = R.string.feature_account_loan),
+        stringResource(id = R.string.feature_account_share),
     )
 
-    LaunchedEffect(key1 = currentPage) {
-        pageChanged(currentPage)
-        pagerState.animateScrollToPage(currentPage)
+    LaunchedEffect(key1 = page) {
+        pageChanged(page)
+        pagerState.animateScrollToPage(page)
     }
 
-    LaunchedEffect(key1 = pagerState.currentPage, pagerState.isScrollInProgress) {
-        currentPage = if (!pagerState.isScrollInProgress)
+    LaunchedEffect(
+        key1 = pagerState.currentPage,
+        key2 = pagerState.isScrollInProgress,
+    ) {
+        page = if (!pagerState.isScrollInProgress) {
             pagerState.currentPage
-        else {
+        } else {
             pagerState.targetPage
         }
     }
 
     MifosTabPager(
         pagerState = pagerState,
-        currentPage = currentPage,
+        currentPage = page,
         modifier = modifier,
         tabs = tabs,
-        setCurrentPage = { currentPage = it }
+        setCurrentPage = { page = it },
     ) {
-        when (currentPage) {
+        when (page) {
             0 -> AccountsScreen(
                 accountType = Constants.SAVINGS_ACCOUNTS,
-                onItemClick = { accType, accountId ->
+                onItemClick = { _, accountId ->
                     onItemClick.invoke(
                         AccountType.SAVINGS,
-                        accountId
+                        accountId,
                     )
-                }
+                },
             )
 
             1 -> AccountsScreen(
                 accountType = Constants.LOAN_ACCOUNTS,
-                onItemClick = { accType, accountId ->
+                onItemClick = { _, accountId ->
                     onItemClick.invoke(
                         AccountType.LOAN,
-                        accountId
+                        accountId,
                     )
-                }
+                },
             )
 
             2 -> AccountsScreen(
                 accountType = Constants.SHARE_ACCOUNTS,
-                onItemClick = { accType, accountId ->
+                onItemClick = { _, accountId ->
                     onItemClick.invoke(
                         AccountType.SHARE,
-                        accountId
+                        accountId,
                     )
-                }
+                },
             )
         }
     }
 }
 
-
-@Preview(showSystemUi = true)
+@DevicePreviews
 @Composable
-fun ClientAccountsScreenPreview() {
+private fun ClientAccountsScreenPreview() {
     MifosMobileTheme {
         ClientAccountsScreen(
-            navigateBack = {},
-            onItemClick = { accountType, accountId -> },
-            cancelFilterDialog = { },
-            clearFilter = { },
-            filterAccounts = { },
-            onSearchQueryChange = { },
-            openSearch = { },
-            closeSearch = { },
             currentPage = 0,
-            pageChanged = { index -> },
             isDialogActive = false,
             filterList = listOf(),
+            openSearch = { },
+            closeSearch = { },
+            onSearchQueryChange = { },
+            pageChanged = { },
+            clearFilter = { },
+            cancelFilterDialog = { },
+            filterAccounts = { },
+            navigateBack = {},
             navigateToLoanApplicationScreen = {},
-            navigateToSavingsApplicationScreen = {}
+            navigateToSavingsApplicationScreen = {},
+            onItemClick = { _, _ -> },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/utils/ClientAccountFilterDialog.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/utils/ClientAccountFilterDialog.kt
new file mode 100644
index 000000000..85ff287f3
--- /dev/null
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/utils/ClientAccountFilterDialog.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.account.clientAccount.utils
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxColors
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.mifos.mobile.core.designsystem.components.MifosTextButton
+import org.mifos.mobile.core.model.entity.CheckboxStatus
+import org.mifos.mobile.feature.account.R
+
+@Composable
+internal fun ClientAccountFilterDialog(
+    title: String,
+    filterList: List<CheckboxStatus>,
+    cancelDialog: () -> Unit,
+    clearFilter: () -> Unit,
+    updateFilterList: (checkBoxList: List<CheckboxStatus>) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    var checkBoxList: List<CheckboxStatus> = filterList
+
+    AlertDialog(
+        onDismissRequest = cancelDialog,
+        modifier = modifier,
+        text = {
+            Column {
+                Text(modifier = Modifier.padding(bottom = 8.dp), text = "Filter $title")
+
+                Text(
+                    modifier = Modifier.padding(bottom = 16.dp),
+                    text = stringResource(R.string.feature_account_select_you_want),
+                )
+
+                ClientAccountFilterCheckBox(
+                    accountStatusList = filterList,
+                    updateList = { checkBoxList = it },
+                )
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                ) {
+                    MifosTextButton(
+                        onClick = clearFilter,
+                        text = stringResource(R.string.feature_account_clear_filters),
+                    )
+
+                    Row {
+                        MifosTextButton(
+                            onClick = cancelDialog,
+                            text = stringResource(R.string.feature_account_cancel),
+                        )
+                        MifosTextButton(
+                            onClick = { updateFilterList(checkBoxList) },
+                            text = stringResource(R.string.feature_account_filter),
+                        )
+                    }
+                }
+            }
+        },
+        confirmButton = {},
+    )
+}
+
+@Composable
+private fun ClientAccountFilterCheckBox(
+    accountStatusList: List<CheckboxStatus>,
+    updateList: (List<CheckboxStatus>) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val lazyColumnState = rememberLazyListState()
+
+    var checkBoxList by rememberSaveable { mutableStateOf(accountStatusList) }
+
+    LazyColumn(
+        state = lazyColumnState,
+        modifier = modifier,
+    ) {
+        items(checkBoxList.size) { index ->
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Start,
+            ) {
+                Checkbox(
+                    checked = checkBoxList[index].isChecked,
+                    onCheckedChange = {
+                        val updatedList = checkBoxList.toMutableList()
+                        updatedList[index] = checkBoxList[index].copy(isChecked = it)
+                        checkBoxList = updatedList
+                        updateList.invoke(checkBoxList)
+                    },
+                    colors = CheckboxColors(
+                        checkedBoxColor = Color(checkBoxList[index].color),
+                        uncheckedBoxColor = if (isSystemInDarkTheme()) {
+                            colorResource(id = R.color.gray_light)
+                        } else {
+                            colorResource(id = R.color.white)
+                        },
+                        checkedCheckmarkColor = if (isSystemInDarkTheme()) {
+                            colorResource(id = R.color.black)
+                        } else {
+                            colorResource(id = R.color.white)
+                        },
+                        uncheckedCheckmarkColor = colorResource(id = R.color.white),
+                        checkedBorderColor = Color(checkBoxList[index].color),
+                        uncheckedBorderColor = Color(checkBoxList[index].color),
+                        disabledBorderColor = colorResource(id = R.color.gray_dark),
+                        disabledIndeterminateBorderColor = colorResource(id = R.color.gray_dark),
+                        disabledCheckedBoxColor = colorResource(id = R.color.black),
+                        disabledUncheckedBoxColor = colorResource(id = R.color.black),
+                        disabledIndeterminateBoxColor = colorResource(id = R.color.black),
+                        disabledUncheckedBorderColor = colorResource(id = R.color.black),
+                    ),
+                )
+                Text(
+                    text = checkBoxList[index].status ?: "",
+                    color = MaterialTheme.colorScheme.onSurface,
+                )
+            }
+        }
+    }
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/utils/ClientAccountScreenTopBar.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/utils/ClientAccountScreenTopBar.kt
similarity index 67%
rename from feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/utils/ClientAccountScreenTopBar.kt
rename to feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/utils/ClientAccountScreenTopBar.kt
index b640d6d37..db49144a5 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/utils/ClientAccountScreenTopBar.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/clientAccount/utils/ClientAccountScreenTopBar.kt
@@ -1,8 +1,16 @@
-package org.mifos.mobile.feature.account.client_account.utils
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.account.clientAccount.utils
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@@ -11,8 +19,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -24,78 +30,82 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import org.mifos.mobile.core.designsystem.components.MifosSearchTextField
 import org.mifos.mobile.core.designsystem.icons.MifosIcons
 
 @Composable
-fun ClientAccountsScreenTopBar(
-    navigateBack: () -> Unit?,
+internal fun ClientAccountsScreenTopBar(
+    navigateBack: () -> Unit,
     onChange: (String) -> Unit,
     clickDialog: () -> Unit,
     closeSearch: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
-    var query by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
+    var query by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(TextFieldValue(""))
+    }
     var isSearchActive by rememberSaveable { mutableStateOf(false) }
 
     Row(
-        Modifier.padding(top = 8.dp)
+        modifier = modifier
+            .padding(top = 8.dp)
             .fillMaxWidth()
             .height(50.dp),
         horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically
+        verticalAlignment = Alignment.CenterVertically,
     ) {
-
         IconButton(
-            onClick = { navigateBack.invoke() },
-            modifier = Modifier.size(40.dp)
+            onClick = {
+                if (isSearchActive) {
+                    query = TextFieldValue("")
+                    isSearchActive = false
+                    closeSearch.invoke()
+                } else {
+                    navigateBack.invoke()
+                }
+            },
+            modifier = Modifier.size(40.dp),
         ) {
             Icon(
-                imageVector = Icons.Filled.ArrowBack,
+                imageVector = MifosIcons.ArrowBack,
                 contentDescription = "Back Arrow",
-                tint = if (isSystemInDarkTheme()) Color.White else Color.Black,
             )
         }
 
         Box(
             Modifier
                 .fillMaxWidth()
-                .fillMaxHeight(), contentAlignment = Alignment.CenterStart
+                .fillMaxHeight(),
+            contentAlignment = Alignment.CenterStart,
         ) {
-
             Text(
                 text = "Accounts",
                 style = MaterialTheme.typography.titleLarge,
-                color = if (isSystemInDarkTheme()) Color.White else Color.Black
             )
 
             Row(
-                Modifier.fillMaxWidth(),
+                modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.End,
-                verticalAlignment = Alignment.CenterVertically
+                verticalAlignment = Alignment.CenterVertically,
             ) {
-
                 IconButton(
                     onClick = { isSearchActive = true },
-                    modifier = Modifier.size(40.dp)
+                    modifier = Modifier.size(40.dp),
                 ) {
                     Image(
                         imageVector = MifosIcons.Search,
                         contentDescription = "Add account",
-                        colorFilter = ColorFilter.tint(if (isSystemInDarkTheme()) Color.White else Color.Black)
                     )
                 }
                 IconButton(
-                    onClick = { clickDialog.invoke() },
-                    modifier = Modifier.size(40.dp)
+                    onClick = clickDialog,
+                    modifier = Modifier.size(40.dp),
                 ) {
                     Image(
                         imageVector = MifosIcons.FilterList,
                         contentDescription = "Add account",
-                        colorFilter = ColorFilter.tint(if (isSystemInDarkTheme()) Color.White else Color.Black)
                     )
                 }
             }
@@ -107,7 +117,8 @@ fun ClientAccountsScreenTopBar(
                         query = it
                         onChange(it.text)
                     },
-                    modifier = Modifier.padding(end = 40.dp)
+                    modifier = Modifier
+                        .padding(end = 40.dp)
                         .height(52.dp)
                         .fillMaxWidth()
                         .background(color = MaterialTheme.colorScheme.background),
@@ -115,9 +126,9 @@ fun ClientAccountsScreenTopBar(
                         query = TextFieldValue("")
                         closeSearch.invoke()
                         isSearchActive = false
-                    }
+                    },
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/utils/ClientAccountFilterDialog.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/utils/ClientAccountFilterDialog.kt
deleted file mode 100644
index 8d3cfd034..000000000
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/client_account/utils/ClientAccountFilterDialog.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.mifos.mobile.feature.account.client_account.utils
-
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.CheckboxColors
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import org.mifos.mobile.feature.account.R
-import org.mifos.mobile.core.model.entity.CheckboxStatus
-
-@Composable
-fun ClientAccountFilterDialog(
-    cancelDialog: () -> Unit,
-    clearFilter: () -> Unit,
-    updateFilterList: (checkBoxList: List<CheckboxStatus>) -> Unit,
-    title: String,
-    filterList: List<CheckboxStatus>
-) {
-    var checkBoxList : List<CheckboxStatus> = filterList
-
-    AlertDialog(
-        onDismissRequest = { cancelDialog.invoke() },
-        text = {
-            Column {
-                Text(modifier = Modifier.padding(bottom = 8.dp), text = "Filter $title")
-                Text(modifier = Modifier.padding(bottom = 16.dp), text = stringResource(R.string.select_you_want))
-
-                ClientAccountFilterCheckBox( accountStatusList =  filterList ) { checkBoxList = it }
-
-                Row( modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween )
-                {
-                    TextButton(onClick = { clearFilter.invoke() }) {
-                        Text(text = stringResource(R.string.clear_filters))
-                    }
-                    Row {
-                        TextButton(onClick = { cancelDialog.invoke() }) {
-                            Text(text = stringResource(R.string.cancel))
-                        }
-                        TextButton(onClick = { updateFilterList(checkBoxList) }) {
-                            Text(text = stringResource(R.string.filter))
-                        }
-                    }
-                }
-
-            }
-        },
-        confirmButton = {}
-    )
-}
-
-@Composable
-fun ClientAccountFilterCheckBox(
-    accountStatusList: List<CheckboxStatus>,
-    updateList: (List<CheckboxStatus>) -> Unit
-) {
-
-    var checkBoxList by rememberSaveable {
-        mutableStateOf(accountStatusList)
-    }
-
-    val lazyColumnState = rememberLazyListState()
-
-    LazyColumn(
-        state = lazyColumnState
-    ) {
-        items( checkBoxList.size ){ index->
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Start
-            )
-            {
-                Checkbox(
-                    checked = checkBoxList[index].isChecked,
-                    onCheckedChange = {
-                        val updatedList = checkBoxList.toMutableList()
-                        updatedList[index] = checkBoxList[index].copy(isChecked = it)
-                        checkBoxList = updatedList
-                        updateList.invoke(checkBoxList)
-                    },
-                    colors= CheckboxColors(
-                        checkedBoxColor = Color(checkBoxList[index].color),
-                        uncheckedBoxColor =  if (isSystemInDarkTheme()) colorResource(id = R.color.gray_light) else colorResource(id = R.color.white) ,
-                        checkedCheckmarkColor = if (isSystemInDarkTheme()) colorResource(id = R.color.black) else colorResource(id = R.color.white),
-                        uncheckedCheckmarkColor= colorResource(id = R.color.white),
-                        checkedBorderColor = Color(checkBoxList[index].color),
-                        uncheckedBorderColor = Color(checkBoxList[index].color ),
-                        disabledBorderColor = colorResource(id = R.color.gray_dark),
-                        disabledIndeterminateBorderColor = colorResource(id = R.color.gray_dark),
-                        disabledCheckedBoxColor= colorResource(id = R.color.black),
-                        disabledUncheckedBoxColor= colorResource(id = R.color.black),
-                        disabledIndeterminateBoxColor= colorResource(id = R.color.black),
-                        disabledUncheckedBorderColor= colorResource(id = R.color.black),
-                    )
-                )
-                Text(
-                    text = checkBoxList[index].status ?: "",
-                    color = MaterialTheme.colorScheme.onSurface,
-                )
-            }
-        }
-    }
-}
-
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/navigation/AccountNavGraph.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/navigation/AccountNavGraph.kt
index 614358e26..685018d75 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/navigation/AccountNavGraph.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/navigation/AccountNavGraph.kt
@@ -1,6 +1,14 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.navigation
 
-import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavType
@@ -9,8 +17,7 @@ import androidx.navigation.compose.navigation
 import androidx.navigation.navArgument
 import org.mifos.mobile.core.common.Constants
 import org.mifos.mobile.core.model.enums.AccountType
-import org.mifos.mobile.feature.account.client_account.screens.ClientAccountsScreen
-
+import org.mifos.mobile.feature.account.clientAccount.screens.ClientAccountsScreen
 
 fun NavController.navigateToClientAccountsScreen(accountType: AccountType = AccountType.SAVINGS) {
     navigate(ClientAccountsNavigation.ClientAccountsScreen.passArguments(accountType = accountType))
@@ -30,7 +37,7 @@ fun NavGraphBuilder.clientAccountsNavGraph(
             navigateToAccountDetail = navigateToAccountDetail,
             navigateBack = navController::popBackStack,
             navigateToLoanApplicationScreen = navigateToLoanApplicationScreen,
-            navigateToSavingsApplicationScreen = navigateToSavingsApplicationScreen
+            navigateToSavingsApplicationScreen = navigateToSavingsApplicationScreen,
         )
     }
 }
@@ -39,19 +46,24 @@ fun NavGraphBuilder.clientAccountsScreenRoute(
     navigateToLoanApplicationScreen: () -> Unit,
     navigateToSavingsApplicationScreen: () -> Unit,
     navigateToAccountDetail: (AccountType, Long) -> Unit,
-    navigateBack: () -> Unit
+    navigateBack: () -> Unit,
 ) {
     composable(
         route = ClientAccountsNavigation.ClientAccountsScreen.route,
         arguments = listOf(
-            navArgument(name = Constants.ACCOUNT_TYPE) { type = NavType.StringType }
-        )
+            navArgument(name = Constants.ACCOUNT_TYPE) { type = NavType.StringType },
+        ),
     ) {
         ClientAccountsScreen(
             navigateBack = navigateBack,
             navigateToLoanApplicationScreen = navigateToLoanApplicationScreen,
             navigateToSavingsApplicationScreen = navigateToSavingsApplicationScreen,
-            onItemClick = { accountType, accountId -> navigateToAccountDetail(accountType, accountId) }
+            onItemClick = { accountType, accountId ->
+                navigateToAccountDetail(
+                    accountType,
+                    accountId,
+                )
+            },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/navigation/AccountNavigation.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/navigation/AccountNavigation.kt
index 7d798b7b1..3756ba21f 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/navigation/AccountNavigation.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/navigation/AccountNavigation.kt
@@ -1,9 +1,16 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.navigation
 
 import org.mifos.mobile.core.common.Constants.ACCOUNT_TYPE
 import org.mifos.mobile.core.model.enums.AccountType
-import org.mifos.mobile.core.model.enums.ChargeType
-
 
 // Constants for Routes
 const val CLIENT_ACCOUNTS_NAVIGATION_ROUTE_BASE = "client_accounts_base_route"
@@ -11,9 +18,12 @@ const val CLIENT_ACCOUNTS_SCREEN_ROUTE = "client_accounts_screen_route"
 
 // Sealed class for Navigation Routes
 sealed class ClientAccountsNavigation(val route: String) {
-    data object ClientAccountsBase : ClientAccountsNavigation(route = CLIENT_ACCOUNTS_NAVIGATION_ROUTE_BASE)
+    data object ClientAccountsBase :
+        ClientAccountsNavigation(route = CLIENT_ACCOUNTS_NAVIGATION_ROUTE_BASE)
 
-    data object ClientAccountsScreen : ClientAccountsNavigation(route = "$CLIENT_ACCOUNTS_SCREEN_ROUTE/{$ACCOUNT_TYPE}") {
-        fun passArguments(accountType: AccountType) = "$CLIENT_ACCOUNTS_SCREEN_ROUTE/${accountType.name}"
+    data object ClientAccountsScreen :
+        ClientAccountsNavigation(route = "$CLIENT_ACCOUNTS_SCREEN_ROUTE/{$ACCOUNT_TYPE}") {
+        fun passArguments(accountType: AccountType) =
+            "$CLIENT_ACCOUNTS_SCREEN_ROUTE/${accountType.name}"
     }
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/utils/AccountState.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/utils/AccountState.kt
index c02058197..130d5287c 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/utils/AccountState.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/utils/AccountState.kt
@@ -1,14 +1,22 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.utils
 
 import org.mifos.mobile.core.model.entity.accounts.loan.LoanAccount
 import org.mifos.mobile.core.model.entity.accounts.savings.SavingAccount
 import org.mifos.mobile.core.model.entity.accounts.share.ShareAccount
 
-
 sealed class AccountState {
     data object Error : AccountState()
     data object Loading : AccountState()
     data class ShowSavingsAccounts(val savingAccounts: List<SavingAccount>?) : AccountState()
     data class ShowLoanAccounts(val loanAccounts: List<LoanAccount>?) : AccountState()
     data class ShowShareAccounts(val shareAccounts: List<ShareAccount>?) : AccountState()
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/utils/StatusUtils.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/utils/StatusUtils.kt
index 8fadffdb2..bab907e85 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/utils/StatusUtils.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/utils/StatusUtils.kt
@@ -1,49 +1,57 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.utils
 
 import android.content.Context
 import androidx.core.content.ContextCompat
-import org.mifos.mobile.feature.account.R
 import org.mifos.mobile.core.model.entity.CheckboxStatus
-import org.mifos.mobile.ui.getThemeAttributeColor
+import org.mifos.mobile.core.ui.utils.getThemeAttributeColor
+import org.mifos.mobile.feature.account.R
 
-/**
- * Created by dilpreet on 3/7/17.
- */
 object StatusUtils {
 
     fun getSavingsAccountStatusList(context: Context?): List<CheckboxStatus> {
         val arrayList = ArrayList<CheckboxStatus>()
+
         arrayList.add(
             CheckboxStatus(
-                context?.getString(R.string.active),
+                context?.getString(R.string.feature_account_active),
                 ContextCompat.getColor(context!!, R.color.deposit_green),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.approved),
+                context.getString(R.string.feature_account_approved),
                 ContextCompat.getColor(context, R.color.light_green),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.approval_pending),
+                context.getString(R.string.feature_account_approval_pending),
                 ContextCompat
                     .getColor(context, R.color.light_yellow),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.matured),
+                context.getString(R.string.feature_account_matured),
                 ContextCompat.getColor(context, R.color.red_light),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.closed),
+                context.getString(R.string.feature_account_closed),
                 context.getThemeAttributeColor(R.attr.colorOnSurface),
             ),
-        )or
+        )
+
         return arrayList
     }
 
@@ -51,44 +59,44 @@ object StatusUtils {
         val arrayList = ArrayList<CheckboxStatus>()
         arrayList.add(
             CheckboxStatus(
-                context?.getString(R.string.in_arrears),
+                context?.getString(R.string.feature_account_in_arrears),
                 ContextCompat.getColor(context!!, R.color.red),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.active),
+                context.getString(R.string.feature_account_active),
                 ContextCompat.getColor(context, R.color.deposit_green),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.waiting_for_disburse),
+                context.getString(R.string.feature_account_disburse),
                 ContextCompat.getColor(context, R.color.blue),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.approval_pending),
+                context.getString(R.string.feature_account_approval_pending),
                 ContextCompat
                     .getColor(context, R.color.light_yellow),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.overpaid),
+                context.getString(R.string.feature_account_overpaid),
                 ContextCompat.getColor(context, R.color.purple),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.closed),
+                context.getString(R.string.feature_account_closed),
                 context.getThemeAttributeColor(R.attr.colorOnSurface),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.withdrawn),
+                context.getString(R.string.feature_account_withdrawn),
                 context.getThemeAttributeColor(R.attr.colorOnSurfaceVariant),
             ),
         )
@@ -99,26 +107,26 @@ object StatusUtils {
         val arrayList = ArrayList<CheckboxStatus>()
         arrayList.add(
             CheckboxStatus(
-                context?.getString(R.string.active),
+                context?.getString(R.string.feature_account_active),
                 ContextCompat.getColor(context!!, R.color.deposit_green),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.approved),
+                context.getString(R.string.feature_account_approved),
                 ContextCompat.getColor(context, R.color.light_green),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.approval_pending),
+                context.getString(R.string.feature_account_approval_pending),
                 ContextCompat
                     .getColor(context, R.color.light_yellow),
             ),
         )
         arrayList.add(
             CheckboxStatus(
-                context.getString(R.string.closed),
+                context.getString(R.string.feature_account_closed),
                 ContextCompat.getColor(context, R.color.light_blue),
             ),
         )
diff --git a/feature/account/src/main/java/org/mifos/mobile/feature/account/viewmodel/AccountsViewModel.kt b/feature/account/src/main/java/org/mifos/mobile/feature/account/viewmodel/AccountsViewModel.kt
index ebe9cf450..cfa307627 100644
--- a/feature/account/src/main/java/org/mifos/mobile/feature/account/viewmodel/AccountsViewModel.kt
+++ b/feature/account/src/main/java/org/mifos/mobile/feature/account/viewmodel/AccountsViewModel.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.account.viewmodel
 
 import android.content.Context
@@ -5,7 +14,6 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import io.reactivex.functions.Predicate
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -34,7 +42,7 @@ import javax.inject.Inject
 class AccountsViewModel @Inject constructor(
     private val accountsRepositoryImp: AccountsRepository,
     private val homeRepositoryImp: HomeRepository,
-    savedStateHandle: SavedStateHandle
+    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
     private val _accountsUiState = MutableStateFlow<AccountState>(AccountState.Loading)
@@ -55,15 +63,18 @@ class AccountsViewModel @Inject constructor(
     private val _filterList = MutableStateFlow(emptyList<CheckboxStatus>())
     val filterList: StateFlow<List<CheckboxStatus>> = _filterList.asStateFlow()
 
-    private val _accountTypeString = savedStateHandle.getStateFlow<String>(key = Constants.ACCOUNT_TYPE, initialValue = AccountType.SAVINGS.name)
+    private val accountTypeString = savedStateHandle.getStateFlow(
+        key = Constants.ACCOUNT_TYPE,
+        initialValue = AccountType.SAVINGS.name,
+    )
 
-    val accountType: StateFlow<AccountType?> = _accountTypeString
+    val accountType: StateFlow<AccountType?> = accountTypeString
         .flatMapLatest { accountTypeString ->
             flowOf(AccountType.valueOf(accountTypeString))
         }.stateIn(
             scope = viewModelScope,
             started = SharingStarted.Eagerly,
-            initialValue = null
+            initialValue = null,
         )
 
     fun refresh(accountType: String?) {
@@ -72,10 +83,12 @@ class AccountsViewModel @Inject constructor(
                 _isRefreshing.value = true
                 loadAccounts(Constants.SAVINGS_ACCOUNTS)
             }
+
             Constants.LOAN_ACCOUNTS -> {
                 _isRefreshing.value = true
                 loadAccounts(Constants.LOAN_ACCOUNTS)
             }
+
             Constants.SHARE_ACCOUNTS -> {
                 _isRefreshing.value = true
                 loadAccounts(Constants.SHARE_ACCOUNTS)
@@ -96,35 +109,36 @@ class AccountsViewModel @Inject constructor(
     fun setFilterList(
         checkBoxList: List<CheckboxStatus>,
         currentPage: Int,
-        context: Context
-    ){
-        if(checkBoxList.isEmpty()) {
+        context: Context,
+    ) {
+        if (checkBoxList.isEmpty()) {
             when (currentPage) {
                 0 -> {
                     _isFiltered.update { false }
                     _filterList.update { StatusUtils.getSavingsAccountStatusList(context) }
                 }
+
                 1 -> {
                     _isFiltered.update { false }
                     _filterList.update { StatusUtils.getLoanAccountStatusList(context) }
                 }
+
                 2 -> {
                     _isFiltered.update { false }
                     _filterList.update { StatusUtils.getShareAccountStatusList(context) }
                 }
             }
-        }else {
+        } else {
             var isChanged = false
-            for( checkBox in checkBoxList )
-            {
-                if(checkBox.isChecked)
+            for (checkBox in checkBoxList) {
+                if (checkBox.isChecked) {
                     isChanged = true
+                }
             }
-            if(isChanged) {
+            if (isChanged) {
                 _isFiltered.update { true }
                 _filterList.update { checkBoxList }
-            }
-            else {
+            } else {
                 _isFiltered.update { false }
                 _filterList.update { checkBoxList }
             }
@@ -134,54 +148,50 @@ class AccountsViewModel @Inject constructor(
     fun getFilterLoanAccountList(
         accountsList: List<LoanAccount?>,
         filterList: List<CheckboxStatus>,
-        context: Context
+        context: Context,
     ): List<LoanAccount> {
-        val uniqueAccountsMap: MutableMap<String, LoanAccount> = mutableMapOf()
-
-        for (filter in filterList) {
-            if (filter.isChecked) {
-                val filteredAccounts = getFilteredLoanAccount(accountsList, filter, AccountsFilterUtil.getFilterStrings(context = context))
-                for (account in filteredAccounts) {
-                    val identifier = getUniqueIdentifierForLoanAccount(account)
-                    uniqueAccountsMap[identifier] = account
-                }
-            }
-        }
+        val accountsFilterUtil = AccountsFilterUtil.getFilterStrings(context)
 
-        return uniqueAccountsMap.values.toList()
+        return filterList
+            .filter { it.isChecked }
+            .flatMap { filter ->
+                getFilteredLoanAccount(accountsList, filter, accountsFilterUtil)
+            }
+            .distinctBy { getUniqueIdentifierForLoanAccount(it) }
     }
 
-    fun getUniqueIdentifierForLoanAccount(account: LoanAccount): String {
+    private fun getUniqueIdentifierForLoanAccount(account: LoanAccount): String {
         return account.accountNo ?: account.loanProductId.toString()
     }
 
     fun getFilterSavingsAccountList(
         accountsList: List<SavingAccount?>,
         filterList: List<CheckboxStatus>,
-        context: Context
+        context: Context,
     ): List<SavingAccount> {
+        val accountsFilterUtil = AccountsFilterUtil.getFilterStrings(context)
 
-        val newList : MutableList<SavingAccount> = mutableListOf()
-        for( filter in filterList)
-        {
-            if( filter.isChecked )
-                newList.addAll( getFilteredSavingsAccount(accountsList,filter, AccountsFilterUtil.getFilterStrings(context = context)))
-        }
-        return newList
+        return filterList
+            .filter { it.isChecked }
+            .flatMap { filter ->
+                getFilteredSavingsAccount(accountsList, filter, accountsFilterUtil)
+            }
+            .distinct()
     }
 
     fun getFilterShareAccountList(
         accountsList: List<ShareAccount?>,
         filterList: List<CheckboxStatus>,
-        context: Context
+        context: Context,
     ): List<ShareAccount> {
-        val newList : MutableList<ShareAccount> = mutableListOf()
-        for( filter in filterList)
-        {
-            if(filter.isChecked)
-                newList.addAll(getFilteredShareAccount(accountsList,filter, AccountsFilterUtil.getFilterStrings(context = context)))
-        }
-        return newList
+        val accountsFilterUtil = AccountsFilterUtil.getFilterStrings(context)
+
+        return filterList
+            .filter { it.isChecked }
+            .flatMap { filter ->
+                getFilteredShareAccount(accountsList, filter, accountsFilterUtil)
+            }
+            .distinct()
     }
 
     /**
@@ -218,16 +228,20 @@ class AccountsViewModel @Inject constructor(
                 _accountsUiState.value = AccountState.Error
             }.collect { clientAccounts ->
                 when (accountType) {
-                    Constants.SAVINGS_ACCOUNTS -> _accountsUiState.value =
-                        AccountState.ShowSavingsAccounts(clientAccounts.savingsAccounts)
-                    Constants.LOAN_ACCOUNTS -> _accountsUiState.value =
-                        AccountState.ShowLoanAccounts(clientAccounts.loanAccounts)
-                    Constants.SHARE_ACCOUNTS -> _accountsUiState.value =
-                        AccountState.ShowShareAccounts(clientAccounts.shareAccounts)
+                    Constants.SAVINGS_ACCOUNTS ->
+                        _accountsUiState.value =
+                            AccountState.ShowSavingsAccounts(clientAccounts.savingsAccounts)
+
+                    Constants.LOAN_ACCOUNTS ->
+                        _accountsUiState.value =
+                            AccountState.ShowLoanAccounts(clientAccounts.loanAccounts)
+
+                    Constants.SHARE_ACCOUNTS ->
+                        _accountsUiState.value =
+                            AccountState.ShowShareAccounts(clientAccounts.shareAccounts)
                 }
                 _isRefreshing.emit(false)
             }
-
         }
     }
 
@@ -242,15 +256,14 @@ class AccountsViewModel @Inject constructor(
         accounts: List<SavingAccount?>?,
         input: String?,
     ): List<SavingAccount> {
-        return io.reactivex.Observable.fromIterable(accounts)
-            .filter { (accountNo, productName) ->
-                input?.lowercase(Locale.ROOT)
-                    ?.let { productName?.lowercase(Locale.ROOT)?.contains(it) } == true ||
-                        input?.lowercase(Locale.ROOT)?.let {
-                            accountNo?.lowercase(Locale.ROOT)
-                                ?.contains(it)
-                        } == true
-            }.toList().blockingGet().filterNotNull()
+        val searchTerm = input?.lowercase(Locale.ROOT).orEmpty()
+
+        return accounts.orEmpty().filter { account ->
+            account?.let {
+                it.productName?.lowercase(Locale.ROOT)?.contains(searchTerm) == true ||
+                    it.accountNo?.lowercase(Locale.ROOT)?.contains(searchTerm) == true
+            } ?: false
+        }.filterNotNull()
     }
 
     /**
@@ -264,15 +277,14 @@ class AccountsViewModel @Inject constructor(
         accounts: List<LoanAccount?>?,
         input: String?,
     ): List<LoanAccount> {
-        return io.reactivex.Observable.fromIterable(accounts)
-            .filter { (_, _, _, accountNo, productName) ->
-                input?.lowercase(Locale.ROOT)
-                    ?.let { productName?.lowercase(Locale.ROOT)?.contains(it) } == true ||
-                        input?.lowercase(Locale.ROOT)?.let {
-                            accountNo?.lowercase(Locale.ROOT)
-                                ?.contains(it)
-                        } == true
-            }.toList().blockingGet().filterNotNull()
+        val searchTerm = input?.lowercase(Locale.ROOT).orEmpty()
+
+        return accounts.orEmpty().filter { account ->
+            account?.let {
+                it.productName?.lowercase(Locale.ROOT)?.contains(searchTerm) == true ||
+                    it.accountNo?.lowercase(Locale.ROOT)?.contains(searchTerm) == true
+            } ?: false
+        }.filterNotNull()
     }
 
     /**
@@ -286,15 +298,14 @@ class AccountsViewModel @Inject constructor(
         accounts: Collection<ShareAccount?>?,
         input: String?,
     ): List<ShareAccount> {
-        return io.reactivex.Observable.fromIterable(accounts)
-            .filter { (accountNo, _, _, _, productName) ->
-                input?.lowercase(Locale.ROOT)
-                    ?.let { productName?.lowercase(Locale.ROOT)?.contains(it) } == true ||
-                        input?.lowercase(Locale.ROOT)?.let {
-                            accountNo?.lowercase(Locale.ROOT)
-                                ?.contains(it)
-                        } == true
-            }.toList().blockingGet().filterNotNull()
+        val searchTerm = input?.lowercase(Locale.ROOT).orEmpty()
+
+        return accounts.orEmpty().filter { account ->
+            account?.let {
+                it.productName?.lowercase(Locale.ROOT)?.contains(searchTerm) == true ||
+                    it.accountNo?.lowercase(Locale.ROOT)?.contains(searchTerm) == true
+            } ?: false
+        }.filterNotNull()
     }
 
     /**
@@ -304,8 +315,7 @@ class AccountsViewModel @Inject constructor(
      * `checkboxStatus.isChecked()` as true.
      */
     fun getCheckedStatus(statusModelList: List<CheckboxStatus?>?): List<CheckboxStatus?>? {
-        return io.reactivex.Observable.fromIterable(statusModelList)
-            .filter { (_, _, isChecked) -> isChecked }.toList().blockingGet()
+        return statusModelList?.filter { it?.isChecked == true }
     }
 
     /**
@@ -315,38 +325,23 @@ class AccountsViewModel @Inject constructor(
      * @return Returns [List] of filtered [SavingAccount] according to the
      * `status` provided.
      */
-    fun getFilteredSavingsAccount(
+    private fun getFilteredSavingsAccount(
         accounts: List<SavingAccount?>?,
         status: CheckboxStatus?,
-        accountsFilterUtil: AccountsFilterUtil
-    ): Collection<SavingAccount> {
-        return io.reactivex.Observable.fromIterable(accounts)
-            .filter(
-                Predicate { (_, _, _, _, _, _, _, _, _, _, _, status1) ->
-                    if (accountsFilterUtil.activeString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.active == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.approvedString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.approved == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.approvalPendingString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.submittedAndPendingApproval == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.maturedString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.matured == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.closedString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.closed == true
-                    ) {
-                        return@Predicate true
-                    }
-                    false
-                },
-            ).toList().blockingGet().filterNotNull()
+        accountsFilterUtil: AccountsFilterUtil,
+    ): List<SavingAccount> {
+        return accounts.orEmpty().filter { account ->
+            when {
+                status?.status == accountsFilterUtil.activeString && account?.status?.active == true -> true
+                status?.status == accountsFilterUtil.approvedString && account?.status?.approved == true -> true
+                status?.status == accountsFilterUtil.approvalPendingString &&
+                    account?.status?.submittedAndPendingApproval == true -> true
+
+                status?.status == accountsFilterUtil.maturedString && account?.status?.matured == true -> true
+                status?.status == accountsFilterUtil.closedString && account?.status?.closed == true -> true
+                else -> false
+            }
+        }.filterNotNull()
     }
 
     /**
@@ -356,46 +351,23 @@ class AccountsViewModel @Inject constructor(
      * @return Returns [List] of filtered [LoanAccount] according to the
      * `status` provided.
      */
-    fun getFilteredLoanAccount(
+    private fun getFilteredLoanAccount(
         accounts: List<LoanAccount?>?,
         status: CheckboxStatus?,
-        accountsFilterUtil: AccountsFilterUtil
-    ): Collection<LoanAccount> {
-        return io.reactivex.Observable.fromIterable(accounts)
-            .filter(
-                Predicate { (_, _, _, _, _, _, _, _, _, _, _, status1, _, _, _, _, _, inArrears) ->
-                    if (accountsFilterUtil.inArrearsString?.let { status?.status?.compareTo(it) }
-                        == 0 && inArrears == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.activeString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.active == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.waitingForDisburseString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.waitingForDisbursal == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.approvalPendingString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.pendingApproval == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.overpaidString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.overpaid == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.closedString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.closed == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.withdrawnString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.isLoanTypeWithdrawn() == true
-                    ) {
-                        return@Predicate true
-                    }
-                    false
-                },
-            ).toList().blockingGet().filterNotNull()
+        accountsFilterUtil: AccountsFilterUtil,
+    ): List<LoanAccount> {
+        return accounts.orEmpty().filter { account ->
+            when (status?.status) {
+                accountsFilterUtil.inArrearsString -> account?.inArrears == true
+                accountsFilterUtil.activeString -> account?.status?.active == true
+                accountsFilterUtil.waitingForDisburseString -> account?.status?.waitingForDisbursal == true
+                accountsFilterUtil.approvalPendingString -> account?.status?.pendingApproval == true
+                accountsFilterUtil.overpaidString -> account?.status?.overpaid == true
+                accountsFilterUtil.closedString -> account?.status?.closed == true
+                accountsFilterUtil.withdrawnString -> account?.status?.isLoanTypeWithdrawn() == true
+                else -> false
+            }
+        }.filterNotNull()
     }
 
     /**
@@ -405,35 +377,19 @@ class AccountsViewModel @Inject constructor(
      * @return Returns [List] of filtered [ShareAccount] according to the
      * `status` provided.
      */
-    fun getFilteredShareAccount(
+    private fun getFilteredShareAccount(
         accounts: List<ShareAccount?>?,
         status: CheckboxStatus?,
-        accountsFilterUtil: AccountsFilterUtil
-    ): Collection<ShareAccount> {
-        return io.reactivex.Observable.fromIterable(accounts)
-            .filter(
-                Predicate { (_, _, _, _, _, _, status1) ->
-                    if (accountsFilterUtil.activeString
-                            ?.let { status?.status?.compareTo(it) } == 0 &&
-                        status1?.active == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.approvedString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.approved == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.approvalPendingString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.submittedAndPendingApproval == true
-                    ) {
-                        return@Predicate true
-                    } else if (accountsFilterUtil.closedString
-                            ?.let { status?.status?.compareTo(it) } == 0 && status1?.closed == true
-                    ) {
-                        return@Predicate true
-                    }
-                    false
-                },
-            ).toList().blockingGet().filterNotNull()
+        accountsFilterUtil: AccountsFilterUtil,
+    ): List<ShareAccount> {
+        return accounts.orEmpty().filter { account ->
+            when (status?.status) {
+                accountsFilterUtil.activeString -> account?.status?.active == true
+                accountsFilterUtil.approvedString -> account?.status?.approved == true
+                accountsFilterUtil.approvalPendingString -> account?.status?.submittedAndPendingApproval == true
+                accountsFilterUtil.closedString -> account?.status?.closed == true
+                else -> false
+            }
+        }.filterNotNull()
     }
-
-}
\ No newline at end of file
+}
diff --git a/feature/account/src/main/res/drawable/ic_error_black_24dp.xml b/feature/account/src/main/res/drawable/feature_account_error_black.xml
similarity index 51%
rename from feature/account/src/main/res/drawable/ic_error_black_24dp.xml
rename to feature/account/src/main/res/drawable/feature_account_error_black.xml
index b666c1818..3695e745c 100644
--- a/feature/account/src/main/res/drawable/ic_error_black_24dp.xml
+++ b/feature/account/src/main/res/drawable/feature_account_error_black.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/feature/account/src/main/res/values/colors.xml b/feature/account/src/main/res/values/colors.xml
index 324b9cd91..60766ea10 100644
--- a/feature/account/src/main/res/values/colors.xml
+++ b/feature/account/src/main/res/values/colors.xml
@@ -14,61 +14,8 @@
     <color name="blue">#ff003fff</color>
     <color name="red">#FF0000</color>
     <color name="light_black">#1C1C1C</color>
-
-    <color name="dashboard_gray_background">#B2C1C8</color>
-
-    <!-- A light Holo shade of blue -->
-    <color name="blue_light">#ff33b5e5</color>
-    <!-- A light Holo shade of gray -->
-    <color name="gray_light">#33999999</color>
-    <!-- A dark Holo shade of gray -->
     <color name="gray_dark">#BB666666</color>
-    <!-- A light Holo shade of green -->
-    <color name="green_light">#ff99cc00</color>
-    <!-- A light Holo shade of red -->
-    <color name="red_light">#ffff4444</color>
-    <!-- A dark Holo shade of blue -->
-    <color name="blue_dark">#ff0099cc</color>
-    <!-- A dark Holo shade of green -->
-    <color name="green_dark">#ff669900</color>
-    <!-- A dark Holo shade of red -->
-    <color name="red_dark">#ffcc0000</color>
-    <!-- A Holo shade of purple -->
     <color name="purple">#ffaa66cc</color>
-    <!-- A light Holo shade of orange -->
-    <color name="orange_light">#ffffbb33</color>
-    <!-- A dark Holo shade of orange -->
-    <color name="orange_dark">#ffff8800</color>
-    <!-- A really bright Holo shade of blue -->
-    <color name="blue_bright">#ff00ddff</color>
-    <!-- A really bright Holo shade of gray -->
-    <color name="gray_bright">#33CCCCCC</color>
-
-    <!-- Material design colors -->
-
-    <!-- New UI color palette -->
-    <!--<color name="primary">#068799</color>-->
-    <!--<color name="primary_dark">#006978</color>-->
-    <!--<color name="primary_light">#56c8d8</color>-->
-    <color name="primary">#03A9F4</color>
-    <color name="primary_dark">#0288D1</color>
-    <color name="primary_light">#B3E5FC</color>
-    <color name="accent">#FF4081</color>
-    <color name="primary_text">#212121</color>
-    <color name="secondary_text">#757575</color>
-    <color name="icons">#FFFFFF</color>
-    <color name="divider">#BDBDBD</color>
-    <color name="cell_background_color">#ffffff</color>
-    <color name="header_line_color">@color/blue_light</color>
-    <color name="background_default_darker">#EEEEEE</color>
-    <color name="transparent">#00000000</color>
-
-    <!--Swipe Refresh Colors-->
-    <array name="swipeRefreshColors">
-        <item>@color/blue_light</item>
-        <item>@color/green_light</item>
-        <item>@color/red_light</item>
-        <item>@color/orange_light</item>
-    </array>
-
+    <color name="red_light">#ffff4444</color>
+    <color name="gray_light">#33999999</color>
 </resources>
\ No newline at end of file
diff --git a/feature/account/src/main/res/values/strings.xml b/feature/account/src/main/res/values/strings.xml
index 412bde354..0c25741e2 100644
--- a/feature/account/src/main/res/values/strings.xml
+++ b/feature/account/src/main/res/values/strings.xml
@@ -1,37 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <resources>
-    <string name="active">Active</string>
-    <string name="approved">Approved</string>
-    <string name="approval_pending">Approval Pending</string>
-    <string name="matured">Matured</string>
-    <string name="waiting_for_disburse">Waiting for Disburse</string>
-    <string name="overpaid">Overpaid</string>
-    <string name="closed">Closed</string>
-    <string name="withdrawn">Withdrawn</string>
-    <string name="in_arrears">In Arrears</string>
-    <string name="empty_savings_accounts">There is no SavingsAccount associated with you</string>
-    <string name="empty_loan_accounts">There is no LoanAccount associated with you</string>
-    <string name="empty_share_accounts">There is no ShareAccount associated with you</string>
-    <string name="disbursement">Disbursement</string>
-    <string name="submitted">Submitted</string>
-    <string name="string_and_string">%1$s %2$s</string>
-    <string name="pending">Pending</string>
-    <string name="savings_account">Savings Account</string>
-    <string name="share_account">Share Account</string>
-    <string name="loan_account">Loan Account</string>
-    <string name="savings">Saving</string>
-    <string name="loan">Loan</string>
-    <string name="share">Share</string>
-    <string name="select_you_want">Select all filters you want to apply</string>
-    <string name="clear_filters">Clear Filters</string>
-    <string name="cancel">Cancel</string>
-    <string name="filter">Filter</string>
-    <string name="deposit">Deposit</string>
-    <string name="dividend_payout">Dividend Payout</string>
-    <string name="withdrawal">Withdrawal</string>
-    <string name="interest_posting">Interest Posting</string>
-    <string name="fee_deduction">Fee Deduction</string>
-    <string name="withdrawal_transfer">Withdrawal Transfer</string>
-    <string name="rejected_transfer">Rejected Transfer</string>
-    <string name="overdraft_fee">Overdraft Fee</string>
+    <string name="feature_account_active">Active</string>
+    <string name="feature_account_approved">Approved</string>
+    <string name="feature_account_approval_pending">Approval Pending</string>
+    <string name="feature_account_matured">Matured</string>
+    <string name="feature_account_disburse">Waiting for Disburse</string>
+    <string name="feature_account_overpaid">Overpaid</string>
+    <string name="feature_account_closed">Closed</string>
+    <string name="feature_account_withdrawn">Withdrawn</string>
+    <string name="feature_account_in_arrears">In Arrears</string>
+    <string name="feature_account_empty_savings_accounts">There is no SavingsAccount associated with you</string>
+    <string name="feature_account_empty_loan_accounts">There is no LoanAccount associated with you</string>
+    <string name="feature_account_empty_share_accounts">There is no ShareAccount associated with you</string>
+    <string name="feature_account_disbursement">Disbursement</string>
+    <string name="feature_account_submitted">Submitted</string>
+    <string name="feature_account_string_and_string">%1$s %2$s</string>
+    <string name="feature_account_pending">Pending</string>
+    <string name="feature_account_savings_account">Savings Account</string>
+    <string name="feature_account_share_account">Share Account</string>
+    <string name="feature_account_loan_account">Loan Account</string>
+    <string name="feature_account_savings">Saving</string>
+    <string name="feature_account_loan">Loan</string>
+    <string name="feature_account_share">Share</string>
+    <string name="feature_account_select_you_want">Select all filters you want to apply</string>
+    <string name="feature_account_clear_filters">Clear Filters</string>
+    <string name="feature_account_cancel">Cancel</string>
+    <string name="feature_account_filter">Filter</string>
+    <string name="feature_account_deposit">Deposit</string>
+    <string name="feature_account_dividend_payout">Dividend Payout</string>
+    <string name="feature_account_withdrawal">Withdrawal</string>
+    <string name="feature_account_interest_posting">Interest Posting</string>
+    <string name="feature_account_fee_deduction">Fee Deduction</string>
+    <string name="feature_account_withdrawal_transfer">Withdrawal Transfer</string>
+    <string name="feature_account_rejected_transfer">Rejected Transfer</string>
+    <string name="feature_account_overdraft_fee">Overdraft Fee</string>
 </resources>
\ No newline at end of file
diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts
index 593194866..bdd37214e 100644
--- a/feature/auth/build.gradle.kts
+++ b/feature/auth/build.gradle.kts
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 plugins {
     alias(libs.plugins.mifos.android.feature)
     alias(libs.plugins.mifos.android.library.compose)
@@ -8,15 +17,5 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.ui)
-    implementation(projects.core.common)
-    implementation(projects.core.model)
-    implementation(projects.core.data)
-
-
-    implementation("com.github.ParveshSandila:CountryCodeChooser:1.0")
-
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.espresso.core)
+    implementation(projects.libs.countryCodePicker)
 }
\ No newline at end of file
diff --git a/feature/auth/src/androidTest/java/org/mifos/mobile/feature/auth/ExampleInstrumentedTest.kt b/feature/auth/src/androidTest/java/org/mifos/mobile/feature/auth/ExampleInstrumentedTest.kt
deleted file mode 100644
index 096a9cb2d..000000000
--- a/feature/auth/src/androidTest/java/org/mifos/mobile/feature/auth/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.mifos.mobile.feature.auth
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("org.mifos.mobile.feature.auth.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/feature/auth/src/main/AndroidManifest.xml b/feature/auth/src/main/AndroidManifest.xml
index a5918e68a..1f9b243f0 100644
--- a/feature/auth/src/main/AndroidManifest.xml
+++ b/feature/auth/src/main/AndroidManifest.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/login/screens/LoginScreen.kt b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/login/screens/LoginScreen.kt
index 61e70cc5d..c7c4d707b 100644
--- a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/login/screens/LoginScreen.kt
+++ b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/login/screens/LoginScreen.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.auth.login.screens
 
 import android.content.Context
@@ -15,18 +24,12 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Error
-import androidx.compose.material.icons.filled.Visibility
-import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -44,7 +47,6 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
@@ -52,105 +54,114 @@ import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.mifos.mobile.core.common.Network
+import org.mifos.mobile.core.designsystem.components.MifosButton
 import org.mifos.mobile.core.designsystem.components.MifosOutlinedTextField
+import org.mifos.mobile.core.designsystem.components.MifosTextButton
+import org.mifos.mobile.core.designsystem.icons.MifosIcons
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.ui.component.MifosMobileIcon
 import org.mifos.mobile.core.ui.component.MifosProgressIndicatorOverlay
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.auth.R
 import org.mifos.mobile.feature.auth.login.viewmodel.LoginUiState
 import org.mifos.mobile.feature.auth.login.viewmodel.LoginViewModel
 
 @Composable
-fun LoginScreen(
-    viewModel: LoginViewModel = hiltViewModel(),
+internal fun LoginScreen(
     navigateToRegisterScreen: () -> Unit,
     navigateToPasscodeScreen: () -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: LoginViewModel = hiltViewModel(),
 ) {
-
     val context = LocalContext.current
     val uiState by viewModel.loginUiState.collectAsStateWithLifecycle()
 
     LoginScreen(
         uiState = uiState,
-        loadClient = { viewModel.loadClient() },
+        loadClient = viewModel::loadClient,
         startPassCodeActivity = navigateToPasscodeScreen,
         startRegisterActivity = navigateToRegisterScreen,
+        modifier = modifier,
         login = { username, password ->
             if (Network.isConnected(context)) {
-                if (isCredentialsValid(username, password))
+                if (isCredentialsValid(username, password)) {
                     viewModel.login(username, password)
+                }
             } else {
-                Toast.makeText(context, context.getString(R.string.no_internet_connection), Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                    context,
+                    context.getString(R.string.no_internet_connection),
+                    Toast.LENGTH_SHORT,
+                ).show()
             }
-        }
+        },
     )
 }
 
 @Composable
-fun LoginScreen(
+private fun LoginScreen(
     uiState: LoginUiState,
     loadClient: () -> Unit,
     startPassCodeActivity: () -> Unit,
     startRegisterActivity: () -> Unit,
-    login: ( username: String, password: String ) -> Unit
+    login: (username: String, password: String) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
 
     Box(
-        modifier = Modifier
-            .fillMaxSize()
+        modifier = modifier
+            .fillMaxSize(),
     ) {
-
         LoginContent(
-            login= login,
-            createAccount = startRegisterActivity
+            login = login,
+            createAccount = startRegisterActivity,
         )
 
         when (uiState) {
-
             LoginUiState.Initial -> Unit
 
             is LoginUiState.Error -> {
                 LaunchedEffect(key1 = true) {
-                    Toast.makeText(context, context.getString(R.string.login_failed), Toast.LENGTH_SHORT).show()
+                    showToast(context, context.getString(R.string.login_failed))
                 }
             }
 
-            LoginUiState.Loading -> {
-                MifosProgressIndicatorOverlay()
-            }
+            LoginUiState.Loading -> MifosProgressIndicatorOverlay()
 
-            is LoginUiState.LoginSuccess -> {
-                loadClient.invoke()
-            }
+            is LoginUiState.LoginSuccess -> loadClient.invoke()
 
             is LoginUiState.LoadClientSuccess -> {
                 startPassCodeActivity.invoke()
                 LaunchedEffect(key1 = true) {
-                    Toast.makeText(context, context.getString(R.string.toast_welcome, uiState.clientName), Toast.LENGTH_SHORT).show()
+                    showToast(
+                        context,
+                        context.getString(R.string.toast_welcome, uiState.clientName),
+                    )
                 }
             }
         }
     }
 }
 
-
 @Composable
-fun LoginContent(
+@Suppress("LongMethod")
+private fun LoginContent(
     login: (username: String, password: String) -> Unit,
-    createAccount: () -> Unit
+    createAccount: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
     val keyboardController = LocalSoftwareKeyboardController.current
 
     var username by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(
-            TextFieldValue("")
+            TextFieldValue(""),
         )
     }
     var password by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(
-            TextFieldValue("")
+            TextFieldValue(""),
         )
     }
 
@@ -162,16 +173,18 @@ fun LoginContent(
     val passwordErrorContent = validatePassword(password.text, context)
 
     Column(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
             .verticalScroll(rememberScrollState())
             .pointerInput(Unit) {
-                detectTapGestures(onTap = {
-                    keyboardController?.hide()
-                })
-            }
+                detectTapGestures(
+                    onTap = {
+                        keyboardController?.hide()
+                    },
+                )
+            },
     ) {
-        MifosMobileIcon(id = R.drawable.mifos_logo)
+        MifosMobileIcon(id = R.drawable.feature_auth_mifos_logo)
 
         MifosOutlinedTextField(
             value = username,
@@ -180,14 +193,14 @@ fun LoginContent(
                 usernameError = false
             },
             label = R.string.username,
-            icon = R.drawable.ic_person_black_24dp,
+            icon = R.drawable.feature_auth_ic_person,
             error = usernameError,
             supportingText = usernameErrorContent,
             trailingIcon = {
                 if (usernameError) {
-                    Icon(imageVector = Icons.Filled.Error, contentDescription = null)
+                    Icon(imageVector = MifosIcons.Error, contentDescription = null)
                 }
-            }
+            },
         )
 
         Spacer(modifier = Modifier.height(8.dp))
@@ -199,28 +212,35 @@ fun LoginContent(
                 passwordError = false
             },
             label = R.string.password,
-            icon = R.drawable.ic_lock_black_24dp,
-            visualTransformation = if (passwordVisibility) VisualTransformation.None else PasswordVisualTransformation(),
+            icon = R.drawable.feature_auth_lock,
+            visualTransformation = if (passwordVisibility) {
+                VisualTransformation.None
+            } else {
+                PasswordVisualTransformation()
+            },
             trailingIcon = {
                 if (!passwordError) {
-                    val image = if (passwordVisibility)
-                        Icons.Filled.Visibility
-                    else Icons.Filled.VisibilityOff
+                    val image = if (passwordVisibility) {
+                        MifosIcons.Visibility
+                    } else {
+                        MifosIcons.VisibilityOff
+                    }
                     IconButton(onClick = { passwordVisibility = !passwordVisibility }) {
                         Icon(imageVector = image, null)
                     }
                 } else {
-                    Icon(imageVector = Icons.Filled.Error, contentDescription = null)
+                    Icon(imageVector = MifosIcons.Error, contentDescription = null)
                 }
             },
             error = passwordError,
             supportingText = passwordErrorContent,
-            keyboardType = KeyboardType.Password
+            keyboardType = KeyboardType.Password,
         )
 
         Spacer(modifier = Modifier.height(8.dp))
 
-        Button(
+        MifosButton(
+            textResId = R.string.login,
             onClick = {
                 when {
                     usernameErrorContent.isEmpty() && passwordErrorContent.isEmpty() -> {
@@ -247,68 +267,68 @@ fun LoginContent(
                 .padding(start = 16.dp, end = 16.dp, top = 4.dp),
             contentPadding = PaddingValues(12.dp),
             colors = ButtonDefaults.buttonColors(
-                containerColor = MaterialTheme.colorScheme.primary
-            )
-        ) {
-            Text(text = stringResource(id = R.string.login))
-        }
+                containerColor = MaterialTheme.colorScheme.primary,
+            ),
+        )
 
         Spacer(modifier = Modifier.height(16.dp))
 
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceEvenly
+            horizontalArrangement = Arrangement.SpaceEvenly,
         ) {
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(start = 16.dp)
-                    .weight(1f), color = Color.Gray, thickness = 1.dp
+                    .weight(1f),
+                thickness = 1.dp,
+                color = Color.Gray,
             )
             Text(
                 modifier = Modifier.padding(8.dp),
                 text = "or",
                 fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(end = 16.dp)
-                    .weight(1f), color = Color.Gray, thickness = 1.dp
+                    .weight(1f),
+                thickness = 1.dp,
+                color = Color.Gray,
             )
         }
 
-        TextButton(
-            onClick = {
-                createAccount.invoke()
-            },
+        MifosTextButton(
+            onClick = createAccount,
             modifier = Modifier
                 .fillMaxWidth()
                 .align(Alignment.CenterHorizontally),
             colors = ButtonDefaults.textButtonColors(
-                contentColor = MaterialTheme.colorScheme.primary
-            )
+                contentColor = MaterialTheme.colorScheme.primary,
+            ),
         ) {
             Text(text = stringResource(id = R.string.create_an_account))
         }
     }
 }
 
-fun isFieldEmpty(fieldText: String): Boolean {
+private fun isFieldEmpty(fieldText: String): Boolean {
     return fieldText.isEmpty()
 }
 
-fun isUsernameLengthInadequate(username: String): Boolean {
+private fun isUsernameLengthInadequate(username: String): Boolean {
     return username.length < 5
 }
 
-fun isPasswordLengthInadequate(password: String): Boolean {
+private fun isPasswordLengthInadequate(password: String): Boolean {
     return password.length < 6
 }
 
-fun usernameHasSpaces(username: String): Boolean {
+private fun usernameHasSpaces(username: String): Boolean {
     return username.trim().contains(" ")
 }
 
@@ -347,7 +367,7 @@ private fun validateUsername(username: String, context: Context): String {
             usernameError = context.getString(
                 R.string.error_validation_blank,
                 context.getString(R.string.username),
-            ).toString()
+            )
         }
 
         isUsernameLengthInadequate(username) -> {
@@ -355,7 +375,7 @@ private fun validateUsername(username: String, context: Context): String {
                 R.string.error_validation_minimum_chars,
                 context.getString(R.string.username),
                 context.resources?.getInteger(R.integer.username_minimum_length),
-            ).toString()
+            )
         }
 
         usernameHasSpaces(username) -> {
@@ -363,7 +383,7 @@ private fun validateUsername(username: String, context: Context): String {
                 R.string.error_validation_cannot_contain_spaces,
                 context.getString(R.string.username),
                 context.getString(R.string.not_contain_username),
-            ).toString()
+            )
         }
     }
     return usernameError
@@ -376,7 +396,7 @@ private fun validatePassword(password: String, context: Context): String {
             passwordError = context.getString(
                 R.string.error_validation_blank,
                 context.getString(R.string.password),
-            ).toString()
+            )
         }
 
         isPasswordLengthInadequate(password) -> {
@@ -384,13 +404,13 @@ private fun validatePassword(password: String, context: Context): String {
                 R.string.error_validation_minimum_chars,
                 context.getString(R.string.password),
                 context.resources.getInteger(R.integer.password_minimum_length),
-            ).toString()
+            )
         }
     }
     return passwordError
 }
 
-class LoginScreenPreviewProvider : PreviewParameterProvider<LoginUiState> {
+internal class LoginScreenPreviewProvider : PreviewParameterProvider<LoginUiState> {
 
     override val values: Sequence<LoginUiState>
         get() = sequenceOf(
@@ -402,14 +422,14 @@ class LoginScreenPreviewProvider : PreviewParameterProvider<LoginUiState> {
         )
 }
 
-private fun showToast(context: Context, text : String){
+private fun showToast(context: Context, text: String) {
     Toast.makeText(context, text, Toast.LENGTH_LONG).show()
 }
 
-@Preview(showSystemUi = true)
+@DevicePreviews
 @Composable
 private fun LoginScreenPreview(
-    @PreviewParameter(LoginScreenPreviewProvider::class) loginUiState: LoginUiState
+    @PreviewParameter(LoginScreenPreviewProvider::class) loginUiState: LoginUiState,
 ) {
     MifosMobileTheme {
         LoginScreen(
@@ -417,7 +437,7 @@ private fun LoginScreenPreview(
             {},
             {},
             {},
-            { _, _ -> }
+            { _, _ -> },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/login/viewmodel/LoginViewModel.kt b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/login/viewmodel/LoginViewModel.kt
index 775cd40bd..4636f0fb4 100644
--- a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/login/viewmodel/LoginViewModel.kt
+++ b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/login/viewmodel/LoginViewModel.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.auth.login.viewmodel
 
 import androidx.lifecycle.ViewModel
@@ -12,11 +21,10 @@ import org.mifos.mobile.core.data.repository.UserAuthRepository
 import javax.inject.Inject
 
 @HiltViewModel
-class LoginViewModel @Inject constructor(
+internal class LoginViewModel @Inject constructor(
     private val userAuthRepositoryImp: UserAuthRepository,
-    private val clientRepositoryImp: ClientRepository
-) :
-    ViewModel() {
+    private val clientRepositoryImp: ClientRepository,
+) : ViewModel() {
 
     private var _loginUiState = MutableStateFlow<LoginUiState>(LoginUiState.Initial)
     val loginUiState: StateFlow<LoginUiState> get() = _loginUiState
@@ -60,10 +68,10 @@ class LoginViewModel @Inject constructor(
     }
 }
 
-sealed class LoginUiState {
+internal sealed class LoginUiState {
     data object Initial : LoginUiState()
     data object LoginSuccess : LoginUiState()
     data object Loading : LoginUiState()
     data object Error : LoginUiState()
     data class LoadClientSuccess(val clientName: String?) : LoginUiState()
-}
\ No newline at end of file
+}
diff --git a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/navigation/AuthenticationNavGraph.kt b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/navigation/AuthenticationNavGraph.kt
index e35d907ff..8d3637dd2 100644
--- a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/navigation/AuthenticationNavGraph.kt
+++ b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/navigation/AuthenticationNavGraph.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.auth.navigation
 
 import androidx.navigation.NavController
@@ -9,7 +18,6 @@ import org.mifos.mobile.feature.auth.login.screens.LoginScreen
 import org.mifos.mobile.feature.auth.registration.screens.RegistrationScreen
 import org.mifos.mobile.feature.auth.registration.screens.RegistrationVerificationScreen
 
-
 fun NavController.navigateToLoginScreen() {
     navigate(AuthenticationNavigation.Login.route) {
         popUpTo(AuthenticationNavigation.Login.route) { inclusive = true }
@@ -18,32 +26,32 @@ fun NavController.navigateToLoginScreen() {
 
 fun NavGraphBuilder.authenticationNavGraph(
     navController: NavHostController,
-    navigateToPasscodeScreen: () -> Unit
+    navigateToPasscodeScreen: () -> Unit,
 ) {
     navigation(
         startDestination = AuthenticationNavigation.Login.route,
-        route = AuthenticationNavigation.AuthenticationBase.route
+        route = AuthenticationNavigation.AuthenticationBase.route,
     ) {
         loginRoute(
             navigateToRegisterScreen = { navController.navigate(AuthenticationNavigation.Registration.route) },
-            navigateToPasscodeScreen = navigateToPasscodeScreen
+            navigateToPasscodeScreen = navigateToPasscodeScreen,
         )
 
         registrationRoute(
             navigateBack = navController::popBackStack,
-            onRegistered = { navController.navigate(AuthenticationNavigation.RegistrationVerification.route) }
+            onRegistered = { navController.navigate(AuthenticationNavigation.RegistrationVerification.route) },
         )
 
         registrationVerificationRoute(
             navigateBack = navController::popBackStack,
-            onRegistrationVerified = navController::navigateToLoginScreen
+            onRegistrationVerified = navController::navigateToLoginScreen,
         )
     }
 }
 
 fun NavGraphBuilder.loginRoute(
     navigateToRegisterScreen: () -> Unit,
-    navigateToPasscodeScreen: () -> Unit
+    navigateToPasscodeScreen: () -> Unit,
 ) {
     composable(route = AuthenticationNavigation.Login.route) {
         LoginScreen(
@@ -53,27 +61,26 @@ fun NavGraphBuilder.loginRoute(
     }
 }
 
-
 fun NavGraphBuilder.registrationRoute(
     navigateBack: () -> Unit,
-    onRegistered: () -> Unit
+    onRegistered: () -> Unit,
 ) {
-    composable(route = AuthenticationNavigation.Registration.route){
+    composable(route = AuthenticationNavigation.Registration.route) {
         RegistrationScreen(
             onVerified = onRegistered,
-            navigateBack = navigateBack
+            navigateBack = navigateBack,
         )
     }
 }
 
 fun NavGraphBuilder.registrationVerificationRoute(
     navigateBack: () -> Unit,
-    onRegistrationVerified: () -> Unit
+    onRegistrationVerified: () -> Unit,
 ) {
-    composable(route = AuthenticationNavigation.RegistrationVerification.route){
+    composable(route = AuthenticationNavigation.RegistrationVerification.route) {
         RegistrationVerificationScreen(
             onVerified = onRegistrationVerified,
-            navigateBack = navigateBack
+            navigateBack = navigateBack,
         )
     }
 }
diff --git a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/navigation/AuthenticationNavigationScreen.kt b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/navigation/AuthenticationNavigationScreen.kt
index f6875ebaa..4c261bdaf 100644
--- a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/navigation/AuthenticationNavigationScreen.kt
+++ b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/navigation/AuthenticationNavigationScreen.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.auth.navigation
 
 const val AUTH_NAVIGATION_ROUTE = "auth_route"
@@ -6,8 +15,9 @@ const val REGISTRATION_SCREEN_ROUTE = "registration_screen"
 const val REGISTRATION_VERIFICATION_SCREEN_ROUTE = "registration_verification_screen"
 
 sealed class AuthenticationNavigation(val route: String) {
-    data object AuthenticationBase: AuthenticationNavigation(route = AUTH_NAVIGATION_ROUTE)
-    data object Login: AuthenticationNavigation(route = LOGIN_SCREEN_ROUTE)
+    data object AuthenticationBase : AuthenticationNavigation(route = AUTH_NAVIGATION_ROUTE)
+    data object Login : AuthenticationNavigation(route = LOGIN_SCREEN_ROUTE)
     data object Registration : AuthenticationNavigation(route = REGISTRATION_SCREEN_ROUTE)
-    data object RegistrationVerification : AuthenticationNavigation(route = REGISTRATION_VERIFICATION_SCREEN_ROUTE)
-}
\ No newline at end of file
+    data object RegistrationVerification :
+        AuthenticationNavigation(route = REGISTRATION_VERIFICATION_SCREEN_ROUTE)
+}
diff --git a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/screens/RegistrationScreen.kt b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/screens/RegistrationScreen.kt
index 833297465..55dc476f4 100644
--- a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/screens/RegistrationScreen.kt
+++ b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/screens/RegistrationScreen.kt
@@ -1,10 +1,17 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.auth.registration.screens
 
 import android.content.Context
 import android.widget.Toast
-import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -16,16 +23,14 @@ import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Visibility
-import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.RadioButton
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
@@ -50,97 +55,87 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getString
 import androidx.core.util.PatternsCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.owlbuddy.www.countrycodechooser.CountryCodeChooser
-import com.owlbuddy.www.countrycodechooser.utils.enums.CountryCodeType
+import com.mifos.library.countrycodepicker.CountryCodePicker
 import kotlinx.coroutines.launch
+import org.mifos.mobile.core.designsystem.components.MifosButton
 import org.mifos.mobile.core.designsystem.components.MifosOutlinedTextField
 import org.mifos.mobile.core.designsystem.components.MifosScaffold
+import org.mifos.mobile.core.designsystem.icons.MifosIcons
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.ui.component.MifosMobileIcon
 import org.mifos.mobile.core.ui.component.MifosProgressIndicatorOverlay
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.auth.R
 import org.mifos.mobile.feature.auth.registration.utils.PasswordStrength
 import org.mifos.mobile.feature.auth.registration.viewmodel.RegistrationUiState
 import org.mifos.mobile.feature.auth.registration.viewmodel.RegistrationViewModel
 
-
-/**
- * @author pratyush
- * @since 28/12/2023
- */
 @Composable
-fun RegistrationScreen(
-    viewModel: RegistrationViewModel = hiltViewModel(),
+internal fun RegistrationScreen(
     onVerified: () -> Unit,
-    navigateBack: () -> Unit
+    navigateBack: () -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: RegistrationViewModel = hiltViewModel(),
 ) {
-
-    val context = LocalContext.current
     val uiState by viewModel.registrationUiState.collectAsStateWithLifecycle()
 
     RegistrationScreen(
         uiState = uiState,
         onVerified = onVerified,
         navigateBack = navigateBack,
-        register = { account, username, firstname, lastname, phoneNumber, email, password, authenticationMode, countryCode ->
-            viewModel.registerUser(
-                accountNumber = account,
-                authenticationMode = authenticationMode,
-                email = email,
-                firstName = firstname,
-                lastName = lastname,
-                mobileNumber = "$countryCode$phoneNumber",
-                password = password,
-                username = username
-            )
-        },
-        progress = { updatePasswordStrengthView(it, context) }
+        register = viewModel::registerUser,
+        modifier = modifier,
     )
 }
 
-
 @Composable
-fun RegistrationScreen(
+private fun RegistrationScreen(
     uiState: RegistrationUiState,
     onVerified: () -> Unit,
     navigateBack: () -> Unit,
-    register: (accountNumber: String, username: String, firstName: String, lastName: String, phoneNumber: String, email: String, password: String, authMode: String, countryCode: String) -> Unit,
-    progress: (String) -> Float
+    register: (
+        accountNumber: String,
+        username: String,
+        firstName: String,
+        lastName: String,
+        phoneNumber: String,
+        email: String,
+        password: String,
+        authMode: String,
+        countryCode: String,
+    ) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
-    val snackBarHostState = remember {
-        SnackbarHostState()
-    }
+    val snackBarHostState = remember { SnackbarHostState() }
 
     MifosScaffold(
         topBarTitleResId = R.string.register,
         navigateBack = navigateBack,
+        modifier = modifier,
         snackbarHost = { SnackbarHost(hostState = snackBarHostState) },
         content = { contentPadding ->
-
             Box(
                 modifier = Modifier
                     .padding(contentPadding)
-                    .fillMaxSize()
+                    .fillMaxSize(),
             ) {
-
                 RegistrationContent(
                     register = register,
-                    progress = progress,
-                    snackBarHostState = snackBarHostState
+                    progress = {
+                        updatePasswordStrengthView(it, context)
+                    },
+                    snackBarHostState = snackBarHostState,
                 )
 
                 when (uiState) {
-
                     RegistrationUiState.Initial -> Unit
 
                     is RegistrationUiState.Error -> {
@@ -156,13 +151,24 @@ fun RegistrationScreen(
                     }
                 }
             }
-        }
+        },
     )
 }
 
 @Composable
-fun RegistrationContent(
-    register: (accountNumber: String, username: String, firstName: String, lastName: String, phoneNumber: String, email: String, password: String, authMode: String, countryCode: String) -> Unit,
+@Suppress("LongMethod")
+private fun RegistrationContent(
+    register: (
+        accountNumber: String,
+        username: String,
+        firstName: String,
+        lastName: String,
+        phoneNumber: String,
+        email: String,
+        password: String,
+        authMode: String,
+        countryCode: String,
+    ) -> Unit,
     progress: (String) -> Float,
     snackBarHostState: SnackbarHostState,
 ) {
@@ -199,7 +205,8 @@ fun RegistrationContent(
     var countryCode by rememberSaveable {
         mutableStateOf("")
     }
-    val radioOptions = listOf(stringResource(id = R.string.rb_email), stringResource(id = R.string.rb_mobile))
+    val radioOptions =
+        listOf(stringResource(id = R.string.rb_email), stringResource(id = R.string.rb_mobile))
 
     var authenticationMode by remember { mutableStateOf(radioOptions[0]) }
 
@@ -209,84 +216,91 @@ fun RegistrationContent(
     val scrollState = rememberScrollState()
     val coroutineScope = rememberCoroutineScope()
 
-    LaunchedEffect(scrollState.canScrollForward){
+    LaunchedEffect(scrollState.canScrollForward) {
         if (scrollState.canScrollForward) scrollState.scrollTo(scrollState.maxValue)
     }
 
+    fun validateAllFields(): String {
+        return areFieldsValidated(
+            context = context,
+            accountNumberContent = accountNumber.text,
+            usernameContent = username.text,
+            firstNameContent = firstName.text,
+            lastNameContent = lastName.text,
+            phoneNumberContent = phoneNumber.text,
+            emailContent = email.text,
+            passwordContent = password.text,
+            confirmPasswordContent = confirmPassword.text,
+        )
+    }
+
     Column(
         modifier = Modifier
             .fillMaxSize()
             .padding(bottom = 12.dp)
             .pointerInput(Unit) {
-                detectTapGestures(onTap = {
-                    keyboardController?.hide()
-                })
+                detectTapGestures(
+                    onTap = {
+                        keyboardController?.hide()
+                    },
+                )
             }
             .verticalScroll(
                 state = scrollState,
-                enabled = true
-            )
+                enabled = true,
+            ),
     ) {
-
-        MifosMobileIcon(id = R.drawable.mifos_logo)
+        MifosMobileIcon(id = R.drawable.feature_auth_mifos_logo)
 
         MifosOutlinedTextField(
             value = accountNumber,
             onValueChange = { accountNumber = it },
             label = R.string.account_number,
-            supportingText = ""
+            supportingText = "",
         )
         MifosOutlinedTextField(
             value = username,
             onValueChange = { username = it },
             label = R.string.username,
-            supportingText = ""
+            supportingText = "",
         )
         MifosOutlinedTextField(
             value = firstName,
             onValueChange = { firstName = it },
             label = R.string.first_name,
-            supportingText = ""
+            supportingText = "",
         )
         MifosOutlinedTextField(
             value = lastName,
             onValueChange = { lastName = it },
             label = R.string.last_name,
-            supportingText = ""
+            supportingText = "",
         )
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.Center
-        ) {
-            CountryCodeChooser(
-                modifier = Modifier
-                    .padding(start = 16.dp)
-                    .border(
-                        width = 1.dp,
-                        shape = RoundedCornerShape(5.dp),
-                        color = Color.Gray
-                    )
-                    .padding(10.dp),
-                defaultCountryCode = "91",
-                countryCodeType = CountryCodeType.FLAG,
-                onCountyCodeSelected = { code, codeWithPrefix ->
-                    countryCode = code
-                }
-            )
-            MifosOutlinedTextField(
-                value = phoneNumber,
-                onValueChange = { phoneNumber = it },
-                label = R.string.phone_number,
-                supportingText = "",
-                keyboardType = KeyboardType.Number
-            )
-        }
+
+        CountryCodePicker(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp),
+            shape = RoundedCornerShape(2.dp),
+            colors = OutlinedTextFieldDefaults.colors(
+                focusedBorderColor = MaterialTheme.colorScheme.primary,
+            ),
+            initialPhoneNumber = phoneNumber.text,
+            onValueChange = { (code, phone), _ ->
+                phoneNumber = TextFieldValue(phone)
+                countryCode = code
+            },
+            label = { Text(stringResource(id = R.string.phone_number)) },
+            keyboardActions = KeyboardActions { keyboardController?.hide() },
+        )
+
         MifosOutlinedTextField(
             value = email,
             onValueChange = { email = it },
             label = R.string.email,
-            supportingText = ""
+            supportingText = "",
         )
+
         MifosOutlinedTextField(
             value = password,
             onValueChange = {
@@ -295,20 +309,27 @@ fun RegistrationContent(
             },
             label = R.string.password,
             supportingText = "",
-            visualTransformation = if (passwordVisibility) VisualTransformation.None else PasswordVisualTransformation(),
+            visualTransformation = if (passwordVisibility) {
+                VisualTransformation.None
+            } else {
+                PasswordVisualTransformation()
+            },
             trailingIcon = {
-                val image = if (passwordVisibility)
-                    Icons.Filled.Visibility
-                else Icons.Filled.VisibilityOff
+                val image = if (passwordVisibility) {
+                    MifosIcons.Visibility
+                } else {
+                    MifosIcons.VisibilityOff
+                }
                 IconButton(onClick = { passwordVisibility = !passwordVisibility }) {
                     Icon(imageVector = image, null)
                 }
             },
-            keyboardType = KeyboardType.Password
+            keyboardType = KeyboardType.Password,
         )
 
         if (onValueChangePassword) {
             LinearProgressIndicator(
+                progress = { progressIndicator },
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(start = 16.dp, end = 16.dp),
@@ -318,8 +339,7 @@ fun RegistrationContent(
                     0.75f -> Color.Green
                     else -> Color.Blue
                 },
-                progress = progressIndicator,
-                trackColor = Color.White
+                trackColor = Color.White,
             )
         }
 
@@ -328,72 +348,70 @@ fun RegistrationContent(
             onValueChange = { confirmPassword = it },
             label = R.string.confirm_password,
             supportingText = "",
-            visualTransformation = if (confirmPasswordVisibility) VisualTransformation.None else PasswordVisualTransformation(),
+            visualTransformation = if (confirmPasswordVisibility) {
+                VisualTransformation.None
+            } else {
+                PasswordVisualTransformation()
+            },
             trailingIcon = {
-                val image = if (confirmPasswordVisibility)
-                    Icons.Filled.Visibility
-                else Icons.Filled.VisibilityOff
+                val image = if (confirmPasswordVisibility) {
+                    MifosIcons.Visibility
+                } else {
+                    MifosIcons.VisibilityOff
+                }
                 IconButton(onClick = { confirmPasswordVisibility = !confirmPasswordVisibility }) {
                     Icon(imageVector = image, null)
                 }
             },
-            keyboardType = KeyboardType.Password
+            keyboardType = KeyboardType.Password,
         )
 
         Row(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(start = 16.dp),
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Text(
                 text = stringResource(id = R.string.verification_mode),
                 modifier = Modifier.padding(end = 8.dp),
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
             radioOptions.forEach { authMode ->
                 RadioButton(
                     selected = (authMode == authenticationMode),
-                    onClick = { authenticationMode = authMode }
+                    onClick = { authenticationMode = authMode },
                 )
                 Text(
                     text = authMode,
-                    color = MaterialTheme.colorScheme.onSurface
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
             }
         }
 
-        Button(
+        MifosButton(
+            textResId = R.string.register,
             onClick = {
-                val error = areFieldsValidated(
-                    context = context,
-                    accountNumberContent = accountNumber.text,
-                    usernameContent = username.text,
-                    firstNameContent = firstName.text,
-                    lastNameContent = lastName.text,
-                    phoneNumberContent = phoneNumber.text,
-                    emailContent = email.text,
-                    passwordContent = password.text,
-                    confirmPasswordContent = confirmPassword.text,
-                )
+                val error = validateAllFields()
+
                 if (error == "") {
                     register.invoke(
-                         accountNumber.text,
-                         username.text,
-                         firstName.text,
-                         lastName.text,
-                         phoneNumber.text,
-                         email.text,
-                         password.text,
+                        accountNumber.text,
+                        username.text,
+                        firstName.text,
+                        lastName.text,
+                        phoneNumber.text,
+                        email.text,
+                        password.text,
                         authenticationMode,
-                        countryCode
+                        countryCode,
                     )
-                }else {
+                } else {
                     coroutineScope.launch {
                         snackBarHostState.showSnackbar(
                             message = error,
                             actionLabel = "Ok",
-                            duration = SnackbarDuration.Short
+                            duration = SnackbarDuration.Short,
                         )
                     }
                 }
@@ -405,20 +423,17 @@ fun RegistrationContent(
                 .padding(start = 16.dp, end = 16.dp, top = 4.dp),
             contentPadding = PaddingValues(12.dp),
             colors = ButtonDefaults.buttonColors(
-                containerColor = MaterialTheme.colorScheme.primary
-            )
-        ) {
-            Text(text = stringResource(id = R.string.register))
-        }
+                containerColor = MaterialTheme.colorScheme.primary,
+            ),
+        )
 
         Spacer(modifier = Modifier.imePadding())
     }
 }
 
-fun isInputFieldBlank(fieldText: String): Boolean {
-    return fieldText.trim().isEmpty()
-}
-fun isPhoneNumberValid(fieldText: String?): Boolean {
+private fun isInputFieldBlank(fieldText: String) = fieldText.trim().isEmpty()
+
+private fun isPhoneNumberValid(fieldText: String?): Boolean {
     if (fieldText.isNullOrBlank()) {
         return false
     }
@@ -428,22 +443,17 @@ fun isPhoneNumberValid(fieldText: String?): Boolean {
     return regex.matches(fieldText.trim())
 }
 
-fun isInputLengthInadequate(fieldText: String): Boolean {
-    return fieldText.trim().length < 6
-}
+private fun isInputLengthInadequate(fieldText: String) = fieldText.trim().length < 6
 
-fun inputHasSpaces(fieldText: String): Boolean {
-    return fieldText.trim().contains(" ")
-}
+private fun inputHasSpaces(fieldText: String) = fieldText.trim().contains(" ")
 
-fun hasLeadingTrailingSpaces(fieldText: String): Boolean {
-    return fieldText.trim().length < fieldText.length
-}
+private fun hasLeadingTrailingSpaces(fieldText: String) = fieldText.trim().length < fieldText.length
 
-fun isEmailInvalid(emailText: String): Boolean {
-    return !PatternsCompat.EMAIL_ADDRESS.matcher(emailText.trim()).matches()
-}
-fun areFieldsValidated(
+private fun isEmailInvalid(emailText: String) =
+    !PatternsCompat.EMAIL_ADDRESS.matcher(emailText.trim()).matches()
+
+@Suppress("CyclomaticComplexMethod")
+private fun areFieldsValidated(
     context: Context,
     accountNumberContent: String,
     usernameContent: String,
@@ -454,106 +464,80 @@ fun areFieldsValidated(
     passwordContent: String,
     confirmPasswordContent: String,
 ): String {
-    return when {
-        isInputFieldBlank(accountNumberContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_blank,
-                context.getString(R.string.account_number)
-            )
-            errorMessage
-        }
+    with(context) {
+        return when {
+            isInputFieldBlank(accountNumberContent) -> {
+                getString(
+                    R.string.error_validation_blank,
+                    context.getString(R.string.account_number),
+                )
+            }
 
-        isInputFieldBlank(usernameContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_blank,
-                context.getString(R.string.username)
-            )
-            errorMessage
-        }
+            isInputFieldBlank(usernameContent) -> {
+                getString(R.string.error_validation_blank, context.getString(R.string.username))
+            }
 
-        isInputLengthInadequate(usernameContent) -> {
-            val errorMessage = context.getString(R.string.error_username_greater_than_six)
-            errorMessage
-        }
+            isInputLengthInadequate(usernameContent) -> {
+                getString(R.string.error_username_greater_than_six)
+            }
 
-        inputHasSpaces(usernameContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_cannot_contain_spaces,
-                context.getString(R.string.username),
-                context.getString(R.string.not_contain_username),
-            )
-            errorMessage
-        }
+            inputHasSpaces(usernameContent) -> {
+                getString(
+                    R.string.error_validation_cannot_contain_spaces,
+                    context.getString(R.string.username),
+                    context.getString(R.string.not_contain_username),
+                )
+            }
 
-        isInputFieldBlank(firstNameContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_blank,
-                context.getString(R.string.first_name)
-            )
-            errorMessage
-        }
+            isInputFieldBlank(firstNameContent) -> {
+                getString(R.string.error_validation_blank, context.getString(R.string.first_name))
+            }
 
-        isInputFieldBlank(lastNameContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_blank,
-                context.getString(R.string.last_name)
-            )
-            errorMessage
-        }
+            isInputFieldBlank(lastNameContent) -> {
+                getString(R.string.error_validation_blank, context.getString(R.string.last_name))
+            }
 
-        !isPhoneNumberValid(phoneNumberContent) -> {
-            val errorMessage = context.getString(R.string.invalid_phn_number)
-            errorMessage
-        }
+            !isPhoneNumberValid(phoneNumberContent) -> {
+                getString(R.string.invalid_phn_number)
+            }
 
-        isInputFieldBlank(emailContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_blank,
-                context.getString(R.string.email)
-            )
-            errorMessage
-        }
+            isInputFieldBlank(emailContent) -> {
+                getString(R.string.error_validation_blank, context.getString(R.string.email))
+            }
 
-        isInputFieldBlank(passwordContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_blank,
-                context.getString(R.string.password)
-            )
-            errorMessage
-        }
+            isInputFieldBlank(passwordContent) -> {
+                getString(R.string.error_validation_blank, context.getString(R.string.password))
+            }
 
-        hasLeadingTrailingSpaces(passwordContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_cannot_contain_leading_or_trailing_spaces,
-                context.getString(R.string.password),
-            )
-            errorMessage
-        }
+            hasLeadingTrailingSpaces(passwordContent) -> {
+                getString(
+                    R.string.error_validation_cannot_contain_leading_or_trailing_spaces,
+                    context.getString(R.string.password),
+                )
+            }
 
-        isEmailInvalid(emailContent) -> {
-            val errorMessage = ContextCompat.getString(context, R.string.error_invalid_email)
-            errorMessage
-        }
+            isEmailInvalid(emailContent) -> {
+                getString(context, R.string.error_invalid_email)
+            }
 
-        isInputLengthInadequate(passwordContent) -> {
-            val errorMessage = context.getString(
-                R.string.error_validation_minimum_chars,
-                context.getString(R.string.password),
-                context.resources.getInteger(R.integer.password_minimum_length),
-            )
-            errorMessage
-        }
+            isInputLengthInadequate(passwordContent) -> {
+                getString(
+                    R.string.error_validation_minimum_chars,
+                    context.getString(R.string.password),
+                    context.resources.getInteger(R.integer.password_minimum_length),
+                )
+            }
 
-        passwordContent != confirmPasswordContent -> {
-            val errorMessage = context.getString(R.string.error_password_not_match)
-            errorMessage
-        }
+            passwordContent != confirmPasswordContent -> {
+                getString(R.string.error_password_not_match)
+            }
 
-        else -> ""
+            else -> ""
+        }
     }
 }
 
-fun updatePasswordStrengthView(password: String, context: Context): Float {
+private fun updatePasswordStrengthView(password: String, context: Context): Float {
     val str = PasswordStrength.calculateStrength(password)
     return when (str.getText(context)) {
         getString(context, R.string.password_strength_weak) -> 0.25f
@@ -563,31 +547,29 @@ fun updatePasswordStrengthView(password: String, context: Context): Float {
     }
 }
 
-class RegistrationScreenPreviewProvider : PreviewParameterProvider<RegistrationUiState> {
+internal class RegistrationScreenPreviewProvider : PreviewParameterProvider<RegistrationUiState> {
 
     override val values: Sequence<RegistrationUiState>
-    get() = sequenceOf(
-        RegistrationUiState.Loading,
-        RegistrationUiState.Error(1),
-        RegistrationUiState.Success,
-        RegistrationUiState.Initial,
-    )
+        get() = sequenceOf(
+            RegistrationUiState.Loading,
+            RegistrationUiState.Error(1),
+            RegistrationUiState.Success,
+            RegistrationUiState.Initial,
+        )
 }
 
-@Preview(showSystemUi = true)
+@DevicePreviews
 @Composable
-
 private fun RegistrationScreenPreview(
-    @PreviewParameter(RegistrationScreenPreviewProvider::class) registrationUiState: RegistrationUiState
+    @PreviewParameter(RegistrationScreenPreviewProvider::class)
+    registrationUiState: RegistrationUiState,
 ) {
     MifosMobileTheme {
         RegistrationScreen(
-            registrationUiState,
-            {},
-            {},
-            { _, _, _, _, _, _, _, _, _ -> },
-            { 0f }
+            uiState = registrationUiState,
+            onVerified = {},
+            navigateBack = {},
+            register = { _, _, _, _, _, _, _, _, _ -> },
         )
-
     }
-}
\ No newline at end of file
+}
diff --git a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/screens/RegistrationVerificationScreen.kt b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/screens/RegistrationVerificationScreen.kt
index dea2d83db..3a01cc6b3 100644
--- a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/screens/RegistrationVerificationScreen.kt
+++ b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/screens/RegistrationVerificationScreen.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.auth.registration.screens
 
 import android.widget.Toast
@@ -11,15 +20,11 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Error
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -34,26 +39,31 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import org.mifos.mobile.core.designsystem.components.MifosButton
 import org.mifos.mobile.core.designsystem.components.MifosOutlinedTextField
 import org.mifos.mobile.core.designsystem.components.MifosScaffold
+import org.mifos.mobile.core.designsystem.components.MifosTextButton
+import org.mifos.mobile.core.designsystem.icons.MifosIcons
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.ui.component.MifosProgressIndicatorOverlay
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.auth.R
 import org.mifos.mobile.feature.auth.registration.viewmodel.RegistrationUiState
 import org.mifos.mobile.feature.auth.registration.viewmodel.RegistrationViewModel
 
 @Composable
-fun RegistrationVerificationScreen(
+internal fun RegistrationVerificationScreen(
     navigateBack: () -> Unit?,
-    onVerified: () -> Unit
+    onVerified: () -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: RegistrationViewModel = hiltViewModel(),
 ) {
-
+    val uiState by viewModel.registrationVerificationUiState.collectAsStateWithLifecycle()
     var showConfirmationDialog by remember { mutableStateOf(false) }
 
     BackHandler(enabled = true) {
@@ -64,84 +74,88 @@ fun RegistrationVerificationScreen(
         AlertDialog(
             onDismissRequest = { showConfirmationDialog = false },
             title = { Text(text = stringResource(R.string.dialog_cancel_registration_title)) },
-            text = { Text(text = stringResource(R.string.dialog_cancel_registration_message)) },
+            text = {
+                Text(text = stringResource(R.string.dialog_cancel_registration_message))
+            },
+            modifier = modifier,
             confirmButton = {
-                TextButton(onClick = {
-                    showConfirmationDialog = false
-                    navigateBack.invoke()
-                }) {
+                MifosTextButton(
+                    onClick = {
+                        showConfirmationDialog = false
+                        navigateBack.invoke()
+                    },
+                ) {
                     Text(text = stringResource(R.string.yes))
                 }
             },
             dismissButton = {
-                TextButton(onClick = { showConfirmationDialog = false }) {
+                MifosTextButton(
+                    onClick = { showConfirmationDialog = false },
+                ) {
                     Text(text = stringResource(R.string.no))
                 }
-            }
+            },
         )
     }
 
-    val viewModel: RegistrationViewModel = hiltViewModel()
-    val uiState by viewModel.registrationVerificationUiState.collectAsStateWithLifecycle()
-
     RegistrationVerificationScreen(
         uiState = uiState,
         verifyUser = { token, id -> viewModel.verifyUser(token, id) },
         onVerified = onVerified,
-        navigateBack = { showConfirmationDialog = true }
+        navigateBack = { showConfirmationDialog = true },
     )
 }
 
-
 @Composable
-fun RegistrationVerificationScreen(
+private fun RegistrationVerificationScreen(
     uiState: RegistrationUiState,
-    verifyUser: (authenticationToken: String, requestID: String) -> Unit,
     onVerified: () -> Unit,
-    navigateBack: () -> Unit
+    navigateBack: () -> Unit,
+    verifyUser: (authenticationToken: String, requestID: String) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
 
     MifosScaffold(
         topBarTitleResId = R.string.register,
         navigateBack = navigateBack,
+        modifier = modifier,
         content = { contentPadding ->
-
             Box(
                 modifier = Modifier
                     .padding(contentPadding)
-                    .fillMaxSize()
+                    .fillMaxSize(),
             ) {
-
                 RegistrationVerificationContent(verifyUser)
 
                 when (uiState) {
+                    is RegistrationUiState.Initial -> Unit
 
-                    RegistrationUiState.Initial -> Unit
+                    is RegistrationUiState.Loading -> MifosProgressIndicatorOverlay()
 
                     is RegistrationUiState.Error -> {
                         Toast.makeText(context, uiState.exception, Toast.LENGTH_SHORT).show()
                     }
 
-                    RegistrationUiState.Loading -> {
-                        MifosProgressIndicatorOverlay()
-                    }
-
-                    RegistrationUiState.Success -> {
-                        Toast.makeText(context, stringResource(R.string.verified), Toast.LENGTH_SHORT).show()
+                    is RegistrationUiState.Success -> {
+                        Toast.makeText(
+                            context,
+                            stringResource(R.string.verified),
+                            Toast.LENGTH_SHORT,
+                        ).show()
                         onVerified()
                     }
                 }
             }
-        }
+        },
     )
 }
 
 @Composable
-fun RegistrationVerificationContent(verifyUser: (authenticationToken: String, requestID: String) -> Unit) {
-
-    val context = LocalContext.current
-
+private fun RegistrationVerificationContent(
+    verifyUser: (authenticationToken: String, requestID: String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
     var requestID by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(TextFieldValue(""))
     }
@@ -152,7 +166,6 @@ fun RegistrationVerificationContent(verifyUser: (authenticationToken: String, re
     var authenticationTokenError by remember { mutableStateOf(false) }
 
     fun validateInput(): Boolean {
-
         var temp = true
         if (requestID.text.isEmpty()) {
             requestIDError = true
@@ -166,23 +179,24 @@ fun RegistrationVerificationContent(verifyUser: (authenticationToken: String, re
         return temp
     }
 
-    Column(modifier = Modifier.fillMaxSize()) {
-
+    Column(
+        modifier = modifier.fillMaxSize(),
+    ) {
         Image(
-            painter = painterResource(R.drawable.mifos_logo),
+            painter = painterResource(R.drawable.feature_auth_mifos_logo),
             contentDescription = null,
             contentScale = ContentScale.Fit,
             alignment = Alignment.Center,
             modifier = Modifier
                 .padding(16.dp)
                 .height(100.dp)
-                .fillMaxWidth()
+                .fillMaxWidth(),
         )
 
         Spacer(
             modifier = Modifier
                 .fillMaxWidth()
-                .height(80.dp)
+                .height(80.dp),
         )
 
         MifosOutlinedTextField(
@@ -197,9 +211,9 @@ fun RegistrationVerificationContent(verifyUser: (authenticationToken: String, re
             keyboardType = KeyboardType.Number,
             trailingIcon = {
                 if (requestIDError) {
-                    Icon(imageVector = Icons.Filled.Error, contentDescription = null)
+                    Icon(imageVector = MifosIcons.Error, contentDescription = null)
                 }
-            }
+            },
         )
 
         MifosOutlinedTextField(
@@ -214,52 +228,52 @@ fun RegistrationVerificationContent(verifyUser: (authenticationToken: String, re
             keyboardType = KeyboardType.Number,
             trailingIcon = {
                 if (authenticationTokenError) {
-                    Icon(imageVector = Icons.Filled.Error, contentDescription = null)
+                    Icon(imageVector = MifosIcons.Error, contentDescription = null)
                 }
-            }
+            },
         )
 
-        Button(
+        MifosButton(
+            textResId = R.string.verify,
             onClick = {
-                if (validateInput())
+                if (validateInput()) {
                     verifyUser(authenticationToken.toString(), requestID.toString())
+                }
             },
-            Modifier
+            modifier = Modifier
                 .fillMaxWidth()
                 .padding(start = 16.dp, end = 16.dp, top = 12.dp),
             contentPadding = PaddingValues(12.dp),
             colors = ButtonDefaults.buttonColors(
-                containerColor = MaterialTheme.colorScheme.primary
-            )
-        ) {
-            Text(text = stringResource(id = R.string.verify))
-        }
+                containerColor = MaterialTheme.colorScheme.primary,
+            ),
+        )
     }
 }
 
-
-class RegistrationVerificationScreenPreviewProvider :
+internal class RegistrationVerificationScreenPreviewProvider :
     PreviewParameterProvider<RegistrationUiState> {
     override val values: Sequence<RegistrationUiState>
         get() = sequenceOf(
             RegistrationUiState.Initial,
             RegistrationUiState.Loading,
             RegistrationUiState.Success,
-            RegistrationUiState.Error(R.string.register)
+            RegistrationUiState.Error(R.string.register),
         )
 }
 
-@Preview(showSystemUi = true, showBackground = true)
+@DevicePreviews
 @Composable
 private fun RegistrationVerificationScreenPreview(
-    @PreviewParameter(RegistrationVerificationScreenPreviewProvider::class) registrationUiState: RegistrationUiState
+    @PreviewParameter(RegistrationVerificationScreenPreviewProvider::class)
+    registrationUiState: RegistrationUiState,
 ) {
     MifosMobileTheme {
         RegistrationVerificationScreen(
             uiState = registrationUiState,
             verifyUser = { _, _ -> },
             onVerified = {},
-            navigateBack = { }
+            navigateBack = { },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/utils/PasswordStrength.kt b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/utils/PasswordStrength.kt
index 57a27dafa..9fbcb10d1 100644
--- a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/utils/PasswordStrength.kt
+++ b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/utils/PasswordStrength.kt
@@ -1,77 +1,81 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.auth.registration.utils
 
 import android.content.Context
 import android.graphics.Color
 import org.mifos.mobile.feature.auth.R
 
-enum class PasswordStrength(private var resId: Int, var color: Int) {
-
+enum class PasswordStrength(private val resId: Int, val color: Int) {
     WEAK(R.string.password_strength_weak, Color.RED),
     MEDIUM(R.string.password_strength_medium, Color.argb(255, 220, 185, 0)),
     STRONG(R.string.password_strength_strong, Color.GREEN),
-    VERY_STRONG(R.string.password_strength_very_strong, Color.BLUE);
+    VERY_STRONG(R.string.password_strength_very_strong, Color.BLUE),
+    ;
 
-    fun getText(ctx: Context?): CharSequence? {
-        return ctx?.getText(resId)
-    }
+    fun getText(ctx: Context?): CharSequence? = ctx?.getText(resId)
 
     companion object {
-        // --------REQUIREMENTS--------
-        private var REQUIRED_LENGTH = 8
-        private var MAXIMUM_LENGTH = 15
-        private var REQUIRE_SPECIAL_CHARACTERS = true
-        private var REQUIRE_DIGITS = true
-        private var REQUIRE_LOWER_CASE = true
-        private var REQUIRE_UPPER_CASE = false
+        private const val REQUIRED_LENGTH = 8
+        private const val MAXIMUM_LENGTH = 15
+        private const val REQUIRE_SPECIAL_CHARACTERS = true
+        private const val REQUIRE_DIGITS = true
+        private const val REQUIRE_LOWER_CASE = true
+        private const val REQUIRE_UPPER_CASE = false
+
         fun calculateStrength(password: String): PasswordStrength {
-            var currentScore = 0
-            var sawUpper = false
-            var sawLower = false
-            var sawDigit = false
-            var sawSpecial = false
-            for (element in password) {
-                if (!sawSpecial && !Character.isLetterOrDigit(element)) {
-                    currentScore += 1
-                    sawSpecial = true
-                } else {
-                    if (!sawDigit && Character.isDigit(element)) {
-                        currentScore += 1
-                        sawDigit = true
-                    } else {
-                        if (!sawUpper || !sawLower) {
-                            if (Character.isUpperCase(element)) {
-                                sawUpper = true
-                            } else {
-                                sawLower = true
-                            }
-                            if (sawUpper && sawLower) currentScore += 1
-                        }
-                    }
-                }
+            val score = calculateScore(password)
+            return when {
+                score >= 3 -> VERY_STRONG
+                score == 2 -> STRONG
+                score == 1 -> MEDIUM
+                else -> WEAK
             }
-            if (password.length > REQUIRED_LENGTH) {
-                if (REQUIRE_SPECIAL_CHARACTERS && !sawSpecial ||
-                    REQUIRE_UPPER_CASE && !sawUpper ||
-                    REQUIRE_LOWER_CASE && !sawLower ||
-                    REQUIRE_DIGITS && !sawDigit
-                ) {
-                    currentScore = 1
-                } else {
-                    currentScore = 2
-                    if (password.length > MAXIMUM_LENGTH) {
-                        currentScore = 3
-                    }
+        }
+
+        @Suppress("ComplexCondition")
+        private fun calculateScore(password: String): Int {
+            if (password.length <= REQUIRED_LENGTH) return 0
+
+            var score = 0
+            val (hasUpper, hasLower, hasDigit, hasSpecial) = password.fold(
+                BooleanArray(4),
+            ) { acc, char ->
+                when {
+                    char.isUpperCase() -> acc[0] = true
+                    char.isLowerCase() -> acc[1] = true
+                    char.isDigit() -> acc[2] = true
+                    !char.isLetterOrDigit() -> acc[3] = true
                 }
-            } else {
-                currentScore = 0
+                acc
             }
-            when (currentScore) {
-                0 -> return WEAK
-                1 -> return MEDIUM
-                2 -> return STRONG
-                3 -> return VERY_STRONG
+
+            if (hasUpper) score++
+            if (hasLower) score++
+            if (hasDigit) score++
+            if (hasSpecial) score++
+
+            if (REQUIRE_SPECIAL_CHARACTERS && !hasSpecial ||
+                REQUIRE_UPPER_CASE && !hasUpper ||
+                REQUIRE_LOWER_CASE && !hasLower ||
+                REQUIRE_DIGITS && !hasDigit
+            ) {
+                score = 1
+            } else {
+                score = 2
+                if (password.length > MAXIMUM_LENGTH) {
+                    score = 3
+                }
             }
-            return VERY_STRONG
+
+            return score
         }
     }
 }
diff --git a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/viewmodel/RegistrationViewModel.kt b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/viewmodel/RegistrationViewModel.kt
index 94fb7e5ce..a69dd5668 100644
--- a/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/viewmodel/RegistrationViewModel.kt
+++ b/feature/auth/src/main/java/org/mifos/mobile/feature/auth/registration/viewmodel/RegistrationViewModel.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.auth.registration.viewmodel
 
 import androidx.lifecycle.ViewModel
@@ -12,8 +21,9 @@ import org.mifos.mobile.feature.auth.R
 import javax.inject.Inject
 
 @HiltViewModel
-class RegistrationViewModel @Inject constructor(private val userAuthRepositoryImp: UserAuthRepository) :
-    ViewModel() {
+internal class RegistrationViewModel @Inject constructor(
+    private val userAuthRepositoryImp: UserAuthRepository,
+) : ViewModel() {
 
     private val _registrationUiState =
         MutableStateFlow<RegistrationUiState>(RegistrationUiState.Initial)
@@ -29,21 +39,22 @@ class RegistrationViewModel @Inject constructor(private val userAuthRepositoryIm
         email: String,
         firstName: String,
         lastName: String,
+        countryCode: String,
         mobileNumber: String,
         password: String,
-        username: String
+        username: String,
     ) {
         viewModelScope.launch {
             _registrationUiState.value = RegistrationUiState.Loading
             userAuthRepositoryImp.registerUser(
-                accountNumber,
-                authenticationMode,
-                email,
-                firstName,
-                lastName,
-                mobileNumber,
-                password,
-                username
+                accountNumber = accountNumber,
+                authenticationMode = authenticationMode,
+                email = email,
+                firstName = firstName,
+                lastName = lastName,
+                mobileNumber = countryCode + mobileNumber,
+                password = password,
+                username = username,
             ).catch {
                 _registrationUiState.value =
                     RegistrationUiState.Error(R.string.could_not_register_user_error)
@@ -67,10 +78,9 @@ class RegistrationViewModel @Inject constructor(private val userAuthRepositoryIm
     }
 }
 
-
-sealed class RegistrationUiState {
+internal sealed class RegistrationUiState {
     data class Error(val exception: Int) : RegistrationUiState()
     data object Success : RegistrationUiState()
     data object Loading : RegistrationUiState()
-    data object Initial: RegistrationUiState()
+    data object Initial : RegistrationUiState()
 }
diff --git a/feature/auth/src/main/res/drawable/ic_person_black_24dp.xml b/feature/auth/src/main/res/drawable/feature_auth_ic_person.xml
similarity index 52%
rename from feature/auth/src/main/res/drawable/ic_person_black_24dp.xml
rename to feature/auth/src/main/res/drawable/feature_auth_ic_person.xml
index 55495d5a0..a45776581 100644
--- a/feature/auth/src/main/res/drawable/ic_person_black_24dp.xml
+++ b/feature/auth/src/main/res/drawable/feature_auth_ic_person.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/feature/auth/src/main/res/drawable/ic_lock_black_24dp.xml b/feature/auth/src/main/res/drawable/feature_auth_lock.xml
similarity index 62%
rename from feature/auth/src/main/res/drawable/ic_lock_black_24dp.xml
rename to feature/auth/src/main/res/drawable/feature_auth_lock.xml
index 54a852060..8658fd5eb 100644
--- a/feature/auth/src/main/res/drawable/ic_lock_black_24dp.xml
+++ b/feature/auth/src/main/res/drawable/feature_auth_lock.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/feature/auth/src/main/res/drawable/mifos_logo.png b/feature/auth/src/main/res/drawable/feature_auth_mifos_logo.png
similarity index 100%
rename from feature/auth/src/main/res/drawable/mifos_logo.png
rename to feature/auth/src/main/res/drawable/feature_auth_mifos_logo.png
diff --git a/feature/auth/src/main/res/values/strings.xml b/feature/auth/src/main/res/values/strings.xml
index 99d5ff8b7..cba4c9a85 100644
--- a/feature/auth/src/main/res/values/strings.xml
+++ b/feature/auth/src/main/res/values/strings.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <resources>
     <string name="no_internet_connection">No Internet Connection</string>
     <string name="register">Register</string>
diff --git a/feature/auth/src/main/res/values/validations.xml b/feature/auth/src/main/res/values/validations.xml
index 37e3b680a..cdebb2f54 100644
--- a/feature/auth/src/main/res/values/validations.xml
+++ b/feature/auth/src/main/res/values/validations.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <resources>
     <integer name="username_minimum_length">5</integer>
     <integer name="password_minimum_length">6</integer>
diff --git a/feature/auth/src/test/java/org/mifos/mobile/feature/auth/ExampleUnitTest.kt b/feature/auth/src/test/java/org/mifos/mobile/feature/auth/ExampleUnitTest.kt
deleted file mode 100644
index 30c9328cd..000000000
--- a/feature/auth/src/test/java/org/mifos/mobile/feature/auth/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.mifos.mobile.feature.auth
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/feature/beneficiary/build.gradle.kts b/feature/beneficiary/build.gradle.kts
index cca3b949d..3a98116e0 100644
--- a/feature/beneficiary/build.gradle.kts
+++ b/feature/beneficiary/build.gradle.kts
@@ -1,21 +1,19 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 plugins {
     alias(libs.plugins.mifos.android.feature)
     alias(libs.plugins.mifos.android.library.compose)
-    alias(libs.plugins.mifos.android.hilt)
 }
 
 android {
     namespace = "org.mifos.mobile.feature.beneficiary"
 }
 
-dependencies {
-    implementation(projects.core.ui)
-    implementation(projects.core.common)
-    implementation(projects.core.model)
-    implementation(projects.core.data)
-
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.espresso.core)
-    api(libs.androidx.fragment.ktx)
-}
\ No newline at end of file
+dependencies { }
\ No newline at end of file
diff --git a/feature/beneficiary/src/androidTest/java/org/mifos/mobile/feature/beneficiary/ExampleInstrumentedTest.kt b/feature/beneficiary/src/androidTest/java/org/mifos/mobile/feature/beneficiary/ExampleInstrumentedTest.kt
deleted file mode 100644
index db7e827d1..000000000
--- a/feature/beneficiary/src/androidTest/java/org/mifos/mobile/feature/beneficiary/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.mifos.mobile.feature.beneficiary
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("org.mifos.mobile.feature.beneficiary.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/feature/beneficiary/src/main/AndroidManifest.xml b/feature/beneficiary/src/main/AndroidManifest.xml
index a5918e68a..1f9b243f0 100644
--- a/feature/beneficiary/src/main/AndroidManifest.xml
+++ b/feature/beneficiary/src/main/AndroidManifest.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationContent.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationContent.kt
similarity index 68%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationContent.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationContent.kt
index 4c96b4b65..4e95f7f4b 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationContent.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationContent.kt
@@ -1,4 +1,13 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_application
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryApplication
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -19,55 +28,80 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.mifos.mobile.core.designsystem.components.MifosButton
 import org.mifos.mobile.core.designsystem.components.MifosOutlinedTextField
-import org.mifos.mobile.core.designsystem.components.MifosTextButton
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.core.model.entity.beneficiary.BeneficiaryPayload
 import org.mifos.mobile.core.model.entity.templates.beneficiary.BeneficiaryTemplate
 import org.mifos.mobile.core.model.enums.BeneficiaryState
 import org.mifos.mobile.core.ui.component.MifosDropDownTextField
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.beneficiary.R
 
 @Composable
-fun BeneficiaryApplicationContent(
+@Suppress("CyclomaticComplexMethod", "ComplexCondition")
+internal fun BeneficiaryApplicationContent(
     prefilledBeneficiary: Beneficiary?,
     beneficiaryTemplate: BeneficiaryTemplate,
     beneficiaryState: BeneficiaryState,
-    onSubmit: (BeneficiaryPayload) -> Unit
+    onSubmit: (BeneficiaryPayload) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
-    val scrollState = rememberScrollState()
-
-    var accountType by rememberSaveable { mutableIntStateOf(prefilledBeneficiary?.accountType?.id ?: -1) }
+    var accountType by rememberSaveable {
+        mutableIntStateOf(
+            prefilledBeneficiary?.accountType?.id ?: -1,
+        )
+    }
     var accountTypeError by rememberSaveable { mutableStateOf<Int?>(null) }
 
-    var accountNumber by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue(prefilledBeneficiary?.accountNumber ?: "")) }
+    var accountNumber by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(
+            TextFieldValue(prefilledBeneficiary?.accountNumber ?: ""),
+        )
+    }
     var accountNumberError by rememberSaveable { mutableStateOf<Int?>(null) }
 
-    var officeName by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue(prefilledBeneficiary?.officeName ?: "")) }
+    var officeName by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(
+            TextFieldValue(prefilledBeneficiary?.officeName ?: ""),
+        )
+    }
     var officeNameError by rememberSaveable { mutableStateOf<Int?>(null) }
 
-    var transferLimit by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue(prefilledBeneficiary?.transferLimit?.toString() ?: "")) }
+    var transferLimit by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(
+            TextFieldValue(prefilledBeneficiary?.transferLimit?.toString() ?: ""),
+        )
+    }
     var transferLimitError by rememberSaveable { mutableStateOf<Int?>(null) }
 
-    var beneficiaryName by rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue(prefilledBeneficiary?.name ?: "")) }
+    var beneficiaryName by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(
+            TextFieldValue(prefilledBeneficiary?.name ?: ""),
+        )
+    }
     var beneficiaryNameError by rememberSaveable { mutableStateOf<Int?>(null) }
 
     fun validateFields() {
         if (beneficiaryState != BeneficiaryState.UPDATE) {
             accountTypeError = if (accountType == -1) R.string.select_account_type else null
-            accountNumberError = if (accountNumber.text.trim().isEmpty()) R.string.enter_account_number else null
-            officeNameError = if (officeName.text.trim().isEmpty()) R.string.enter_office_name else null
+            accountNumberError =
+                if (accountNumber.text.trim().isEmpty()) R.string.enter_account_number else null
+            officeNameError =
+                if (officeName.text.trim().isEmpty()) R.string.enter_office_name else null
         }
         transferLimitError = when {
             transferLimit.text.trim().isEmpty() -> R.string.enter_transfer_limit
             transferLimit.text.any { it.isLetter() } -> R.string.invalid_amount
-            transferLimit.text.toDoubleOrNull()?.let { it % 1 != 0.0 } == true -> R.string.invalid_amount
+            transferLimit.text.toDoubleOrNull()
+                ?.let { it % 1 != 0.0 } == true -> R.string.invalid_amount
+
             else -> null
         }
-        beneficiaryNameError = if (beneficiaryName.text.trim().isEmpty()) R.string.enter_beneficiary_name else null
+        beneficiaryNameError =
+            if (beneficiaryName.text.trim().isEmpty()) R.string.enter_beneficiary_name else null
     }
 
     LaunchedEffect(key1 = accountType) {
@@ -90,18 +124,23 @@ fun BeneficiaryApplicationContent(
         beneficiaryNameError = null
     }
 
-    Column(modifier = Modifier
-        .fillMaxSize()
-        .verticalScroll(rememberScrollState())
-        .padding(16.dp)
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(16.dp),
     ) {
         MifosDropDownTextField(
-            optionsList = beneficiaryTemplate.accountTypeOptions?.mapNotNull { it.value } ?: listOf(),
+            optionsList = beneficiaryTemplate.accountTypeOptions?.mapNotNull { it.value }
+                ?: listOf(),
             labelResId = R.string.select_account_type,
-            onClick = { index, _ -> accountType = beneficiaryTemplate.accountTypeOptions?.filter{ it.value != null }?.get(index)?.id ?: -1 },
+            onClick = { index, _ ->
+                accountType = beneficiaryTemplate.accountTypeOptions?.filter { it.value != null }
+                    ?.get(index)?.id ?: -1
+            },
             error = accountTypeError != null && beneficiaryState != BeneficiaryState.UPDATE,
             isEnabled = beneficiaryState != BeneficiaryState.UPDATE,
-            supportingText = accountTypeError?.let { stringResource(id = it) }
+            supportingText = accountTypeError?.let { stringResource(id = it) },
         )
 
         MifosOutlinedTextField(
@@ -111,7 +150,7 @@ fun BeneficiaryApplicationContent(
             label = R.string.account_number,
             error = accountNumberError != null && beneficiaryState != BeneficiaryState.UPDATE,
             enabled = beneficiaryState != BeneficiaryState.UPDATE,
-            supportingText = accountNumberError?.let { stringResource(id = it) }
+            supportingText = accountNumberError?.let { stringResource(id = it) },
         )
 
         MifosOutlinedTextField(
@@ -121,7 +160,7 @@ fun BeneficiaryApplicationContent(
             label = R.string.office_name,
             error = officeNameError != null && beneficiaryState != BeneficiaryState.UPDATE,
             enabled = beneficiaryState != BeneficiaryState.UPDATE,
-            supportingText = officeNameError?.let { stringResource(id = it) }
+            supportingText = officeNameError?.let { stringResource(id = it) },
         )
 
         MifosOutlinedTextField(
@@ -131,7 +170,7 @@ fun BeneficiaryApplicationContent(
             label = R.string.transfer_limit,
             keyboardType = KeyboardType.Number,
             error = transferLimitError != null,
-            supportingText = transferLimitError?.let { stringResource(id = it) }
+            supportingText = transferLimitError?.let { stringResource(id = it) },
         )
 
         MifosOutlinedTextField(
@@ -140,36 +179,42 @@ fun BeneficiaryApplicationContent(
             onValueChange = { beneficiaryName = it },
             label = R.string.beneficiary_name,
             error = beneficiaryNameError != null,
-            supportingText = beneficiaryNameError?.let { stringResource(id = it) }
+            supportingText = beneficiaryNameError?.let { stringResource(id = it) },
         )
 
         Spacer(modifier = Modifier.height(10.dp))
 
-        MifosTextButton(
+        MifosButton(
             modifier = Modifier.fillMaxWidth(),
             textResId = R.string.submit_beneficiary,
             onClick = {
                 validateFields()
-                if ((beneficiaryState != BeneficiaryState.UPDATE && accountTypeError == null && accountNumberError == null && officeNameError == null) &&
-                    transferLimitError == null && beneficiaryNameError == null) {
+                if ((
+                        beneficiaryState != BeneficiaryState.UPDATE && accountTypeError == null &&
+                            accountNumberError == null && officeNameError == null
+                        ) &&
+                    transferLimitError == null && beneficiaryNameError == null
+                ) {
                     onSubmit(
                         BeneficiaryPayload(
                             name = beneficiaryName.text,
                             accountNumber = accountNumber.text,
                             transferLimit = transferLimit.text.toFloat(),
                             officeName = officeName.text,
-                            accountType = accountType
-                        )
+                            accountType = accountType,
+                        ),
                     )
-                } else if (beneficiaryState == BeneficiaryState.UPDATE && transferLimitError == null && beneficiaryNameError == null) {
+                } else if (beneficiaryState == BeneficiaryState.UPDATE &&
+                    transferLimitError == null && beneficiaryNameError == null
+                ) {
                     onSubmit(
                         BeneficiaryPayload(
                             name = beneficiaryName.text,
                             accountNumber = accountNumber.text,
                             transferLimit = transferLimit.text.toFloat(),
                             officeName = officeName.text,
-                            accountType = accountType
-                        )
+                            accountType = accountType,
+                        ),
                     )
                 }
             },
@@ -177,10 +222,9 @@ fun BeneficiaryApplicationContent(
     }
 }
 
-
 @Composable
-@Preview(showSystemUi = true)
-fun BeneficiaryApplicationContentPreview() {
+@DevicePreviews
+private fun BeneficiaryApplicationContentPreview() {
     MifosMobileTheme {
         BeneficiaryApplicationContent(
             prefilledBeneficiary = null,
@@ -189,4 +233,4 @@ fun BeneficiaryApplicationContentPreview() {
             onSubmit = {},
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationScreen.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationScreen.kt
similarity index 72%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationScreen.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationScreen.kt
index ad86c548d..863e651bd 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationScreen.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationScreen.kt
@@ -1,15 +1,21 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_application
-
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryApplication
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -23,97 +29,106 @@ import org.mifos.mobile.core.model.entity.templates.beneficiary.BeneficiaryTempl
 import org.mifos.mobile.core.model.enums.BeneficiaryState
 import org.mifos.mobile.core.ui.component.MifosErrorComponent
 import org.mifos.mobile.core.ui.component.MifosProgressIndicator
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.beneficiary.R
 
-
 @Composable
-fun BeneficiaryApplicationScreen(
-    viewModel: BeneficiaryApplicationViewModel = hiltViewModel(),
+internal fun BeneficiaryApplicationScreen(
     navigateBack: () -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: BeneficiaryApplicationViewModel = hiltViewModel(),
 ) {
     val beneficiaryState by viewModel.beneficiaryState.collectAsStateWithLifecycle()
     val beneficiary by viewModel.beneficiary.collectAsStateWithLifecycle()
     val uiState by viewModel.beneficiaryUiState.collectAsStateWithLifecycle()
 
-    LaunchedEffect(key1 = Unit) {
-        viewModel.loadBeneficiaryTemplate()
-    }
-
-    BeneficiaryApplicationScreen (
+    BeneficiaryApplicationScreen(
         uiState = uiState,
-        navigateBack = navigateBack,
         beneficiaryState = beneficiaryState,
         beneficiary = beneficiary,
-        onRetry = { viewModel.loadBeneficiaryTemplate() },
-        onSubmit = { viewModel.submitBeneficiary(it) }
+        navigateBack = navigateBack,
+        onRetry = viewModel::loadBeneficiaryTemplate,
+        onSubmit = viewModel::submitBeneficiary,
+        modifier = modifier,
     )
 }
 
 @Composable
-fun BeneficiaryApplicationScreen(
+private fun BeneficiaryApplicationScreen(
     uiState: BeneficiaryApplicationUiState,
-    navigateBack: () -> Unit,
     beneficiaryState: BeneficiaryState,
     beneficiary: Beneficiary?,
+    navigateBack: () -> Unit,
     onRetry: () -> Unit,
-    onSubmit: (BeneficiaryPayload) -> Unit
+    onSubmit: (BeneficiaryPayload) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
+
     MifosScaffold(
-        topBarTitleResId = when(beneficiaryState) {
+        topBarTitleResId = when (beneficiaryState) {
             BeneficiaryState.UPDATE -> R.string.update_beneficiary
             else -> R.string.add_beneficiary
         },
         navigateBack = navigateBack,
+        modifier = modifier,
         content = { paddingValues ->
-            Box(modifier = Modifier.padding(paddingValues = paddingValues)) {
-                when(uiState) {
+            Box(
+                modifier = Modifier
+                    .padding(paddingValues = paddingValues),
+            ) {
+                when (uiState) {
                     is BeneficiaryApplicationUiState.Error -> {
                         MifosErrorComponent(
                             isNetworkConnected = Network.isConnected(context),
                             isRetryEnabled = true,
                             onRetry = onRetry,
-                            message = stringResource(id = uiState.errorResId)
+                            message = stringResource(id = uiState.errorResId),
                         )
                     }
+
                     is BeneficiaryApplicationUiState.Loading -> {
                         MifosProgressIndicator()
                     }
+
                     is BeneficiaryApplicationUiState.Success -> {
                         navigateBack()
                     }
+
                     is BeneficiaryApplicationUiState.Template -> {
                         BeneficiaryApplicationContent(
                             prefilledBeneficiary = beneficiary,
                             beneficiaryTemplate = uiState.beneficiaryTemplate,
                             beneficiaryState = beneficiaryState,
-                            onSubmit = onSubmit
+                            onSubmit = onSubmit,
                         )
                     }
                 }
             }
-        }
+        },
     )
 }
 
-@Preview(showSystemUi = true)
+@DevicePreviews
 @Composable
-fun BeneficiaryApplicationScreenPreview(
-    @PreviewParameter(BeneficiaryApplicationUiPreview::class) uiState: BeneficiaryApplicationUiState
+private fun BeneficiaryApplicationScreenPreview(
+    @PreviewParameter(BeneficiaryApplicationUiPreview::class)
+    uiState: BeneficiaryApplicationUiState,
 ) {
     MifosMobileTheme {
         BeneficiaryApplicationScreen(
             uiState = uiState,
+            beneficiaryState = BeneficiaryState.CREATE_QR,
+            beneficiary = Beneficiary(),
             navigateBack = { },
             onRetry = { },
-            beneficiary = Beneficiary(),
-            beneficiaryState = BeneficiaryState.CREATE_QR,
-            onSubmit = { }
+            onSubmit = { },
         )
     }
 }
 
-class BeneficiaryApplicationUiPreview : PreviewParameterProvider<BeneficiaryApplicationUiState> {
+internal class BeneficiaryApplicationUiPreview :
+    PreviewParameterProvider<BeneficiaryApplicationUiState> {
     override val values: Sequence<BeneficiaryApplicationUiState>
         get() = sequenceOf(
             BeneficiaryApplicationUiState.Template(BeneficiaryTemplate()),
@@ -121,5 +136,3 @@ class BeneficiaryApplicationUiPreview : PreviewParameterProvider<BeneficiaryAppl
             BeneficiaryApplicationUiState.Loading,
         )
 }
-
-
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationViewModel.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationViewModel.kt
similarity index 69%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationViewModel.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationViewModel.kt
index 00f6f71b6..e318475cb 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_application/BeneficiaryApplicationViewModel.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryApplication/BeneficiaryApplicationViewModel.kt
@@ -1,4 +1,13 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_application
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryApplication
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
@@ -20,22 +29,28 @@ import org.mifos.mobile.core.model.entity.beneficiary.BeneficiaryUpdatePayload
 import org.mifos.mobile.core.model.entity.templates.beneficiary.BeneficiaryTemplate
 import org.mifos.mobile.core.model.enums.BeneficiaryState
 import org.mifos.mobile.feature.beneficiary.R
+import org.mifos.mobile.feature.beneficiary.beneficiaryApplication.BeneficiaryApplicationUiState.Loading
 import org.mifos.mobile.feature.beneficiary.navigation.BENEFICIARY_ID
 import javax.inject.Inject
 
 @HiltViewModel
-class BeneficiaryApplicationViewModel @Inject constructor(
+internal class BeneficiaryApplicationViewModel @Inject constructor(
     private val beneficiaryRepositoryImp: BeneficiaryRepository,
-    savedStateHandle: SavedStateHandle
-) :
-    ViewModel() {
+    savedStateHandle: SavedStateHandle,
+) : ViewModel() {
 
-    private val _beneficiaryUiState = MutableStateFlow<BeneficiaryApplicationUiState>(BeneficiaryApplicationUiState.Loading)
+    private val _beneficiaryUiState = MutableStateFlow<BeneficiaryApplicationUiState>(Loading)
     val beneficiaryUiState: StateFlow<BeneficiaryApplicationUiState> get() = _beneficiaryUiState
 
-    private val beneficiaryId = savedStateHandle.getStateFlow<Int?>(key = BENEFICIARY_ID, initialValue = null)
+    private val beneficiaryId = savedStateHandle.getStateFlow<Int?>(
+        key = BENEFICIARY_ID,
+        initialValue = null,
+    )
 
-    val beneficiaryState = savedStateHandle.getStateFlow<BeneficiaryState>(key = BENEFICIARY_STATE, initialValue = BeneficiaryState.CREATE_QR)
+    val beneficiaryState = savedStateHandle.getStateFlow(
+        key = BENEFICIARY_STATE,
+        initialValue = BeneficiaryState.CREATE_QR,
+    )
 
     val beneficiary: StateFlow<Beneficiary?> = beneficiaryId
         .flatMapLatest {
@@ -47,15 +62,19 @@ class BeneficiaryApplicationViewModel @Inject constructor(
         }.stateIn(
             scope = viewModelScope,
             started = SharingStarted.WhileSubscribed(5_000),
-            initialValue = null
+            initialValue = null,
         )
 
+    init {
+        loadBeneficiaryTemplate()
+    }
+
     fun loadBeneficiaryTemplate() {
         viewModelScope.launch {
-                _beneficiaryUiState.value = BeneficiaryApplicationUiState.Loading
+            _beneficiaryUiState.value = Loading
             beneficiaryRepositoryImp.beneficiaryTemplate().catch {
-               _beneficiaryUiState.value =
-                   BeneficiaryApplicationUiState.Error(R.string.error_fetching_beneficiary_template)
+                _beneficiaryUiState.value =
+                    BeneficiaryApplicationUiState.Error(R.string.error_fetching_beneficiary_template)
             }.collect {
                 _beneficiaryUiState.value = BeneficiaryApplicationUiState.Template(it)
             }
@@ -63,21 +82,22 @@ class BeneficiaryApplicationViewModel @Inject constructor(
     }
 
     fun submitBeneficiary(beneficiaryPayload: BeneficiaryPayload) {
-        when(beneficiaryState.value) {
+        when (beneficiaryState.value) {
             BeneficiaryState.UPDATE -> updateBeneficiary(
                 beneficiaryId = beneficiary.value?.id?.toLong(),
                 payload = BeneficiaryUpdatePayload(
                     name = beneficiaryPayload.name,
-                    transferLimit = beneficiaryPayload.transferLimit ?: 0F
-                )
+                    transferLimit = beneficiaryPayload.transferLimit ?: 0F,
+                ),
             )
+
             else -> createBeneficiary(payload = beneficiaryPayload)
         }
     }
 
     private fun createBeneficiary(payload: BeneficiaryPayload?) {
         viewModelScope.launch {
-            _beneficiaryUiState.value = BeneficiaryApplicationUiState.Loading
+            _beneficiaryUiState.value = Loading
             beneficiaryRepositoryImp.createBeneficiary(payload).catch {
                 _beneficiaryUiState.value =
                     BeneficiaryApplicationUiState.Error(R.string.error_creating_beneficiary)
@@ -89,7 +109,7 @@ class BeneficiaryApplicationViewModel @Inject constructor(
 
     private fun updateBeneficiary(beneficiaryId: Long?, payload: BeneficiaryUpdatePayload?) {
         viewModelScope.launch {
-            _beneficiaryUiState.value = BeneficiaryApplicationUiState.Loading
+            _beneficiaryUiState.value = Loading
             beneficiaryRepositoryImp.updateBeneficiary(beneficiaryId, payload).catch {
                 _beneficiaryUiState.value =
                     BeneficiaryApplicationUiState.Error(R.string.error_updating_beneficiary)
@@ -98,13 +118,13 @@ class BeneficiaryApplicationViewModel @Inject constructor(
             }
         }
     }
-
 }
 
-sealed class BeneficiaryApplicationUiState {
-    data class Template(val beneficiaryTemplate: BeneficiaryTemplate): BeneficiaryApplicationUiState()
-    data object Loading: BeneficiaryApplicationUiState()
-    data object Success: BeneficiaryApplicationUiState()
-    data class Error(val errorResId: Int): BeneficiaryApplicationUiState()
-}
+internal sealed class BeneficiaryApplicationUiState {
+    data class Template(val beneficiaryTemplate: BeneficiaryTemplate) :
+        BeneficiaryApplicationUiState()
 
+    data object Loading : BeneficiaryApplicationUiState()
+    data object Success : BeneficiaryApplicationUiState()
+    data class Error(val errorResId: Int) : BeneficiaryApplicationUiState()
+}
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailContent.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailContent.kt
similarity index 71%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailContent.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailContent.kt
index 9b35c465c..7210c8fe3 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailContent.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailContent.kt
@@ -1,4 +1,13 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_detail
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryDetail
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -12,29 +21,29 @@ import androidx.compose.material3.OutlinedCard
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.core.ui.component.MifosTitleDescSingleLineEqual
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.beneficiary.R
 
 @Composable
-fun BeneficiaryDetailContent(
-    beneficiary: Beneficiary?
+internal fun BeneficiaryDetailContent(
+    beneficiary: Beneficiary?,
+    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
-            .padding(16.dp)
+            .padding(16.dp),
     ) {
-
         MifosTitleDescSingleLineEqual(
             modifier = Modifier
                 .padding(horizontal = 4.dp)
                 .padding(4.dp),
             title = stringResource(id = R.string.beneficiary_name),
-            description = beneficiary?.name.toString()
+            description = beneficiary?.name.toString(),
         )
 
         MifosTitleDescSingleLineEqual(
@@ -42,54 +51,57 @@ fun BeneficiaryDetailContent(
                 .padding(horizontal = 4.dp)
                 .padding(4.dp),
             title = stringResource(id = R.string.account_number),
-            description = beneficiary?.accountNumber.toString()
+            description = beneficiary?.accountNumber.toString(),
         )
 
         Spacer(modifier = Modifier.height(24.dp))
 
         OutlinedCard(
-            modifier = Modifier.fillMaxWidth(), colors = CardDefaults.outlinedCardColors(
-                containerColor = MaterialTheme.colorScheme.background
-            )
+            modifier = Modifier.fillMaxWidth(),
+            colors = CardDefaults.outlinedCardColors(
+                containerColor = MaterialTheme.colorScheme.background,
+            ),
         ) {
             Column(
-                modifier = Modifier.padding(8.dp)
+                modifier = Modifier.padding(8.dp),
             ) {
                 MifosTitleDescSingleLineEqual(
                     modifier = Modifier.padding(vertical = 4.dp),
                     title = stringResource(id = R.string.client_name),
-                    description = beneficiary?.clientName.toString()
+                    description = beneficiary?.clientName.toString(),
                 )
 
                 MifosTitleDescSingleLineEqual(
                     modifier = Modifier.padding(vertical = 4.dp),
                     title = stringResource(id = R.string.account_type),
-                    description = beneficiary?.accountType.toString()
+                    description = beneficiary?.accountType.toString(),
                 )
 
                 MifosTitleDescSingleLineEqual(
                     modifier = Modifier.padding(vertical = 4.dp),
                     title = stringResource(id = R.string.transfer_limit),
-                    description = beneficiary?.transferLimit.toString()
+                    description = beneficiary?.transferLimit.toString(),
                 )
 
                 MifosTitleDescSingleLineEqual(
                     modifier = Modifier.padding(vertical = 4.dp),
                     title = stringResource(id = R.string.office_name),
-                    description = beneficiary?.officeName.toString()
+                    description = beneficiary?.officeName.toString(),
                 )
             }
         }
     }
 }
 
-
-@Preview(showSystemUi = true)
+@DevicePreviews
 @Composable
-fun PreviewBeneficiaryDetailContent(modifier: Modifier = Modifier) {
+private fun PreviewBeneficiaryDetailContent(
+    modifier: Modifier = Modifier,
+) {
     MifosMobileTheme {
         BeneficiaryDetailContent(
-            beneficiary = Beneficiary()
+            beneficiary = Beneficiary(),
+            modifier = modifier,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailScreen.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailScreen.kt
similarity index 74%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailScreen.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailScreen.kt
index 14acd3472..782bdf52c 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailScreen.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailScreen.kt
@@ -1,12 +1,18 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_detail
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryDetail
 
 import android.widget.Toast
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -26,22 +32,24 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import org.mifos.mobile.core.designsystem.icons.MifosIcons
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.core.ui.component.MifosAlertDialog
 import org.mifos.mobile.core.ui.component.MifosProgressIndicatorOverlay
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.beneficiary.R
 
 @Composable
-fun BeneficiaryDetailScreen(
-    viewModel: BeneficiaryDetailViewModel = hiltViewModel(),
+internal fun BeneficiaryDetailScreen(
     navigateBack: () -> Unit,
     updateBeneficiary: (beneficiary: Beneficiary?) -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: BeneficiaryDetailViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.beneficiaryDetailsUiStates.collectAsStateWithLifecycle()
     val beneficiary by viewModel.beneficiary.collectAsStateWithLifecycle()
@@ -50,22 +58,22 @@ fun BeneficiaryDetailScreen(
         beneficiary = beneficiary,
         uiState = uiState,
         navigateBack = navigateBack,
+        modifier = modifier,
         updateBeneficiary = {
-            updateBeneficiary(viewModel.getBeneficiary())
+            updateBeneficiary(beneficiary)
         },
-        deleteBeneficiary = {
-            viewModel.deleteBeneficiary(it)
-        }
+        deleteBeneficiary = viewModel::deleteBeneficiary,
     )
 }
 
 @Composable
-fun BeneficiaryDetailScreen(
+private fun BeneficiaryDetailScreen(
     beneficiary: Beneficiary?,
     uiState: BeneficiaryDetailsUiState,
     navigateBack: () -> Unit,
     updateBeneficiary: () -> Unit,
     deleteBeneficiary: (id: Long?) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     var openDropdown by rememberSaveable { mutableStateOf(false) }
     var showAlert by rememberSaveable { mutableStateOf(false) }
@@ -88,7 +96,7 @@ fun BeneficiaryDetailScreen(
             },
             confirmationText = context.getString(R.string.delete),
             dialogTitle = context.getString(R.string.delete_beneficiary),
-            dialogText = context.getString(R.string.delete_beneficiary_confirmation) + "?"
+            dialogText = context.getString(R.string.delete_beneficiary_confirmation) + "?",
         )
     }
 
@@ -103,15 +111,16 @@ fun BeneficiaryDetailScreen(
                 },
                 showAlert = {
                     showAlert = true
-                }
+                },
             )
-        }
+        },
+        modifier = modifier,
     ) {
         Box(
-            modifier = Modifier.padding(it)
+            modifier = Modifier.padding(it),
         ) {
             BeneficiaryDetailContent(
-                beneficiary = beneficiary
+                beneficiary = beneficiary,
             )
 
             when (uiState) {
@@ -125,7 +134,7 @@ fun BeneficiaryDetailScreen(
                     Toast.makeText(
                         context,
                         stringResource(id = R.string.beneficiary_deleted_successfully),
-                        Toast.LENGTH_SHORT
+                        Toast.LENGTH_SHORT,
                     ).show()
                     navigateBack.invoke()
                 }
@@ -140,7 +149,6 @@ fun BeneficiaryDetailScreen(
                         showBeneficiaryNullError = false
                     }
                 }
-
             }
         }
     }
@@ -152,7 +160,8 @@ private fun BeneficiaryDetailTopAppBar(
     navigateBack: () -> Unit,
     updateBeneficiaryClicked: () -> Unit,
     updateDropdownValue: (value: Boolean) -> Boolean,
-    showAlert: () -> Unit
+    showAlert: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     var openDropdown by rememberSaveable {
         mutableStateOf(false)
@@ -160,10 +169,11 @@ private fun BeneficiaryDetailTopAppBar(
 
     TopAppBar(
         title = { Text(text = stringResource(id = R.string.beneficiary_detail)) },
+        modifier = modifier,
         navigationIcon = {
             IconButton(onClick = { navigateBack.invoke() }) {
                 Icon(
-                    imageVector = Icons.Filled.ArrowBack,
+                    imageVector = MifosIcons.ArrowBack,
                     contentDescription = "Back Arrow",
                     tint = if (isSystemInDarkTheme()) Color.White else Color.Black,
                 )
@@ -171,61 +181,56 @@ private fun BeneficiaryDetailTopAppBar(
         },
         actions = {
             IconButton(
-                onClick = { openDropdown = updateDropdownValue.invoke(!openDropdown) }
+                onClick = { openDropdown = updateDropdownValue.invoke(!openDropdown) },
             ) {
                 Icon(
-                    imageVector = Icons.Default.MoreVert,
+                    imageVector = MifosIcons.MoreVert,
                     contentDescription = "More",
-                    tint = if (isSystemInDarkTheme()) Color.White else Color.Black,
                 )
             }
 
-            if (openDropdown) {
-                DropdownMenu(
-                    expanded = openDropdown,
-                    onDismissRequest = {
+            DropdownMenu(
+                expanded = openDropdown,
+                onDismissRequest = {
+                    openDropdown = updateDropdownValue.invoke(!openDropdown)
+                },
+            ) {
+                DropdownMenuItem(
+                    text = { Text(text = stringResource(id = R.string.update_beneficiary)) },
+                    onClick = {
                         openDropdown = updateDropdownValue.invoke(!openDropdown)
-                    }
-                ) {
-                    DropdownMenuItem(
-                        text = { Text(text = stringResource(id = R.string.update_beneficiary)) },
-                        onClick = {
-                            openDropdown = updateDropdownValue.invoke(!openDropdown)
-                            updateBeneficiaryClicked.invoke()
-                        }
-                    )
-                    DropdownMenuItem(
-                        text = { Text(text = stringResource(id = R.string.delete_beneficiary)) },
-                        onClick = {
-                            openDropdown = updateDropdownValue.invoke(!openDropdown)
-                            showAlert.invoke()
-                        }
-                    )
-                }
+                        updateBeneficiaryClicked.invoke()
+                    },
+                )
+                DropdownMenuItem(
+                    text = { Text(text = stringResource(id = R.string.delete_beneficiary)) },
+                    onClick = {
+                        openDropdown = updateDropdownValue.invoke(!openDropdown)
+                        showAlert.invoke()
+                    },
+                )
             }
         },
-        colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = if (isSystemInDarkTheme()) Color(0xFF1B1B1F)
-            else Color(0xFFFEFBFF)
-        )
+        colors = TopAppBarDefaults.topAppBarColors(),
     )
 }
 
-class BeneficiaryDetailScreenUiStatesParameterProvider :
+internal class BeneficiaryDetailScreenUiStatesParameterProvider :
     PreviewParameterProvider<BeneficiaryDetailsUiState> {
     override val values: Sequence<BeneficiaryDetailsUiState>
         get() = sequenceOf(
             BeneficiaryDetailsUiState.Initial,
             BeneficiaryDetailsUiState.Loading,
             BeneficiaryDetailsUiState.DeletedSuccessfully,
-            BeneficiaryDetailsUiState.ShowError(R.string.error_creating_beneficiary)
+            BeneficiaryDetailsUiState.ShowError(R.string.error_creating_beneficiary),
         )
 }
 
 @Composable
-@Preview(showSystemUi = true)
-fun PreviewBeneficiaryDetailScreen(
-    @PreviewParameter(BeneficiaryDetailScreenUiStatesParameterProvider::class) beneficiaryDetailsUiState : BeneficiaryDetailsUiState
+@DevicePreviews
+private fun PreviewBeneficiaryDetailScreen(
+    @PreviewParameter(BeneficiaryDetailScreenUiStatesParameterProvider::class)
+    beneficiaryDetailsUiState: BeneficiaryDetailsUiState,
 ) {
     val beneficiary = Beneficiary(
         id = 1234,
@@ -234,7 +239,7 @@ fun PreviewBeneficiaryDetailScreen(
         clientName = "Tom carl",
         accountType = null,
         transferLimit = 2003030.00,
-        accountNumber = "2345678"
+        accountNumber = "2345678",
     )
     MifosMobileTheme {
         BeneficiaryDetailScreen(
@@ -246,6 +251,3 @@ fun PreviewBeneficiaryDetailScreen(
         )
     }
 }
-
-
-
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailViewModel.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailViewModel.kt
similarity index 73%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailViewModel.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailViewModel.kt
index 1e77e7ba4..a146e72e1 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_detail/BeneficiaryDetailViewModel.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryDetail/BeneficiaryDetailViewModel.kt
@@ -1,4 +1,13 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_detail
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryDetail
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
@@ -15,20 +24,23 @@ import kotlinx.coroutines.launch
 import org.mifos.mobile.core.data.repository.BeneficiaryRepository
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.feature.beneficiary.R
+import org.mifos.mobile.feature.beneficiary.beneficiaryDetail.BeneficiaryDetailsUiState.Initial
 import org.mifos.mobile.feature.beneficiary.navigation.BENEFICIARY_ID
 import javax.inject.Inject
 
 @HiltViewModel
-class BeneficiaryDetailViewModel @Inject constructor(
+internal class BeneficiaryDetailViewModel @Inject constructor(
     private val beneficiaryRepositoryImp: BeneficiaryRepository,
-    savedStateHandle: SavedStateHandle
+    savedStateHandle: SavedStateHandle,
 ) : ViewModel() {
 
-    private val _beneficiaryDetailsUiStates =
-        MutableStateFlow<BeneficiaryDetailsUiState>(BeneficiaryDetailsUiState.Initial)
+    private val _beneficiaryDetailsUiStates = MutableStateFlow<BeneficiaryDetailsUiState>(Initial)
     val beneficiaryDetailsUiStates: StateFlow<BeneficiaryDetailsUiState> get() = _beneficiaryDetailsUiStates
 
-    private val beneficiaryId = savedStateHandle.getStateFlow<Int?>(key = BENEFICIARY_ID, initialValue = null)
+    private val beneficiaryId = savedStateHandle.getStateFlow<Int?>(
+        key = BENEFICIARY_ID,
+        initialValue = null,
+    )
 
     val beneficiary: StateFlow<Beneficiary?> = beneficiaryId
         .flatMapLatest {
@@ -40,13 +52,9 @@ class BeneficiaryDetailViewModel @Inject constructor(
         }.stateIn(
             scope = viewModelScope,
             started = SharingStarted.WhileSubscribed(5_000),
-            initialValue = null
+            initialValue = null,
         )
 
-    fun getBeneficiary(): Beneficiary? {
-        return beneficiary.value
-    }
-
     fun deleteBeneficiary(beneficiaryId: Long?) {
         viewModelScope.launch {
             _beneficiaryDetailsUiStates.value = BeneficiaryDetailsUiState.Loading
@@ -60,12 +68,9 @@ class BeneficiaryDetailViewModel @Inject constructor(
     }
 }
 
-
-
-sealed class BeneficiaryDetailsUiState {
+internal sealed class BeneficiaryDetailsUiState {
     data object Initial : BeneficiaryDetailsUiState()
     data object Loading : BeneficiaryDetailsUiState()
     data object DeletedSuccessfully : BeneficiaryDetailsUiState()
     data class ShowError(val message: Int) : BeneficiaryDetailsUiState()
 }
-
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListContent.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListContent.kt
similarity index 70%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListContent.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListContent.kt
index c868b0702..7970fe853 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListContent.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListContent.kt
@@ -1,4 +1,13 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_list
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryList
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -9,7 +18,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
@@ -19,25 +28,26 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 
 @Composable
 fun ShowBeneficiary(
     beneficiaryList: List<Beneficiary>,
-    onClick: (beneficiaryId: Int) -> Unit
+    onClick: (beneficiaryId: Int) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Box(
-        modifier = Modifier
-            .fillMaxSize()
+        modifier = modifier
+            .fillMaxSize(),
     ) {
         LazyColumn {
-            itemsIndexed(beneficiaryList) { index, beneficiary ->
+            items(beneficiaryList) { beneficiary ->
                 BeneficiaryItem(
                     beneficiary = beneficiary,
-                    onClick = { onClick(beneficiary.id ?: -1) }
+                    onClick = { onClick(beneficiary.id ?: -1) },
                 )
             }
         }
@@ -47,63 +57,62 @@ fun ShowBeneficiary(
 @Composable
 fun BeneficiaryItem(
     beneficiary: Beneficiary,
-    onClick: () -> Unit
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Card(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = modifier.fillMaxWidth(),
         shape = RoundedCornerShape(0.dp),
         onClick = onClick,
         colors = CardDefaults.cardColors(
-            containerColor = Color.Transparent
-        )
+            containerColor = Color.Transparent,
+        ),
     ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(horizontal = 8.dp, vertical = 16.dp)
+                .padding(horizontal = 8.dp, vertical = 16.dp),
         ) {
             Text(
                 text = "${beneficiary.name}",
-                style = MaterialTheme.typography.bodyMedium
+                style = MaterialTheme.typography.bodyMedium,
             )
 
             Row(
                 modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween
+                horizontalArrangement = Arrangement.SpaceBetween,
             ) {
                 Text(
                     text = "${beneficiary.id}",
                     style = MaterialTheme.typography.labelMedium,
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = .7f)
+                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = .7f),
                 )
 
                 Text(
                     text = "${beneficiary.officeName}",
                     style = MaterialTheme.typography.labelMedium,
-                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = .7f)
+                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = .7f),
                 )
             }
-
         }
         HorizontalDivider(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(0.2.dp),
-            color = MaterialTheme.colorScheme.onBackground.copy(alpha = .3f)
+            color = MaterialTheme.colorScheme.onBackground.copy(alpha = .3f),
         )
-
     }
 }
 
 @Composable
-@Preview(showSystemUi = true)
+@DevicePreviews
 fun PreviewBeneficiaryListEmpty(modifier: Modifier = Modifier) {
     val beneficiary = Beneficiary(name = "Victor", id = 242344343, officeName = "Main office")
     MifosMobileTheme {
         BeneficiaryItem(
             beneficiary = beneficiary,
-            onClick = {}
+            onClick = {},
+            modifier = modifier,
         )
     }
 }
-
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListScreen.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListScreen.kt
similarity index 81%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListScreen.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListScreen.kt
index 2fde51c3d..9c343f634 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListScreen.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListScreen.kt
@@ -1,4 +1,13 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_list
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryList
 
 import android.widget.Toast
 import androidx.compose.foundation.layout.Box
@@ -18,7 +27,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -31,44 +39,43 @@ import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.core.ui.component.EmptyDataView
 import org.mifos.mobile.core.ui.component.MifosErrorComponent
 import org.mifos.mobile.core.ui.component.MifosProgressIndicatorOverlay
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.beneficiary.R
 
 @Composable
-fun BeneficiaryListScreen(
-    viewModel: BeneficiaryListViewModel = hiltViewModel(),
+internal fun BeneficiaryListScreen(
     navigateBack: () -> Unit,
     addBeneficiaryClicked: () -> Unit,
     onBeneficiaryItemClick: (position: Int) -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: BeneficiaryListViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.beneficiaryListUiState.collectAsStateWithLifecycle()
     val isRefreshing by viewModel.isRefreshing.collectAsStateWithLifecycle()
 
-    LaunchedEffect(key1 = Unit) {
-        viewModel.loadBeneficiaries()
-    }
-
     BeneficiaryListScreen(
         uiState = uiState,
         navigateBack = navigateBack,
         addBeneficiaryClicked = addBeneficiaryClicked,
         onBeneficiaryItemClick = onBeneficiaryItemClick,
-        retryLoadingBeneficiary = { viewModel.loadBeneficiaries() },
+        retryLoadingBeneficiary = viewModel::loadBeneficiaries,
         isRefreshing = isRefreshing,
-        refresh = { viewModel.refresh() }
+        refresh = viewModel::refresh,
+        modifier = modifier,
     )
 }
 
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun BeneficiaryListScreen(
+private fun BeneficiaryListScreen(
     uiState: BeneficiaryListUiState,
+    isRefreshing: Boolean,
     navigateBack: () -> Unit,
     addBeneficiaryClicked: () -> Unit,
     onBeneficiaryItemClick: (position: Int) -> Unit,
     retryLoadingBeneficiary: () -> Unit,
-    isRefreshing: Boolean,
     refresh: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val pullRefreshState = rememberPullToRefreshState()
     val context = LocalContext.current
@@ -76,6 +83,7 @@ fun BeneficiaryListScreen(
     MifosScaffold(
         topBarTitleResId = R.string.beneficiaries,
         navigateBack = navigateBack,
+        modifier = modifier,
         floatingActionButtonContent = FloatingActionButtonContent(
             onClick = addBeneficiaryClicked,
             contentColor = MaterialTheme.colorScheme.onBackground,
@@ -83,16 +91,16 @@ fun BeneficiaryListScreen(
                 Icon(
                     painter = painterResource(id = R.drawable.ic_add_white_24dp),
                     contentDescription = null,
-                    tint = MaterialTheme.colorScheme.surfaceBright
+                    tint = MaterialTheme.colorScheme.surfaceBright,
                 )
-            }
-        )
+            },
+        ),
     ) {
         Box(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(it)
-                .nestedScroll(pullRefreshState.nestedScrollConnection)
+                .nestedScroll(pullRefreshState.nestedScrollConnection),
         ) {
             when (uiState) {
                 BeneficiaryListUiState.Loading -> {
@@ -104,21 +112,21 @@ fun BeneficiaryListScreen(
                         isNetworkConnected = Network.isConnected(context),
                         isRetryEnabled = true,
                         onRetry = retryLoadingBeneficiary,
-                        message = stringResource(R.string.error_fetching_beneficiaries)
+                        message = stringResource(R.string.error_fetching_beneficiaries),
                     )
                 }
 
                 is BeneficiaryListUiState.Success -> {
-                    if(uiState.beneficiaries.isEmpty()) {
+                    if (uiState.beneficiaries.isEmpty()) {
                         EmptyDataView(
                             modifier = Modifier.fillMaxSize(),
                             icon = R.drawable.ic_error_black_24dp,
-                            error = R.string.no_beneficiary_found_please_add
+                            error = R.string.no_beneficiary_found_please_add,
                         )
                     } else {
                         ShowBeneficiary(
                             beneficiaryList = uiState.beneficiaries,
-                            onClick = onBeneficiaryItemClick
+                            onClick = onBeneficiaryItemClick,
                         )
                     }
                 }
@@ -126,13 +134,12 @@ fun BeneficiaryListScreen(
 
             PullToRefreshContainer(
                 state = pullRefreshState,
-                modifier = Modifier.align(Alignment.TopCenter)
+                modifier = Modifier.align(Alignment.TopCenter),
             )
         }
 
         LaunchedEffect(key1 = isRefreshing) {
-            if (isRefreshing)
-                pullRefreshState.startRefresh()
+            if (isRefreshing) pullRefreshState.startRefresh()
         }
 
         LaunchedEffect(key1 = pullRefreshState.isRefreshing) {
@@ -152,8 +159,9 @@ fun BeneficiaryListScreen(
     }
 }
 
-class BeneficiaryListScreenPreviewProvider : PreviewParameterProvider<BeneficiaryListUiState> {
-    val beneficiaryList = listOf(
+internal class BeneficiaryListScreenPreviewProvider :
+    PreviewParameterProvider<BeneficiaryListUiState> {
+    private val beneficiaryList = listOf(
         Beneficiary(
             id = 982098302,
             name = "John Doe",
@@ -161,7 +169,7 @@ class BeneficiaryListScreenPreviewProvider : PreviewParameterProvider<Beneficiar
             clientName = "Jane Smith",
             accountType = null,
             accountNumber = "1234567890",
-            transferLimit = 1000.00
+            transferLimit = 1000.00,
         ),
         Beneficiary(
             id = 982098302,
@@ -170,7 +178,7 @@ class BeneficiaryListScreenPreviewProvider : PreviewParameterProvider<Beneficiar
             clientName = "Bob Smith",
             accountType = null,
             accountNumber = "0987654321",
-            transferLimit = 500.00
+            transferLimit = 500.00,
         ),
     )
     override val values: Sequence<BeneficiaryListUiState>
@@ -181,20 +189,21 @@ class BeneficiaryListScreenPreviewProvider : PreviewParameterProvider<Beneficiar
         )
 }
 
-@Preview(showSystemUi = true, showBackground = true)
+@DevicePreviews
 @Composable
 private fun PreviewBeneficiaryListScreen(
-    @PreviewParameter(BeneficiaryListScreenPreviewProvider::class) beneficiaryUiState: BeneficiaryListUiState
+    @PreviewParameter(BeneficiaryListScreenPreviewProvider::class)
+    beneficiaryUiState: BeneficiaryListUiState,
 ) {
     MifosMobileTheme {
         BeneficiaryListScreen(
             uiState = beneficiaryUiState,
             navigateBack = {},
             addBeneficiaryClicked = {},
-            onBeneficiaryItemClick = {  },
+            onBeneficiaryItemClick = { },
             isRefreshing = false,
             retryLoadingBeneficiary = {},
-            refresh = {}
+            refresh = {},
         )
     }
 }
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListViewModel.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListViewModel.kt
similarity index 64%
rename from feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListViewModel.kt
rename to feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListViewModel.kt
index 5af26a43b..5ab340df5 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiary_list/BeneficiaryListViewModel.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/beneficiaryList/BeneficiaryListViewModel.kt
@@ -1,4 +1,13 @@
-package org.mifos.mobile.feature.beneficiary.beneficiary_list
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.beneficiaryList
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -10,20 +19,24 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.launch
 import org.mifos.mobile.core.data.repository.BeneficiaryRepository
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
+import org.mifos.mobile.feature.beneficiary.beneficiaryList.BeneficiaryListUiState.Loading
 import javax.inject.Inject
 
 @HiltViewModel
-class BeneficiaryListViewModel @Inject constructor(private val beneficiaryRepositoryImp: BeneficiaryRepository) :
-    ViewModel() {
+internal class BeneficiaryListViewModel @Inject constructor(
+    private val beneficiaryRepositoryImp: BeneficiaryRepository,
+) : ViewModel() {
 
-    private val _beneficiaryListUiState = MutableStateFlow<BeneficiaryListUiState>(
-        BeneficiaryListUiState.Loading
-    )
+    private val _beneficiaryListUiState = MutableStateFlow<BeneficiaryListUiState>(Loading)
     val beneficiaryListUiState: StateFlow<BeneficiaryListUiState> get() = _beneficiaryListUiState
 
     private val _isRefreshing = MutableStateFlow(false)
     val isRefreshing: StateFlow<Boolean> get() = _isRefreshing.asStateFlow()
 
+    init {
+        loadBeneficiaries()
+    }
+
     fun refresh() {
         viewModelScope.launch {
             _isRefreshing.emit(true)
@@ -33,10 +46,10 @@ class BeneficiaryListViewModel @Inject constructor(private val beneficiaryReposi
 
     fun loadBeneficiaries() {
         viewModelScope.launch {
-            _beneficiaryListUiState.value = BeneficiaryListUiState.Loading
+            _beneficiaryListUiState.value = Loading
             beneficiaryRepositoryImp.beneficiaryList().catch {
                 _beneficiaryListUiState.value = BeneficiaryListUiState.Error(it.message)
-            }.collect { beneficiaryList->
+            }.collect { beneficiaryList ->
                 _beneficiaryListUiState.value = BeneficiaryListUiState.Success(beneficiaryList)
                 _isRefreshing.emit(false)
             }
@@ -44,10 +57,8 @@ class BeneficiaryListViewModel @Inject constructor(private val beneficiaryReposi
     }
 }
 
-
-sealed class BeneficiaryListUiState{
+internal sealed class BeneficiaryListUiState {
     data object Loading : BeneficiaryListUiState()
     data class Error(val message: String?) : BeneficiaryListUiState()
     data class Success(val beneficiaries: List<Beneficiary>) : BeneficiaryListUiState()
 }
-
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/navigation/BeneficiaryNavGraph.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/navigation/BeneficiaryNavGraph.kt
index a8bda44ae..811ad0d18 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/navigation/BeneficiaryNavGraph.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/navigation/BeneficiaryNavGraph.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.beneficiary.navigation
 
 import androidx.navigation.NavController
@@ -10,9 +19,9 @@ import androidx.navigation.navArgument
 import org.mifos.mobile.core.common.Constants
 import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.core.model.enums.BeneficiaryState
-import org.mifos.mobile.feature.beneficiary.beneficiary_application.BeneficiaryApplicationScreen
-import org.mifos.mobile.feature.beneficiary.beneficiary_detail.BeneficiaryDetailScreen
-import org.mifos.mobile.feature.beneficiary.beneficiary_list.BeneficiaryListScreen
+import org.mifos.mobile.feature.beneficiary.beneficiaryApplication.BeneficiaryApplicationScreen
+import org.mifos.mobile.feature.beneficiary.beneficiaryDetail.BeneficiaryDetailScreen
+import org.mifos.mobile.feature.beneficiary.beneficiaryList.BeneficiaryListScreen
 import org.mifos.mobile.feature.beneficiary.presentation.BeneficiaryScreen
 
 fun NavController.navigateToBeneficiaryListScreen() {
@@ -23,23 +32,26 @@ fun NavController.navigateToAddBeneficiaryScreen() {
     navigate(BeneficiaryNavigation.AddBeneficiary.route)
 }
 
-fun NavController.navigateToBeneficiaryApplicationScreen(beneficiary: Beneficiary?, beneficiaryState: BeneficiaryState) {
+fun NavController.navigateToBeneficiaryApplicationScreen(
+    beneficiary: Beneficiary?,
+    beneficiaryState: BeneficiaryState,
+) {
     navigate(
         BeneficiaryNavigation.BeneficiaryApplication.passArguments(
             beneficiaryId = beneficiary?.id ?: -1,
-            beneficiaryState = beneficiaryState
-        )
+            beneficiaryState = beneficiaryState,
+        ),
     )
 }
 
 fun NavGraphBuilder.beneficiaryNavGraph(
     navController: NavHostController,
     openQrReaderScreen: () -> Unit,
-    openQrImportScreen: () -> Unit
+    openQrImportScreen: () -> Unit,
 ) {
     navigation(
         startDestination = BeneficiaryNavigation.BeneficiaryList.route,
-        route = BeneficiaryNavigation.BeneficiaryBaseRoute.route
+        route = BeneficiaryNavigation.BeneficiaryBaseRoute.route,
     ) {
         beneficiaryListRoute(
             navigateBack = navController::popBackStack,
@@ -47,28 +59,38 @@ fun NavGraphBuilder.beneficiaryNavGraph(
                 navController.navigate(BeneficiaryNavigation.AddBeneficiary.route)
             },
             showBeneficiaryDetail = { beneficiaryId ->
-                navController.navigate(BeneficiaryNavigation.BeneficiaryDetail.passArguments(beneficiaryId = beneficiaryId))
-            }
+                navController.navigate(
+                    BeneficiaryNavigation.BeneficiaryDetail.passArguments(
+                        beneficiaryId = beneficiaryId,
+                    ),
+                )
+            },
         )
 
         addBeneficiaryRoute(
             navigateBack = navController::popBackStack,
             addBeneficiaryManually = {
                 navController.navigate(
-                    BeneficiaryNavigation.BeneficiaryApplication.passArguments(-1, BeneficiaryState.CREATE_MANUAL)
+                    BeneficiaryNavigation.BeneficiaryApplication.passArguments(
+                        -1,
+                        BeneficiaryState.CREATE_MANUAL,
+                    ),
                 )
             },
             openQrScanner = openQrReaderScreen,
-            uploadQrCode = openQrImportScreen
+            uploadQrCode = openQrImportScreen,
         )
 
         beneficiaryDetailRoute(
             navigateBack = navController::popBackStack,
             updateBeneficiary = { beneficiary ->
                 navController.navigate(
-                   BeneficiaryNavigation.BeneficiaryApplication.passArguments(beneficiary?.id ?: -1, BeneficiaryState.UPDATE)
+                    BeneficiaryNavigation.BeneficiaryApplication.passArguments(
+                        beneficiary?.id ?: -1,
+                        BeneficiaryState.UPDATE,
+                    ),
                 )
-            }
+            },
         )
 
         beneficiaryApplicationRoute(
@@ -80,13 +102,13 @@ fun NavGraphBuilder.beneficiaryNavGraph(
 fun NavGraphBuilder.beneficiaryListRoute(
     navigateBack: () -> Unit,
     addBeneficiary: () -> Unit,
-    showBeneficiaryDetail: (Int) -> Unit
+    showBeneficiaryDetail: (Int) -> Unit,
 ) {
     composable(route = BeneficiaryNavigation.BeneficiaryList.route) {
         BeneficiaryListScreen(
             navigateBack = navigateBack,
             addBeneficiaryClicked = addBeneficiary,
-            onBeneficiaryItemClick = showBeneficiaryDetail
+            onBeneficiaryItemClick = showBeneficiaryDetail,
         )
     }
 }
@@ -95,14 +117,14 @@ fun NavGraphBuilder.addBeneficiaryRoute(
     navigateBack: () -> Unit,
     addBeneficiaryManually: () -> Unit,
     openQrScanner: () -> Unit,
-    uploadQrCode: () -> Unit
+    uploadQrCode: () -> Unit,
 ) {
     composable(route = BeneficiaryNavigation.AddBeneficiary.route) {
         BeneficiaryScreen(
-            topAppbarNavigateback = navigateBack,
-            addiconClicked = addBeneficiaryManually,
-            scaniconClicked = openQrScanner,
-            uploadIconClicked = uploadQrCode
+            topAppbarNavigateBack = navigateBack,
+            addIconClicked = addBeneficiaryManually,
+            scanIconClicked = openQrScanner,
+            uploadIconClicked = uploadQrCode,
         )
     }
 }
@@ -114,8 +136,8 @@ fun NavGraphBuilder.beneficiaryDetailRoute(
     composable(
         route = BeneficiaryNavigation.BeneficiaryDetail.route,
         arguments = listOf(
-            navArgument(name = BENEFICIARY_ID) { type = NavType.IntType }
-        )
+            navArgument(name = BENEFICIARY_ID) { type = NavType.IntType },
+        ),
     ) {
         BeneficiaryDetailScreen(
             navigateBack = navigateBack,
@@ -131,11 +153,13 @@ fun NavGraphBuilder.beneficiaryApplicationRoute(
         route = BeneficiaryNavigation.BeneficiaryApplication.route,
         arguments = listOf(
             navArgument(name = BENEFICIARY_ID) { type = NavType.IntType },
-            navArgument(name = Constants.BENEFICIARY_STATE) { type = NavType.EnumType(BeneficiaryState::class.java) }
-        )
+            navArgument(name = Constants.BENEFICIARY_STATE) {
+                type = NavType.EnumType(BeneficiaryState::class.java)
+            },
+        ),
     ) {
         BeneficiaryApplicationScreen(
             navigateBack = navigateBack,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/navigation/BeneficiaryNavigationScreen.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/navigation/BeneficiaryNavigationScreen.kt
index 2131d7500..df22dcc2e 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/navigation/BeneficiaryNavigationScreen.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/navigation/BeneficiaryNavigationScreen.kt
@@ -1,10 +1,17 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.beneficiary.navigation
 
 import org.mifos.mobile.core.common.Constants.BENEFICIARY_STATE
-import org.mifos.mobile.core.model.entity.beneficiary.Beneficiary
 import org.mifos.mobile.core.model.enums.BeneficiaryState
 
-
 const val BENEFICIARY_NAVIGATION_ROUTE = "beneficiary_route"
 const val BENEFICIARY_LIST_ROUTE = "beneficiary_list_screen"
 const val BENEFICIARY_DETAIL_SCREEN_ROUTE = "beneficiary_detail_screen"
@@ -19,11 +26,14 @@ sealed class BeneficiaryNavigation(val route: String) {
 
     data object AddBeneficiary : BeneficiaryNavigation(route = ADD_BENEFICIARY_SCREEN_ROUTE)
 
-    data object BeneficiaryDetail : BeneficiaryNavigation(route = "$BENEFICIARY_DETAIL_SCREEN_ROUTE/{$BENEFICIARY_ID}") {
-        fun passArguments(beneficiaryId: Int) = "$BENEFICIARY_DETAIL_SCREEN_ROUTE/${beneficiaryId}"
+    data object BeneficiaryDetail :
+        BeneficiaryNavigation(route = "$BENEFICIARY_DETAIL_SCREEN_ROUTE/{$BENEFICIARY_ID}") {
+        fun passArguments(beneficiaryId: Int) = "$BENEFICIARY_DETAIL_SCREEN_ROUTE/$beneficiaryId"
     }
 
-    data object BeneficiaryApplication : BeneficiaryNavigation(route = "$BENEFICIARY_APPLICATION_SCREEN_ROUTE/{$BENEFICIARY_ID}/{$BENEFICIARY_STATE}") {
-        fun passArguments(beneficiaryId: Int, beneficiaryState: BeneficiaryState) = "$BENEFICIARY_APPLICATION_SCREEN_ROUTE/${beneficiaryId}/${beneficiaryState}"
+    data object BeneficiaryApplication :
+        BeneficiaryNavigation(route = "$BENEFICIARY_APPLICATION_SCREEN_ROUTE/{$BENEFICIARY_ID}/{$BENEFICIARY_STATE}") {
+        fun passArguments(beneficiaryId: Int, beneficiaryState: BeneficiaryState) =
+            "$BENEFICIARY_APPLICATION_SCREEN_ROUTE/$beneficiaryId/$beneficiaryState"
     }
-}
\ No newline at end of file
+}
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/BeneficiaryScreen.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/BeneficiaryScreen.kt
index 42dfcf005..42600d2b2 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/BeneficiaryScreen.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/BeneficiaryScreen.kt
@@ -1,8 +1,14 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.beneficiary.presentation
 
-import android.content.res.Configuration
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
@@ -11,71 +17,64 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.mifos.mobile.core.designsystem.components.MifosTopBar
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.beneficiary.R
 
-
 @Composable
-fun BeneficiaryScreen(
-    topAppbarNavigateback: () -> Unit,
-    addiconClicked: () -> Unit,
-    scaniconClicked: () -> Unit,
+internal fun BeneficiaryScreen(
+    topAppbarNavigateBack: () -> Unit,
+    addIconClicked: () -> Unit,
+    scanIconClicked: () -> Unit,
     uploadIconClicked: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Scaffold(
         topBar = {
             MifosTopBar(
-                navigateBack = topAppbarNavigateback,
+                navigateBack = topAppbarNavigateBack,
                 title = {
                     Text(text = stringResource(id = R.string.add_beneficiary))
-                }
+                },
             )
-        }
+        },
+        modifier = modifier,
     ) {
         Column(
             modifier = Modifier
                 .padding(it)
-                .padding(10.dp)
+                .padding(10.dp),
         ) {
             Text(
                 stringResource(id = R.string.select_mode),
                 fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
 
             Text(
                 modifier = Modifier.padding(top = 16.dp),
                 text = stringResource(R.string.add_beneficiary_option),
                 fontSize = 18.sp,
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
             )
 
             BeneficiaryScreenIcons(
+                addIconClicked = addIconClicked,
+                scanIconClicked = scanIconClicked,
+                uploadIconClicked = uploadIconClicked,
                 modifier = Modifier.padding(top = 20.dp),
-                addIconclicked = addiconClicked,
-                scanIconClicked = scaniconClicked,
-                uploadIconClicked = uploadIconClicked
             )
         }
     }
 }
 
-@RequiresApi(Build.VERSION_CODES.TIRAMISU)
-@Preview(
-    name = "Night Mode",
-    uiMode = Configuration.UI_MODE_NIGHT_YES,
-)
-@Preview(
-    name = "Day mode",
-    uiMode = Configuration.UI_MODE_NIGHT_NO,
-)
+@DevicePreviews
 @Composable
-fun BeneficiaryScreenPreview() {
+private fun BeneficiaryScreenPreview() {
     MifosMobileTheme {
         BeneficiaryScreen({}, {}, {}, {})
     }
-}
\ No newline at end of file
+}
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/BeneficiaryScreenIcons.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/BeneficiaryScreenIcons.kt
index 6f0b67524..354e4a8d6 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/BeneficiaryScreenIcons.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/BeneficiaryScreenIcons.kt
@@ -1,84 +1,81 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
 package org.mifos.mobile.feature.beneficiary.presentation
 
-import android.content.res.Configuration
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.beneficiary.R
-import org.mifos.mobile.ui.beneficiary.presentation.RenderIconAndText
 
 @Composable
-fun BeneficiaryScreenIcons(
-    modifier: Modifier = Modifier,
-    addIconclicked: () -> Unit,
+internal fun BeneficiaryScreenIcons(
+    addIconClicked: () -> Unit,
     scanIconClicked: () -> Unit,
-    uploadIconClicked: () -> Unit
+    uploadIconClicked: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
-
     Column(modifier = modifier) {
-
         Row(
             horizontalArrangement = Arrangement.SpaceAround,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
         ) {
             RenderIconAndText(
                 icon = R.drawable.ic_beneficiary_add_48px,
                 text = stringResource(id = R.string.add),
-                icondescription = stringResource(id = R.string.add),
-                iconClick = addIconclicked
+                iconDescription = stringResource(id = R.string.add),
+                iconClick = addIconClicked,
             )
 
             RenderIconAndText(
                 icon = R.drawable.ic_qrcode_scan_gray_dark,
                 text = stringResource(id = R.string.scan),
-                icondescription = stringResource(id = R.string.scan),
-                iconClick = scanIconClicked
+                iconDescription = stringResource(id = R.string.scan),
+                iconClick = scanIconClicked,
             )
-
         }
 
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier.fillMaxWidth(),
         ) {
             RenderIconAndText(
                 icon = R.drawable.ic_file_upload_black_24dp,
                 text = stringResource(id = R.string.upload_qr_code),
-                icondescription = stringResource(id = R.string.upload_qr_code),
-                iconClick = uploadIconClicked
+                iconDescription = stringResource(id = R.string.upload_qr_code),
+                iconClick = uploadIconClicked,
             )
-
         }
     }
 }
 
-@Preview(
-    name = "Night Mode",
-    uiMode = Configuration.UI_MODE_NIGHT_YES,
-)
-@Preview(
-    name = "Day mode",
-    uiMode = Configuration.UI_MODE_NIGHT_NO,
-)
+@DevicePreviews
 @Composable
-fun IconsScreenPreview() {
+private fun IconsScreenPreview() {
     MifosMobileTheme {
-
-        BeneficiaryScreenIcons(
-            modifier = Modifier.padding(top = 20.dp),
-            addIconclicked = {},
-            scanIconClicked = {},
-            uploadIconClicked = {}
-        )
-
+        Surface {
+            BeneficiaryScreenIcons(
+                addIconClicked = {},
+                scanIconClicked = {},
+                uploadIconClicked = {},
+                modifier = Modifier.padding(top = 20.dp),
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/RenderIconAndText.kt b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/RenderIconAndText.kt
index 394cef9bf..033b3bae3 100644
--- a/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/RenderIconAndText.kt
+++ b/feature/beneficiary/src/main/java/org/mifos/mobile/feature/beneficiary/presentation/RenderIconAndText.kt
@@ -1,6 +1,14 @@
-package org.mifos.mobile.ui.beneficiary.presentation
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package org.mifos.mobile.feature.beneficiary.presentation
 
-import android.content.res.Configuration
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -8,72 +16,69 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
+import org.mifos.mobile.core.ui.utils.DevicePreviews
 import org.mifos.mobile.feature.beneficiary.R
 
-
 /**
  * this is a reusable composable function that is made up of a text and icon composable
  * some of the intake parameters are
  * @param[icon]
- * @param[icondescription]
+ * @param[iconDescription]
  * @param[text]
  * @param[iconClick]
  *
  * */
 @Composable
-fun RenderIconAndText(
+internal fun RenderIconAndText(
     @DrawableRes icon: Int,
-    icondescription: String,
     text: String,
-    iconClick: () -> Unit
+    iconDescription: String,
+    iconClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
-
-    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
         Icon(
             tint = MaterialTheme.colorScheme.onSurface,
             painter = painterResource(id = icon),
-            contentDescription = icondescription,
+            contentDescription = iconDescription,
             modifier = Modifier
                 .height(85.dp)
                 .width(85.dp)
                 .clickable(
-                    onClick = iconClick
-                )
+                    onClick = iconClick,
+                ),
         )
 
         Text(
             text,
-            color = MaterialTheme.colorScheme.onSurface
+            color = MaterialTheme.colorScheme.onSurface,
         )
     }
 }
 
-
-@Preview(
-    name = "Night Mode",
-    uiMode = Configuration.UI_MODE_NIGHT_YES,
-)
-@Preview(
-    name = "Day mode",
-    uiMode = Configuration.UI_MODE_NIGHT_NO,
-)
+@DevicePreviews
 @Composable
-fun IconsAndTextPreview() {
+private fun IconsAndTextPreview() {
     MifosMobileTheme {
-        RenderIconAndText(
-            icon = R.drawable.ic_qrcode_scan_gray_dark,
-            text = stringResource(id = R.string.scan),
-            icondescription = stringResource(id = R.string.scan),
-            iconClick = {}
-        )
+        Surface {
+            RenderIconAndText(
+                icon = R.drawable.ic_qrcode_scan_gray_dark,
+                text = stringResource(id = R.string.scan),
+                iconDescription = stringResource(id = R.string.scan),
+                iconClick = {},
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/beneficiary/src/main/res/drawable/ic_add_white_24dp.xml b/feature/beneficiary/src/main/res/drawable/ic_add_white_24dp.xml
index d29480261..73c4dab96 100644
--- a/feature/beneficiary/src/main/res/drawable/ic_add_white_24dp.xml
+++ b/feature/beneficiary/src/main/res/drawable/ic_add_white_24dp.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/feature/beneficiary/src/main/res/drawable/ic_beneficiary_add_48px.xml b/feature/beneficiary/src/main/res/drawable/ic_beneficiary_add_48px.xml
index d94f64af2..11ff69bfd 100644
--- a/feature/beneficiary/src/main/res/drawable/ic_beneficiary_add_48px.xml
+++ b/feature/beneficiary/src/main/res/drawable/ic_beneficiary_add_48px.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/feature/beneficiary/src/main/res/drawable/ic_error_black_24dp.xml b/feature/beneficiary/src/main/res/drawable/ic_error_black_24dp.xml
index b666c1818..3695e745c 100644
--- a/feature/beneficiary/src/main/res/drawable/ic_error_black_24dp.xml
+++ b/feature/beneficiary/src/main/res/drawable/ic_error_black_24dp.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/feature/beneficiary/src/main/res/drawable/ic_file_upload_black_24dp.xml b/feature/beneficiary/src/main/res/drawable/ic_file_upload_black_24dp.xml
index 2df667502..7c3f6e304 100644
--- a/feature/beneficiary/src/main/res/drawable/ic_file_upload_black_24dp.xml
+++ b/feature/beneficiary/src/main/res/drawable/ic_file_upload_black_24dp.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/feature/beneficiary/src/main/res/drawable/ic_qrcode_scan_gray_dark.xml b/feature/beneficiary/src/main/res/drawable/ic_qrcode_scan_gray_dark.xml
index e5308f34f..104829c13 100644
--- a/feature/beneficiary/src/main/res/drawable/ic_qrcode_scan_gray_dark.xml
+++ b/feature/beneficiary/src/main/res/drawable/ic_qrcode_scan_gray_dark.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/feature/beneficiary/src/main/res/values/strings.xml b/feature/beneficiary/src/main/res/values/strings.xml
index 24b923385..fc68147da 100644
--- a/feature/beneficiary/src/main/res/values/strings.xml
+++ b/feature/beneficiary/src/main/res/values/strings.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
 <resources>
     <string name="error_fetching_beneficiaries">Failed to fetch Beneficiaries</string>
     <string name="error_fetching_beneficiary_template">Failed to fetch Beneficiary Template</string>
diff --git a/feature/beneficiary/src/test/java/org/mifos/mobile/feature/beneficiary/ExampleUnitTest.kt b/feature/beneficiary/src/test/java/org/mifos/mobile/feature/beneficiary/ExampleUnitTest.kt
deleted file mode 100644
index baf2b6123..000000000
--- a/feature/beneficiary/src/test/java/org/mifos/mobile/feature/beneficiary/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.mifos.mobile.feature.beneficiary
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/feature/third-party-transfer/src/main/java/org/mifos/mobile/feature/third/party/transfer/third_party_transfer/ThirdPartyTransferContent.kt b/feature/third-party-transfer/src/main/java/org/mifos/mobile/feature/third/party/transfer/third_party_transfer/ThirdPartyTransferContent.kt
index 2981b56d7..dd88357f6 100644
--- a/feature/third-party-transfer/src/main/java/org/mifos/mobile/feature/third/party/transfer/third_party_transfer/ThirdPartyTransferContent.kt
+++ b/feature/third-party-transfer/src/main/java/org/mifos/mobile/feature/third/party/transfer/third_party_transfer/ThirdPartyTransferContent.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.mifos.mobile.core.designsystem.components.MifosOutlinedTextButton
 import org.mifos.mobile.core.designsystem.components.MifosOutlinedTextField
-import org.mifos.mobile.core.designsystem.components.MifosTextButton
+import org.mifos.mobile.core.designsystem.components.MifosButton
 import org.mifos.mobile.core.designsystem.theme.DarkGray
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 import org.mifos.mobile.core.designsystem.theme.Primary
@@ -222,7 +222,7 @@ fun BeneficiaryStep(
                     fontWeight = FontWeight.Bold,
                     style = MaterialTheme.typography.labelMedium
                 )
-                MifosTextButton(
+                MifosButton(
                     onClick = { addBeneficiary() },
                     textResId = R.string.add_beneficiary
                 )
@@ -239,7 +239,7 @@ fun BeneficiaryStep(
                         beneficiaryError = false
                     }
                 )
-                MifosTextButton(
+                MifosButton(
                     onClick = {
                         if (beneficiary == null) beneficiaryError = true
                         else onContinueClick(beneficiary!!)
@@ -294,7 +294,7 @@ fun EnterAmountStep(
                 supportingText = amountError?.let { stringResource(id = it) },
                 label = R.string.enter_amount,
             )
-            MifosTextButton(
+            MifosButton(
                 onClick = {
                     if (amountError == null) {
                         onContinueClick(amount.text)
@@ -352,7 +352,7 @@ fun RemarkStep(
             )
             Spacer(modifier = Modifier.height(12.dp))
             Row {
-                MifosTextButton(
+                MifosButton(
                     onClick = {
                         remarkError?.let { showRemarkError = true }
                             ?: onContinueClicked(remark.text)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 61916c74b..1fa3f380e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -97,6 +97,7 @@ roborazzi = "1.6.0"
 simplecropviewVersion = "1.1.8"
 sweetErrorVersion = "1.0.0"
 secrets = "2.0.1"
+slackComposeLint = "1.3.1"
 
 tableviewVersion = "0.8.9.4"
 targetSdk = "34"
@@ -219,6 +220,7 @@ libphonenumber-android = { module = "io.michaelrocks:libphonenumber-android", ve
 lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "androidTools" }
 lint-checks = { group = "com.android.tools.lint", name = "lint-checks", version.ref = "androidTools" }
 lint-tests = { group = "com.android.tools.lint", name = "lint-tests", version.ref = "androidTools" }
+slack-compose-lint = {group="com.slack.lint.compose",name="compose-lint-checks",version.ref="slackComposeLint"}
 
 #Detekt
 detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
diff --git a/lint/build.gradle.kts b/lint/build.gradle.kts
index 26b8acd38..964c67a53 100644
--- a/lint/build.gradle.kts
+++ b/lint/build.gradle.kts
@@ -29,8 +29,11 @@ kotlin {
 }
 
 dependencies {
+    lintChecks(libs.slack.compose.lint)
+
     compileOnly(libs.kotlin.stdlib)
     compileOnly(libs.lint.api)
+
     testImplementation(libs.lint.checks)
     testImplementation(libs.lint.tests)
     testImplementation(kotlin("test"))