diff --git a/ci-prebuild.bat b/ci-prebuild.bat
index a005d114f..dc7e9d6bc 100644
--- a/ci-prebuild.bat
+++ b/ci-prebuild.bat
@@ -14,9 +14,6 @@ call :run_gradle_task "spotlessApply --no-configuration-cache"
 call :run_gradle_task "dependencyGuardBaseline"
 call :run_gradle_task "detekt"
 call :run_gradle_task "testDemoDebug :lint:test :mifospay:lintProdRelease :lint:lint"
-call :run_gradle_task ":lint:test :mifospay:lintProdRelease :lint:lint"
-call :run_gradle_task ":mifospay:lintProdRelease"
-call :run_gradle_task ":lint:lint"
 call :run_gradle_task "build"
 call :run_gradle_task "updateProdReleaseBadging"
 
diff --git a/ci-prebuild.sh b/ci-prebuild.sh
index e771026c4..3e02d3d01 100644
--- a/ci-prebuild.sh
+++ b/ci-prebuild.sh
@@ -28,10 +28,7 @@ tasks=(
     "spotlessApply --no-configuration-cache"
     "dependencyGuardBaseline"
     "detekt"
-    "testDemoDebug"
-    ":lint:test"
-    ":lint:lint"
-    ":mifospay:lintProdRelease"
+    "testDemoDebug :lint:test :lint:lint :mifospay:lintProdRelease"
     "build"
     "updateProdReleaseBadging"
 )
diff --git a/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt
index f70da1eec..3caf851dc 100644
--- a/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt
+++ b/core/designsystem/src/main/kotlin/org/mifospay/core/designsystem/icon/MifosIcons.kt
@@ -16,6 +16,7 @@ import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.ArrowOutward
 import androidx.compose.material.icons.filled.Camera
 import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.ChevronRight
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.ContentCopy
 import androidx.compose.material.icons.filled.Delete
@@ -52,6 +53,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
  * Mifos icons. Material icons are [ImageVector]s, custom icons are drawable resource IDs.
  */
 object MifosIcons {
+    val ChevronRight: ImageVector = Icons.Filled.ChevronRight
     val QrCode: ImageVector = Icons.Filled.QrCode
     val Close: ImageVector = Icons.Filled.Close
     val VisibilityOff: ImageVector = Icons.Filled.VisibilityOff
diff --git a/feature/accounts/src/main/kotlin/org/mifospay/feature/bank/accounts/details/BankAccountDetailScreen.kt b/feature/accounts/src/main/kotlin/org/mifospay/feature/bank/accounts/details/BankAccountDetailScreen.kt
index 56589e89e..4e99dae28 100644
--- a/feature/accounts/src/main/kotlin/org/mifospay/feature/bank/accounts/details/BankAccountDetailScreen.kt
+++ b/feature/accounts/src/main/kotlin/org/mifospay/feature/bank/accounts/details/BankAccountDetailScreen.kt
@@ -17,9 +17,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ChevronRight
-import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -31,7 +28,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.mifospay.core.model.domain.BankAccountDetails
+import org.mifospay.core.designsystem.component.MifosButton
 import org.mifospay.core.designsystem.component.MifosTopBar
+import org.mifospay.core.designsystem.icon.MifosIcons
 import org.mifospay.feature.bank.accounts.R
 
 @Composable
@@ -194,7 +193,7 @@ private fun BankAccountDetailButton(
     hasTrailingIcon: Boolean = false,
 ) {
     if (isUpiEnabled) {
-        Button(
+        MifosButton(
             onClick = { onClick.invoke() },
             colors = ButtonDefaults.buttonColors(MaterialTheme.colorScheme.primary),
             modifier = modifier
@@ -213,7 +212,7 @@ private fun BankAccountDetailButton(
                 )
                 if (hasTrailingIcon) {
                     Icon(
-                        imageVector = Icons.Filled.ChevronRight,
+                        imageVector = MifosIcons.ChevronRight,
                         contentDescription = null,
                         tint = MaterialTheme.colorScheme.onPrimary,
                     )
diff --git a/feature/accounts/src/main/kotlin/org/mifospay/feature/bank/accounts/link/LinkBankAccountScreen.kt b/feature/accounts/src/main/kotlin/org/mifospay/feature/bank/accounts/link/LinkBankAccountScreen.kt
index 1c81b3c13..ec319bc8c 100644
--- a/feature/accounts/src/main/kotlin/org/mifospay/feature/bank/accounts/link/LinkBankAccountScreen.kt
+++ b/feature/accounts/src/main/kotlin/org/mifospay/feature/bank/accounts/link/LinkBankAccountScreen.kt
@@ -28,8 +28,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -183,7 +181,7 @@ private fun BankListScreenContent(
                 .fillMaxWidth()
                 .padding(horizontal = 16.dp),
             trailingIcon = {
-                Icon(imageVector = Icons.Filled.Search, contentDescription = null)
+                Icon(imageVector = MifosIcons.Search, contentDescription = null)
             },
         )
 
diff --git a/feature/kyc/src/main/kotlin/org/mifospay/feature/kyc/KYCLevel1Screen.kt b/feature/kyc/src/main/kotlin/org/mifospay/feature/kyc/KYCLevel1Screen.kt
index 42ce469f6..501f40cec 100644
--- a/feature/kyc/src/main/kotlin/org/mifospay/feature/kyc/KYCLevel1Screen.kt
+++ b/feature/kyc/src/main/kotlin/org/mifospay/feature/kyc/KYCLevel1Screen.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextFieldDefaults
@@ -48,6 +47,7 @@ import com.maxkeppeler.sheets.calendar.models.CalendarSelection
 import com.maxkeppeler.sheets.calendar.models.CalendarStyle
 import com.mifos.library.countrycodepicker.CountryCodePicker
 import org.mifospay.core.designsystem.component.MfOverlayLoadingWheel
+import org.mifospay.core.designsystem.component.MifosButton
 import org.mifospay.core.designsystem.component.MifosOutlinedTextField
 import org.mifospay.core.designsystem.theme.MifosTheme
 import org.mifospay.kyc.R
@@ -236,7 +236,7 @@ private fun Kyc1Form(
             )
         }
 
-        Button(
+        MifosButton(
             onClick = {
                 submitData(kycDetails)
             },