diff --git a/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationBarItem.kt b/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationBarItem.kt
index ce7c166d08..bd892610f8 100644
--- a/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationBarItem.kt
+++ b/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationBarItem.kt
@@ -47,7 +47,7 @@ fun RowScope.MifosNavigationBarItem(
                 modifier = Modifier.padding(DesignToken.padding.extraSmall),
                 text = stringResource(label),
                 style = MifosTypography.labelMedium,
-                color = MaterialTheme.colorScheme.secondary,
+                color = MaterialTheme.colorScheme.onSurface,
             )
         },
         selected = isSelected,
diff --git a/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRail.kt b/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRail.kt
index 03c6ea4489..1d4674ad04 100644
--- a/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRail.kt
+++ b/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRail.kt
@@ -19,12 +19,12 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationRailDefaults
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import org.mifos.mobile.core.designsystem.theme.DesignToken
@@ -38,8 +38,8 @@ fun MifosNavigationRail(
     windowInsets: WindowInsets = NavigationRailDefaults.windowInsets,
 ) {
     Surface(
-        color = Color.White,
-        contentColor = Color.Unspecified,
+        color = MaterialTheme.colorScheme.surface,
+        contentColor = MaterialTheme.colorScheme.onSurface,
         modifier = modifier,
     ) {
         Column(
diff --git a/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRailItem.kt b/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRailItem.kt
index ba89407cc3..e8ebff3af7 100644
--- a/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRailItem.kt
+++ b/core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRailItem.kt
@@ -18,7 +18,6 @@ import androidx.compose.material3.NavigationRailItemDefaults
 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.graphics.vector.ImageVector
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
@@ -40,7 +39,6 @@ fun ColumnScope.MifosNavigationRailItem(
             Icon(
                 imageVector = if (isSelected) selectedIconRes else unselectedIconRes,
                 contentDescription = stringResource(contentDescriptionRes),
-                tint = Color.Unspecified,
             )
         },
         label = {
@@ -48,7 +46,7 @@ fun ColumnScope.MifosNavigationRailItem(
                 modifier = Modifier.padding(DesignToken.padding.extraSmall),
                 text = stringResource(label),
                 style = MifosTypography.labelMedium,
-                color = MaterialTheme.colorScheme.secondary,
+                color = MaterialTheme.colorScheme.onSurface,
             )
         },
         selected = isSelected,
@@ -57,7 +55,9 @@ fun ColumnScope.MifosNavigationRailItem(
         colors = NavigationRailItemDefaults.colors(
             selectedIconColor = MaterialTheme.colorScheme.primary,
             unselectedIconColor = MaterialTheme.colorScheme.primary,
+            indicatorColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.3f),
         ),
+
         modifier = modifier,
     )
 }
diff --git a/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferNavigation.kt b/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferNavigation.kt
index 2f82f6f7b8..2049c2833a 100644
--- a/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferNavigation.kt
+++ b/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferNavigation.kt
@@ -24,8 +24,8 @@ import org.mifos.mobile.core.ui.composableWithSlideTransitions
 data class MakeTransferRoute(
     val accountId: Long = -1L,
     val accountNo: String? = null,
-    val amount: Double? = null,
-    val outstandingBalance: Double? = null,
+    val amount: String? = null,
+    val outstandingBalance: String? = null,
     val transferType: String? = null,
     val transferTarget: String? = null,
     val transferSuccessDestination: String? = null,
@@ -36,7 +36,7 @@ fun NavController.navigateToMakeTransferScreen(transferPayload: AccountDetails,
         MakeTransferRoute(
             accountId = transferPayload.accountId,
             accountNo = transferPayload.accountNo,
-            outstandingBalance = transferPayload.outstandingBalance,
+            outstandingBalance = transferPayload.outstandingBalance.toString(),
             transferType = transferPayload.transferType,
             transferTarget = transferPayload.transferTarget.name,
             transferSuccessDestination = transferPayload.transferSuccessDestination,
diff --git a/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferViewModel.kt b/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferViewModel.kt
index 5bc3f28d6e..67bd2fca88 100644
--- a/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferViewModel.kt
+++ b/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferViewModel.kt
@@ -64,7 +64,7 @@ internal class MakeTransferViewModel(
         MakeTransferState(
             clientId = requireNotNull(userPreferencesRepositoryImpl.clientId.value),
             accountId = route.accountId,
-            outstandingBalance = route.outstandingBalance,
+            outstandingBalance = route.outstandingBalance?.toDouble(),
             transferTarget = if (route.transferTarget != null) {
                 enumValueOf<TransferType>(route.transferTarget)
             } else {
diff --git a/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessNavGraph.kt b/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessNavGraph.kt
index 490428cb87..00fcb1019c 100644
--- a/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessNavGraph.kt
+++ b/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessNavGraph.kt
@@ -28,7 +28,7 @@ data class TransferProcessRoute(
     val toClientId: Long? = null,
     val toAccountType: Int? = null,
     val toAccountId: String? = null,
-    val transferAmount: Double? = null,
+    val transferAmount: String? = null,
     val transferDescription: String? = null,
     val transferType: String = TransferType.SELF.name,
     val transferSuccessDestination: String = "",
@@ -63,7 +63,7 @@ fun NavController.navigateToTransferProcessScreen(
             toAccountId = transferPayload.payToAccount?.accountNo,
             toClientId = transferPayload.payToAccount?.clientId,
             toAccountType = transferPayload.payToAccount?.accountType?.id,
-            transferAmount = transferPayload.amount.toDoubleOrNull(),
+            transferAmount = transferPayload.amount,
             transferDescription = transferPayload.review,
             transferType = transferType.name,
             transferSuccessDestination = transferSuccessDestination,
diff --git a/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessViewModel.kt b/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessViewModel.kt
index 2ef200f0e3..e0c5f4bc8b 100644
--- a/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessViewModel.kt
+++ b/feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessViewModel.kt
@@ -80,7 +80,7 @@ internal class TransferProcessViewModel(
                 toClientId = route.toClientId,
                 toAccountType = route.toAccountType,
                 transferDate = DateHelper.getDateMonthYearString(transferDate),
-                transferAmount = route.transferAmount,
+                transferAmount = route.transferAmount?.toDouble(),
                 transferDescription = route.transferDescription,
                 dateFormat = "dd MMMM yyyy",
                 locale = "en",