diff --git a/app/src/main/java/ru/cloudpayments/demo/screens/main/MainActivity.kt b/app/src/main/java/ru/cloudpayments/demo/screens/main/MainActivity.kt
index 32c0532..89813d1 100644
--- a/app/src/main/java/ru/cloudpayments/demo/screens/main/MainActivity.kt
+++ b/app/src/main/java/ru/cloudpayments/demo/screens/main/MainActivity.kt
@@ -11,7 +11,6 @@ import ru.cloudpayments.sdk.configuration.CloudpaymentsSDK
 import ru.cloudpayments.sdk.configuration.PaymentConfiguration
 import ru.cloudpayments.sdk.configuration.PaymentData
 
-
 class MainActivity : BaseActivity() {
 
 	private val cpSdkLauncher = CloudpaymentsSDK.getInstance().launcher(this, result = {
@@ -39,66 +38,74 @@ class MainActivity : BaseActivity() {
 		val view = binding.root
 		setContentView(view)
 
-		binding.buttonRun.setOnClickListener {
+		binding.buttonRunTop.setOnClickListener {
+			runCpSdk()
+		}
 
-			val apiUrl = binding.editApiUrl.text.toString()
-			val publicId = binding.editPublicId.text.toString()
-			val amount = binding.editAmount.text.toString()
-			val currency = binding.editCurrency.text.toString()
-			val invoiceId = binding.editInvoiceId.text.toString()
-			val description = binding.editDescription.text.toString()
-			val accountId = binding.editAccountId.text.toString()
-			val email = binding.editEmail.text.toString()
-
-			val payerFirstName = binding.editPayerFirstName.text.toString()
-			val payerLastName = binding.editPayerLastName.text.toString()
-			val payerMiddleName = binding.editPayerMiddleName.text.toString()
-			val payerBirthDay = binding.editPayerBirth.text.toString()
-			val payerAddress = binding.editPayerAddress.text.toString()
-			val payerStreet = binding.editPayerStreet.text.toString()
-			val payerCity = binding.editPayerCity.text.toString()
-			val payerCountry = binding.editPayerCountry.text.toString()
-			val payerPhone = binding.editPayerPhone.text.toString()
-			val payerPostcode = binding.editPayerPostcode.text.toString()
-
-			val jsonData = binding.editJsonData.text.toString()
-			val isDualMessagePayment = binding.checkboxDualMessagePayment.isChecked
-
-			var payer = PaymentDataPayer()
-			payer.firstName = payerFirstName
-			payer.lastName = payerLastName
-			payer.middleName = payerMiddleName
-			payer.birthDay = payerBirthDay
-			payer.address = payerAddress
-			payer.street = payerStreet
-			payer.city = payerCity
-			payer.country = payerCountry
-			payer.phone = payerPhone
-			payer.postcode = payerPostcode
-
-			val paymentData = PaymentData(
-				amount = amount,
-				currency = currency,
-				invoiceId = invoiceId,
-				description = description,
-				accountId = accountId,
-				email = email,
-				payer = payer,
-				jsonData = jsonData
-			)
-
-			val configuration = PaymentConfiguration(
-				publicId = publicId,
-				paymentData = paymentData,
-				scanner = CardIOScanner(),
-				showEmailField = true,
-				useDualMessagePayment = isDualMessagePayment,
-				disableGPay = false,
-				disableYandexPay = false,
-				yandexPayMerchantID = "1423423564546767575",
-				apiUrl = apiUrl
-			)
-			cpSdkLauncher.launch(configuration)
+		binding.buttonRun.setOnClickListener {
+			runCpSdk()
 		}
 	}
+
+	private fun runCpSdk() {
+
+		val apiUrl = binding.editApiUrl.text.toString()
+		val publicId = binding.editPublicId.text.toString()
+		val amount = binding.editAmount.text.toString()
+		val currency = binding.editCurrency.text.toString()
+		val invoiceId = binding.editInvoiceId.text.toString()
+		val description = binding.editDescription.text.toString()
+		val accountId = binding.editAccountId.text.toString()
+		val email = binding.editEmail.text.toString()
+
+		val payerFirstName = binding.editPayerFirstName.text.toString()
+		val payerLastName = binding.editPayerLastName.text.toString()
+		val payerMiddleName = binding.editPayerMiddleName.text.toString()
+		val payerBirthDay = binding.editPayerBirth.text.toString()
+		val payerAddress = binding.editPayerAddress.text.toString()
+		val payerStreet = binding.editPayerStreet.text.toString()
+		val payerCity = binding.editPayerCity.text.toString()
+		val payerCountry = binding.editPayerCountry.text.toString()
+		val payerPhone = binding.editPayerPhone.text.toString()
+		val payerPostcode = binding.editPayerPostcode.text.toString()
+
+		val jsonData = binding.editJsonData.text.toString()
+		val isDualMessagePayment = binding.checkboxDualMessagePayment.isChecked
+
+		var payer = PaymentDataPayer()
+		payer.firstName = payerFirstName
+		payer.lastName = payerLastName
+		payer.middleName = payerMiddleName
+		payer.birthDay = payerBirthDay
+		payer.address = payerAddress
+		payer.street = payerStreet
+		payer.city = payerCity
+		payer.country = payerCountry
+		payer.phone = payerPhone
+		payer.postcode = payerPostcode
+
+		val paymentData = PaymentData(
+			amount = amount,
+			currency = currency,
+			invoiceId = invoiceId,
+			description = description,
+			accountId = accountId,
+			email = email,
+			payer = payer,
+			jsonData = jsonData
+		)
+
+		val configuration = PaymentConfiguration(
+			publicId = publicId,
+			paymentData = paymentData,
+			scanner = CardIOScanner(),
+			requireEmail = false,
+			useDualMessagePayment = isDualMessagePayment,
+			disableGPay = false,
+			disableYandexPay = false,
+			yandexPayMerchantID = "",
+			apiUrl = apiUrl
+		)
+		cpSdkLauncher.launch(configuration)
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_checkout.xml b/app/src/main/res/layout/activity_checkout.xml
index 689d9df..aafcfdf 100644
--- a/app/src/main/res/layout/activity_checkout.xml
+++ b/app/src/main/res/layout/activity_checkout.xml
@@ -144,8 +144,7 @@
                 android:layout_marginTop="@dimen/ui_margin_16dp"
                 android:layout_marginRight="@dimen/ui_margin_16dp"
                 android:text="@string/checkout_payment"
-                app:backgroundTint="@color/colorAccent"
-                style="@style/cpsdk_UnelevatedButton"/>
+                app:backgroundTint="@color/colorAccent"/>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index af2973e..9f52820 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:background="@android:color/white">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -20,6 +20,23 @@
                 android:layout_height="wrap_content"
                 android:src="@drawable/logo" />
 
+            <Button
+                android:id="@+id/button_run_top"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/ui_margin_16dp"
+                android:text="RUN"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:gravity="center"
+                android:textColor="@android:color/black"
+                android:textStyle="bold"
+                android:textSize="24sp"
+                android:text="Settings:"/>
+
             <TextView
                 style="@style/CPETextView"
                 android:text="API URL (only for testing):"/>
diff --git a/gradle.properties b/gradle.properties
index 4d15d01..0aedba5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+org.gradle.unsafe.configuration-cache = true
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/card/Card.kt b/sdk/src/main/java/ru/cloudpayments/sdk/card/Card.kt
index a184fcf..44b8ef7 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/card/Card.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/card/Card.kt
@@ -2,15 +2,14 @@ package ru.cloudpayments.sdk.card
 
 import android.text.TextUtils
 import android.util.Base64
-import android.util.Log
 import java.io.UnsupportedEncodingException
-import java.security.*
+import java.security.InvalidKeyException
+import java.security.KeyFactory
+import java.security.NoSuchAlgorithmException
+import java.security.PublicKey
+import java.security.SecureRandom
 import java.security.spec.InvalidKeySpecException
 import java.security.spec.X509EncodedKeySpec
-import java.text.DateFormat
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
 import javax.crypto.BadPaddingException
 import javax.crypto.Cipher
 import javax.crypto.IllegalBlockSizeException
@@ -36,36 +35,24 @@ class Card {
 				false
 			} else {
 				val number = prepareCardNumber(cardNumber)
-				return if (TextUtils.isEmpty(number) || number.length < 14) {
+				return if (TextUtils.isEmpty(number) || number.length < 14 || number.length > 19 ) {
 					false
 				} else {
-					var sum = 0
-					if (number.length % 2 == 0) {
-						for (i in number.indices step 2) {
-							var c = number.substring(i, i + 1).toInt()
-							c *= 2
-							if (c > 9) {
-								c -= 9
-							}
-							sum += c
-							sum += number.substring(i + 1, i + 2).toInt()
-						}
-					} else {
-						for (i in 1 until number.length step 2) {
-							var c: Int = number.substring(i, i + 1).toInt()
-							c *= 2
-							if (c > 9) {
-								c -= 9
-							}
-							sum += c
-							sum += number.substring(i - 1, i).toInt()
-						}
-					}
-					sum % 10 == 0
+					number.luhnAlgorithm()
 				}
 			}
 		}
 
+		fun String.luhnAlgorithm() = reversed()
+			.map(Character::getNumericValue)
+			.mapIndexed { index, digit ->
+				when {
+					index % 2 == 0 -> digit
+					digit < 5 -> digit * 2
+					else -> digit * 2 - 9
+				}
+			}.sum() % 10 == 0
+
 		fun isValidExpDate(exp: String?): Boolean {
 			return if (exp == null) {
 				false
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/configuration/PaymentConfiguration.kt b/sdk/src/main/java/ru/cloudpayments/sdk/configuration/PaymentConfiguration.kt
index 134390e..1bafcb5 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/configuration/PaymentConfiguration.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/configuration/PaymentConfiguration.kt
@@ -8,7 +8,7 @@ import ru.cloudpayments.sdk.scanner.CardScanner
 data class PaymentConfiguration(val publicId: String,
 								val paymentData: PaymentData,
 								val scanner: CardScanner?,
-								val showEmailField: Boolean = false,
+								val requireEmail: Boolean = false,
 								val useDualMessagePayment: Boolean = false,
 								val disableGPay: Boolean = false,
 								val disableYandexPay: Boolean = false,
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/configuration/PaymentData.kt b/sdk/src/main/java/ru/cloudpayments/sdk/configuration/PaymentData.kt
index 9ee38dd..2151468 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/configuration/PaymentData.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/configuration/PaymentData.kt
@@ -10,6 +10,6 @@ class PaymentData(val amount: String,
 				  val invoiceId: String? = null,
 				  val description: String? = null,
 				  val accountId: String? = null,
-				  val email: String? = null,
+				  var email: String? = null,
 				  val payer: PaymentDataPayer? = null,
 				  val jsonData: String? = null): Parcelable
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/PaymentActivity.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/PaymentActivity.kt
index 148ee17..dbd7ea1 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/ui/PaymentActivity.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/PaymentActivity.kt
@@ -24,16 +24,16 @@ import ru.cloudpayments.sdk.dagger2.CloudpaymentsModule
 import ru.cloudpayments.sdk.dagger2.CloudpaymentsNetModule
 import ru.cloudpayments.sdk.dagger2.DaggerCloudpaymentsComponent
 import ru.cloudpayments.sdk.databinding.ActivityCpsdkPaymentBinding
-import ru.cloudpayments.sdk.ui.dialogs.BasePaymentFragment
+import ru.cloudpayments.sdk.ui.dialogs.base.BasePaymentBottomSheetFragment
 import ru.cloudpayments.sdk.ui.dialogs.PaymentCardFragment
 import ru.cloudpayments.sdk.ui.dialogs.PaymentOptionsFragment
 import ru.cloudpayments.sdk.ui.dialogs.PaymentProcessFragment
 import ru.cloudpayments.sdk.util.GooglePayHandler
 import ru.cloudpayments.sdk.util.nextFragment
 
-internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPaymentFragment,
-		PaymentOptionsFragment.IPaymentOptionsFragment, PaymentCardFragment.IPaymentCardFragment,
-		PaymentProcessFragment.IPaymentProcessFragment {
+internal class PaymentActivity: FragmentActivity(), BasePaymentBottomSheetFragment.IPaymentFragment,
+								PaymentOptionsFragment.IPaymentOptionsFragment, PaymentCardFragment.IPaymentCardFragment,
+								PaymentProcessFragment.IPaymentProcessFragment {
 
 	companion object {
 		private const val REQUEST_CODE_GOOGLE_PAY = 1
@@ -47,15 +47,20 @@ internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPayment
 		}
 	}
 
+	override fun finish() {
+		super.finish()
+		overridePendingTransition(R.anim.cpsdk_fade_in, R.anim.cpsdk_fade_out)
+	}
+
 	internal val component: CloudpaymentsComponent by lazy {
 		DaggerCloudpaymentsComponent
 			.builder()
 			.cloudpaymentsModule(CloudpaymentsModule())
-			.cloudpaymentsNetModule(CloudpaymentsNetModule(configuration!!.publicId, configuration!!.apiUrl))
+			.cloudpaymentsNetModule(CloudpaymentsNetModule(paymentConfiguration!!.publicId, paymentConfiguration!!.apiUrl))
 			.build()
 	}
 
-	private val configuration by lazy {
+	val paymentConfiguration by lazy {
 		intent.getParcelableExtra<PaymentConfiguration>(EXTRA_CONFIGURATION)
 	}
 
@@ -71,7 +76,7 @@ internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPayment
 				val token = Base64.decode(result.paymentToken.toString(), Base64.DEFAULT)
 
 				val runnable = {
-					val fragment = PaymentProcessFragment.newInstance(configuration!!, String(token), null)
+					val fragment = PaymentProcessFragment.newInstance(String(token))
 					nextFragment(fragment, true, R.id.frame_content)
 				}
 				Handler().postDelayed(runnable, 1000)
@@ -106,7 +111,7 @@ internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPayment
 				context = this,
 				config = YandexPayLibConfig(
 					merchantDetails = Merchant(
-						id = MerchantId.from(configuration!!.yandexPayMerchantID),
+						id = MerchantId.from(paymentConfiguration!!.yandexPayMerchantID),
 						name = "Cloud",
 						url = "https://cp.ru/",
 					),
@@ -115,7 +120,7 @@ internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPayment
 					logging = false
 				)
 			)
-			yandexPayAvailable = !configuration!!.disableYandexPay && configuration!!.yandexPayMerchantID.isNotEmpty()
+			yandexPayAvailable = !paymentConfiguration!!.disableYandexPay && paymentConfiguration!!.yandexPayMerchantID.isNotEmpty()
 		} else {
 			yandexPayAvailable = false
 		}
@@ -133,21 +138,18 @@ internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPayment
 	}
 
 	private fun showUi(googlePayAvailable: Boolean) {
-		this.googlePayAvailable = googlePayAvailable && !configuration!!.disableGPay
+		this.googlePayAvailable = googlePayAvailable && !paymentConfiguration!!.disableGPay
 
 		binding.iconProgress.isVisible = false
 
-		val fragment = if (this.googlePayAvailable || this.yandexPayAvailable) {
-			PaymentOptionsFragment.newInstance(configuration!!)
-		} else {
-			PaymentCardFragment.newInstance(configuration!!)
-		}
-		nextFragment(fragment, true, R.id.frame_content)
+		val fragment = PaymentOptionsFragment.newInstance()
+
+		fragment.show(supportFragmentManager, "")
 	}
 
 	override fun onBackPressed() {
 		val fragment = supportFragmentManager.findFragmentById(R.id.frame_content)
-		if (fragment is BasePaymentFragment<*, *>) {
+		if (fragment is BasePaymentBottomSheetFragment<*, *>) {
 			fragment.handleBackButton()
 		} else {
 			super.onBackPressed()
@@ -159,17 +161,19 @@ internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPayment
 	}
 
 	override fun onGooglePayClicked() {
-		GooglePayHandler.present(configuration!!, this, REQUEST_CODE_GOOGLE_PAY)
+		GooglePayHandler.present(paymentConfiguration!!, this, REQUEST_CODE_GOOGLE_PAY)
 	}
 
 	override fun onCardClicked() {
-		val fragment = PaymentCardFragment.newInstance(configuration!!)
-		nextFragment(fragment, true, R.id.frame_content)
+		val fragment = PaymentCardFragment.newInstance()
+		fragment.show(supportFragmentManager, "")
+		//nextFragment(fragment, true, R.id.frame_content)
 	}
 
-	override fun onPayClicked(cryptogram: String, email: String?) {
-		val fragment = PaymentProcessFragment.newInstance(configuration!!, cryptogram, email)
-		nextFragment(fragment, true, R.id.frame_content)
+	override fun onPayClicked(cryptogram: String) {
+		val fragment = PaymentProcessFragment.newInstance(cryptogram)
+		fragment.show(supportFragmentManager, "")
+		//nextFragment(fragment, true, R.id.frame_content)
 	}
 
 	override fun onPaymentFinished(transactionId: Int) {
@@ -227,7 +231,7 @@ internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPayment
 
 			if (token != null) {
 				val runnable = {
-					val fragment = PaymentProcessFragment.newInstance(configuration!!, token, null)
+					val fragment = PaymentProcessFragment.newInstance(token)
 					nextFragment(fragment, true, R.id.frame_content)
 				}
 				Handler().postDelayed(runnable, 1000)
@@ -240,8 +244,8 @@ internal class PaymentActivity: FragmentActivity(), BasePaymentFragment.IPayment
 	}
 
 	private fun checkCurrency() {
-		if (configuration!!.paymentData.currency.isEmpty()) {
-			configuration!!.paymentData.currency = "RUB"
+		if (paymentConfiguration!!.paymentData.currency.isEmpty()) {
+			paymentConfiguration!!.paymentData.currency = "RUB"
 		}
 	}
 }
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentCardFragment.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentCardFragment.kt
index d284342..bf21549 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentCardFragment.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentCardFragment.kt
@@ -6,21 +6,16 @@ import android.text.Editable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
-import com.google.android.material.checkbox.MaterialCheckBox
-import com.google.android.material.textfield.TextInputEditText
 import ru.cloudpayments.sdk.R
 import ru.cloudpayments.sdk.card.Card
 import ru.cloudpayments.sdk.card.CardType
-import ru.cloudpayments.sdk.configuration.PaymentConfiguration
 import ru.cloudpayments.sdk.databinding.DialogCpsdkPaymentCardBinding
 import ru.cloudpayments.sdk.models.Currency
 import ru.cloudpayments.sdk.scanner.CardData
+import ru.cloudpayments.sdk.ui.dialogs.base.BasePaymentBottomSheetFragment
 import ru.cloudpayments.sdk.util.TextWatcherAdapter
-import ru.cloudpayments.sdk.util.emailIsValid
 import ru.cloudpayments.sdk.util.hideKeyboard
 import ru.cloudpayments.sdk.viewmodel.PaymentCardViewModel
 import ru.cloudpayments.sdk.viewmodel.PaymentCardViewState
@@ -28,17 +23,17 @@ import ru.tinkoff.decoro.MaskDescriptor
 import ru.tinkoff.decoro.parser.UnderscoreDigitSlotsParser
 import ru.tinkoff.decoro.watchers.DescriptorFormatWatcher
 
-internal class PaymentCardFragment: BasePaymentFragment<PaymentCardViewState, PaymentCardViewModel>() {
+internal class PaymentCardFragment :
+	BasePaymentBottomSheetFragment<PaymentCardViewState, PaymentCardViewModel>() {
 	interface IPaymentCardFragment {
-		fun onPayClicked(cryptogram: String, email: String?)
+		fun onPayClicked(cryptogram: String)
 	}
 
 	companion object {
 		const val REQUEST_CODE_SCANNER = 1
 
-		fun newInstance(configuration: PaymentConfiguration) = PaymentCardFragment().apply {
+		fun newInstance() = PaymentCardFragment().apply {
 			arguments = Bundle()
-			setConfiguration(configuration)
 		}
 	}
 
@@ -88,11 +83,6 @@ internal class PaymentCardFragment: BasePaymentFragment<PaymentCardViewState, Pa
 
 		activity().component.inject(viewModel)
 
-		binding.checkboxReceipt.setOnCheckedChangeListener { _, isChecked ->
-			binding.tilEmail.isGone = !isChecked
-			requireActivity().hideKeyboard()
-		}
-
 		cardNumberFormatWatcher.installOn(binding.editCardNumber)
 		cardExpFormatWatcher.installOn(binding.editCardExp)
 
@@ -103,17 +93,21 @@ internal class PaymentCardFragment: BasePaymentFragment<PaymentCardViewState, Pa
 				val cardNumber = s.toString().replace(" ", "")
 				if (Card.isValidNumber(cardNumber)) {
 					//edit_card_exp.requestFocus()
-					errorMode(false, binding.editCardNumber)
+					errorMode(false, binding.editCardNumber, binding.tilCardNumber)
 				} else {
-					errorMode(cardNumber.length == 19, binding.editCardNumber)
+					errorMode(cardNumber.length == 19, binding.editCardNumber, binding.tilCardNumber)
 				}
 
 				updatePaymentSystemIcon(cardNumber)
+				updateStateButtons()
 			}
 		})
 
 		binding.editCardNumber.setOnFocusChangeListener { _, hasFocus ->
-			errorMode(!hasFocus && !Card.isValidNumber(binding.editCardNumber.text.toString()), binding.editCardNumber)
+			errorMode(
+				!hasFocus && !Card.isValidNumber(binding.editCardNumber.text.toString()),
+				binding.editCardNumber, binding.tilCardNumber
+			)
 		}
 
 		binding.editCardExp.addTextChangedListener(object : TextWatcherAdapter() {
@@ -123,42 +117,40 @@ internal class PaymentCardFragment: BasePaymentFragment<PaymentCardViewState, Pa
 				val cardExp = s.toString()
 				if (Card.isValidExpDate(cardExp)) {
 					//edit_card_cvv.requestFocus()
-					errorMode(false, binding.editCardExp)
+					errorMode(false, binding.editCardExp, binding.tilCardExp)
 				} else {
-					errorMode(cardExp.length == 5, binding.editCardExp)
+					errorMode(cardExp.length == 5, binding.editCardExp, binding.tilCardExp)
 				}
+				updateStateButtons()
 			}
 		})
 
 		binding.editCardExp.setOnFocusChangeListener { _, hasFocus ->
-			errorMode(!hasFocus && !Card.isValidExpDate(binding.editCardExp.text.toString()), binding.editCardExp)
+			errorMode(
+				!hasFocus && !Card.isValidExpDate(binding.editCardExp.text.toString()),
+				binding.editCardExp, binding.tilCardExp
+			)
 		}
 
 		binding.editCardCvv.addTextChangedListener(object : TextWatcherAdapter() {
 			override fun afterTextChanged(s: Editable?) {
 				super.afterTextChanged(s)
-				errorMode(false, binding.editCardCvv)
+				errorMode(false, binding.editCardCvv, binding.tilCardCvv)
 
 				if (Card.isValidCvv(binding.editCardNumber.toString(), s.toString())) {
-					if (binding.checkboxReceipt.isChecked) {
-						//edit_email.requestFocus()
-					} else {
-						requireActivity().hideKeyboard()
-					}
+					requireActivity().hideKeyboard()
 				}
+				updateStateButtons()
 			}
 		})
 
 		binding.editCardCvv.setOnFocusChangeListener { _, hasFocus ->
-			errorMode(!hasFocus && !Card.isValidCvv(binding.editCardNumber.toString(), binding.editCardCvv.text.toString()), binding.editCardCvv)
-		}
-
-		binding.editEmail.setOnFocusChangeListener { _, hasFocus ->
-			errorMode(!hasFocus && !emailIsValid(binding.editEmail.text.toString()), binding.editEmail)
-		}
-
-		binding.buttonClose.setOnClickListener {
-			close(true)
+			errorMode(
+				!hasFocus && !Card.isValidCvv(
+					binding.editCardNumber.toString(),
+					binding.editCardCvv.text.toString()
+				), binding.editCardCvv, binding.tilCardCvv
+			)
 		}
 
 		binding.buttonPay.setOnClickListener {
@@ -166,17 +158,18 @@ internal class PaymentCardFragment: BasePaymentFragment<PaymentCardViewState, Pa
 			val cardExp = binding.editCardExp.text.toString()
 			val cardCvv = binding.editCardCvv.text.toString()
 
-			val cryptogram = Card.cardCryptogram(cardNumber, cardExp, cardCvv, paymentConfiguration?.publicId ?: "")
-			val email = if (binding.checkboxReceipt.isChecked) {
-				binding.editEmail.text.toString().ifEmpty { null }
-			} else {
-				null
-			}
+			val cryptogram = Card.cardCryptogram(
+				cardNumber,
+				cardExp,
+				cardCvv,
+				paymentConfiguration?.publicId ?: ""
+			)
+
 			if (isValid() && cryptogram != null) {
-				close(false) {
-					val listener = requireActivity() as? IPaymentCardFragment
-					listener?.onPayClicked(cryptogram, email)
-				}
+
+				val listener = requireActivity() as? IPaymentCardFragment
+				listener?.onPayClicked(cryptogram)
+				dismiss()
 			}
 		}
 
@@ -187,25 +180,19 @@ internal class PaymentCardFragment: BasePaymentFragment<PaymentCardViewState, Pa
 			}
 		}
 
-		binding.buttonPay.text = getString(R.string.cpsdk_text_card_pay_button, String.format("%.2f " + Currency.getSymbol(paymentConfiguration!!.paymentData.currency), paymentConfiguration!!.paymentData.amount.toDouble()))
+		binding.buttonPay.text = getString(
+			R.string.cpsdk_text_card_pay_button,
+			String.format(
+				"%.2f " + Currency.getSymbol(paymentConfiguration!!.paymentData.currency),
+				paymentConfiguration!!.paymentData.amount.toDouble()
+			)
+		)
 
 		updatePaymentSystemIcon("")
-
-		binding.checkboxReceipt.checkedState = if (paymentConfiguration!!.showEmailField) MaterialCheckBox.STATE_CHECKED else MaterialCheckBox.STATE_UNCHECKED
-		binding.editEmail.setText(paymentConfiguration!!.paymentData.email)
+		updateStateButtons()
 	}
 
-	private fun errorMode(isErrorMode: Boolean, editText: TextInputEditText){
-		if (isErrorMode) {
-			editText.setTextColor(ContextCompat.getColor(requireContext(), R.color.cpsdk_pale_red))
-			editText.setBackgroundResource(R.drawable.cpsdk_edit_text_underline_error)
-		} else {
-			editText.setTextColor(ContextCompat.getColor(requireContext(), R.color.cpsdk_dark))
-			editText.setBackgroundResource(R.drawable.cpsdk_edit_text_underline)
-		}
-	}
-
-	private fun updatePaymentSystemIcon(cardNumber: String){
+	private fun updatePaymentSystemIcon(cardNumber: String) {
 		val cardType = CardType.getType(cardNumber)
 		val psIcon = cardType.getIconRes()
 		if (paymentConfiguration?.scanner != null && (cardNumber.isEmpty() || psIcon == null)) {
@@ -218,19 +205,33 @@ internal class PaymentCardFragment: BasePaymentFragment<PaymentCardViewState, Pa
 		}
 	}
 
+	private fun updateStateButtons() {
+		if (isValid()) {
+			enableButtons()
+		} else {
+			disableButtons()
+		}
+	}
+
+	private fun disableButtons() {
+		binding.viewBlockButtons.visibility = View.VISIBLE
+	}
+
+	private fun enableButtons() {
+		binding.viewBlockButtons.visibility = View.GONE
+	}
+
 	private fun isValid(): Boolean {
 		val cardNumber = binding.editCardNumber.text.toString()
 		val cardNumberIsValid = Card.isValidNumber(cardNumber)
 		val cardExpIsValid = Card.isValidExpDate(binding.editCardExp.text.toString())
 		val cardCvvIsValid = Card.isValidCvv(cardNumber, binding.editCardCvv.text.toString())
-		val emailIsValid = !binding.checkboxReceipt.isChecked || emailIsValid(binding.editEmail.text.toString())
 
-		errorMode(!cardNumberIsValid, binding.editCardNumber)
-		errorMode(!cardExpIsValid, binding.editCardExp)
-		errorMode(!cardCvvIsValid, binding.editCardCvv)
-		errorMode(!emailIsValid, binding.editEmail)
+//		errorMode(!cardNumberIsValid, binding.editCardNumber)
+//		errorMode(!cardExpIsValid, binding.editCardExp)
+//		errorMode(!cardCvvIsValid, binding.editCardCvv)
 
-		return cardNumberIsValid && cardExpIsValid && cardCvvIsValid && emailIsValid
+		return cardNumberIsValid && cardExpIsValid && cardCvvIsValid
 	}
 
 	private fun updateWithCardData(cardData: CardData) {
@@ -238,17 +239,19 @@ internal class PaymentCardFragment: BasePaymentFragment<PaymentCardViewState, Pa
 		binding.editCardExp.setText("${cardData.cardExpMonth}/${cardData.cardExpYear}")
 	}
 
-	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) = when (requestCode) {
-		REQUEST_CODE_SCANNER -> {
-			if (data != null) {
-				val cardData = paymentConfiguration?.scanner?.getCardDataFromIntent(data)
-				if (cardData != null) {
-					updateWithCardData(cardData)
+	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) =
+		when (requestCode) {
+			REQUEST_CODE_SCANNER -> {
+				if (data != null) {
+					val cardData = paymentConfiguration?.scanner?.getCardDataFromIntent(data)
+					if (cardData != null) {
+						updateWithCardData(cardData)
+					}
 				}
+
+				super.onActivityResult(requestCode, resultCode, data)
 			}
 
-			super.onActivityResult(requestCode, resultCode, data)
+			else -> super.onActivityResult(requestCode, resultCode, data)
 		}
-		else -> super.onActivityResult(requestCode, resultCode, data)
-	}
 }
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentOptionsFragment.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentOptionsFragment.kt
index a3b6551..6888d01 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentOptionsFragment.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentOptionsFragment.kt
@@ -1,27 +1,43 @@
 package ru.cloudpayments.sdk.ui.dialogs
 
 import android.os.Bundle
+import android.text.Editable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isGone
 import androidx.fragment.app.viewModels
-import com.yandex.pay.core.data.*
-import ru.cloudpayments.sdk.configuration.PaymentConfiguration
+import com.google.android.material.checkbox.MaterialCheckBox
+import com.yandex.pay.core.data.Amount
+import com.yandex.pay.core.data.AuthMethod
+import com.yandex.pay.core.data.CardNetwork
+import com.yandex.pay.core.data.Gateway
+import com.yandex.pay.core.data.GatewayMerchantID
+import com.yandex.pay.core.data.Order
+import com.yandex.pay.core.data.OrderDetails
+import com.yandex.pay.core.data.OrderID
+import com.yandex.pay.core.data.PaymentMethod
+import com.yandex.pay.core.data.PaymentMethodType
 import ru.cloudpayments.sdk.databinding.DialogCpsdkPaymentOptionsBinding
 import ru.cloudpayments.sdk.ui.PaymentActivity
+import ru.cloudpayments.sdk.ui.dialogs.base.BasePaymentBottomSheetFragment
+import ru.cloudpayments.sdk.util.TextWatcherAdapter
+import ru.cloudpayments.sdk.util.emailIsValid
+import ru.cloudpayments.sdk.util.hideKeyboard
 import ru.cloudpayments.sdk.viewmodel.PaymentOptionsViewModel
 import ru.cloudpayments.sdk.viewmodel.PaymentOptionsViewState
 
-internal class PaymentOptionsFragment: BasePaymentFragment<PaymentOptionsViewState, PaymentOptionsViewModel>() {
+
+internal class PaymentOptionsFragment :
+	BasePaymentBottomSheetFragment<PaymentOptionsViewState, PaymentOptionsViewModel>() {
 	interface IPaymentOptionsFragment {
 		fun onGooglePayClicked()
 		fun onCardClicked()
 	}
 
 	companion object {
-		fun newInstance(configuration: PaymentConfiguration) = PaymentOptionsFragment().apply {
+		fun newInstance() = PaymentOptionsFragment().apply {
 			arguments = Bundle()
-			setConfiguration(configuration)
 		}
 	}
 
@@ -64,14 +80,64 @@ internal class PaymentOptionsFragment: BasePaymentFragment<PaymentOptionsViewSta
 
 		activity().component.inject(viewModel)
 
-		binding.buttonClose.setOnClickListener {
-			close(true)
+		binding.editEmail.setText(paymentConfiguration!!.paymentData.email)
+
+		binding.editEmail.setOnFocusChangeListener { _, hasFocus ->
+			errorMode(
+				!hasFocus && !emailIsValid(binding.editEmail.text.toString()),
+				binding.editEmail, binding.textFieldEmail
+			)
+		}
+
+		binding.editEmail.addTextChangedListener(object : TextWatcherAdapter() {
+			override fun afterTextChanged(s: Editable?) {
+				super.afterTextChanged(s)
+				updateStateButtons()
+			}
+		})
+
+		if (paymentConfiguration!!.requireEmail) {
+			binding.checkboxSendReceipt.visibility = View.GONE
+			binding.textFieldEmail.visibility = View.VISIBLE
+			binding.textEmailRequire.visibility = View.VISIBLE
+		} else {
+			binding.checkboxSendReceipt.visibility = View.VISIBLE
+			if (paymentConfiguration!!.paymentData.email.isNullOrEmpty()) {
+				binding.checkboxSendReceipt.checkedState = MaterialCheckBox.STATE_UNCHECKED
+				binding.textFieldEmail.visibility = View.GONE
+			} else {
+				binding.checkboxSendReceipt.checkedState = MaterialCheckBox.STATE_CHECKED
+				binding.textFieldEmail.visibility = View.VISIBLE
+			}
+			binding.textEmailRequire.visibility = View.GONE
+		}
+
+		binding.checkboxSendReceipt.setOnCheckedChangeListener { _, isChecked ->
+			binding.textFieldEmail.isGone = !isChecked
+			requireActivity().hideKeyboard()
+			updateStateButtons()
+		}
+
+		updateStateButtons()
+
+		binding.buttonPayCard.setOnClickListener {
+
+			if (paymentConfiguration!!.requireEmail || binding.checkboxSendReceipt.isChecked) {
+				paymentConfiguration?.paymentData?.email = binding.editEmail.text.toString()
+			} else {
+				paymentConfiguration?.paymentData?.email = ""
+			}
+
+			val listener = requireActivity() as? IPaymentOptionsFragment
+			listener?.onCardClicked()
+			dismiss()
 		}
 
 		binding.buttonYandexpay.setOnClickListener { ->
 
 			val orderDetails = OrderDetails(
-				Order( // Order details
+				Order(
+					// Order details
 					OrderID.from("ORDER_ID"), // Order ID
 					Amount.from(paymentConfiguration!!.paymentData.amount), // Total price for all items combined
 				),
@@ -80,27 +146,62 @@ internal class PaymentOptionsFragment: BasePaymentFragment<PaymentOptionsViewSta
 						listOf(AuthMethod.PanOnly), // What the payment token will contain: encrypted card details or a card token
 						PaymentMethodType.Card, // Currently it's a single supported payment method: CARD
 						Gateway.from("cloudpayments"), // PSP Gateway ID
-						listOf(CardNetwork.Visa, CardNetwork.MasterCard, CardNetwork.MIR), // Payment networks supported by the PSP
+						listOf(
+							CardNetwork.Visa,
+							CardNetwork.MasterCard,
+							CardNetwork.MIR
+						), // Payment networks supported by the PSP
 						GatewayMerchantID.from(paymentConfiguration!!.publicId), // Merchant ID with the PSP
 					)
 				)
 			)
 
 			(activity as PaymentActivity).runYandexPay(orderDetails)
+			dismiss()
 		}
 
 		binding.buttonGooglepay.root.setOnClickListener {
-			close(false) {
-				val listener = requireActivity() as? IPaymentOptionsFragment
-				listener?.onGooglePayClicked()
-			}
+			val listener = requireActivity() as? IPaymentOptionsFragment
+			listener?.onGooglePayClicked()
+			dismiss()
 		}
+	}
 
-		binding.buttonPayCard.setOnClickListener {
-			close(false) {
-				val listener = requireActivity() as? IPaymentOptionsFragment
-				listener?.onCardClicked()
+	private fun updateStateButtons() {
+		if (paymentConfiguration!!.requireEmail) {
+			if (isValid()) {
+				enableButtons()
+			} else {
+				disableButtons()
+			}
+		} else {
+			if (binding.checkboxSendReceipt.checkedState == MaterialCheckBox.STATE_CHECKED) {
+				if (isValid()) {
+					enableButtons()
+				} else {
+					disableButtons()
+				}
+			} else {
+				enableButtons()
 			}
 		}
 	}
+	private fun isValid(): Boolean {
+
+		val valid = if (paymentConfiguration!!.requireEmail) {
+			emailIsValid(binding.editEmail.text.toString())
+		} else {
+			!binding.checkboxSendReceipt.isChecked || emailIsValid(binding.editEmail.text.toString())
+		}
+
+		return valid
+	}
+
+	private fun disableButtons() {
+		binding.viewBlockButtons.visibility = View.VISIBLE
+	}
+
+	private fun enableButtons() {
+		binding.viewBlockButtons.visibility = View.GONE
+	}
 }
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentProcessFragment.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentProcessFragment.kt
index b992b39..fea3740 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentProcessFragment.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/PaymentProcessFragment.kt
@@ -1,19 +1,15 @@
 package ru.cloudpayments.sdk.ui.dialogs
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.animation.AccelerateDecelerateInterpolator
-import android.view.animation.Animation
-import android.view.animation.RotateAnimation
 import androidx.core.view.isInvisible
 import androidx.fragment.app.viewModels
 import ru.cloudpayments.sdk.R
-import ru.cloudpayments.sdk.configuration.PaymentConfiguration
 import ru.cloudpayments.sdk.databinding.DialogCpsdkPaymentProcessBinding
 import ru.cloudpayments.sdk.models.ApiError
+import ru.cloudpayments.sdk.ui.dialogs.base.BasePaymentDialogFragment
 import ru.cloudpayments.sdk.util.InjectorUtils
 import ru.cloudpayments.sdk.viewmodel.PaymentProcessViewModel
 import ru.cloudpayments.sdk.viewmodel.PaymentProcessViewState
@@ -24,7 +20,7 @@ internal enum class PaymentProcessStatus {
 	Failed;
 }
 
-internal class PaymentProcessFragment: BasePaymentFragment<PaymentProcessViewState, PaymentProcessViewModel>(), ThreeDsDialogFragment.ThreeDSDialogListener {
+internal class PaymentProcessFragment: BasePaymentDialogFragment<PaymentProcessViewState, PaymentProcessViewModel>(), ThreeDsDialogFragment.ThreeDSDialogListener {
 	interface IPaymentProcessFragment {
 		fun onPaymentFinished(transactionId: Int)
 		fun onPaymentFailed(transactionId: Int, reasonCode: Int?)
@@ -34,13 +30,10 @@ internal class PaymentProcessFragment: BasePaymentFragment<PaymentProcessViewSta
 
 	companion object {
 		private const val ARG_CRYPTOGRAM = "ARG_CRYPTOGRAM"
-		private const val ARG_EMAIL = "ARG_EMAIL"
 
-		fun newInstance(configuration: PaymentConfiguration, cryptogram: String, email: String?) = PaymentProcessFragment().apply {
+		fun newInstance(cryptogram: String) = PaymentProcessFragment().apply {
 			arguments = Bundle()
-			setConfiguration(configuration)
 			arguments?.putString(ARG_CRYPTOGRAM, cryptogram)
-			email?.let { arguments?.putString(ARG_EMAIL, it) }
 		}
 	}
 
@@ -54,8 +47,7 @@ internal class PaymentProcessFragment: BasePaymentFragment<PaymentProcessViewSta
 		savedInstanceState: Bundle?
 	): View? {
 		_binding = DialogCpsdkPaymentProcessBinding.inflate(inflater, container, false)
-		val view = binding.root
-		return view
+		return binding.root
 	}
 
 	override fun onDestroyView() {
@@ -69,7 +61,6 @@ internal class PaymentProcessFragment: BasePaymentFragment<PaymentProcessViewSta
 		InjectorUtils.providePaymentProcessViewModelFactory(
 			paymentConfiguration!!.paymentData,
 			cryptogram,
-			email,
 			paymentConfiguration!!.useDualMessagePayment)
 	}
 
@@ -90,10 +81,6 @@ internal class PaymentProcessFragment: BasePaymentFragment<PaymentProcessViewSta
 		arguments?.getString(ARG_CRYPTOGRAM) ?: ""
 	}
 
-	private val email by lazy {
-		arguments?.getString(ARG_EMAIL)?: ""
-	}
-
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 
@@ -108,22 +95,12 @@ internal class PaymentProcessFragment: BasePaymentFragment<PaymentProcessViewSta
 	private fun updateWith(status: PaymentProcessStatus, error: String? = null) {
 		when (status) {
 			PaymentProcessStatus.InProcess -> {
-				val rotate = RotateAnimation(
-					0f, 357f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
-				rotate.duration = 1000
-				rotate.interpolator = AccelerateDecelerateInterpolator()
-				rotate.repeatCount = -1
-				rotate.repeatMode = Animation.INFINITE
-				rotate.fillAfter = true
-				binding.iconStatus.startAnimation(rotate)
-
+				binding.iconStatus.setImageResource(R.drawable.cpsdk_ic_progress)
 				binding.textStatus.setText(R.string.cpsdk_text_process_title)
 				binding.buttonFinish.isInvisible = true
 			}
 
 			PaymentProcessStatus.Succeeded, PaymentProcessStatus.Failed -> {
-				binding.iconStatus.clearAnimation()
-				binding.iconStatus.rotation = 0f
 				binding.buttonFinish.isInvisible = false
 
 				val listener = requireActivity() as? IPaymentProcessFragment
@@ -136,24 +113,26 @@ internal class PaymentProcessFragment: BasePaymentFragment<PaymentProcessViewSta
 					listener?.onPaymentFinished(currentState?.transaction?.transactionId ?: 0)
 
 					binding.buttonFinish.setOnClickListener {
-						close(false) {
-							listener?.finishPayment()
-						}
+
+						listener?.finishPayment()
+						dismiss()
 					}
 				} else {
 
 					binding.iconStatus.setImageResource(R.drawable.cpsdk_ic_failure)
 					binding.textStatus.text =
-						context?.let { ApiError.getFullErrorDescription(it, currentState?.reasonCode.toString()) }
+						context?.let { ApiError.getErrorDescription(it, currentState?.reasonCode.toString()) }
+					binding.textDescription.text =
+						context?.let { ApiError.getErrorDescriptionExtra(it, currentState?.reasonCode.toString()) }
 
 					binding.buttonFinish.setText(R.string.cpsdk_text_process_button_error)
 
 					listener?.onPaymentFailed(currentState?.transaction?.transactionId ?: 0, currentState?.reasonCode)
 
 					binding.buttonFinish.setOnClickListener {
-						close(false) {
-							listener?.retryPayment()
-						}
+
+						listener?.retryPayment()
+						dismiss()
 					}
 				}
 			}
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/ThreeDsDialogFragment.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/ThreeDsDialogFragment.kt
index 9378af0..2d1363e 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/ThreeDsDialogFragment.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/ThreeDsDialogFragment.kt
@@ -3,7 +3,6 @@ package ru.cloudpayments.sdk.ui.dialogs
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -52,8 +51,7 @@ class ThreeDsDialogFragment : DialogFragment() {
 		savedInstanceState: Bundle?
 	): View? {
 		_binding = DialogCpsdkThreeDsBinding.inflate(inflater, container, false)
-		val view = binding.root
-		return view
+		return binding.root
 	}
 
 	override fun onDestroyView() {
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BasePaymentBottomSheetFragment.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BasePaymentBottomSheetFragment.kt
new file mode 100644
index 0000000..33ee316
--- /dev/null
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BasePaymentBottomSheetFragment.kt
@@ -0,0 +1,108 @@
+package ru.cloudpayments.sdk.ui.dialogs.base
+
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.view.View
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
+import androidx.core.content.ContextCompat
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import ru.cloudpayments.sdk.R
+import ru.cloudpayments.sdk.configuration.PaymentConfiguration
+import ru.cloudpayments.sdk.ui.PaymentActivity
+import ru.cloudpayments.sdk.viewmodel.BaseViewModel
+import ru.cloudpayments.sdk.viewmodel.BaseViewState
+
+
+internal abstract class BasePaymentBottomSheetFragment<VS: BaseViewState, VM: BaseViewModel<VS>>: BaseVMBottomSheetFragment<VS, VM>() {
+	interface IPaymentFragment {
+		fun paymentWillFinish()
+	}
+
+	private fun getConfiguration(): PaymentConfiguration? {
+		if (activity is PaymentActivity) {
+			return (activity as PaymentActivity).paymentConfiguration
+		}
+		return null
+	}
+
+	protected val paymentConfiguration by lazy {
+		getConfiguration()
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+
+		val fadeAnim = AnimationUtils.loadAnimation(requireContext(), R.anim.cpsdk_fade_in)
+		fadeAnim.fillAfter = true
+
+		val slideAnim = AnimationUtils.loadAnimation(requireContext(), R.anim.cpsdk_slide_in)
+		slideAnim.fillAfter = true
+	}
+
+	protected fun close(force: Boolean, completion: (() -> (Unit))? = null){
+		val slideAnim = AnimationUtils.loadAnimation(requireContext(), R.anim.cpsdk_slide_out)
+		slideAnim.fillAfter = true
+		slideAnim.setAnimationListener(object : Animation.AnimationListener{
+			override fun onAnimationStart(animation: Animation?) {
+			}
+
+			override fun onAnimationEnd(animation: Animation?) {
+				animation?.setAnimationListener(null)
+				requireActivity().supportFragmentManager.popBackStack()
+				if (force) {
+					val listener = requireActivity() as? IPaymentFragment
+					listener?.paymentWillFinish()
+				}
+				completion?.invoke()
+			}
+
+			override fun onAnimationRepeat(animation: Animation?) {
+			}
+		})
+
+		val fadeAnim = AnimationUtils.loadAnimation(requireContext(), R.anim.cpsdk_fade_out)
+		fadeAnim.fillAfter = true
+	}
+
+	fun handleBackButton(){
+		close(true)
+	}
+
+	internal fun activity(): PaymentActivity {
+		return activity as  PaymentActivity
+	}
+
+	protected fun errorMode(isErrorMode: Boolean, editText: TextInputEditText, editLayout: TextInputLayout){
+		if (isErrorMode) {
+
+			val csl = ColorStateList(
+				arrayOf(intArrayOf(android.R.attr.state_pressed), intArrayOf()),
+				intArrayOf(
+					ContextCompat.getColor(requireContext(), R.color.cpsdk_pale_red),
+					ContextCompat.getColor(requireContext(), R.color.cpsdk_pale_red)
+				)
+			)
+
+			editLayout.defaultHintTextColor = csl
+			editLayout.hintTextColor = csl
+			editText.setTextColor(ContextCompat.getColor(requireContext(), R.color.cpsdk_pale_red))
+			editText.setBackgroundResource(R.drawable.cpsdk_bg_edit_text_selector_error)
+		} else {
+
+			val csl = ColorStateList(
+				arrayOf(intArrayOf(android.R.attr.state_pressed), intArrayOf()),
+				intArrayOf(
+					ContextCompat.getColor(requireContext(), R.color.cpsdk_edit_text_hint),
+					ContextCompat.getColor(requireContext(), R.color.cpsdk_edit_text_hint)
+				)
+			)
+
+			editLayout.defaultHintTextColor = csl
+			editLayout.hintTextColor = csl
+			editText.setTextColor(ContextCompat.getColor(requireContext(), R.color.cpsdk_dark))
+			editText.setBackgroundResource(R.drawable.cpsdk_bg_edit_text_selector)
+		}
+	}
+}
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/BasePaymentFragment.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BasePaymentDialogFragment.kt
similarity index 66%
rename from sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/BasePaymentFragment.kt
rename to sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BasePaymentDialogFragment.kt
index 484f5ec..350feb3 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/BasePaymentFragment.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BasePaymentDialogFragment.kt
@@ -1,48 +1,41 @@
-package ru.cloudpayments.sdk.ui.dialogs
+package ru.cloudpayments.sdk.ui.dialogs.base
 
 import android.os.Bundle
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
+import androidx.core.content.ContextCompat
+import com.google.android.material.textfield.TextInputEditText
 import ru.cloudpayments.sdk.R
 import ru.cloudpayments.sdk.configuration.PaymentConfiguration
 import ru.cloudpayments.sdk.ui.PaymentActivity
 import ru.cloudpayments.sdk.viewmodel.BaseViewModel
 import ru.cloudpayments.sdk.viewmodel.BaseViewState
 
-internal abstract class BasePaymentFragment<VS: BaseViewState, VM: BaseViewModel<VS>>: BaseVMFragment<VS, VM>() {
+internal abstract class BasePaymentDialogFragment<VS: BaseViewState, VM: BaseViewModel<VS>>: BaseVMDialogFragment<VS, VM>() {
 	interface IPaymentFragment {
 		fun paymentWillFinish()
 	}
 
-	companion object {
-		private const val ARG_CONFIGURATION = "ARG_CONFIGURATION"
-	}
-
-	protected fun setConfiguration(configuration: PaymentConfiguration) {
-		arguments?.putParcelable(ARG_CONFIGURATION, configuration)
+	private fun getConfiguration(): PaymentConfiguration? {
+		if (activity is PaymentActivity) {
+			return (activity as PaymentActivity).paymentConfiguration
+		}
+		return null
 	}
 
 	protected val paymentConfiguration by lazy {
-		arguments?.getParcelable<PaymentConfiguration>(ARG_CONFIGURATION)
+		getConfiguration()
 	}
 
-	private lateinit var background: View
-	private lateinit var content: View
-
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 
-		background = view.findViewById(R.id.background)
-		content = view.findViewById(R.id.content)
-
 		val fadeAnim = AnimationUtils.loadAnimation(requireContext(), R.anim.cpsdk_fade_in)
 		fadeAnim.fillAfter = true
-		background.startAnimation(fadeAnim)
 
 		val slideAnim = AnimationUtils.loadAnimation(requireContext(), R.anim.cpsdk_slide_in)
 		slideAnim.fillAfter = true
-		content.startAnimation(slideAnim)
 	}
 
 	protected fun close(force: Boolean, completion: (() -> (Unit))? = null){
@@ -65,11 +58,9 @@ internal abstract class BasePaymentFragment<VS: BaseViewState, VM: BaseViewModel
 			override fun onAnimationRepeat(animation: Animation?) {
 			}
 		})
-		content.startAnimation(slideAnim)
 
 		val fadeAnim = AnimationUtils.loadAnimation(requireContext(), R.anim.cpsdk_fade_out)
 		fadeAnim.fillAfter = true
-		background.startAnimation(fadeAnim)
 	}
 
 	fun handleBackButton(){
@@ -79,4 +70,14 @@ internal abstract class BasePaymentFragment<VS: BaseViewState, VM: BaseViewModel
 	internal fun activity(): PaymentActivity {
 		return activity as  PaymentActivity
 	}
+
+	protected fun errorMode(isErrorMode: Boolean, editText: TextInputEditText){
+		if (isErrorMode) {
+			editText.setTextColor(ContextCompat.getColor(requireContext(), R.color.cpsdk_pale_red))
+			editText.setBackgroundResource(R.drawable.cpsdk_bg_edit_text_selector_error)
+		} else {
+			editText.setTextColor(ContextCompat.getColor(requireContext(), R.color.cpsdk_dark))
+			editText.setBackgroundResource(R.drawable.cpsdk_bg_edit_text_selector)
+		}
+	}
 }
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/BaseVMFragment.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BaseVMBottomSheetFragment.kt
similarity index 54%
rename from sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/BaseVMFragment.kt
rename to sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BaseVMBottomSheetFragment.kt
index 99a1d7c..275487c 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/BaseVMFragment.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BaseVMBottomSheetFragment.kt
@@ -1,13 +1,14 @@
-package ru.cloudpayments.sdk.ui.dialogs
+package ru.cloudpayments.sdk.ui.dialogs.base
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import ru.cloudpayments.sdk.viewmodel.BaseViewModel
 import ru.cloudpayments.sdk.viewmodel.BaseViewState
 
-internal abstract class BaseVMFragment<VS: BaseViewState, VM: BaseViewModel<VS>>: Fragment() {
+internal abstract class BaseVMBottomSheetFragment<VS: BaseViewState, VM: BaseViewModel<VS>>: BottomSheetDialogFragment() {
 	abstract val viewModel: VM
 	abstract fun render(state: VS)
 
@@ -17,5 +18,10 @@ internal abstract class BaseVMFragment<VS: BaseViewState, VM: BaseViewModel<VS>>
 		viewModel.viewState.observe(viewLifecycleOwner, Observer {
 			render(it)
 		})
+
+	}
+	override fun onCancel(dialog: DialogInterface) {
+		super.onCancel(dialog)
+		activity?.finish()
 	}
 }
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BaseVMDialogFragment.kt b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BaseVMDialogFragment.kt
new file mode 100644
index 0000000..43b7562
--- /dev/null
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/ui/dialogs/base/BaseVMDialogFragment.kt
@@ -0,0 +1,48 @@
+package ru.cloudpayments.sdk.ui.dialogs.base
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.View
+import androidx.constraintlayout.widget.Constraints
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.Observer
+import ru.cloudpayments.sdk.R
+import ru.cloudpayments.sdk.viewmodel.BaseViewModel
+import ru.cloudpayments.sdk.viewmodel.BaseViewState
+
+
+internal abstract class BaseVMDialogFragment<VS : BaseViewState, VM : BaseViewModel<VS>> :
+	DialogFragment() {
+	abstract val viewModel: VM
+	abstract fun render(state: VS)
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setStyle(STYLE_NO_TITLE, R.style.cpsdk_Dialog);
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+
+		viewModel.viewState.observe(viewLifecycleOwner, Observer {
+			render(it)
+		})
+
+	}
+
+	override fun onStart() {
+		super.onStart()
+
+		dialog?.window?.setLayout(
+			Constraints.LayoutParams.MATCH_PARENT,
+			Constraints.LayoutParams.WRAP_CONTENT
+		) // full width dialog
+		dialog?.setCancelable(false)
+
+	}
+
+	override fun onCancel(dialog: DialogInterface) {
+		super.onCancel(dialog)
+		activity?.finish()
+	}
+}
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/util/InjectorUtils.kt b/sdk/src/main/java/ru/cloudpayments/sdk/util/InjectorUtils.kt
index 607e4ca..f9b5acc 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/util/InjectorUtils.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/util/InjectorUtils.kt
@@ -4,7 +4,7 @@ import ru.cloudpayments.sdk.configuration.PaymentData
 import ru.cloudpayments.sdk.viewmodel.PaymentProcessViewModelFactory
 
 internal object InjectorUtils {
-    fun providePaymentProcessViewModelFactory(paymentData: PaymentData, cryptogram: String, email: String, useDualMessagePayment: Boolean): PaymentProcessViewModelFactory {
-        return PaymentProcessViewModelFactory(paymentData, cryptogram, email, useDualMessagePayment)
+    fun providePaymentProcessViewModelFactory(paymentData: PaymentData, cryptogram: String, useDualMessagePayment: Boolean): PaymentProcessViewModelFactory {
+        return PaymentProcessViewModelFactory(paymentData, cryptogram, useDualMessagePayment)
     }
 }
\ No newline at end of file
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/viewmodel/PaymentProcessViewModel.kt b/sdk/src/main/java/ru/cloudpayments/sdk/viewmodel/PaymentProcessViewModel.kt
index cdedcb5..7cd7e2c 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/viewmodel/PaymentProcessViewModel.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/viewmodel/PaymentProcessViewModel.kt
@@ -16,7 +16,6 @@ import javax.inject.Inject
 internal class PaymentProcessViewModel(
 	private val paymentData: PaymentData,
 	private val cryptogram: String,
-	private val email: String?,
 	private val useDualMessagePayment: Boolean
 ): BaseViewModel<PaymentProcessViewState>() {
 	override var currentState = PaymentProcessViewState()
@@ -51,7 +50,7 @@ internal class PaymentProcessViewModel(
 									  invoiceId = paymentData.invoiceId ?: "",
 									  description = paymentData.description ?: "",
 									  accountId = paymentData.accountId ?: "",
-									  email = email ?: "",
+									  email = paymentData.email ?: "",
 									  payer = paymentData.payer,
 									  jsonData = jsonDataString)
 
diff --git a/sdk/src/main/java/ru/cloudpayments/sdk/viewmodel/PaymentProcessViewModelFactory.kt b/sdk/src/main/java/ru/cloudpayments/sdk/viewmodel/PaymentProcessViewModelFactory.kt
index 8788f5a..aff661a 100644
--- a/sdk/src/main/java/ru/cloudpayments/sdk/viewmodel/PaymentProcessViewModelFactory.kt
+++ b/sdk/src/main/java/ru/cloudpayments/sdk/viewmodel/PaymentProcessViewModelFactory.kt
@@ -7,12 +7,11 @@ import ru.cloudpayments.sdk.configuration.PaymentData
 internal class PaymentProcessViewModelFactory(
 	private val paymentData: PaymentData,
 	private val cryptogram: String,
-	private val email: String,
 	private val useDualMessagePayment: Boolean
 ): ViewModelProvider.Factory {
 
 	@Suppress("UNCHECKED_CAST")
 	override fun <T : ViewModel> create(modelClass: Class<T>): T {
-		return PaymentProcessViewModel(paymentData, cryptogram, email, useDualMessagePayment) as T
+		return PaymentProcessViewModel(paymentData, cryptogram, useDualMessagePayment) as T
 	}
 }
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable-hdpi/cpsdk_ic_checkbox_checked.png b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_checkbox_checked.png
new file mode 100644
index 0000000..0a44dee
Binary files /dev/null and b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_checkbox_checked.png differ
diff --git a/sdk/src/main/res/drawable-hdpi/cpsdk_ic_checkbox_unchecked.png b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_checkbox_unchecked.png
new file mode 100644
index 0000000..2830a1e
Binary files /dev/null and b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_checkbox_unchecked.png differ
diff --git a/sdk/src/main/res/drawable-hdpi/cpsdk_ic_failure.png b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_failure.png
new file mode 100644
index 0000000..1a942f5
Binary files /dev/null and b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_failure.png differ
diff --git a/sdk/src/main/res/drawable-hdpi/cpsdk_ic_progress.png b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_progress.png
new file mode 100644
index 0000000..db89f18
Binary files /dev/null and b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_progress.png differ
diff --git a/sdk/src/main/res/drawable-hdpi/cpsdk_ic_success.png b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_success.png
new file mode 100644
index 0000000..1dcb1db
Binary files /dev/null and b/sdk/src/main/res/drawable-hdpi/cpsdk_ic_success.png differ
diff --git a/sdk/src/main/res/drawable-hdpi/drag_handle.png b/sdk/src/main/res/drawable-hdpi/drag_handle.png
new file mode 100644
index 0000000..50328b8
Binary files /dev/null and b/sdk/src/main/res/drawable-hdpi/drag_handle.png differ
diff --git a/sdk/src/main/res/drawable-hdpi/ic_required_email.png b/sdk/src/main/res/drawable-hdpi/ic_required_email.png
new file mode 100644
index 0000000..7bb77f3
Binary files /dev/null and b/sdk/src/main/res/drawable-hdpi/ic_required_email.png differ
diff --git a/sdk/src/main/res/drawable-mdpi/cpsdk_ic_checkbox_unchecked.png b/sdk/src/main/res/drawable-mdpi/cpsdk_ic_checkbox_unchecked.png
new file mode 100644
index 0000000..c47936c
Binary files /dev/null and b/sdk/src/main/res/drawable-mdpi/cpsdk_ic_checkbox_unchecked.png differ
diff --git a/sdk/src/main/res/drawable-mdpi/cpsdk_ic_failure.png b/sdk/src/main/res/drawable-mdpi/cpsdk_ic_failure.png
new file mode 100644
index 0000000..3355ce9
Binary files /dev/null and b/sdk/src/main/res/drawable-mdpi/cpsdk_ic_failure.png differ
diff --git a/sdk/src/main/res/drawable-mdpi/cpsdk_ic_progress.png b/sdk/src/main/res/drawable-mdpi/cpsdk_ic_progress.png
new file mode 100644
index 0000000..75c7414
Binary files /dev/null and b/sdk/src/main/res/drawable-mdpi/cpsdk_ic_progress.png differ
diff --git a/sdk/src/main/res/drawable-mdpi/cpsdk_ic_success.png b/sdk/src/main/res/drawable-mdpi/cpsdk_ic_success.png
new file mode 100644
index 0000000..4f05ac4
Binary files /dev/null and b/sdk/src/main/res/drawable-mdpi/cpsdk_ic_success.png differ
diff --git a/sdk/src/main/res/drawable-mdpi/drag_handle.png b/sdk/src/main/res/drawable-mdpi/drag_handle.png
new file mode 100644
index 0000000..8178cbc
Binary files /dev/null and b/sdk/src/main/res/drawable-mdpi/drag_handle.png differ
diff --git a/sdk/src/main/res/drawable-mdpi/ic_required_email.png b/sdk/src/main/res/drawable-mdpi/ic_required_email.png
new file mode 100644
index 0000000..c28a9c5
Binary files /dev/null and b/sdk/src/main/res/drawable-mdpi/ic_required_email.png differ
diff --git a/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_checkbox_checked.png b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_checkbox_checked.png
new file mode 100644
index 0000000..9abbddf
Binary files /dev/null and b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_checkbox_checked.png differ
diff --git a/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_checkbox_unchecked.png b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_checkbox_unchecked.png
new file mode 100644
index 0000000..632dca1
Binary files /dev/null and b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_checkbox_unchecked.png differ
diff --git a/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_failure.png b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_failure.png
new file mode 100644
index 0000000..e743f2f
Binary files /dev/null and b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_failure.png differ
diff --git a/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_progress.png b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_progress.png
new file mode 100644
index 0000000..25b5a00
Binary files /dev/null and b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_progress.png differ
diff --git a/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_success.png b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_success.png
new file mode 100644
index 0000000..76691af
Binary files /dev/null and b/sdk/src/main/res/drawable-xhdpi/cpsdk_ic_success.png differ
diff --git a/sdk/src/main/res/drawable-xhdpi/drag_handle.png b/sdk/src/main/res/drawable-xhdpi/drag_handle.png
new file mode 100644
index 0000000..03c76a3
Binary files /dev/null and b/sdk/src/main/res/drawable-xhdpi/drag_handle.png differ
diff --git a/sdk/src/main/res/drawable-xhdpi/ic_required_email.png b/sdk/src/main/res/drawable-xhdpi/ic_required_email.png
new file mode 100644
index 0000000..d133ee3
Binary files /dev/null and b/sdk/src/main/res/drawable-xhdpi/ic_required_email.png differ
diff --git a/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_checkbox_checked.png b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_checkbox_checked.png
new file mode 100644
index 0000000..aef0812
Binary files /dev/null and b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_checkbox_checked.png differ
diff --git a/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_checkbox_unchecked.png b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_checkbox_unchecked.png
new file mode 100644
index 0000000..ce1a17d
Binary files /dev/null and b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_checkbox_unchecked.png differ
diff --git a/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_failure.png b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_failure.png
new file mode 100644
index 0000000..f156557
Binary files /dev/null and b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_failure.png differ
diff --git a/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_progress.png b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_progress.png
new file mode 100644
index 0000000..2f3d9bc
Binary files /dev/null and b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_progress.png differ
diff --git a/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_success.png b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_success.png
new file mode 100644
index 0000000..4ff0d5b
Binary files /dev/null and b/sdk/src/main/res/drawable-xxhdpi/cpsdk_ic_success.png differ
diff --git a/sdk/src/main/res/drawable-xxhdpi/drag_handle.png b/sdk/src/main/res/drawable-xxhdpi/drag_handle.png
new file mode 100644
index 0000000..a94fb00
Binary files /dev/null and b/sdk/src/main/res/drawable-xxhdpi/drag_handle.png differ
diff --git a/sdk/src/main/res/drawable-xxhdpi/ic_required_email.png b/sdk/src/main/res/drawable-xxhdpi/ic_required_email.png
new file mode 100644
index 0000000..2c38aef
Binary files /dev/null and b/sdk/src/main/res/drawable-xxhdpi/ic_required_email.png differ
diff --git a/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_checkbox_checked.png b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_checkbox_checked.png
new file mode 100644
index 0000000..a30bcbc
Binary files /dev/null and b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_checkbox_checked.png differ
diff --git a/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_checkbox_unchecked.png b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_checkbox_unchecked.png
new file mode 100644
index 0000000..b2ab339
Binary files /dev/null and b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_checkbox_unchecked.png differ
diff --git a/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_failure.png b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_failure.png
new file mode 100644
index 0000000..47a8b80
Binary files /dev/null and b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_failure.png differ
diff --git a/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_progress.png b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_progress.png
new file mode 100644
index 0000000..5e6260f
Binary files /dev/null and b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_progress.png differ
diff --git a/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_success.png b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_success.png
new file mode 100644
index 0000000..8ffaee1
Binary files /dev/null and b/sdk/src/main/res/drawable-xxxhdpi/cpsdk_ic_success.png differ
diff --git a/sdk/src/main/res/drawable-xxxhdpi/drag_handle.png b/sdk/src/main/res/drawable-xxxhdpi/drag_handle.png
new file mode 100644
index 0000000..b9a3db6
Binary files /dev/null and b/sdk/src/main/res/drawable-xxxhdpi/drag_handle.png differ
diff --git a/sdk/src/main/res/drawable-xxxhdpi/ic_required_email.png b/sdk/src/main/res/drawable-xxxhdpi/ic_required_email.png
new file mode 100644
index 0000000..f4c769c
Binary files /dev/null and b/sdk/src/main/res/drawable-xxxhdpi/ic_required_email.png differ
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_button_gp_black.xml b/sdk/src/main/res/drawable/cpsdk_bg_button_gp_black.xml
index 6ec8a76..ad7c836 100644
--- a/sdk/src/main/res/drawable/cpsdk_bg_button_gp_black.xml
+++ b/sdk/src/main/res/drawable/cpsdk_bg_button_gp_black.xml
@@ -3,6 +3,6 @@
     android:shape="rectangle">
 
     <solid android:color="#000000"/>
-    <corners android:radius="4dp"/>
+    <corners android:radius="8dp"/>
 
 </shape>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_edit_text.xml b/sdk/src/main/res/drawable/cpsdk_bg_edit_text.xml
new file mode 100644
index 0000000..c526178
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_edit_text.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" android:padding="10dp">
+
+    <solid android:color="#FFFFFF"/>
+
+    <stroke android:color="#E2E8EF" android:width="1dp"/>
+
+    <corners
+        android:bottomRightRadius="8dp"
+        android:bottomLeftRadius="8dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"/>
+</shape>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_edit_text_error.xml b/sdk/src/main/res/drawable/cpsdk_bg_edit_text_error.xml
new file mode 100644
index 0000000..3dcc355
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_edit_text_error.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" android:padding="10dp">
+
+    <solid android:color="#FFFFFF"/>
+
+    <stroke android:color="#EB5757" android:width="2dp"/>
+
+    <corners
+        android:bottomRightRadius="8dp"
+        android:bottomLeftRadius="8dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"/>
+</shape>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_edit_text_focused.xml b/sdk/src/main/res/drawable/cpsdk_bg_edit_text_focused.xml
new file mode 100644
index 0000000..9fdada0
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_edit_text_focused.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" android:padding="10dp">
+
+    <solid android:color="#FFFFFF"/>
+
+    <stroke android:color="#2E71FC" android:width="2dp"/>
+
+    <corners
+        android:bottomRightRadius="8dp"
+        android:bottomLeftRadius="8dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"/>
+</shape>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_edit_text_selector.xml b/sdk/src/main/res/drawable/cpsdk_bg_edit_text_selector.xml
new file mode 100644
index 0000000..c13fefc
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_edit_text_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_focused="true" android:drawable="@drawable/cpsdk_bg_edit_text_focused" />
+    <item android:drawable="@drawable/cpsdk_bg_edit_text" />
+</selector>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_edit_text_selector_error.xml b/sdk/src/main/res/drawable/cpsdk_bg_edit_text_selector_error.xml
new file mode 100644
index 0000000..bc2a86f
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_edit_text_selector_error.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_focused="true" android:drawable="@drawable/cpsdk_bg_edit_text_focused" />
+    <item android:drawable="@drawable/cpsdk_bg_edit_text_error" />
+</selector>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_rounded_blue_button.xml b/sdk/src/main/res/drawable/cpsdk_bg_rounded_blue_button.xml
new file mode 100644
index 0000000..b2aafe7
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_rounded_blue_button.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#2e71fc" />
+
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"
+        android:bottomLeftRadius="8dp"
+        android:bottomRightRadius="8dp"/>
+</shape>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_rounded_bottom_sheet.xml b/sdk/src/main/res/drawable/cpsdk_bg_rounded_bottom_sheet.xml
new file mode 100644
index 0000000..7ba4553
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_rounded_bottom_sheet.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/white" />
+
+    <corners
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp" />
+</shape>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_rounded_dialog.xml b/sdk/src/main/res/drawable/cpsdk_bg_rounded_dialog.xml
new file mode 100644
index 0000000..3f5fd9e
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_rounded_dialog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/white" />
+
+    <corners
+        android:radius="28dp" />
+</shape>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_bg_rounded_dialog_inset.xml b/sdk/src/main/res/drawable/cpsdk_bg_rounded_dialog_inset.xml
new file mode 100644
index 0000000..0db93f1
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_bg_rounded_dialog_inset.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- drawable is a reference to your 'real' dialog background -->
+<!-- insetRight and insetLeft add the margins -->
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/cpsdk_bg_rounded_dialog"
+    android:insetRight="28dp"
+    android:insetLeft="28dp">
+</inset>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_ic_checkbox_selector.xml b/sdk/src/main/res/drawable/cpsdk_ic_checkbox_selector.xml
new file mode 100644
index 0000000..ca6495a
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_ic_checkbox_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_checked="true" android:drawable="@drawable/cpsdk_ic_checkbox_checked" />
+    <item android:state_pressed="true" android:drawable="@drawable/cpsdk_ic_checkbox_checked" />
+    <item android:state_pressed="false" android:drawable="@drawable/cpsdk_ic_checkbox_unchecked" />
+</selector>
\ No newline at end of file
diff --git a/sdk/src/main/res/drawable/cpsdk_ic_failure.xml b/sdk/src/main/res/drawable/cpsdk_ic_failure.xml
deleted file mode 100644
index 035a377..0000000
--- a/sdk/src/main/res/drawable/cpsdk_ic_failure.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="77dp"
-    android:height="77dp"
-    android:viewportWidth="77"
-    android:viewportHeight="77">
-  <path
-      android:pathData="M0,38.5C0,17.237 17.237,0 38.5,0C59.763,0 77,17.237 77,38.5C77,59.763 59.763,77 38.5,77C17.237,77 0,59.763 0,38.5ZM38.5,2.7831C18.7741,2.7831 2.7831,18.7741 2.7831,38.5C2.7831,58.2259 18.7741,74.2169 38.5,74.2169C58.2259,74.2169 74.2169,58.2259 74.2169,38.5C74.2169,18.7741 58.2259,2.7831 38.5,2.7831Z"
-      android:fillColor="#FF4C4C"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M24.5844,22.6164L54.2384,52.2703L52.2704,54.2383L22.6165,24.5843L24.5844,22.6164Z"
-      android:fillColor="#FF4C4C"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M54.2384,24.5843L24.5844,54.2383L22.6165,52.2703L52.2704,22.6164L54.2384,24.5843Z"
-      android:fillColor="#FF4C4C"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/sdk/src/main/res/drawable/cpsdk_ic_progress.xml b/sdk/src/main/res/drawable/cpsdk_ic_progress.xml
deleted file mode 100644
index ec8950e..0000000
--- a/sdk/src/main/res/drawable/cpsdk_ic_progress.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="77dp"
-    android:height="77dp"
-    android:viewportWidth="77"
-    android:viewportHeight="77">
-  <path
-      android:pathData="M38.5,1.5L38.5,1.5A37,37 0,0 1,75.5 38.5L75.5,38.5A37,37 0,0 1,38.5 75.5L38.5,75.5A37,37 0,0 1,1.5 38.5L1.5,38.5A37,37 0,0 1,38.5 1.5z"
-      android:strokeWidth="3"
-      android:fillColor="#00000000"
-      android:strokeColor="#D1EAFF"/>
-  <path
-      android:pathData="M39,74.0965C58.4308,73.8291 74.1,57.9944 74.1,38.5C74.1,19.0056 58.4308,3.1709 39,2.9034V0.0032C60.0325,0.2709 77,17.4039 77,38.5C77,59.596 60.0325,76.7291 39,76.9968V74.0965Z"
-      android:fillColor="#4297DF"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/sdk/src/main/res/drawable/cpsdk_ic_success.xml b/sdk/src/main/res/drawable/cpsdk_ic_success.xml
deleted file mode 100644
index 709fac9..0000000
--- a/sdk/src/main/res/drawable/cpsdk_ic_success.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="77dp"
-    android:height="77dp"
-    android:viewportWidth="77"
-    android:viewportHeight="77">
-  <path
-      android:pathData="M52.2333,29.9261L31.7484,50L24,41.93L25.9896,40.0629L31.8081,46.123L50.3022,28L52.2333,29.9261Z"
-      android:fillColor="#1EBE88"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,38.5C0,17.237 17.237,0 38.5,0C59.763,0 77,17.237 77,38.5C77,59.763 59.763,77 38.5,77C17.237,77 0,59.763 0,38.5ZM38.5,2.7831C18.7741,2.7831 2.7831,18.7741 2.7831,38.5C2.7831,58.2259 18.7741,74.2169 38.5,74.2169C58.2259,74.2169 74.2169,58.2259 74.2169,38.5C74.2169,18.7741 58.2259,2.7831 38.5,2.7831Z"
-      android:fillColor="#1EBE88"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/sdk/src/main/res/drawable/cpsdk_secured_logo.xml b/sdk/src/main/res/drawable/cpsdk_secured_logo.xml
new file mode 100644
index 0000000..0a42cda
--- /dev/null
+++ b/sdk/src/main/res/drawable/cpsdk_secured_logo.xml
@@ -0,0 +1,82 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="169dp"
+    android:height="17dp"
+    android:viewportWidth="169"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M84.41,8.26C84.41,5.95 86.13,4.19 88.47,4.19C90.35,4.19 91.81,5.35 92.27,7.02H90.55C90.18,6.21 89.43,5.72 88.46,5.72C87.01,5.72 86.03,6.79 86.03,8.26C86.03,9.73 87.01,10.8 88.46,10.8C89.43,10.8 90.18,10.3 90.55,9.5H92.27C91.81,11.17 90.35,12.33 88.47,12.33C86.13,12.33 84.41,10.57 84.41,8.26Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M114.35,9.1C114.35,8.09 113.67,7.41 112.77,7.41C111.87,7.41 111.21,8.09 111.21,9.1C111.21,10.12 111.88,10.8 112.77,10.8C113.67,10.8 114.35,10.12 114.35,9.1ZM115.96,3.92V12.19H114.35V11.36C113.92,11.94 113.27,12.33 112.41,12.33C110.8,12.33 109.59,11 109.59,9.1C109.59,7.19 110.81,5.88 112.4,5.88C112.78,5.87 113.16,5.96 113.5,6.13C113.84,6.31 114.13,6.56 114.35,6.88V3.92H115.96Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M94.7,3.92H93.09V12.19H94.7V3.92Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M108.7,6.01V12.19H107.09V11.34C106.64,11.97 106.04,12.33 105.18,12.33C103.82,12.33 102.98,11.39 102.98,9.89V6.01H104.58V9.54C104.58,10.35 104.89,10.8 105.72,10.8C106.61,10.8 107.09,10.27 107.09,9.26V6.01H108.7L108.7,6.01Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M97.24,9.1C97.24,10.12 97.94,10.8 98.83,10.8C99.73,10.8 100.43,10.13 100.43,9.1C100.43,8.09 99.73,7.41 98.83,7.41C97.93,7.41 97.24,8.09 97.24,9.1ZM102.06,9.1C102.06,10.97 100.65,12.33 98.84,12.33C97.04,12.33 95.62,10.96 95.62,9.1C95.62,7.24 97.06,5.88 98.84,5.88C100.62,5.88 102.06,7.24 102.06,9.1H102.06Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M120.81,8.05C121.89,8.05 122.63,7.55 122.63,6.43C122.63,5.3 121.89,4.81 120.81,4.81H118.73V8.04L120.81,8.05ZM117.64,3.92H120.93C122.39,3.92 123.72,4.62 123.72,6.42C123.72,8.22 122.44,8.88 120.95,8.88H118.73V12.19H117.65L117.64,3.92Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M126.24,11.59C127.49,11.59 128.22,10.73 128.22,9.53V9.16L126.49,9.33C125.5,9.43 124.97,9.83 124.97,10.54C124.97,11.12 125.35,11.59 126.24,11.59ZM126.37,8.67L128.22,8.49V7.9C128.22,7.18 127.77,6.6 126.75,6.62C125.91,6.62 125.25,6.98 125.2,7.82H124.25C124.29,6.42 125.38,5.86 126.75,5.86C128.38,5.86 129.24,6.65 129.24,8.1V12.19H128.3V10.91C127.92,11.79 127.11,12.33 125.94,12.33C124.54,12.33 123.94,11.55 123.94,10.57C123.94,9.43 124.78,8.82 126.37,8.67V8.67Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M135.28,6.01L132.97,12.91C132.55,14.26 132.1,14.71 130.9,14.71C130.71,14.71 130.47,14.7 130.21,14.67V13.87C130.43,13.88 130.65,13.89 130.84,13.89C131.48,13.89 131.75,13.66 132.03,12.76L132.21,12.2L129.86,6.01H131L132.72,10.9L134.16,6.01H135.28Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M136.22,6H137.17V7.17C137.52,6.33 138.24,5.86 139.19,5.86C140.14,5.86 140.82,6.31 141.05,7.21C141.39,6.34 142.13,5.86 143.1,5.86C144.3,5.86 145.07,6.6 145.07,8.01V12.19H144.03V8.28C144.03,7.31 143.6,6.71 142.75,6.71C141.78,6.71 141.16,7.48 141.16,8.76V12.19H140.13V8.28C140.13,7.32 139.69,6.71 138.84,6.71C137.87,6.71 137.26,7.48 137.26,8.76V12.2H136.22L136.22,6Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M150.76,8.71C150.73,7.42 150.05,6.62 149,6.62C147.98,6.62 147.23,7.32 147.13,8.71H150.76ZM149,5.86C150.77,5.86 151.78,6.94 151.78,9.25V9.39H147.12C147.2,10.83 147.97,11.58 149.08,11.58C149.91,11.58 150.46,11.15 150.72,10.52L151.71,10.58C151.39,11.65 150.48,12.34 149.08,12.34C147.3,12.34 146.08,11.28 146.08,9.1C146.08,6.92 147.31,5.86 149,5.86Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M152.87,6H153.83V7.19C154.18,6.36 154.95,5.86 156.04,5.86C157.39,5.86 158.15,6.59 158.15,8.1V12.19H157.12V8.43C157.12,7.31 156.68,6.71 155.69,6.71C154.53,6.71 153.92,7.51 153.92,8.75V12.19H152.88V6H152.87Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M161.14,6.79V10.41C161.14,11.19 161.3,11.44 161.93,11.44C162.18,11.43 162.41,11.41 162.65,11.37V12.2C162.35,12.26 162.05,12.29 161.74,12.29C160.54,12.29 160.1,11.81 160.1,10.57V6.79H158.8V6.03H159.79C160.07,6.03 160.17,5.92 160.17,5.66V4.64H161.14V6H162.65V6.8L161.14,6.79Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M164.32,10.38C164.4,11.21 165.02,11.58 166,11.58C166.92,11.58 167.53,11.25 167.53,10.62C167.53,10.16 167.19,9.89 166.34,9.63L165,9.24C164.05,8.95 163.56,8.38 163.56,7.54C163.56,6.34 164.54,5.86 165.83,5.86C167.2,5.86 168.29,6.41 168.41,7.69L167.46,7.75C167.35,6.97 166.68,6.62 165.83,6.62C165.07,6.59 164.58,6.92 164.58,7.5C164.58,8 164.93,8.28 165.58,8.47L166.93,8.86C167.97,9.16 168.56,9.68 168.56,10.57C168.56,11.72 167.58,12.33 165.97,12.33C164.46,12.33 163.48,11.75 163.37,10.43L164.32,10.38Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M80.34,8.13C80.34,12.61 76.71,16.25 72.22,16.25C67.73,16.25 64.09,12.61 64.09,8.13C64.09,3.64 67.73,0 72.22,0C76.71,0 80.34,3.64 80.34,8.13ZM68.7,11.12L73.96,5.85C73.44,5.33 72.72,5.03 71.98,5.03C71.24,5.03 70.52,5.33 70,5.85L66.72,9.13C66.46,9.4 66.31,9.75 66.31,10.13C66.31,10.5 66.46,10.85 66.72,11.12C66.85,11.25 67.01,11.35 67.18,11.42C67.35,11.49 67.53,11.53 67.71,11.53C67.9,11.53 68.08,11.49 68.25,11.42C68.42,11.35 68.57,11.25 68.7,11.12ZM75.74,5.13L70.47,10.4C71,10.92 71.71,11.22 72.46,11.22C73.2,11.22 73.91,10.92 74.44,10.4L77.72,7.12C77.85,6.99 77.95,6.83 78.02,6.66C78.09,6.49 78.13,6.31 78.13,6.13C78.13,5.94 78.09,5.76 78.02,5.59C77.95,5.42 77.85,5.26 77.72,5.13C77.59,5 77.43,4.9 77.26,4.83C77.09,4.76 76.91,4.72 76.73,4.72C76.54,4.72 76.36,4.76 76.19,4.83C76.02,4.9 75.86,5 75.74,5.13Z"
+      android:fillColor="#C0C9D4"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M70.47,10.4L75.74,5.13C75.86,5 76.02,4.9 76.19,4.83C76.36,4.76 76.54,4.72 76.73,4.72C76.91,4.72 77.09,4.76 77.26,4.83C77.43,4.9 77.59,5 77.72,5.13C77.85,5.26 77.95,5.42 78.02,5.59C78.09,5.76 78.13,5.94 78.13,6.13C78.13,6.31 78.09,6.49 78.02,6.66C77.95,6.83 77.85,6.99 77.72,7.12L74.44,10.4C73.91,10.92 73.2,11.22 72.46,11.22C71.71,11.22 71,10.92 70.47,10.4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M73.96,5.85L68.7,11.12C68.57,11.25 68.42,11.35 68.25,11.42C68.08,11.49 67.9,11.53 67.71,11.53C67.53,11.53 67.35,11.49 67.18,11.42C67.01,11.35 66.85,11.25 66.72,11.12C66.46,10.85 66.31,10.5 66.31,10.13C66.31,9.75 66.46,9.4 66.72,9.13L70,5.85C70.52,5.33 71.24,5.03 71.98,5.03C72.72,5.03 73.44,5.33 73.96,5.85Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M0,9.35L1.07,9.25C1.12,9.68 1.24,10.04 1.42,10.31C1.61,10.59 1.9,10.81 2.29,10.98C2.68,11.15 3.12,11.23 3.61,11.23C4.04,11.23 4.43,11.17 4.76,11.04C5.09,10.91 5.34,10.73 5.5,10.51C5.66,10.29 5.74,10.04 5.74,9.77C5.74,9.5 5.66,9.27 5.51,9.07C5.35,8.87 5.09,8.7 4.73,8.56C4.5,8.47 3.99,8.33 3.21,8.14C2.42,7.95 1.86,7.77 1.55,7.61C1.14,7.39 0.83,7.13 0.63,6.81C0.43,6.49 0.33,6.13 0.33,5.74C0.33,5.3 0.45,4.9 0.7,4.52C0.94,4.14 1.3,3.86 1.78,3.66C2.25,3.47 2.77,3.37 3.35,3.37C3.99,3.37 4.55,3.47 5.03,3.68C5.52,3.88 5.9,4.18 6.16,4.58C6.42,4.98 6.56,5.43 6.58,5.94L5.49,6.02C5.43,5.47 5.23,5.06 4.89,4.79C4.56,4.51 4.06,4.37 3.4,4.37C2.71,4.37 2.21,4.5 1.89,4.75C1.58,5 1.42,5.3 1.42,5.66C1.42,5.97 1.54,6.22 1.76,6.42C1.98,6.62 2.55,6.83 3.47,7.04C4.39,7.24 5.03,7.43 5.37,7.58C5.87,7.81 6.24,8.11 6.48,8.46C6.72,8.81 6.84,9.22 6.84,9.68C6.84,10.14 6.71,10.57 6.45,10.97C6.18,11.38 5.81,11.69 5.31,11.92C4.83,12.14 4.28,12.25 3.66,12.25C2.88,12.25 2.23,12.14 1.71,11.91C1.18,11.69 0.77,11.35 0.47,10.89C0.17,10.44 0.02,9.92 0,9.35Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M12.52,10.1L13.61,10.24C13.43,10.87 13.12,11.37 12.65,11.72C12.19,12.07 11.59,12.25 10.87,12.25C9.96,12.25 9.24,11.97 8.7,11.41C8.17,10.85 7.9,10.06 7.9,9.05C7.9,8 8.17,7.19 8.71,6.61C9.25,6.03 9.95,5.74 10.81,5.74C11.64,5.74 12.32,6.03 12.85,6.59C13.38,7.16 13.64,7.96 13.64,8.98C13.64,9.04 13.64,9.14 13.63,9.26H8.99C9.03,9.95 9.23,10.47 9.57,10.83C9.92,11.2 10.36,11.38 10.88,11.38C11.26,11.38 11.59,11.28 11.87,11.07C12.14,10.87 12.36,10.55 12.52,10.1ZM9.05,8.4H12.53C12.48,7.87 12.35,7.48 12.13,7.22C11.79,6.81 11.36,6.61 10.82,6.61C10.34,6.61 9.93,6.77 9.6,7.1C9.27,7.42 9.09,7.85 9.05,8.4Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M19,9.83L20.03,9.96C19.92,10.68 19.63,11.24 19.16,11.64C18.7,12.04 18.12,12.25 17.44,12.25C16.59,12.25 15.91,11.97 15.39,11.41C14.87,10.86 14.61,10.06 14.61,9.02C14.61,8.35 14.72,7.76 14.95,7.25C15.17,6.75 15.51,6.37 15.96,6.12C16.42,5.87 16.91,5.74 17.45,5.74C18.13,5.74 18.68,5.91 19.11,6.26C19.54,6.6 19.81,7.08 19.93,7.71L18.91,7.87C18.81,7.45 18.64,7.14 18.39,6.93C18.14,6.71 17.84,6.61 17.49,6.61C16.96,6.61 16.53,6.8 16.2,7.18C15.86,7.56 15.7,8.16 15.7,8.99C15.7,9.82 15.86,10.43 16.18,10.81C16.5,11.19 16.92,11.38 17.43,11.38C17.85,11.38 18.19,11.25 18.47,11C18.75,10.74 18.92,10.35 19,9.83Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M25.01,12.11V11.19C24.53,11.89 23.87,12.25 23.04,12.25C22.67,12.25 22.33,12.18 22.01,12.04C21.69,11.89 21.46,11.72 21.3,11.51C21.15,11.29 21.04,11.03 20.98,10.72C20.93,10.52 20.91,10.19 20.91,9.74V5.88H21.97V9.33C21.97,9.88 21.99,10.26 22.03,10.45C22.1,10.72 22.24,10.94 22.45,11.1C22.67,11.26 22.93,11.34 23.25,11.34C23.57,11.34 23.86,11.26 24.14,11.1C24.42,10.93 24.61,10.71 24.73,10.44C24.84,10.15 24.9,9.75 24.9,9.22V5.88H25.96V12.11H25.01Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M27.6,12.11V5.88H28.55V6.83C28.79,6.38 29.02,6.09 29.22,5.95C29.43,5.81 29.65,5.74 29.9,5.74C30.26,5.74 30.62,5.86 30.98,6.08L30.62,7.06C30.36,6.91 30.11,6.83 29.85,6.83C29.62,6.83 29.41,6.9 29.23,7.04C29.04,7.18 28.91,7.37 28.83,7.62C28.72,7.99 28.66,8.4 28.66,8.85V12.11H27.6Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M35.87,10.1L36.96,10.24C36.79,10.87 36.47,11.37 36.01,11.72C35.54,12.07 34.95,12.25 34.22,12.25C33.31,12.25 32.59,11.97 32.06,11.41C31.53,10.85 31.26,10.06 31.26,9.05C31.26,8 31.53,7.19 32.07,6.61C32.61,6.03 33.31,5.74 34.17,5.74C35,5.74 35.68,6.03 36.21,6.59C36.73,7.16 37,7.96 37,8.98C37,9.04 36.99,9.14 36.99,9.26H32.35C32.39,9.95 32.58,10.47 32.93,10.83C33.28,11.2 33.71,11.38 34.23,11.38C34.62,11.38 34.95,11.28 35.22,11.07C35.49,10.87 35.71,10.55 35.87,10.1ZM32.41,8.4H35.88C35.84,7.87 35.7,7.48 35.48,7.22C35.15,6.81 34.71,6.61 34.18,6.61C33.69,6.61 33.29,6.77 32.95,7.1C32.63,7.42 32.44,7.85 32.41,8.4Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M42.33,12.11V11.32C41.93,11.94 41.35,12.25 40.59,12.25C40.09,12.25 39.63,12.11 39.22,11.84C38.8,11.56 38.48,11.18 38.25,10.69C38.02,10.2 37.91,9.64 37.91,9C37.91,8.38 38.01,7.82 38.22,7.31C38.43,6.8 38.74,6.42 39.15,6.15C39.57,5.88 40.03,5.74 40.54,5.74C40.92,5.74 41.25,5.82 41.54,5.98C41.84,6.14 42.07,6.34 42.26,6.6V3.52H43.31V12.11H42.33ZM38.99,9C38.99,9.8 39.16,10.39 39.5,10.79C39.83,11.18 40.23,11.38 40.69,11.38C41.15,11.38 41.54,11.19 41.86,10.82C42.18,10.44 42.35,9.86 42.35,9.09C42.35,8.24 42.18,7.61 41.85,7.21C41.53,6.81 41.12,6.62 40.64,6.62C40.17,6.62 39.78,6.81 39.46,7.19C39.15,7.57 38.99,8.18 38.99,9Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M49.28,12.11H48.3V3.52H49.36V6.58C49.8,6.02 50.37,5.74 51.06,5.74C51.45,5.74 51.81,5.82 52.15,5.98C52.49,6.13 52.77,6.35 52.99,6.63C53.21,6.9 53.39,7.24 53.51,7.63C53.64,8.03 53.7,8.45 53.7,8.9C53.7,9.97 53.44,10.79 52.91,11.37C52.38,11.96 51.75,12.25 51.01,12.25C50.28,12.25 49.7,11.94 49.28,11.33V12.11ZM49.27,8.95C49.27,9.69 49.37,10.23 49.58,10.56C49.91,11.11 50.36,11.38 50.92,11.38C51.38,11.38 51.78,11.18 52.12,10.78C52.46,10.38 52.62,9.78 52.62,8.99C52.62,8.18 52.46,7.58 52.14,7.19C51.82,6.8 51.43,6.61 50.97,6.61C50.51,6.61 50.11,6.81 49.78,7.21C49.44,7.61 49.27,8.19 49.27,8.95Z"
+      android:fillColor="#C0C9D4"/>
+  <path
+      android:pathData="M54.94,14.5L54.83,13.51C55.06,13.57 55.26,13.61 55.43,13.61C55.66,13.61 55.85,13.57 55.99,13.49C56.13,13.41 56.25,13.3 56.34,13.16C56.4,13.05 56.51,12.79 56.66,12.38C56.68,12.32 56.71,12.23 56.75,12.12L54.39,5.88H55.53L56.82,9.49C56.99,9.94 57.14,10.42 57.28,10.93C57.4,10.44 57.54,9.97 57.71,9.51L59.04,5.88H60.09L57.73,12.21C57.47,12.89 57.28,13.37 57.13,13.62C56.95,13.97 56.73,14.22 56.49,14.38C56.25,14.55 55.96,14.63 55.62,14.63C55.42,14.63 55.19,14.59 54.94,14.5Z"
+      android:fillColor="#C0C9D4"/>
+</vector>
diff --git a/sdk/src/main/res/font/sf_pro_text_regular.ttf b/sdk/src/main/res/font/sf_pro_text_regular.ttf
new file mode 100644
index 0000000..b63615e
Binary files /dev/null and b/sdk/src/main/res/font/sf_pro_text_regular.ttf differ
diff --git a/sdk/src/main/res/layout/activity_cpsdk_payment.xml b/sdk/src/main/res/layout/activity_cpsdk_payment.xml
index 033bede..41596a8 100644
--- a/sdk/src/main/res/layout/activity_cpsdk_payment.xml
+++ b/sdk/src/main/res/layout/activity_cpsdk_payment.xml
@@ -3,8 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/cpsdk_transparent">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/icon_progress"
diff --git a/sdk/src/main/res/layout/dialog_cpsdk_payment_card.xml b/sdk/src/main/res/layout/dialog_cpsdk_payment_card.xml
index de3ca77..852fcda 100644
--- a/sdk/src/main/res/layout/dialog_cpsdk_payment_card.xml
+++ b/sdk/src/main/res/layout/dialog_cpsdk_payment_card.xml
@@ -1,208 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <View
-        android:id="@+id/background"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:id="@+id/image_drag_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/drag_handle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/text_title"
+        style="@style/cpsdk_TextTitle"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#64000000"/>
+        android:layout_height="wrap_content"
+        android:text="@string/cpsdk_text_card_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/image_drag_handle" />
 
-    <LinearLayout
-        android:id="@+id/content"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/til_card_number"
+        style="@style/cpsdk_TextInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/cpsdk_padding_normal"
-        android:paddingEnd="@dimen/cpsdk_padding_normal"
-        android:paddingTop="@dimen/cpsdk_padding_big"
-        android:paddingBottom="@dimen/cpsdk_padding_big"
-        android:background="@color/cpsdk_white"
-        android:layout_gravity="bottom">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/cpsdk_margin_normal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/cpsdk_margin_small"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/button_close"
-                android:text="@string/cpsdk_text_card_title"
-                android:textColor="@color/cpsdk_dark"
-                style="@style/cpsdk_TextTitle"/>
-
-            <ImageButton
-                android:id="@+id/button_close"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:background="@drawable/cpsdk_bg_button_close"
-                android:src="@drawable/cpsdk_ic_close"/>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/cpsdk_margin_normal">
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_card_number"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                style="@style/cpsdk_TextInputLayout">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/edit_card_number"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/cpsdk_text_card_hint_number"
-                    android:nextFocusDown="@id/edit_card_exp"
-                    android:imeOptions="actionNext"
-                    android:inputType="number"
-                    android:digits="0123456789 "
-                    style="@style/cpsdk_TextInputEditText"
-                    tools:text="4242 4242 4242 4242"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <ImageView
-                android:id="@+id/ic_ps"
-                android:layout_width="40dp"
-                android:layout_height="0dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:scaleType="centerCrop"
-                android:layout_marginBottom="@dimen/cpsdk_margin_small"/>
-
-            <ImageButton
-                android:id="@+id/btn_scan"
-                android:layout_width="40dp"
-                android:layout_height="0dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:src="@drawable/cpsdk_ic_scan"
-                android:background="@color/cpsdk_transparent"
-                android:layout_marginBottom="@dimen/cpsdk_margin_small"/>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
+        android:layout_marginTop="20dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_title">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edit_card_number"
+            style="@style/cpsdk_TextInputEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/cpsdk_margin_small">
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_card_exp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/til_card_cvv"
-                android:layout_marginEnd="6dp"
-                style="@style/cpsdk_TextInputLayout">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/edit_card_exp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/cpsdk_text_card_hint_exp"
-                    android:nextFocusDown="@id/edit_card_cvv"
-                    android:imeOptions="actionNext"
-                    android:inputType="number"
-                    android:digits="0123456789/"
-                    style="@style/cpsdk_TextInputEditText"
-                    tools:text="11/20"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_card_cvv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
-                app:layout_constraintStart_toEndOf="@+id/til_card_exp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                style="@style/cpsdk_TextInputLayout">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/edit_card_cvv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/cpsdk_text_card_hint_cvv"
-                    android:nextFocusDown="@id/edit_email"
-                    android:imeOptions="actionNext"
-                    android:inputType="number"
-                    android:digits="0123456789"
-                    android:maxLength="4"
-                    style="@style/cpsdk_TextInputEditText"
-                    tools:text="111"/>
-            </com.google.android.material.textfield.TextInputLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <com.google.android.material.checkbox.MaterialCheckBox
-            android:id="@+id/checkbox_receipt"
+            android:layout_marginBottom="12dp"
+            android:digits="0123456789 "
+            android:hint="@string/cpsdk_text_card_hint_number"
+            android:imeOptions="actionNext"
+            android:inputType="number"
+            android:nextFocusDown="@id/edit_card_exp"
+            tools:text="4242 4242 4242 4242" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <ImageView
+        android:id="@+id/ic_ps"
+        android:layout_width="40dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="10dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="@id/til_card_number"
+        app:layout_constraintEnd_toEndOf="@id/til_card_number"
+        app:layout_constraintTop_toTopOf="@id/til_card_number" />
+
+    <ImageButton
+        android:id="@+id/btn_scan"
+        android:layout_width="40dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="10dp"
+        android:src="@drawable/cpsdk_ic_scan"
+        android:background="@null"
+        app:layout_constraintBottom_toBottomOf="@id/til_card_number"
+        app:layout_constraintEnd_toEndOf="@id/til_card_number"
+        app:layout_constraintTop_toTopOf="@id/til_card_number" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/til_card_exp"
+        style="@style/cpsdk_TextInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="6dp"
+        app:layout_constraintEnd_toStartOf="@+id/til_card_cvv"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/til_card_number">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edit_card_exp"
+            style="@style/cpsdk_TextInputEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/cpsdk_text_card_receipt"
-            android:checked="false"
-            android:textSize="16sp"
-            app:buttonTint="@color/cpsdk_dark_sky_blue"
-            android:fontFamily="@font/rubik_regular"
-            android:layout_marginStart="-6dp"/>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/til_email"
+            android:digits="0123456789/"
+            android:hint="@string/cpsdk_text_card_hint_exp"
+            android:imeOptions="actionNext"
+            android:inputType="number"
+            android:nextFocusDown="@id/edit_card_cvv" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/til_card_cvv"
+        style="@style/cpsdk_TextInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        app:passwordToggleEnabled="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/til_card_exp"
+        app:layout_constraintTop_toBottomOf="@id/til_card_number">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edit_card_cvv"
+            style="@style/cpsdk_TextInputEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:hintEnabled="false"
-            android:layout_marginTop="@dimen/cpsdk_margin_small"
-            android:visibility="gone"
-            style="@style/cpsdk_TextInputLayout">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/edit_email"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/cpsdk_text_card_hint_email"
-                android:maxLines="1"
-                android:inputType="textEmailAddress"
-                style="@style/cpsdk_TextInputEditText"
-                tools:text="support@cloudpayments.ru"/>
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/button_pay"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/cpsdk_button_height"
-            android:layout_marginTop="@dimen/cpsdk_margin_normal"
-            android:text="@string/cpsdk_text_card_pay_button"
-            android:textColor="@color/cpsdk_white"
-            style="@style/cpsdk_UnelevatedButton"/>
+            android:digits="0123456789"
+            android:hint="@string/cpsdk_text_card_hint_cvv"
+            android:imeOptions="actionDone"
+            android:inputType="numberPassword"
+            android:maxLength="4"
+            tools:text="111" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/button_pay"
+        style="@style/cpsdk_ButtonBlue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/cpsdk_text_card_pay_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/til_card_exp" />
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/cpsdk_margin_big"
-            android:src="@drawable/cpsdk_ic_secured"/>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+    <View
+        android:id="@+id/view_block_buttons"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@color/cpsdk_white"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:clickable="true"
+        android:visibility="visible"
+        android:alpha="0.5"
+        app:layout_constraintBottom_toBottomOf="@id/button_pay"
+        app:layout_constraintEnd_toEndOf="@id/button_pay"
+        app:layout_constraintStart_toStartOf="@id/button_pay"
+        app:layout_constraintTop_toTopOf="@id/button_pay" />
+
+    <ImageView
+        android:layout_width="210dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/cpsdk_margin_big"
+        android:src="@drawable/cpsdk_secured_logo"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_pay" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sdk/src/main/res/layout/dialog_cpsdk_payment_options.xml b/sdk/src/main/res/layout/dialog_cpsdk_payment_options.xml
index 7845054..6ba8171 100644
--- a/sdk/src/main/res/layout/dialog_cpsdk_payment_options.xml
+++ b/sdk/src/main/res/layout/dialog_cpsdk_payment_options.xml
@@ -1,84 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <View
-        android:id="@+id/background"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp"
+    android:paddingBottom="16dp">
+
+    <ImageView
+        android:id="@+id/image_drag_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/drag_handle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/text_title"
+        style="@style/cpsdk_TextTitle"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#64000000"/>
+        android:layout_height="wrap_content"
+        android:text="@string/cpsdk_text_options_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/image_drag_handle" />
 
     <LinearLayout
-        android:id="@+id/content"
+        android:id="@+id/layout_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/cpsdk_white"
-        android:layout_gravity="bottom"
+        android:layout_marginTop="20dp"
         android:orientation="vertical"
-        android:paddingStart="@dimen/cpsdk_padding_normal"
-        android:paddingTop="@dimen/cpsdk_padding_big"
-        android:paddingEnd="@dimen/cpsdk_padding_normal"
-        android:paddingBottom="@dimen/cpsdk_padding_big">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_title">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <Button
+            android:id="@+id/button_pay_card"
+            style="@style/cpsdk_ButtonBlue"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/cpsdk_margin_normal">
-
-            <TextView
-                style="@style/cpsdk_TextTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/cpsdk_margin_small"
-                android:text="@string/cpsdk_text_options_title"
-                android:textColor="@color/cpsdk_dark"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/button_close"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/button_close"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:background="@drawable/cpsdk_bg_button_close"
-                android:src="@drawable/cpsdk_ic_close"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <com.yandex.pay.core.ui.YandexPayButton
-            android:id="@+id/button_yandexpay"
-            android:layout_width="match_parent"
-            android:layout_height="54dp"
-            android:layout_marginBottom="@dimen/cpsdk_margin_normal"
-            app:yandexpay_corner_radius="4dp"/>
+            android:text="@string/cpsdk_text_options_card" />
 
         <include
             android:id="@+id/button_googlepay"
             layout="@layout/googlepay_button"
             android:layout_width="match_parent"
-            android:layout_height="54dp"
-            android:layout_marginBottom="@dimen/cpsdk_margin_normal" />
+            android:layout_height="56dp"
+            android:layout_marginTop="16dp" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/button_pay_card"
-            style="@style/cpsdk_OutlinedButton"
+        <com.yandex.pay.core.ui.YandexPayButton
+            android:id="@+id/button_yandexpay"
             android:layout_width="match_parent"
-            android:layout_height="54dp"
-            android:text="@string/cpsdk_text_options_card"
-            android:textColor="@color/cpsdk_dark"
-            android:textSize="16sp" />
+            android:layout_height="56dp"
+            android:layout_marginTop="16dp"
+            app:yandexpay_color_scheme="dark"
+            app:yandexpay_corner_radius="8dp" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/view_block_buttons"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@color/cpsdk_white"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:clickable="true"
+        android:visibility="visible"
+        android:alpha="0.5"
+        app:layout_constraintBottom_toBottomOf="@id/layout_buttons"
+        app:layout_constraintEnd_toEndOf="@id/layout_buttons"
+        app:layout_constraintStart_toStartOf="@id/layout_buttons"
+        app:layout_constraintTop_toTopOf="@id/layout_buttons" />
+
+    <com.google.android.material.checkbox.MaterialCheckBox
+        android:id="@+id/checkbox_send_receipt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:button="@drawable/cpsdk_ic_checkbox_selector"
+        android:fontFamily="@font/sf_pro_text_regular"
+        android:gravity="center_vertical"
+        android:letterSpacing="0.01"
+        android:lineSpacingExtra="6sp"
+        android:paddingStart="10dp"
+        android:text="@string/cpsdk_text_options_email_checkbox"
+        android:textColor="#8c949f"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/layout_buttons" />
 
-        <ImageView
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/text_field_email"
+        style="@style/cpsdk_TextInputLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="Email"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/checkbox_send_receipt">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/edit_email"
+            style="@style/cpsdk_TextInputEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/cpsdk_margin_big"
-            android:src="@drawable/cpsdk_ic_secured" />
-    </LinearLayout>
-</FrameLayout>
+            android:maxLines="1"
+            android:inputType="textEmailAddress"
+            android:imeOptions="actionDone"/>
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <TextView
+        android:id="@+id/text_email_require"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:drawableStart="@drawable/ic_required_email"
+        android:drawablePadding="8dp"
+        android:fontFamily="@font/sf_pro_text_regular"
+        android:letterSpacing="-0.01"
+        android:lineSpacingExtra="5sp"
+        android:text="@string/cpsdk_text_options_email_require"
+        android:textColor="#8c949f"
+        android:textSize="13sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_field_email" />
+
+    <ImageView
+        android:layout_width="210dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/cpsdk_margin_big"
+        android:src="@drawable/cpsdk_secured_logo"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_email_require" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/sdk/src/main/res/layout/dialog_cpsdk_payment_process.xml b/sdk/src/main/res/layout/dialog_cpsdk_payment_process.xml
index 660b99d..74bab2d 100644
--- a/sdk/src/main/res/layout/dialog_cpsdk_payment_process.xml
+++ b/sdk/src/main/res/layout/dialog_cpsdk_payment_process.xml
@@ -1,91 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:background="@drawable/cpsdk_bg_rounded_dialog_inset"
+    android:paddingStart="48dp"
+    android:paddingTop="28dp"
+    android:paddingEnd="48dp"
+    android:paddingBottom="40dp">
 
-    <View
-        android:id="@+id/background"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#64000000"/>
+    <ImageView
+        android:id="@+id/icon_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/cpsdk_ic_progress"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:id="@+id/content"
+    <TextView
+        android:id="@+id/text_status"
+        style="@style/cpsdk_TextTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="@color/cpsdk_white"
-        android:layout_gravity="bottom"
-        android:minHeight="360dp"
-        android:paddingStart="@dimen/cpsdk_padding_normal"
-        android:paddingEnd="@dimen/cpsdk_padding_normal"
-        android:paddingTop="@dimen/cpsdk_padding_big"
-        android:paddingBottom="@dimen/cpsdk_padding_big">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_marginTop="@dimen/cpsdk_margin_big"
+        android:gravity="center"
+        android:textColor="@color/cpsdk_dark"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/icon_status" />
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:1">
+    <TextView
+        android:id="@+id/text_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:fontFamily="@font/sf_pro_text_regular"
+        android:gravity="center"
+        android:letterSpacing="0.01"
+        android:lineSpacingExtra="6sp"
+        android:textColor="#444d5b"
+        android:textSize="18sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_status" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toTopOf="@+id/icon"
-                    android:layout_marginBottom="@dimen/cpsdk_margin_big"
-                    android:orientation="vertical"
-                    android:gravity="center">
+    <Button
+        android:id="@+id/button_finish"
+        style="@style/cpsdk_ButtonBlue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="@string/cpsdk_text_process_button_success"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_description" />
 
-                    <ImageView
-                        android:id="@+id/icon_status"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/cpsdk_ic_progress"/>
 
-                    <TextView
-                        android:id="@+id/text_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textColor="@color/cpsdk_dark"
-                        android:layout_marginTop="@dimen/cpsdk_margin_big"
-                        android:layout_marginBottom="@dimen/cpsdk_margin_normal"
-                        android:gravity="center"
-                        style="@style/cpsdk_TextTitle"
-                        tools:text="@string/cpsdk_text_process_title"/>
+    <ImageView
+        android:layout_width="210dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/cpsdk_margin_big"
+        android:src="@drawable/cpsdk_secured_logo"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_finish" />
 
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/button_finish"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/cpsdk_button_height"
-                        android:layout_marginTop="@dimen/cpsdk_margin_normal"
-                        android:text="@string/cpsdk_text_process_button_success"
-                        android:textColor="@color/cpsdk_white"
-                        style="@style/cpsdk_UnelevatedButton"/>
-                </LinearLayout>
 
-                <ImageView
-                    android:id="@+id/icon"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    android:src="@drawable/cpsdk_ic_secured"/>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sdk/src/main/res/layout/googlepay_button.xml b/sdk/src/main/res/layout/googlepay_button.xml
index 3305ac5..4bf38ce 100755
--- a/sdk/src/main/res/layout/googlepay_button.xml
+++ b/sdk/src/main/res/layout/googlepay_button.xml
@@ -3,7 +3,8 @@
     android:clickable="true"
     android:focusable="true"
     android:layout_width="match_parent"
-    android:layout_height="48sp"
+    android:layout_height="wrap_content"
+    android:minHeight="56dp"
     android:background="@drawable/cpsdk_bg_button_gp">
 
     <LinearLayout
diff --git a/sdk/src/main/res/values-v21/styles.xml b/sdk/src/main/res/values-v21/styles.xml
index 896fff1..19c42a0 100644
--- a/sdk/src/main/res/values-v21/styles.xml
+++ b/sdk/src/main/res/values-v21/styles.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="cpsdk_OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:textSize">16sp</item>
-        <item name="textAllCaps">false</item>
-        <item name="strokeColor">@color/cpsdk_light_blue_grey</item>
-        <item name="strokeWidth">1dp</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="cornerRadius">4dp</item>
-        <item name="android:insetBottom">0dp</item>
-        <item name="android:insetTop">0dp</item>
-        <item name="android:fontFamily">@font/rubik_regular</item>
-    </style>
-    <style name="cpsdk_UnelevatedButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">
-        <item name="android:textSize">16sp</item>
-        <item name="textAllCaps">false</item>
-        <item name="backgroundTint">@color/cpsdk_dark_sky_blue</item>
-        <item name="android:letterSpacing">0</item>
-        <item name="cornerRadius">4dp</item>
-        <item name="android:insetBottom">0dp</item>
-        <item name="android:insetTop">0dp</item>
-        <item name="android:fontFamily">@font/rubik_regular</item>
-    </style>
+<!--    <style name="cpsdk_OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">-->
+<!--        <item name="android:textSize">16sp</item>-->
+<!--        <item name="textAllCaps">false</item>-->
+<!--        <item name="strokeColor">@color/cpsdk_light_blue_grey</item>-->
+<!--        <item name="strokeWidth">1dp</item>-->
+<!--        <item name="android:letterSpacing">0</item>-->
+<!--        <item name="cornerRadius">4dp</item>-->
+<!--        <item name="android:insetBottom">0dp</item>-->
+<!--        <item name="android:insetTop">0dp</item>-->
+<!--        <item name="android:fontFamily">@font/rubik_regular</item>-->
+<!--    </style>-->
+
+<!--    <style name="cpsdk_UnelevatedButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">-->
+<!--        <item name="android:textSize">16sp</item>-->
+<!--        <item name="textAllCaps">false</item>-->
+<!--        <item name="backgroundTint">@color/cpsdk_dark_sky_blue</item>-->
+<!--        <item name="android:letterSpacing">0</item>-->
+<!--        <item name="cornerRadius">4dp</item>-->
+<!--        <item name="android:insetBottom">0dp</item>-->
+<!--        <item name="android:insetTop">0dp</item>-->
+<!--        <item name="android:fontFamily">@font/rubik_regular</item>-->
+<!--    </style>-->
 </resources>
\ No newline at end of file
diff --git a/sdk/src/main/res/values/colors.xml b/sdk/src/main/res/values/colors.xml
index db3a54a..2e4539e 100644
--- a/sdk/src/main/res/values/colors.xml
+++ b/sdk/src/main/res/values/colors.xml
@@ -9,6 +9,6 @@
     <color name="cpsdk_dark_sky_blue">#4297df</color>
     <color name="cpsdk_pale_red">#ec4444</color>
     <color name="cpsdk_white">#ffffff</color>
-    <color name="cpsdk_transparent">#00ffffff</color>
-
+    <color name="cpsdk_transparent">#64000000</color>
+    <color name="cpsdk_edit_text_hint">#8C949F</color>
 </resources>
\ No newline at end of file
diff --git a/sdk/src/main/res/values/strings.xml b/sdk/src/main/res/values/strings.xml
index c7a1477..0456d00 100644
--- a/sdk/src/main/res/values/strings.xml
+++ b/sdk/src/main/res/values/strings.xml
@@ -2,21 +2,23 @@
 <resources>
     <public name="cloud_payments_sdk" type="string">CloudPaymentsSDK</public>
     <string name="cpsdk_text_options_title">Выберите способ оплаты</string>
-    <string name="cpsdk_text_options_card">Оплатить картой</string>
+    <string name="cpsdk_text_options_card">Банковская карта</string>
+    <string name="cpsdk_text_options_email_checkbox">Отправить квитанцию на E-mail</string>
+    <string name="cpsdk_text_options_email_title">E-mail</string>
+    <string name="cpsdk_text_options_email_error">Некорректный e-mail</string>
+    <string name="cpsdk_text_options_email_require">Для оплаты введите E-mail</string>
 
-    <string name="cpsdk_text_card_title">Введите данные карты</string>
+    <string name="cpsdk_text_card_title">Оплата картой</string>
     <string name="cpsdk_text_card_hint_number">Номер карты</string>
-    <string name="cpsdk_text_card_hint_exp">ММ/ГГ</string>
-    <string name="cpsdk_text_card_hint_cvv">CVC</string>
-    <string name="cpsdk_text_card_hint_email">E-mail</string>
-    <string name="cpsdk_text_card_receipt">Получить квитанцию</string>
+    <string name="cpsdk_text_card_hint_exp">ММ / ГГ</string>
+    <string name="cpsdk_text_card_hint_cvv">CVV</string>
     <string name="cpsdk_text_card_pay_button">Оплатить %s</string>
 
-    <string name="cpsdk_text_process_title">Оплата выполняется…</string>
-    <string name="cpsdk_text_process_title_success">Оплата завершена</string>
+    <string name="cpsdk_text_process_title">Оплата в процессе</string>
+    <string name="cpsdk_text_process_title_success">Оплата прошла успешно</string>
     <string name="cpsdk_text_process_button_success">Отлично!</string>
-    <string name="cpsdk_text_process_title_error">Произошла ошибка!</string>
-    <string name="cpsdk_text_process_button_error">Повторить оплату</string>
+    <string name="cpsdk_text_process_title_error">Операция отклонена</string>
+    <string name="cpsdk_text_process_button_error">Повторить попытку</string>
 
     <string name="cpsdk_currency_template">%.2f\u20BD</string>
 
diff --git a/sdk/src/main/res/values/styles.xml b/sdk/src/main/res/values/styles.xml
index 0d04bfc..4719396 100644
--- a/sdk/src/main/res/values/styles.xml
+++ b/sdk/src/main/res/values/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="cpsdk_AcquiringTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorPrimary">@color/cpsdk_dark_sky_blue</item>
         <item name="colorPrimaryDark">@color/cpsdk_dark</item>
@@ -10,60 +11,92 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="bottomSheetDialogTheme">@style/cpsdk_BottomSheetDialogTheme</item>
+    </style>
+
+    <style name="cpsdk_BottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/cpsdk_AppModalStyle</item>
+    </style>
+
+    <style name="cpsdk_AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/cpsdk_bg_rounded_bottom_sheet</item>
+    </style>
+
+    <style name="cpsdk_Dialog" parent="android:style/Theme.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
     </style>
 
     <style name="cpsdk_TextTitle" parent="Widget.MaterialComponents.TextView">
-        <item name="android:textSize">20sp</item>
+        <item name="android:layout_marginTop">12dp</item>
+        <item name="android:ellipsize">end</item>
         <item name="android:fontFamily">@font/rubik_medium</item>
-        <item name="lineHeight">28sp</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:letterSpacing">0.01</item>
+        <item name="android:lineSpacingExtra">4sp</item>
+        <item name="android:textColor">#0b1e46</item>
+        <item name="android:textStyle">normal</item>
     </style>
 
-    <style name="cpsdk_TextRegular" parent="Widget.MaterialComponents.TextView">
-        <item name="android:textSize">16sp</item>
-        <item name="lineHeight">18sp</item>
-        <item name="android:fontFamily">@font/rubik_regular</item>
-    </style>
-    
-    <style name="cpsdk_OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:textSize">16sp</item>
-        <item name="textAllCaps">false</item>
-        <item name="strokeColor">@color/cpsdk_light_blue_grey</item>
-        <item name="strokeWidth">1dp</item>
-        <item name="cornerRadius">4dp</item>
+    <style name="cpsdk_ButtonBlue" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="android:minHeight">56dp</item>
+        <item name="android:background">@drawable/cpsdk_bg_rounded_blue_button</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:insetTop">0dp</item>
-        <item name="android:fontFamily">@font/rubik_regular</item>
+        <item name="android:fontFamily">@font/sf_pro_text_regular</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0.01</item>
+        <item name="android:lineSpacingExtra">6sp</item>
     </style>
-    <style name="cpsdk_UnelevatedButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+
+    <style name="cpsdk_TextRegular" parent="Widget.MaterialComponents.TextView">
         <item name="android:textSize">16sp</item>
-        <item name="textAllCaps">false</item>
-        <item name="backgroundTint">@color/cpsdk_dark_sky_blue</item>
-        <item name="cornerRadius">4dp</item>
-        <item name="android:insetBottom">0dp</item>
-        <item name="android:insetTop">0dp</item>
+        <item name="lineHeight">18sp</item>
         <item name="android:fontFamily">@font/rubik_regular</item>
     </style>
 
-    <style name="cpsdk_TextInputLayout" parent="Widget.Design.TextInputLayout">
-        <item name="boxBackgroundMode">none</item>
-        <item name="android:textColorHint">@color/cpsdk_grey</item>
-        <item name="hintEnabled">false</item>
-        <item name="materialThemeOverlay">@style/cpsdk_ThemeOverlayFilledPadding</item>
-    </style>
+    <!--    <style name="cpsdk_TextInputLayout" parent="Widget.Design.TextInputLayout">-->
+    <!--        <item name="boxBackgroundMode">none</item>-->
+    <!--        <item name="android:textColorHint">@color/cpsdk_grey</item>-->
+    <!--        <item name="hintEnabled">false</item>-->
+    <!--        <item name="materialThemeOverlay">@style/cpsdk_ThemeOverlayFilledPadding</item>-->
+    <!--    </style>-->
 
-    <style name="cpsdk_ThemeOverlayFilledPadding">
-        <item name="editTextStyle">@style/cpsdk_TextInputLayout_padding</item>
-    </style>
+    <!--    <style name="cpsdk_ThemeOverlayFilledPadding">-->
+    <!--        <item name="editTextStyle">@style/cpsdk_TextInputLayout_padding</item>-->
+    <!--    </style>-->
+
+    <!--    <style name="cpsdk_TextInputLayout_padding" parent="@style/Widget.Design.TextInputLayout">-->
+    <!--        <item name="android:paddingStart">0dp</item>-->
+    <!--        <item name="android:paddingEnd">0dp</item>-->
+    <!--    </style>-->
+
+    <!--    <style name="cpsdk_TextInputEditText" parent="Widget.AppCompat.EditText">-->
+    <!--        <item name="android:paddingBottom">@dimen/cpsdk_padding_normal</item>-->
+    <!--        <item name="android:textSize">16sp</item>-->
+    <!--        <item name="android:paddingStart">2dp</item>-->
+    <!--        <item name="android:background">@drawable/cpsdk_edit_text_underline</item>-->
+    <!--        <item name="android:fontFamily">@font/rubik_regular</item>-->
+    <!--    </style>-->
 
-    <style name="cpsdk_TextInputLayout_padding" parent="@style/Widget.Design.TextInputLayout">
-        <item name="android:paddingStart">0dp</item>
-        <item name="android:paddingEnd">0dp</item>
+    <style name="cpsdk_TextInputLayout">
+        <item name="android:textColorHint">@color/cpsdk_edit_text_hint</item>
+        <item name="hintTextColor">@color/cpsdk_edit_text_hint</item>
+        <item name="minHeight">20dp</item>
+        <item name="boxBackgroundColor">@android:color/transparent</item>
+        <item name="boxStrokeWidth">0dp</item>
+        <item name="boxStrokeWidthFocused">0dp</item>
     </style>
-    <style name="cpsdk_TextInputEditText" parent="Widget.AppCompat.EditText">
-        <item name="android:paddingBottom">@dimen/cpsdk_padding_normal</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:paddingStart">2dp</item>
-        <item name="android:background">@drawable/cpsdk_edit_text_underline</item>
-        <item name="android:fontFamily">@font/rubik_regular</item>
+
+    <style name="cpsdk_TextInputEditText">
+        <item name="minHeight">20dp</item>
+        <item name="android:background">@drawable/cpsdk_bg_edit_text_selector</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:textColorHint">#8C949F</item>
     </style>
 </resources>
\ No newline at end of file