diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/BankAccountsListSection.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/BankAccountsListSection.kt
index cbd6f85153..83d74f787c 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/BankAccountsListSection.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/BankAccountsListSection.kt
@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright © 2022 by Navi Technologies Limited
+ *  * Copyright © 2022-2024 by Navi Technologies Limited
  *  * All rights reserved. Strictly confidential
  *
  */
@@ -96,7 +96,7 @@ fun BankAccountsLoading(modifier: Modifier) {
         LottieAnimation(
             composition,
             iterations = LottieConstants.IterateForever,
-            modifier = Modifier.width(40.dp).height(40.dp).align(Alignment.CenterHorizontally)
+            modifier = Modifier.size(40.dp).align(Alignment.CenterHorizontally)
         )
     }
 }
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/PendingTransactionModalContent.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/PendingTransactionModalContent.kt
index 762006ef2a..5e615d6953 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/PendingTransactionModalContent.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/PendingTransactionModalContent.kt
@@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
@@ -39,7 +39,7 @@ fun PendingTransactionModalContent(onGoToTransactionClick: () -> Unit) {
     ) {
         Image(
             painter = painterResource(id = R.drawable.ic_circular_red_exclamation),
-            modifier = Modifier.height(20.dp).width(20.dp),
+            modifier = Modifier.size(20.dp),
             colorFilter = ColorFilter.tint(NaviPayColor.onSurfaceNotice),
             contentDescription = null
         )
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyMainScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyMainScreen.kt
index c4fb8c7977..32e8445a68 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyMainScreen.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyMainScreen.kt
@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright © 2022 by Navi Technologies Limited
+ *  * Copyright © 2022-2024 by Navi Technologies Limited
  *  * All rights reserved. Strictly confidential
  *
  */
@@ -583,7 +583,7 @@ private fun SelectBankShimmerView(modifier: Modifier) {
             modifier = Modifier.fillMaxWidth().padding(vertical = 14.dp, horizontal = 16.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Box(modifier = Modifier.width(32.dp).height(32.dp).shimmerEffect())
+            Box(modifier = Modifier.size(32.dp).shimmerEffect())
 
             Spacer(modifier = Modifier.width(8.dp))
 
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UPILiteSection.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UPILiteSection.kt
index 7fd73a932f..72fd73b7b3 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UPILiteSection.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UPILiteSection.kt
@@ -800,7 +800,7 @@ internal fun UpiLiteBankShimmerView(modifier: Modifier) {
                 Modifier.fillMaxWidth().height(48.dp).padding(vertical = 8.dp, horizontal = 16.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Box(modifier = Modifier.width(32.dp).height(32.dp).shimmerEffect())
+            Box(modifier = Modifier.size(32.dp).shimmerEffect())
 
             Spacer(modifier = Modifier.width(14.dp))
 
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/addnew/ui/ConfirmNewUpiNumberCreationModalContent.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/addnew/ui/ConfirmNewUpiNumberCreationModalContent.kt
index 726cfed063..c74e5b321a 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/addnew/ui/ConfirmNewUpiNumberCreationModalContent.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/addnew/ui/ConfirmNewUpiNumberCreationModalContent.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -71,7 +72,7 @@ fun ConfirmNewUpiNumberCreationModalContent(
         Image(
             painter = painterResource(id = R.drawable.ic_info_icon_black_outline),
             contentDescription = null,
-            modifier = Modifier.width(24.dp).height(24.dp)
+            modifier = Modifier.size(24.dp)
         )
         Spacer(modifier = Modifier.height(8.dp))
         NaviText(
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/LinkUpiNumberToNaviPayConfirmationModalContentV2.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/LinkUpiNumberToNaviPayConfirmationModalContentV2.kt
index ea6a276581..81c19aeb6d 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/LinkUpiNumberToNaviPayConfirmationModalContentV2.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/LinkUpiNumberToNaviPayConfirmationModalContentV2.kt
@@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -80,7 +80,7 @@ fun LinkUpiNumberToNaviPayConfirmationModalContentV2(
     ) {
         Image(
             painter = painterResource(id = R.drawable.ic_link_circular),
-            modifier = Modifier.height(20.dp).width(20.dp),
+            modifier = Modifier.size(20.dp),
             contentDescription = null
         )
         Spacer(modifier = Modifier.height(10.dp))
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberInfoModalContent.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberInfoModalContent.kt
index 85e72ec3a0..52ad0b426e 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberInfoModalContent.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberInfoModalContent.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -45,7 +46,7 @@ fun UpiNumberInfoModalContent(
     ) {
         Image(
             painter = painterResource(id = R.drawable.ic_link_circular),
-            modifier = Modifier.height(20.dp).width(20.dp),
+            modifier = Modifier.size(20.dp),
             contentDescription = null
         )
         Spacer(modifier = Modifier.height(10.dp))
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberLinkedSuccessContent.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberLinkedSuccessContent.kt
index 2602657ed8..a1a67a8b7c 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberLinkedSuccessContent.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberLinkedSuccessContent.kt
@@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -63,7 +63,7 @@ fun UpiNumberLinkedSuccessContent(
     ) {
         Image(
             painter = painterResource(id = R.drawable.ic_success_green),
-            modifier = Modifier.height(20.dp).width(20.dp),
+            modifier = Modifier.size(20.dp),
             contentDescription = null
         )
         Spacer(modifier = Modifier.height(10.dp))
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberLinkedToExternalUpiModalContentV2.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberLinkedToExternalUpiModalContentV2.kt
index f083a53e11..6f68b04a30 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberLinkedToExternalUpiModalContentV2.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberLinkedToExternalUpiModalContentV2.kt
@@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -64,7 +64,7 @@ fun UpiNumberLinkedToExternalUpiModalContentV2(
     ) {
         Image(
             painter = painterResource(id = R.drawable.ic_link_circular),
-            modifier = Modifier.height(20.dp).width(20.dp),
+            modifier = Modifier.size(20.dp),
             contentDescription = null
         )
         Spacer(modifier = Modifier.height(10.dp))
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberScreenShimmer.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberScreenShimmer.kt
index 28733a6b77..f2d5c69955 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberScreenShimmer.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/ui/UpiNumberScreenShimmer.kt
@@ -17,6 +17,7 @@ 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.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.runtime.Composable
@@ -72,7 +73,7 @@ fun UpiNumberScreenShimmer() {
                             .padding(all = 16.dp)
                             .layoutId(box2)
                 ) {
-                    Box(modifier = Modifier.width(40.dp).height(40.dp).shimmerEffect())
+                    Box(modifier = Modifier.size(40.dp).shimmerEffect())
 
                     Spacer(modifier = Modifier.width(16.dp))
 
@@ -130,7 +131,7 @@ fun UpiNumberScreenShimmer() {
                             .padding(all = 16.dp)
                             .layoutId(box2)
                 ) {
-                    Box(modifier = Modifier.width(40.dp).height(40.dp).shimmerEffect())
+                    Box(modifier = Modifier.size(40.dp).shimmerEffect())
 
                     Spacer(modifier = Modifier.width(16.dp))