diff --git a/app/build.gradle b/app/build.gradle
index c7dd2002..dea9987b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.flutterwave.rave_android"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java
index 72bf855e..876db36d 100644
--- a/app/src/main/java/com/flutterwave/rave_android/MainActivity.java
+++ b/app/src/main/java/com/flutterwave/rave_android/MainActivity.java
@@ -16,6 +16,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.SwitchCompat;
 
 import com.flutterwave.raveandroid.RavePayActivity;
@@ -49,7 +50,7 @@ public class MainActivity
         implements
         FeeCheckListener, // Implement if you want to be able to check fees beforehand
         SavedCardsListener, // Implement if you want to be able to save cards and charge saved cards
-        CardPaymentCallback {// Must be implemented to charge cards with custom UI or no-UI
+        CardPaymentCallback { // Must be implemented to charge cards with custom UI or no-UI
 
     EditText emailEt;
     EditText amountEt;
@@ -105,6 +106,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+
         emailEt = findViewById(R.id.emailEt);
         amountEt = findViewById(R.id.amountEt);
         publicKeyEt = findViewById(R.id.publicKeyEt);
@@ -519,10 +522,10 @@ public void showProgressIndicator(boolean active) {
                 progressDialog = new ProgressDialog(this);
                 progressDialog.setCanceledOnTouchOutside(false);
                 progressDialog.setMessage("Please wait...");
-            }
-
-            if (active && !progressDialog.isShowing()) {
+            } else if (active && !progressDialog.isShowing()) {
                 progressDialog.show();
+            } else if (active && !progressDialog.isShowing()) {
+
             } else {
                 progressDialog.dismiss();
             }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 239fe188..7b9ec929 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -297,6 +297,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:hint="@string/email"
+                tools:text="mikelis135@gmail.com"
                 android:inputType="textEmailAddress"
                 android:textSize="14sp" />
 
@@ -305,6 +306,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
+                tools:text="1"
                 android:hint="@string/amount_to_charge_required"
                 android:inputType="number"
                 android:textSize="14sp" />
@@ -332,6 +334,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
+                tools:text="ref"
                 android:hint="@string/txref_required"
                 android:textSize="14sp" />
 
@@ -340,6 +343,7 @@
                 android:id="@+id/narrationTV"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                tools:text="ravepay"
                 android:layout_marginBottom="10dp"
                 android:hint="@string/narration"
                 android:textSize="14sp" />
@@ -349,6 +353,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
+                tools:text="NGN"
                 android:hint="@string/currency_code_e_g_ngn"
                 android:textSize="14sp" />
 
@@ -357,6 +362,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
+                tools:text="NG"
                 android:hint="@string/country_code_e_g_ng"
                 android:textSize="14sp" />
 
@@ -366,6 +372,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
+                tools:text="taiwo"
                 android:hint="@string/first_name"
                 android:textSize="14sp" />
 
@@ -374,6 +381,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
+                tools:text="ade"
                 android:hint="@string/last_name"
                 android:textSize="14sp" />
 
@@ -383,6 +391,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:inputType="phone"
+                tools:text="08132383284"
                 android:hint="@string/phone_number"
                 android:textSize="14sp" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b8bf69c6..4c471ae8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,5 +2,7 @@
 <resources>
     <color name="colorPrimary">#F99B37</color>
     <color name="colorPrimaryDark">#c16c00</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorAccent">#c16c00</color>
+    <color name="blackgrey">#12122c</color>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 51ea0803..838ac237 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
index 44ee8238..bd7939af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/rave_android/build.gradle b/rave_android/build.gradle
index 8177a8ad..c633a818 100644
--- a/rave_android/build.gradle
+++ b/rave_android/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.flutterwave'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "2.0.5"
 
diff --git a/rave_android/src/main/AndroidManifest.xml b/rave_android/src/main/AndroidManifest.xml
index 0e1ae2e0..ef3e901a 100644
--- a/rave_android/src/main/AndroidManifest.xml
+++ b/rave_android/src/main/AndroidManifest.xml
@@ -5,14 +5,17 @@
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
+        android:theme="@style/AppThemes"
         android:supportsRtl="true">
         <activity
             android:name=".RavePayActivity"
             android:label="@string/app_name"
+            android:theme="@style/AppThemes"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".card.savedcards.SavedCardsActivity"
+            android:theme="@style/AppThemes"
             android:screenOrientation="portrait" />
     </application>
 
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java b/rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java
index a9138910..f1b117e6 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/RavePayActivity.java
@@ -551,8 +551,8 @@ private void generatePaymentTiles() {
         Collections.reverse(orderedPaymentTypesList);
 
         tileCount = orderedPaymentTypesList.size();
-        if (tileCount > 8) paymentTilesTextSize = 18f;
-        else paymentTilesTextSize = 20f;
+        if (tileCount > 8) paymentTilesTextSize = 16f;
+        else paymentTilesTextSize = 18f;
 
         for (int index = 0; index < orderedPaymentTypesList.size(); index++)
             addPaymentType(orderedPaymentTypesList.get(index));
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java
index f815bc52..1872d26c 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java
@@ -91,7 +91,6 @@ public class CardFragment extends Fragment implements View.OnClickListener, Card
     private static final String RAVEPAY = "ravepay";
     private View v;
     TextView useASavedCardTv;
-    TextView useAnotherCardTv;
     private Button payButton;
     private TextView pcidss_tv;
     private AlertDialog dialog;
@@ -131,9 +130,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             if (savedInstanceState.containsKey(STATE_PRESENTER_SAVEDCARDS)) {
                 Type savedCardsListType = new TypeToken<List<SavedCard>>() {
                 }.getType();
-                presenter.savedCards = (new Gson()).fromJson(savedInstanceState.getString
-                                (STATE_PRESENTER_SAVEDCARDS),
-                        savedCardsListType);
+                try {
+                    presenter.savedCards = (new Gson()).fromJson(savedInstanceState.getString
+                                    (STATE_PRESENTER_SAVEDCARDS),
+                            savedCardsListType);
+                } catch (Exception ignore) {
+
+                }
             }
         }
 
@@ -216,15 +219,14 @@ private void initializeViews() {
         emailEt = v.findViewById(R.id.rave_emailEt);
         cvvTil = v.findViewById(R.id.rave_cvvTil);
         cvvTv = v.findViewById(R.id.rave_cvvTv);
-        useAnotherCardTv = (TextView) v.findViewById(R.id.rave_use_new_card_tv);
-        useASavedCardTv = (TextView) v.findViewById(R.id.rave_use_saved_card_tv);
+        useASavedCardTv = v.findViewById(R.id.rave_use_saved_card_tv);
         useASavedCardTv.setVisibility(GONE);
-        saveCardSwitch = (SwitchCompat) v.findViewById(R.id.rave_saveCardSwitch);
-        saveCardPhoneNoEt = (EditText) v.findViewById(R.id.save_card_phoneNoTV);
-        saveCardEmailEt = (EditText) v.findViewById(R.id.save_card_emailTv);
-        saveCardPhoneNoTil = (TextInputLayout) v.findViewById(R.id.save_card_phoneNoTil);
-        saveCardEmailTil = (TextInputLayout) v.findViewById(R.id.save_card_emailTil);
-        saveNewCardLayout = (LinearLayout) v.findViewById(R.id.rave_layout_for_saving_card);
+        saveCardSwitch = v.findViewById(R.id.rave_saveCardSwitch);
+        saveCardPhoneNoEt = v.findViewById(R.id.save_card_phoneNoTV);
+        saveCardEmailEt = v.findViewById(R.id.save_card_emailTv);
+        saveCardPhoneNoTil = v.findViewById(R.id.save_card_phoneNoTil);
+        saveCardEmailTil = v.findViewById(R.id.save_card_emailTil);
+        saveNewCardLayout = v.findViewById(R.id.rave_layout_for_saving_card);
 
 
     }
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java
index 639fe8b6..7cab2aa2 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CardUiPresenter.java
@@ -73,7 +73,7 @@ public class CardUiPresenter extends CardPaymentHandler implements CardUiContrac
     SharedPrefsRepo sharedManager;
     @Inject
     Gson gson;
-    List<SavedCard> savedCards;
+    List<SavedCard> savedCards = new ArrayList<>();
     private CardUiContract.View mView;
     private boolean cardSaveInProgress = false;
     private String requeryInstruction = "Transaction is under processing, please use transaction requery to check status";
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardTextWatcher.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardTextWatcher.java
index b6734114..10a499b6 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardTextWatcher.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardTextWatcher.java
@@ -6,7 +6,6 @@
 import android.text.TextWatcher;
 import android.util.SparseArray;
 
-
 import com.flutterwave.raveandroid.R;
 
 import java.util.regex.Pattern;
@@ -18,13 +17,13 @@
 class CreditCardTextWatcher implements TextWatcher {
 
     private static final char space = ' ';
-    private final int mDefaultDrawableResId = R.drawable.creditcard;
+    private final int mDefaultDrawableResId = R.drawable.ic_credit_card;
     private int mCurrentDrawableResId = 0;
     private Drawable mCurrentDrawable;
     String lastFormattedText;
     private SparseArray<Pattern> mCCPatterns = null;
 
-    CreditCardTextWatcher(){
+    CreditCardTextWatcher() {
         init();
     }
 
@@ -32,14 +31,14 @@ private void init() {
         if (mCCPatterns == null) {
             mCCPatterns = new SparseArray<>();
             // With spaces for credit card masking
-            mCCPatterns.put(R.drawable.visa_logo_new, Pattern.compile(
+            mCCPatterns.put(R.drawable.ic_visa, Pattern.compile(
                     "^4[0-9]{2,12}(?:[0-9]{3})?$"));
-            mCCPatterns.put(R.drawable.master_card_logo_svg, Pattern.compile(
+            mCCPatterns.put(R.drawable.ic_master_card, Pattern.compile(
                     "^5[1-5][0-9]{1,14}$"));
-            mCCPatterns.put(R.drawable.amex, Pattern.compile(
+            mCCPatterns.put(R.drawable.ic_american_express, Pattern.compile(
                     "^3[47][0-9]{1,13}$"));
             ///^([506]{3})([0-9]{1,16})$/
-            mCCPatterns.put(R.drawable.verve, Pattern.compile(
+            mCCPatterns.put(R.drawable.ic_verve_logo, Pattern.compile(
                     "^([506]{3})([0-9]{1,16})$"
             ));
         }
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java
index 22a3dfee..6ccd8f28 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/CreditCardView.java
@@ -3,14 +3,13 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import com.google.android.material.textfield.TextInputEditText;
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.SparseArray;
 
-
 import com.flutterwave.raveandroid.R;
+import com.google.android.material.textfield.TextInputEditText;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -24,7 +23,7 @@ public class CreditCardView extends TextInputEditText {
 
     private SparseArray<Pattern> mCCPatterns = null;
     //default credit card image
-    private final int mDefaultDrawableResId = R.drawable.creditcard;
+    private final int mDefaultDrawableResId = R.drawable.ic_credit_card;
     private int mCurrentDrawableResId = 0;
     private Drawable mCurrentDrawable;
     String lastFormattedText;
@@ -50,20 +49,19 @@ private void init() {
         if (mCCPatterns == null) {
             mCCPatterns = new SparseArray<>();
             // With spaces for credit card masking
-            mCCPatterns.put(R.drawable.visa_logo_new, Pattern.compile(
+            mCCPatterns.put(R.drawable.ic_visa, Pattern.compile(
                     "^4[0-9]{2,12}(?:[0-9]{3})?$"));
-            mCCPatterns.put(R.drawable.master_card_logo_svg, Pattern.compile(
+            mCCPatterns.put(R.drawable.ic_master_card, Pattern.compile(
                     "^5[1-5][0-9]{1,14}$"));
-            mCCPatterns.put(R.drawable.amex, Pattern.compile(
+            mCCPatterns.put(R.drawable.ic_american_express, Pattern.compile(
                     "^3[47][0-9]{1,13}$"));
             ///^([506]{3})([0-9]{1,16})$/
-            mCCPatterns.put(R.drawable.verve, Pattern.compile(
+            mCCPatterns.put(R.drawable.ic_verve_logo, Pattern.compile(
                     "^([506]{3})([0-9]{1,16})$"
             ));
         }
 
         setInputType(InputType.TYPE_CLASS_PHONE);
-
         addTextChangedListener(new CreditCardTextWatcher());
     }
 
@@ -127,7 +125,6 @@ protected void onTextChanged(CharSequence text, int start, int lengthBefore, int
         mCurrentDrawable = getResources()
                 .getDrawable(mCurrentDrawableResId);
 
-
     }
 
 }
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java
index 2d6633b0..c707d9ea 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardRecyclerAdapter.java
@@ -1,13 +1,14 @@
 package com.flutterwave.raveandroid.card.savedcards;
 
 import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.flutterwave.raveandroid.R;
 import com.flutterwave.raveandroid.rave_core.models.SavedCard;
 import com.flutterwave.raveandroid.rave_remote.Callbacks;
@@ -62,26 +63,26 @@ public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickL
 
         ViewHolder(View v) {
             super(v);
-            cardTypeTv = (TextView) v.findViewById(R.id.card_type_tv);
-            maskedPanTv = (TextView) v.findViewById(R.id.masked_pan_tv);
-            cardBrandIv = (ImageView) v.findViewById(R.id.rave_card_brand_imageview);
+            cardTypeTv = v.findViewById(R.id.card_type_tv);
+            maskedPanTv = v.findViewById(R.id.masked_pan_tv);
+            cardBrandIv = v.findViewById(R.id.rave_card_brand_imageview);
 
             v.setOnClickListener(this);
         }
 
         public void bind(SavedCard card) {
             this.card = card;
-            cardTypeTv.setText("YOUR " + card.getCard_brand());
+            cardTypeTv.setText(card.getCard_brand());
             maskedPanTv.setText(card.getMasked_pan());
             if (card.getCard_brand().equalsIgnoreCase("mastercard")) {
                 cardBrandIv
-                        .setImageResource(R.drawable.master_card_logo_svg);
+                        .setImageResource(R.drawable.ic_master_card);
             } else if (card.getCard_brand().equalsIgnoreCase("visa")) {
-                cardBrandIv.setImageResource(R.drawable.visa_logo_new);
-            } else if (card.getCard_brand().equalsIgnoreCase("verve")) {
-                cardBrandIv.setImageResource(R.drawable.verve);
-            } else if (card.getCard_brand().equalsIgnoreCase("amex")) {
-                cardBrandIv.setImageResource(R.drawable.amex);
+                cardBrandIv.setImageResource(R.drawable.ic_visa);
+            } else if (card.getCard_brand().equalsIgnoreCase("ic_verve_logo")) {
+                cardBrandIv.setImageResource(R.drawable.ic_verve_logo);
+            } else if (card.getCard_brand().equalsIgnoreCase("ic_american_express")) {
+                cardBrandIv.setImageResource(R.drawable.ic_american_express);
             }
         }
 
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java
index 972a1811..fe544f18 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsActivity.java
@@ -2,8 +2,11 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+import android.view.View;
+
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
 
 import com.flutterwave.raveandroid.R;
 
@@ -14,11 +17,24 @@ public class SavedCardsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         if (getIntent() != null & getIntent().getIntExtra("theme", 0) != 0) {
             setTheme(getIntent().getIntExtra("theme", 0));
         }
         setContentView(R.layout.rave_sdk_activity_futher_verification);
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+        }
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onBackPressed();
+            }
+        });
+
         if (findViewById(R.id.frame_container) != null) {
             if (savedInstanceState != null) {
                 return;
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java
index 4fc7064f..87c484b1 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/card/savedcards/SavedCardsFragment.java
@@ -2,16 +2,13 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.UnderlineSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.flutterwave.raveandroid.R;
 import com.flutterwave.raveandroid.RavePayActivity;
@@ -32,7 +29,6 @@ public class SavedCardsFragment extends Fragment {
 
     public static final String EXTRA_SAVED_CARDS = "saved_cards";
     public static final String SAVED_CARD_MOTIVE = "for_saved_card";
-    TextView useAnotherCardTv;
     private SavedCard savedCardToCharge = null;
     private List<SavedCard> savedCards;
 
@@ -41,27 +37,12 @@ public SavedCardsFragment() {
         // Required empty public constructor
     }
 
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         final View v = inflater.inflate(R.layout.rave_sdk_fragment_saved_cards, container, false);
 
-        useAnotherCardTv = (TextView) v.findViewById(R.id.rave_use_new_card_tv);
-
-        String s = useAnotherCardTv.getText().toString();
-        Spannable spannable = new SpannableString(s);
-        spannable.setSpan(new UnderlineSpan(), 0, s.length(), 0);
-        useAnotherCardTv.setText(spannable);
-
-        useAnotherCardTv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                goBack();
-            }
-        });
-
         if (getArguments() != null) {
             if (getArguments().containsKey(EXTRA_SAVED_CARDS)) {
                 Type savedCardsListType = new TypeToken<List<SavedCard>>() {
@@ -81,7 +62,7 @@ public void onCardSelected(SavedCard savedCard) {
                 goBack();
             }
         });
-        RecyclerView recyclerView = (RecyclerView) v.findViewById(R.id.rave_recycler);
+        RecyclerView recyclerView = v.findViewById(R.id.rave_recycler);
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         recyclerView.setAdapter(adapter);
 
diff --git a/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java
index 1a36daa4..591d95e9 100644
--- a/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java
+++ b/rave_android/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java
@@ -121,10 +121,11 @@ private void initializeViews() {
     }
 
     private void setUpNetworks() {
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getActivity(),
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(requireActivity(),
                 R.array.zm_mobile_money_networks, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         networkSpinner.setAdapter(adapter);
+        networkSpinner.setBackgroundResource(R.drawable.rectangle);
 
         networkSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
diff --git a/rave_android/src/main/res/drawable-hdpi/collapsed.png b/rave_android/src/main/res/drawable-hdpi/collapsed.png
deleted file mode 100644
index 0cbbc5f6..00000000
Binary files a/rave_android/src/main/res/drawable-hdpi/collapsed.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-hdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-hdpi/master_card_logo_svg.png
deleted file mode 100644
index 38505cca..00000000
Binary files a/rave_android/src/main/res/drawable-hdpi/master_card_logo_svg.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-hdpi/padlock.png b/rave_android/src/main/res/drawable-hdpi/padlock.png
deleted file mode 100644
index 22cbaeb4..00000000
Binary files a/rave_android/src/main/res/drawable-hdpi/padlock.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-hdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-hdpi/visa_logo_new.png
deleted file mode 100644
index a9810cf2..00000000
Binary files a/rave_android/src/main/res/drawable-hdpi/visa_logo_new.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-mdpi/collapsed.png b/rave_android/src/main/res/drawable-mdpi/collapsed.png
deleted file mode 100644
index 8b8074b4..00000000
Binary files a/rave_android/src/main/res/drawable-mdpi/collapsed.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-mdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-mdpi/master_card_logo_svg.png
deleted file mode 100644
index 143cf475..00000000
Binary files a/rave_android/src/main/res/drawable-mdpi/master_card_logo_svg.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-mdpi/padlock.png b/rave_android/src/main/res/drawable-mdpi/padlock.png
deleted file mode 100644
index 29e989b8..00000000
Binary files a/rave_android/src/main/res/drawable-mdpi/padlock.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-mdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-mdpi/visa_logo_new.png
deleted file mode 100644
index 674eab02..00000000
Binary files a/rave_android/src/main/res/drawable-mdpi/visa_logo_new.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-night/ic_visa.xml b/rave_android/src/main/res/drawable-night/ic_visa.xml
new file mode 100644
index 00000000..71230df8
--- /dev/null
+++ b/rave_android/src/main/res/drawable-night/ic_visa.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="20dp"
+    android:viewportWidth="64"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M33.0993,6.3939C33.0628,9.1798 35.6649,10.7346 37.6251,11.6589C39.6392,12.6074 40.3157,13.2155 40.308,14.0636C40.2926,15.3617 38.7013,15.9345 37.2119,15.9569C34.6838,15.9949 33.1855,15.3163 32,14.7793L31.902,14.735L30.9661,18.9734C32.171,19.5109 34.4023,19.9795 36.7161,20C42.1471,20 45.7006,17.4056 45.7198,13.3829C45.7324,10.3289 43.1184,9.0007 41.0266,7.9379C39.6218,7.2241 38.4526,6.63 38.4726,5.7132C38.4899,5.0214 39.1722,4.2831 40.6673,4.0952C41.4072,4.0004 43.4501,3.9278 45.7659,4.96L46.6749,0.8592C45.4296,0.4203 43.8287,0 41.8358,0C36.7238,0 33.1281,2.6297 33.0993,6.3939ZM55.4095,0.3534C54.4179,0.3534 53.5819,0.9131 53.2091,1.7724L45.4507,19.6987H50.8779L51.958,16.8105H58.5901L59.2166,19.6987H64L59.8258,0.3534H55.4095ZM57.7349,12.8436L56.1686,5.5793L53.4454,12.8436H57.7349ZM26.519,0.3534L22.2411,19.6987H27.4126L31.6887,0.3534H26.519ZM13.4853,13.5206L18.8683,0.3534H24.2993L15.9202,19.6987L10.4546,19.6987L6.3304,4.2607C6.0806,3.3104 5.8634,2.9608 5.1024,2.5609C3.859,1.9063 1.8065,1.2944 0,0.915L0.123,0.3534H8.9229C10.0434,0.3534 11.0523,1.0749 11.3079,2.3247L13.4853,13.5206Z" />
+</vector>
\ No newline at end of file
diff --git a/rave_android/src/main/res/drawable-xhdpi/collapsed.png b/rave_android/src/main/res/drawable-xhdpi/collapsed.png
deleted file mode 100644
index f1177d27..00000000
Binary files a/rave_android/src/main/res/drawable-xhdpi/collapsed.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xhdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-xhdpi/master_card_logo_svg.png
deleted file mode 100644
index d51580a6..00000000
Binary files a/rave_android/src/main/res/drawable-xhdpi/master_card_logo_svg.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xhdpi/padlock.png b/rave_android/src/main/res/drawable-xhdpi/padlock.png
deleted file mode 100644
index 25939a75..00000000
Binary files a/rave_android/src/main/res/drawable-xhdpi/padlock.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xhdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-xhdpi/visa_logo_new.png
deleted file mode 100644
index dd2fa91d..00000000
Binary files a/rave_android/src/main/res/drawable-xhdpi/visa_logo_new.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xxhdpi/collapsed.png b/rave_android/src/main/res/drawable-xxhdpi/collapsed.png
deleted file mode 100644
index f317bf5e..00000000
Binary files a/rave_android/src/main/res/drawable-xxhdpi/collapsed.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xxhdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-xxhdpi/master_card_logo_svg.png
deleted file mode 100644
index 6ad89458..00000000
Binary files a/rave_android/src/main/res/drawable-xxhdpi/master_card_logo_svg.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xxhdpi/padlock.png b/rave_android/src/main/res/drawable-xxhdpi/padlock.png
deleted file mode 100644
index bb8e77ce..00000000
Binary files a/rave_android/src/main/res/drawable-xxhdpi/padlock.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xxhdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-xxhdpi/visa_logo_new.png
deleted file mode 100644
index bcf4b89b..00000000
Binary files a/rave_android/src/main/res/drawable-xxhdpi/visa_logo_new.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xxxhdpi/collapsed.png b/rave_android/src/main/res/drawable-xxxhdpi/collapsed.png
deleted file mode 100644
index 9c3792cf..00000000
Binary files a/rave_android/src/main/res/drawable-xxxhdpi/collapsed.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xxxhdpi/master_card_logo_svg.png b/rave_android/src/main/res/drawable-xxxhdpi/master_card_logo_svg.png
deleted file mode 100644
index 5e42321d..00000000
Binary files a/rave_android/src/main/res/drawable-xxxhdpi/master_card_logo_svg.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xxxhdpi/padlock.png b/rave_android/src/main/res/drawable-xxxhdpi/padlock.png
deleted file mode 100644
index 42993af7..00000000
Binary files a/rave_android/src/main/res/drawable-xxxhdpi/padlock.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable-xxxhdpi/visa_logo_new.png b/rave_android/src/main/res/drawable-xxxhdpi/visa_logo_new.png
deleted file mode 100644
index f1f99d06..00000000
Binary files a/rave_android/src/main/res/drawable-xxxhdpi/visa_logo_new.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable/amex.png b/rave_android/src/main/res/drawable/amex.png
deleted file mode 100644
index 8c4aa322..00000000
Binary files a/rave_android/src/main/res/drawable/amex.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable/back_grey.xml b/rave_android/src/main/res/drawable/back_grey.xml
new file mode 100644
index 00000000..5d03e8fa
--- /dev/null
+++ b/rave_android/src/main/res/drawable/back_grey.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#999999"
+        android:pathData="M16,7H3.83L9.42,1.41L8,0L0,8L8,16L9.41,14.59L3.83,9H16V7Z" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/black_background_curved.xml b/rave_android/src/main/res/drawable/black_background_curved.xml
index 62f1744f..3e2280c1 100644
--- a/rave_android/src/main/res/drawable/black_background_curved.xml
+++ b/rave_android/src/main/res/drawable/black_background_curved.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="5dp" />
-    <solid android:color="#000000" />
+    <solid android:color="#000" />
 </shape>
\ No newline at end of file
diff --git a/rave_android/src/main/res/drawable/broken_link.png b/rave_android/src/main/res/drawable/broken_link.png
deleted file mode 100644
index c15a1f34..00000000
Binary files a/rave_android/src/main/res/drawable/broken_link.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable/creditcard.png b/rave_android/src/main/res/drawable/creditcard.png
deleted file mode 100644
index 7117bd6f..00000000
Binary files a/rave_android/src/main/res/drawable/creditcard.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable/flw_icon_coloured.png b/rave_android/src/main/res/drawable/flw_icon_coloured.png
deleted file mode 100755
index 37aad702..00000000
Binary files a/rave_android/src/main/res/drawable/flw_icon_coloured.png and /dev/null differ
diff --git a/rave_android/src/main/res/drawable/ic_american_express.xml b/rave_android/src/main/res/drawable/ic_american_express.xml
new file mode 100644
index 00000000..0a7708ba
--- /dev/null
+++ b/rave_android/src/main/res/drawable/ic_american_express.xml
@@ -0,0 +1,78 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="1000"
+    android:viewportHeight="997.517">
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m0,0 l997.52,0 0,538.49 -49.37,77.15 49.37,68.66 0,313.22 -997.52,0 0,-507.63L30.86,454.4 0,420.45Z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m193.64,695.1 l0,-156.61 165.82,0 17.79,23.19 18.38,-23.19 601.89,0 0,145.81c0,0 -15.74,10.64 -33.94,10.8l-333.28,0 -20.06,-24.69 0,24.69 -65.73,0 0,-42.14c0,0 -8.98,5.88 -28.39,5.88l-22.37,0 0,36.26 -99.52,0 -17.77,-23.69 -18.04,23.69z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m0,420.45 l37.39,-87.18 64.67,0 21.22,48.83 0,-48.83 80.39,0 12.63,35.29 12.25,-35.29 360.86,0 0,17.74c0,0 18.97,-17.74 50.15,-17.74l117.08,0.41 20.85,48.19 0,-48.6 67.27,0 18.52,27.68 0,-27.68 67.89,0 0,156.61 -67.89,0 -17.74,-27.77 0,27.77 -98.84,0 -9.94,-24.69 -26.57,0 -9.78,24.69 -67.03,0c-26.83,0 -43.97,-17.38 -43.97,-17.38l0,17.38 -101.06,0 -20.06,-24.69 0,24.69 -375.8,0 -9.93,-24.69 -26.49,0 -9.86,24.69 -46.2,0z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m50.63,352.58 l-50.44,117.26 32.84,0 9.31,-23.48 54.1,0 9.26,23.48 33.56,0 -50.39,-117.26 -38.24,0zM69.29,379.87 L85.78,420.91 52.75,420.91 69.29,379.87z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m142.72,469.83 l0,-117.26 46.66,0.17 27.14,75.6 26.49,-75.78 46.29,0 0,117.26 -29.32,0 0,-86.41 -31.08,86.41 -25.71,0 -31.16,-86.41 0,86.41z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m309.36,469.83 l0,-117.26 95.66,0 0,26.23 -66.04,0 0,20.06 64.5,0 0,24.69 -64.5,0 0,20.83 66.04,0 0,25.46z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m422,352.58 l0,117.26 29.32,0 0,-41.66 12.34,0 35.15,41.66 35.83,0 -38.57,-43.2c15.83,-1.34 32.16,-14.92 32.16,-36.02 0,-24.68 -19.37,-38.04 -40.98,-38.04l-65.24,0zM451.31,378.81 L484.82,378.81c8.04,0 13.89,6.29 13.89,12.34 0,7.79 -7.58,12.34 -13.45,12.34l-33.94,0 0,-24.69z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m570.12,469.83 l-29.93,0 0,-117.26 29.93,0z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m641.1,469.83 l-6.46,0c-31.26,0 -50.24,-24.63 -50.24,-58.15 0,-34.35 18.77,-59.11 58.25,-59.11l32.4,0 0,27.77 -33.59,0c-16.03,0 -27.36,12.51 -27.36,31.63 0,22.71 12.96,32.25 31.63,32.25l7.71,0z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m704.89,352.58 l-50.44,117.26 32.84,0 9.31,-23.48 54.1,0 9.26,23.48 33.56,0 -50.39,-117.26 -38.24,0zM723.55,379.87 L740.04,420.91 707.01,420.91 723.55,379.87z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m796.93,469.83 l0,-117.26 37.27,0 47.59,73.68 0,-73.68 29.32,0 0,117.26 -36.07,0 -48.8,-75.6 0,75.6z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m213.7,675.04 l0,-117.26 95.66,0 0,26.23 -66.04,0 0,20.06 64.5,0 0,24.69 -64.5,0 0,20.83 66.04,0 0,25.46z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m682.45,675.04 l0,-117.26 95.66,0 0,26.23 -66.04,0 0,20.06 64.19,0 0,24.69 -64.19,0 0,20.83 66.04,0 0,25.46z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m313.07,675.04 l46.58,-57.91 -47.69,-59.36 36.93,0 28.4,36.69 28.5,-36.69 35.49,0 -47.06,58.63 46.66,58.63 -36.93,0 -27.58,-36.11 -26.91,36.11z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m444.37,557.8 l0,117.26 30.09,0 0,-37.03 30.86,0c26.11,0 45.9,-13.85 45.9,-40.79 0,-22.32 -15.52,-39.44 -42.09,-39.44l-64.76,0zM474.46,584.32 L506.96,584.32c8.44,0 14.47,5.17 14.47,13.5 0,7.83 -6,13.5 -14.56,13.5l-32.4,0 0,-27z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m563.95,557.78 l0,117.26 29.32,0 0,-41.66 12.34,0 35.15,41.66 35.83,0 -38.57,-43.2c15.83,-1.34 32.16,-14.92 32.16,-36.02 0,-24.68 -19.37,-38.04 -40.98,-38.04l-65.24,0zM593.26,584.01 L626.77,584.01c8.04,0 13.89,6.29 13.89,12.34 0,7.79 -7.58,12.34 -13.45,12.34l-33.94,0 0,-24.69z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m791.69,675.04 l0,-25.46 58.67,0c8.68,0 12.44,-4.69 12.44,-9.84 0,-4.93 -3.75,-9.91 -12.44,-9.91l-26.51,0c-23.05,0 -35.88,-14.04 -35.88,-35.12 0,-18.8 11.75,-36.93 46,-36.93l57.09,0 -12.34,26.38 -49.37,0c-9.44,0 -12.34,4.95 -12.34,9.68 0,4.86 3.59,10.22 10.8,10.22l27.77,0c25.69,0 36.84,14.57 36.84,33.66 0,20.52 -12.42,37.32 -38.24,37.32z"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#016fd0"
+        android:pathData="m899.28,675.04 l0,-25.46 58.67,0c8.68,0 12.44,-4.69 12.44,-9.84 0,-4.93 -3.75,-9.91 -12.44,-9.91l-26.51,0c-23.05,0 -35.88,-14.04 -35.88,-35.12 0,-18.8 11.75,-36.93 46,-36.93l57.09,0 -12.34,26.38 -49.37,0c-9.44,0 -12.34,4.95 -12.34,9.68 0,4.86 3.59,10.22 10.8,10.22l27.77,0c25.69,0 36.84,14.57 36.84,33.66 0,20.52 -12.42,37.32 -38.24,37.32z"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/ic_arrow_down.xml b/rave_android/src/main/res/drawable/ic_arrow_down.xml
new file mode 100644
index 00000000..29d7bd0a
--- /dev/null
+++ b/rave_android/src/main/res/drawable/ic_arrow_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#999999"
+      android:pathData="M8.12,9.29L12,13.17l3.88,-3.88c0.39,-0.39 1.02,-0.39 1.41,0 0.39,0.39 0.39,1.02 0,1.41l-4.59,4.59c-0.39,0.39 -1.02,0.39 -1.41,0L6.7,10.7c-0.39,-0.39 -0.39,-1.02 0,-1.41 0.39,-0.38 1.03,-0.39 1.42,0z" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/ic_arrow_up.xml b/rave_android/src/main/res/drawable/ic_arrow_up.xml
new file mode 100644
index 00000000..21510d65
--- /dev/null
+++ b/rave_android/src/main/res/drawable/ic_arrow_up.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#999999"
+        android:pathData="M8.12,14.71L12,10.83l3.88,3.88c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L12.7,8.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L6.7,13.3c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.38 1.03,0.39 1.42,0z" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/ic_credit_card.xml b/rave_android/src/main/res/drawable/ic_credit_card.xml
new file mode 100644
index 00000000..a9f0230b
--- /dev/null
+++ b/rave_android/src/main/res/drawable/ic_credit_card.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#999999"
+        android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/ic_flw_logo.xml b/rave_android/src/main/res/drawable/ic_flw_logo.xml
new file mode 100644
index 00000000..115cd80e
--- /dev/null
+++ b/rave_android/src/main/res/drawable/ic_flw_logo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="75dp"
+    android:viewportWidth="72"
+    android:viewportHeight="75">
+    <path
+        android:fillColor="#F5A623"
+        android:pathData="M53.5282,31.7914C63.5927,23.8798 84.2969,-4.3964 51.9463,0.5843C37.8562,2.6356 17.1513,15.6754 12.9816,30.6196C10.8089,26.627 8.409,22.7623 5.7936,19.0445C1.9113,13.9163 -2.5457,17.8728 1.768,23.1464C13.9889,38.2368 22.4715,56.4041 22.4715,74.7182C23.4788,65.6342 21.8969,54.4996 18.1586,43.6579C20.0278,44.2438 22.0409,44.5368 23.9101,44.5368C30.5242,54.7932 40.5887,63.5829 51.9471,67.6855C62.2995,71.6413 76.1023,69.297 70.4948,53.4739C67.4751,44.8297 60.4303,37.2111 53.5289,31.7906L53.5282,31.7914ZM54.9654,4.2478C72.9379,2.3426 53.6715,23.5869 47.3454,27.5419C41.4506,23.8798 34.1172,20.6568 26.9285,21.5356C32.1047,15.2356 44.6136,5.4196 54.9661,4.2471L54.9654,4.2478ZM26.7852,26.2234C31.6734,25.7836 36.9929,28.4208 41.0193,31.0586C37.0613,32.995 32.7632,34.1395 28.3663,34.4278C21.7522,34.4278 20.4583,26.8092 26.7852,26.2234ZM51.659,59.3342C43.1758,56.9907 35.2685,50.5438 29.5169,43.9509C34.2612,43.0721 38.8628,41.3137 43.1758,38.8234C44.7569,38.0906 46.3388,37.065 47.7767,36.0394C52.8096,40.4349 57.9852,46.2951 59.9983,52.8881C62.0108,60.0669 56.5473,60.6528 51.659,59.3342Z" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/ic_lock.xml b/rave_android/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 00000000..b5650bca
--- /dev/null
+++ b/rave_android/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#999"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/ic_lock_outline_black_24dp.xml b/rave_android/src/main/res/drawable/ic_lock_outline_black_24dp.xml
deleted file mode 100644
index 3d95ceb6..00000000
--- a/rave_android/src/main/res/drawable/ic_lock_outline_black_24dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="10dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
-</vector>
diff --git a/rave_android/src/main/res/drawable/ic_master_card.xml b/rave_android/src/main/res/drawable/ic_master_card.xml
new file mode 100644
index 00000000..d1d08e59
--- /dev/null
+++ b/rave_android/src/main/res/drawable/ic_master_card.xml
@@ -0,0 +1,78 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="300dp"
+    android:height="180dp"
+    android:viewportWidth="300"
+    android:viewportHeight="180">
+    <path
+        android:fillColor="#FF9900"
+        android:pathData="M298.032,90.5c0.014,48.936 -39.646,88.614 -88.582,88.627c-48.937,0.012 -88.614,-39.646 -88.627,-88.582c0,-0.016 0,-0.029 0,-0.045c-0.013,-48.935 39.647,-88.615 88.581,-88.628c48.937,-0.013 88.615,39.647 88.628,88.583C298.032,90.47 298.032,90.484 298.032,90.5z" />
+    <path
+        android:fillColor="#CC0000"
+        android:pathData="M90.001,1.895C41.355,2.204 1.967,41.781 1.967,90.5c0,48.909 39.695,88.604 88.605,88.604c22.955,0 43.879,-8.748 59.624,-23.086c-0.001,0 -0.003,-0.002 -0.007,-0.004h0.019c3.224,-2.938 6.231,-6.108 8.995,-9.488H141.05c-2.424,-2.928 -4.627,-5.979 -6.606,-9.127h31.308c1.904,-3.047 3.628,-6.211 5.158,-9.488h-41.635c-1.419,-3.042 -2.651,-6.153 -3.703,-9.309h49.045c2.956,-8.832 4.56,-18.281 4.56,-28.103c0,-6.512 -0.706,-12.861 -2.042,-18.974h-54.164c0.671,-3.146 1.518,-6.254 2.528,-9.308h49.063c-1.097,-3.25 -2.371,-6.417 -3.82,-9.487H129.27c1.496,-3.196 3.191,-6.305 5.084,-9.307h31.285c-2.082,-3.317 -4.386,-6.486 -6.877,-9.488h-17.443c2.697,-3.174 5.666,-6.163 8.889,-8.95c-15.746,-14.34 -36.676,-23.09 -59.636,-23.09C90.381,1.895 90.192,1.894 90.001,1.895z" />
+    <path
+        android:fillColor="#FCB340"
+        android:pathData="M289.143,136.82c0.482,0 0.951,0.125 1.409,0.371c0.46,0.246 0.814,0.601 1.07,1.062c0.256,0.456 0.384,0.937 0.384,1.435c0,0.492 -0.127,0.968 -0.379,1.424c-0.251,0.455 -0.605,0.81 -1.061,1.063c-0.451,0.249 -0.928,0.375 -1.424,0.375s-0.972,-0.126 -1.426,-0.375c-0.455,-0.254 -0.807,-0.607 -1.063,-1.063c-0.252,-0.456 -0.377,-0.932 -0.377,-1.424c0,-0.498 0.127,-0.979 0.384,-1.435c0.258,-0.461 0.614,-0.813 1.071,-1.062C288.193,136.945 288.662,136.82 289.143,136.82M289.143,137.295c-0.401,0 -0.793,0.104 -1.176,0.311c-0.38,0.207 -0.677,0.5 -0.891,0.888c-0.217,0.382 -0.325,0.778 -0.325,1.194c0,0.412 0.106,0.81 0.315,1.188c0.214,0.377 0.51,0.673 0.888,0.885c0.381,0.211 0.776,0.315 1.188,0.315c0.414,0 0.81,-0.104 1.189,-0.315c0.378,-0.212 0.673,-0.508 0.884,-0.885c0.209,-0.378 0.313,-0.775 0.313,-1.188c0,-0.416 -0.106,-0.813 -0.321,-1.194c-0.213,-0.388 -0.511,-0.681 -0.894,-0.888C289.934,137.398 289.544,137.295 289.143,137.295M287.887,141.27v-3.082h1.062c0.36,0 0.622,0.028 0.784,0.088c0.162,0.057 0.291,0.154 0.388,0.297c0.095,0.141 0.144,0.291 0.144,0.451c0,0.226 -0.08,0.422 -0.242,0.588c-0.158,0.166 -0.373,0.261 -0.639,0.281c0.109,0.045 0.196,0.102 0.264,0.164c0.125,0.12 0.275,0.323 0.455,0.61l0.375,0.603h-0.606l-0.272,-0.485c-0.215,-0.382 -0.388,-0.62 -0.521,-0.718c-0.091,-0.069 -0.224,-0.105 -0.397,-0.105h-0.293v1.311h-0.5M288.385,139.535h0.604c0.288,0 0.483,-0.044 0.588,-0.129c0.106,-0.088 0.159,-0.2 0.159,-0.342c0,-0.092 -0.024,-0.174 -0.075,-0.244c-0.052,-0.073 -0.122,-0.125 -0.213,-0.162c-0.089,-0.035 -0.255,-0.055 -0.497,-0.055h-0.564v0.932" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M119.975,115.92l1.18,-8.02c-0.645,0 -1.593,0.279 -2.431,0.279c-3.284,0 -3.694,-1.755 -3.436,-3.037l3.236,-16.13h4.992l1.029,-9.103h-4.705l0.958,-5.516L110.956,74.393c-0.208,0.208 -5.568,31.022 -5.568,34.776c0,5.555 3.118,8.027 7.516,7.988C116.346,117.128 119.029,116.175 119.975,115.92z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M122.962,100.632c0,13.332 8.799,16.499 16.297,16.499c6.921,0 10.55,-1.604 10.55,-1.604l1.662,-9.1c0,0 -5.848,2.378 -10.601,2.378c-10.131,0 -8.355,-7.554 -8.355,-7.554l19.463,0.059c0,0 1.239,-6.111 1.239,-8.602c0,-6.217 -3.387,-13.849 -13.745,-13.849C129.986,78.861 122.962,89.082 122.962,100.632zM139.508,87.307c5.324,0 4.342,5.984 4.342,6.469L133.376,93.776C133.376,93.156 134.365,87.307 139.508,87.307z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M199.246,115.917l1.689,-10.284c0,0 -4.632,2.321 -7.807,2.321c-6.693,0 -9.378,-5.11 -9.378,-10.601c0,-11.137 5.758,-17.265 12.168,-17.265c4.808,0 8.665,2.699 8.665,2.699l1.54,-9.993c0,0 -4.554,-3.289 -9.456,-3.308c-14.745,-0.058 -23.182,10.208 -23.182,27.955c0,11.763 6.248,19.768 17.506,19.768C194.174,117.209 199.246,115.917 199.246,115.917z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M68.086,79.006c-6.469,0 -11.427,2.079 -11.427,2.079l-1.37,8.127c0,0 4.093,-1.663 10.281,-1.663c3.513,0 6.083,0.395 6.083,3.25c0,1.734 -0.314,2.374 -0.314,2.374s-2.772,-0.231 -4.056,-0.231c-9.21,0 -16.729,3.482 -16.729,13.98c0,8.273 5.623,10.17 9.108,10.17c6.657,0 9.292,-4.203 9.444,-4.215l-0.077,3.488c0,0 8.306,0 8.307,0l3.706,-25.98C81.042,79.36 71.426,79.006 68.086,79.006zM69.524,100.102c0.181,1.586 -0.41,9.086 -6.092,9.086c-2.93,0 -3.691,-2.24 -3.691,-3.562c0,-2.584 1.403,-5.683 8.315,-5.683C69.666,99.943 69.253,100.059 69.524,100.102z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M89.871,116.9c2.125,0 14.272,0.541 14.272,-11.994c0,-11.721 -11.244,-9.404 -11.244,-14.114c0,-2.342 1.833,-3.08 5.184,-3.08c1.329,0 6.447,0.423 6.447,0.423l1.189,-8.33c0,0.001 -3.312,-0.741 -8.704,-0.741c-6.979,0 -14.063,2.786 -14.063,12.318c0,10.802 11.812,9.717 11.812,14.267c0,3.037 -3.3,3.287 -5.844,3.287c-4.401,0 -8.363,-1.511 -8.377,-1.438l-1.259,8.245C79.513,115.813 81.958,116.9 89.871,116.9z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M277.063,71.449l-1.705,12.709c0,0 -3.553,-4.905 -9.112,-4.905c-10.459,0 -15.849,10.423 -15.849,22.396c0,7.73 3.844,15.307 11.699,15.307c5.651,0 8.784,-3.941 8.784,-3.941l-0.415,3.365h9.178l7.207,-44.862L277.063,71.449zM273.011,96.15c0,4.983 -2.468,11.64 -7.581,11.64c-3.396,0 -4.988,-2.851 -4.988,-7.324c0,-7.315 3.285,-12.14 7.432,-12.14C271.268,88.326 273.011,90.656 273.011,96.15z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M17.005,116.417l5.743,-33.87l0.844,33.87h6.499l12.125,-33.87l-5.371,33.87h9.658l7.437,-44.922l-15.342,-0.117l-9.126,27.504l-0.25,-27.387h-14.06l-7.544,44.922L17.005,116.417L17.005,116.417z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M162.357,116.481c2.746,-15.615 3.724,-27.947 11.732,-25.393c1.15,-6.044 3.891,-11.3 5.143,-13.858c0,0 -0.396,-0.589 -2.871,-0.589c-4.225,0 -9.866,8.574 -9.866,8.574l0.843,-5.301h-8.786l-5.884,36.566L162.357,116.48z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M219.006,79.006c-6.472,0 -11.43,2.079 -11.43,2.079l-1.369,8.127c0,0 4.095,-1.663 10.28,-1.663c3.514,0 6.083,0.395 6.083,3.25c0,1.734 -0.313,2.374 -0.313,2.374s-2.771,-0.231 -4.055,-0.231c-9.211,0 -16.729,3.482 -16.729,13.98c0,8.273 5.622,10.17 9.107,10.17c6.655,0 9.292,-4.203 9.443,-4.215l-0.078,3.488h8.309l3.705,-25.98C231.96,79.36 222.344,79.006 219.006,79.006zM220.442,100.102c0.18,1.586 -0.411,9.086 -6.092,9.086c-2.932,0 -3.692,-2.24 -3.692,-3.562c0,-2.584 1.402,-5.683 8.315,-5.683C220.584,99.943 220.172,100.059 220.442,100.102z" />
+    <path
+        android:fillColor="#000066"
+        android:pathData="M241.522,116.481c1.508,-11.488 4.299,-27.616 11.731,-25.393c1.149,-6.044 0.041,-6.028 -2.433,-6.028c-4.228,0 -5.164,0.154 -5.164,0.154l0.844,-5.301h-8.785l-5.884,36.567L241.522,116.48L241.522,116.481z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M122.434,113.059l1.181,-8.019c-0.645,0 -1.594,0.276 -2.431,0.276c-3.284,0 -3.646,-1.746 -3.437,-3.037l2.653,-16.362h4.991l1.205,-8.87h-4.706l0.958,-5.516h-9.434c-0.208,0.208 -5.569,31.023 -5.569,34.775c0,5.555 3.119,8.029 7.517,7.989C118.806,114.266 121.488,113.313 122.434,113.059z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M125.423,97.77c0,13.332 8.8,16.5 16.297,16.5c6.92,0 9.965,-1.547 9.965,-1.547l1.662,-9.099c0,0 -5.264,2.319 -10.018,2.319c-10.13,0 -8.356,-7.553 -8.356,-7.553h19.172c0,0 1.238,-6.113 1.238,-8.604c0,-6.216 -3.094,-13.79 -13.452,-13.79C132.445,75.998 125.423,86.219 125.423,97.77zM141.967,84.445c5.324,0 4.342,5.983 4.342,6.467h-10.474C135.835,90.294 136.825,84.445 141.967,84.445z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M201.707,113.055l1.688,-10.285c0,0 -4.629,2.321 -7.806,2.321c-6.692,0 -9.376,-5.11 -9.376,-10.6c0,-11.137 5.758,-17.264 12.168,-17.264c4.807,0 8.665,2.699 8.665,2.699l1.54,-9.993c0,0 -5.721,-2.315 -10.625,-2.315c-10.891,0 -21.486,9.448 -21.486,27.192c0,11.766 5.721,19.537 16.979,19.537C196.637,114.348 201.707,113.055 201.707,113.055z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M70.547,76.143c-6.469,0 -11.428,2.079 -11.428,2.079l-1.369,8.127c0,0 4.093,-1.663 10.28,-1.663c3.513,0 6.083,0.395 6.083,3.25c0,1.734 -0.315,2.374 -0.315,2.374s-2.771,-0.232 -4.054,-0.232c-8.159,0 -16.73,3.482 -16.73,13.98c0,8.272 5.623,10.17 9.108,10.17c6.656,0 9.525,-4.319 9.678,-4.332l-0.311,3.605h8.307l3.706,-25.981C83.502,76.498 73.887,76.143 70.547,76.143zM72.568,97.297c0.18,1.587 -0.995,9.026 -6.675,9.026c-2.93,0 -3.692,-2.238 -3.692,-3.562c0,-2.582 1.403,-5.682 8.316,-5.682C72.125,97.081 72.297,97.253 72.568,97.297z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M92.331,114.038c2.125,0 14.273,0.54 14.273,-11.995c0,-11.719 -11.245,-9.404 -11.245,-14.112c0,-2.344 1.833,-3.082 5.183,-3.082c1.33,0 6.447,0.423 6.447,0.423l1.19,-8.33c0,0.001 -3.312,-0.741 -8.704,-0.741c-6.979,0 -14.063,2.786 -14.063,12.318c0,10.801 11.812,9.717 11.812,14.267c0,3.037 -3.3,3.284 -5.843,3.284c-4.401,0 -8.364,-1.51 -8.378,-1.438l-1.258,8.246C81.973,112.948 84.417,114.038 92.331,114.038z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M279.852,68.668l-2.035,12.627c0,0 -3.551,-4.905 -9.11,-4.905c-8.644,0 -15.849,10.422 -15.849,22.397c0,7.73 3.843,15.304 11.699,15.304c5.651,0 8.784,-3.94 8.784,-3.94l-0.415,3.365h9.176l7.207,-44.863L279.852,68.668zM275.471,93.288c0,4.983 -2.467,11.639 -7.582,11.639c-3.395,0 -4.986,-2.85 -4.986,-7.323c0,-7.314 3.285,-12.14 7.43,-12.14C273.729,85.463 275.471,87.796 275.471,93.288z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19.466,113.555l5.743,-33.87l0.843,33.87h6.5l12.125,-33.87l-5.371,33.87h9.658l7.438,-44.923H41.467l-9.301,27.563l-0.484,-27.563H17.915l-7.545,44.923H19.466z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M164.818,113.617c2.746,-15.616 3.255,-28.296 9.808,-25.975c1.147,-6.044 2.254,-8.382 3.506,-10.94c0,0 -0.587,-0.123 -1.819,-0.123c-4.225,0 -7.355,5.772 -7.355,5.772l0.841,-5.301h-8.784l-5.885,36.567H164.818z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M223.475,76.143c-6.469,0 -11.428,2.079 -11.428,2.079l-1.368,8.127c0,0 4.093,-1.663 10.28,-1.663c3.513,0 6.081,0.395 6.081,3.25c0,1.734 -0.313,2.374 -0.313,2.374s-2.771,-0.232 -4.055,-0.232c-8.158,0 -16.729,3.482 -16.729,13.98c0,8.272 5.622,10.17 9.107,10.17c6.656,0 9.525,-4.319 9.677,-4.332l-0.309,3.605c0,0 8.304,0 8.307,0l3.705,-25.981C236.431,76.498 226.815,76.143 223.475,76.143zM225.499,97.297c0.18,1.587 -0.996,9.026 -6.678,9.026c-2.93,0 -3.69,-2.238 -3.69,-3.562c0,-2.582 1.403,-5.682 8.315,-5.682C225.054,97.081 225.225,97.253 225.499,97.297z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M244.023,113.617c2.747,-15.616 3.256,-28.296 9.807,-25.975c1.149,-6.044 2.257,-8.382 3.508,-10.94c0,0 -0.587,-0.123 -1.819,-0.123c-4.225,0 -7.355,5.772 -7.355,5.772l0.841,-5.301h-8.784l-5.885,36.567L244.023,113.617z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M289.105,107.975c0.479,0 0.951,0.123 1.406,0.373c0.459,0.242 0.816,0.598 1.072,1.059c0.257,0.458 0.383,0.935 0.383,1.434c0,0.493 -0.126,0.969 -0.379,1.424c-0.251,0.455 -0.604,0.812 -1.059,1.063c-0.454,0.25 -0.93,0.376 -1.424,0.376c-0.498,0 -0.974,-0.126 -1.429,-0.376c-0.454,-0.253 -0.806,-0.608 -1.058,-1.063c-0.256,-0.455 -0.381,-0.931 -0.381,-1.424c0,-0.499 0.127,-0.976 0.384,-1.434c0.258,-0.461 0.616,-0.815 1.073,-1.059C288.154,108.098 288.626,107.975 289.105,107.975M289.105,108.447c-0.401,0 -0.793,0.104 -1.176,0.313c-0.382,0.204 -0.679,0.499 -0.894,0.885c-0.214,0.381 -0.322,0.78 -0.322,1.194s0.104,0.81 0.313,1.188c0.213,0.377 0.509,0.673 0.891,0.886c0.378,0.208 0.773,0.313 1.188,0.313c0.412,0 0.81,-0.105 1.188,-0.313c0.378,-0.213 0.674,-0.509 0.884,-0.886c0.211,-0.381 0.314,-0.774 0.314,-1.188s-0.107,-0.813 -0.321,-1.194c-0.213,-0.386 -0.51,-0.681 -0.894,-0.885C289.896,108.552 289.507,108.447 289.105,108.447M287.85,112.423v-3.083h1.061c0.361,0 0.625,0.029 0.785,0.088c0.162,0.055 0.289,0.154 0.388,0.297c0.097,0.142 0.146,0.291 0.146,0.451c0,0.225 -0.082,0.422 -0.244,0.588c-0.158,0.166 -0.371,0.262 -0.637,0.28c0.106,0.046 0.194,0.101 0.262,0.163c0.123,0.122 0.275,0.326 0.455,0.611l0.377,0.604h-0.609l-0.271,-0.485c-0.216,-0.383 -0.389,-0.621 -0.521,-0.718c-0.091,-0.071 -0.224,-0.106 -0.399,-0.106h-0.291v1.311L287.85,112.423M288.348,110.688h0.604c0.289,0 0.484,-0.043 0.588,-0.129c0.105,-0.084 0.16,-0.199 0.16,-0.342c0,-0.091 -0.025,-0.173 -0.075,-0.242c-0.051,-0.074 -0.122,-0.127 -0.213,-0.164c-0.091,-0.035 -0.254,-0.053 -0.498,-0.053h-0.565V110.688" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/ic_verve_logo.jpg b/rave_android/src/main/res/drawable/ic_verve_logo.jpg
new file mode 100644
index 00000000..4ae1fd0d
Binary files /dev/null and b/rave_android/src/main/res/drawable/ic_verve_logo.jpg differ
diff --git a/rave_android/src/main/res/drawable/ic_visa.xml b/rave_android/src/main/res/drawable/ic_visa.xml
new file mode 100644
index 00000000..ed402421
--- /dev/null
+++ b/rave_android/src/main/res/drawable/ic_visa.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="20dp"
+    android:viewportWidth="64"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#000F72"
+        android:fillType="evenOdd"
+        android:pathData="M33.0993,6.3939C33.0628,9.1798 35.6649,10.7346 37.6251,11.6589C39.6392,12.6074 40.3157,13.2155 40.308,14.0636C40.2926,15.3617 38.7013,15.9345 37.2119,15.9569C34.6838,15.9949 33.1855,15.3163 32,14.7793L31.902,14.735L30.9661,18.9734C32.171,19.5109 34.4023,19.9795 36.7161,20C42.1471,20 45.7006,17.4056 45.7198,13.3829C45.7324,10.3289 43.1184,9.0007 41.0266,7.9379C39.6218,7.2241 38.4526,6.63 38.4726,5.7132C38.4899,5.0214 39.1722,4.2831 40.6673,4.0952C41.4072,4.0004 43.4501,3.9278 45.7659,4.96L46.6749,0.8592C45.4296,0.4203 43.8287,0 41.8358,0C36.7238,0 33.1281,2.6297 33.0993,6.3939ZM55.4095,0.3534C54.4179,0.3534 53.5819,0.9131 53.2091,1.7724L45.4507,19.6987H50.8779L51.958,16.8105H58.5901L59.2166,19.6987H64L59.8258,0.3534H55.4095ZM57.7349,12.8436L56.1686,5.5793L53.4454,12.8436H57.7349ZM26.519,0.3534L22.2411,19.6987H27.4126L31.6887,0.3534H26.519ZM13.4853,13.5206L18.8683,0.3534H24.2993L15.9202,19.6987L10.4546,19.6987L6.3304,4.2607C6.0806,3.3104 5.8634,2.9608 5.1024,2.5609C3.859,1.9063 1.8065,1.2944 0,0.915L0.123,0.3534H8.9229C10.0434,0.3534 11.0523,1.0749 11.3079,2.3247L13.4853,13.5206Z" />
+</vector>
diff --git a/rave_android/src/main/res/drawable/rectangle.xml b/rave_android/src/main/res/drawable/rectangle.xml
new file mode 100644
index 00000000..f17c0f21
--- /dev/null
+++ b/rave_android/src/main/res/drawable/rectangle.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">
+
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/black" />
+    <corners android:radius="6dp" />
+    <size
+        android:width="150dp"
+        android:height="35dp" />
+</shape>
\ No newline at end of file
diff --git a/rave_android/src/main/res/drawable/verve.png b/rave_android/src/main/res/drawable/verve.png
deleted file mode 100644
index 2b62b467..00000000
Binary files a/rave_android/src/main/res/drawable/verve.png and /dev/null differ
diff --git a/rave_android/src/main/res/layout/rave_sdk_add_exisiting_bank.xml b/rave_android/src/main/res/layout/rave_sdk_add_exisiting_bank.xml
index dbc58b27..9cdcb6a7 100644
--- a/rave_android/src/main/res/layout/rave_sdk_add_exisiting_bank.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_add_exisiting_bank.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:background="@color/background"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
 
     <TextView
+        android:id="@+id/rave_payment_type_title_textView"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:text="Choose a bank"
-        android:textStyle="bold"
-        android:textSize="16sp"
         android:layout_marginBottom="10dp"
-        android:textColor="#4a4a4a"
         android:gravity="center_horizontal|center_vertical"
-        android:id="@+id/rave_payment_type_title_textView"
-        />
+        android:text="Choose a bank"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:textStyle="bold" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rave_recycler"
diff --git a/rave_android/src/main/res/layout/rave_sdk_add_vendor_layout.xml b/rave_android/src/main/res/layout/rave_sdk_add_vendor_layout.xml
index bcf704eb..e4266535 100644
--- a/rave_android/src/main/res/layout/rave_sdk_add_vendor_layout.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_add_vendor_layout.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black"
         android:layout_margin="10dp"
-        android:text="Add Vendor"/>
+        android:text="Add Vendor"
+        android:textColor="@color/black" />
 
     <EditText
+        android:id="@+id/vendorReferecnceET"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Your Vendor's Rave Reference"
-        android:textSize="14sp"
-        android:id="@+id/vendorReferecnceET"
         android:layout_margin="10dp"
+        android:hint="Your Vendor's Rave Reference"
         android:inputType="textEmailAddress"
-        />
+        android:textSize="14sp" />
 
     <EditText
+        android:id="@+id/vendorRatioET"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="number"
-        android:textSize="14sp"
         android:layout_margin="10dp"
         android:hint="Ratio for this vendor"
-        android:id="@+id/vendorRatioET"
-        />
+        android:inputType="number"
+        android:textSize="14sp" />
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_gravity="end"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_gravity="end">
 
         <Button
+            android:id="@+id/cancelDialogBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/cancelDialogBtn"
-            android:text="Cancel"
-            android:background="?android:attr/selectableItemBackground"/>
+            android:background="?android:attr/selectableItemBackground"
+            android:text="Cancel" />
+
         <Button
+            android:id="@+id/doneDialogBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/doneDialogBtn"
+            android:background="?android:attr/selectableItemBackground"
             android:text="ADD"
-            android:textColor="@color/colorAccent"
-            android:background="?android:attr/selectableItemBackground"/>
+            android:textColor="@color/colorAccent" />
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/rave_android/src/main/res/layout/rave_sdk_card_preview_item.xml b/rave_android/src/main/res/layout/rave_sdk_card_preview_item.xml
index b60379f7..44b1e598 100644
--- a/rave_android/src/main/res/layout/rave_sdk_card_preview_item.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_card_preview_item.xml
@@ -9,10 +9,10 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_margin="8dp"
+        card_view:cardCornerRadius="4dp"
         card_view:contentPadding="8dp"
         card_view:contentPaddingLeft="16dp"
-        card_view:contentPaddingRight="16dp"
-        card_view:cardCornerRadius="4dp">
+        card_view:contentPaddingRight="16dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -30,8 +30,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingBottom="6dp"
-                    android:text="YOUR "
-                    android:textSize="16sp" />
+                    android:text=""
+                    android:textSize="14sp" />
 
                 <TextView
                     android:id="@+id/masked_pan_tv"
@@ -39,7 +39,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="424242******4242"
-                    android:textSize="18sp" />
+                    android:textSize="16sp" />
 
             </LinearLayout>
 
@@ -48,7 +48,7 @@
                 android:layout_width="40dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/creditcard" />
+                android:src="@drawable/ic_credit_card" />
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_content_rave_pay.xml b/rave_android/src/main/res/layout/rave_sdk_content_rave_pay.xml
index a1fbb3ae..50b599c3 100644
--- a/rave_android/src/main/res/layout/rave_sdk_content_rave_pay.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_content_rave_pay.xml
@@ -11,10 +11,10 @@
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/sliding_tabs"
+        style="?TabLayoutStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        style="?TabLayoutStyle"
         app:tabMode="fixed" />
 
     <androidx.viewpager.widget.ViewPager
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_account.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_account.xml
index 504dc40e..5a83b8cc 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_account.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_account.xml
@@ -1,11 +1,11 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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:layout_width="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    android:layout_height="wrap_content"
     android:descendantFocusability="beforeDescendants"
     android:focusableInTouchMode="true"
-    android:layout_height="wrap_content"
+    android:orientation="vertical"
     tools:context=".account.AccountFragment">
 
     <ScrollView
@@ -17,38 +17,32 @@
             android:id="@+id/rave_topLay"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_margin="16dp"
             android:orientation="vertical"
-            android:paddingTop="20dp">
+            android:paddingTop="10dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
                     android:id="@+id/rave_amountEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/rave_card1"
                     android:hint="@string/amount"
-                    android:inputType="numberDecimal" />
+                    android:inputType="numberDecimal"
+                    android:maxLength="10" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_emailTil"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
                     android:id="@+id/rave_emailEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -59,34 +53,27 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
                     android:id="@+id/rave_phoneEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/rave_card1"
                     android:hint="@string/phone_number"
-                    android:inputType="numberDecimal" />
+                    android:inputType="numberDecimal"
+                    android:maxLength="15" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_accountNumberTil"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
                     android:id="@+id/rave_accountNumberEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -99,16 +86,12 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_bvnTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp">
+                android:visibility="gone">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
                     android:id="@+id/rave_bvnEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -123,49 +106,45 @@
             <EditText
                 android:id="@+id/rave_bankEditText"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="20dp"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
-                android:layout_marginBottom="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginBottom="3dp"
+                android:background="@drawable/rectangle"
                 android:focusableInTouchMode="false"
-                android:longClickable="false"
                 android:hint="@string/bank"
-                android:inputType="numberDecimal" />
-
+                android:inputType="numberDecimal"
+                android:longClickable="false"
+                android:padding="10dp" />
 
             <EditText
                 android:id="@+id/rave_dobEditText"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="3dp"
-                android:longClickable="false"
-                android:visibility="gone"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="20dp"
+                android:background="@drawable/rectangle"
                 android:clickable="true"
                 android:focusableInTouchMode="false"
-                android:layout_marginBottom="20dp"
                 android:hint="@string/date_of_birth"
-                android:inputType="text" />
-
+                android:inputType="text"
+                android:longClickable="false"
+                android:padding="10dp"
+                android:visibility="gone" />
 
             <Button
                 android:id="@+id/rave_payButton"
+                style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="25dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                style="?PayButtonStyle"
-                android:text="@string/pay"
-                android:textColor="#FFF" />
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp"
+                android:text="@string/pay" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="25dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginBottom="8dp"
                 android:background="@drawable/black_background_curved"
                 android:orientation="horizontal"
@@ -180,7 +159,7 @@
                     android:layout_marginEnd="4dp"
                     android:layout_marginRight="4dp"
                     android:layout_marginBottom="4dp"
-                    android:src="@drawable/flw_icon_coloured" />
+                    android:src="@drawable/ic_flw_logo" />
 
                 <TextView
                     android:id="@+id/secured_by_flutterwave_tv"
@@ -196,7 +175,6 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-
             </LinearLayout>
 
             <TextView
@@ -204,11 +182,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:drawableStart="@drawable/ic_lock_outline_black_24dp"
-                android:drawableLeft="@drawable/ic_lock_outline_black_24dp"
+                android:drawableStart="@drawable/ic_lock"
+                android:drawableLeft="@drawable/ic_lock"
                 android:drawablePadding="5dp"
+                android:gravity="center_vertical"
                 android:text="@string/pci_dss_compliant"
-                android:textSize="12sp" />
+                android:textSize="10sp" />
 
         </LinearLayout>
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_ach.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_ach.xml
index 2e7c90e9..b34ee66a 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_ach.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_ach.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".ach.AchFragment">
 
     <ScrollView
@@ -13,54 +12,50 @@
         android:fillViewport="true">
 
         <LinearLayout
+            android:id="@+id/rave_topLay"
             android:layout_width="match_parent"
-            android:padding="20dp"
             android:layout_height="wrap_content"
-            android:id="@+id/rave_topLay"
-            android:paddingTop="10dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="20dp"
+            android:paddingTop="10dp">
 
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
-                android:layout_width="match_parent"
                 android:id="@+id/rave_amountTil"
-                android:visibility="gone"
-                android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+
+                    android:id="@+id/rave_amountEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/amount"
-                    android:id="@+id/rave_amountEt"
-                    android:inputType="numberDecimal"
                     android:layout_marginBottom="10dp"
-                    />
+                    android:hint="@string/amount"
+                    android:inputType="numberDecimal" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
+                android:id="@+id/paymentInstructionsTv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="You will be redirected to your US bank account to complete this payment"
-                android:textStyle="bold"
                 android:layout_marginBottom="20dp"
-                android:id="@+id/paymentInstructionsTv"
-                android:visibility="gone"
                 android:gravity="center"
-                />
+                android:text="You will be redirected to your US bank account to complete this payment"
+                android:textStyle="bold"
+                android:visibility="gone" />
 
             <Button
+                android:id="@+id/rave_payButton"
+                style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/pay"
-                style="?PayButtonStyle"
-                android:id="@+id/rave_payButton"
+                android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="15dp"
-                android:layout_marginLeft="10dp"
-                />
+                android:text="@string/pay" />
 
 
         </LinearLayout>
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_bank_transfer.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_bank_transfer.xml
index 8860da75..452a0dee 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_bank_transfer.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_bank_transfer.xml
@@ -1,32 +1,31 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:descendantFocusability="beforeDescendants"
     android:focusableInTouchMode="true"
-    android:layout_width="match_parent"
     android:orientation="vertical"
-    android:layout_height="match_parent"
     tools:context="com.flutterwave.raveandroid.banktransfer.BankTransferFragment">
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:fillViewport="true"
         android:orientation="vertical"
-        android:fillViewport="true">
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:padding="32dp"
             android:layout_height="wrap_content"
-            android:paddingTop="10dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="32dp"
+            android:paddingTop="10dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/rave_initiate_payment_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:id="@+id/rave_initiate_payment_layout"
                 tools:visibility="gone">
 
                 <com.google.android.material.textfield.TextInputLayout
@@ -68,10 +67,11 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
+
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/rave_transfer_details_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:id="@+id/rave_transfer_details_layout"
                 android:visibility="gone"
                 tools:visibility="visible">
 
@@ -84,10 +84,10 @@
                     android:layout_marginTop="40dp"
                     android:layout_marginEnd="24dp"
                     android:layout_marginRight="24dp"
-                    android:textSize="16sp"
-                    android:textColor="#333333"
                     android:gravity="center"
                     android:text="@string/bank_transfer_instructions_placeholder"
+                    android:textColor="#333333"
+                    android:textSize="16sp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -96,10 +96,10 @@
                     android:id="@+id/textView2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="16sp"
-                    android:textColor="#333333"
                     android:layout_marginTop="32dp"
                     android:text="@string/amount"
+                    android:textColor="#333333"
+                    android:textSize="16sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/rave_bank_transfer_instruction" />
 
@@ -108,9 +108,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/amount_placeholder"
-                    android:textSize="16sp"
                     android:textColor="#333333"
                     android:textIsSelectable="true"
+                    android:textSize="16sp"
                     app:layout_constraintBottom_toBottomOf="@+id/textView2"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/textView2" />
@@ -138,8 +138,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="32dp"
                     android:text="@string/account_number"
-                    android:textSize="16sp"
                     android:textColor="#333333"
+                    android:textSize="16sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/textView2" />
 
@@ -150,9 +150,9 @@
                     android:layout_marginEnd="1dp"
                     android:layout_marginRight="1dp"
                     android:text="@string/account_number_placeholder"
-                    android:textSize="20sp"
                     android:textColor="#333333"
                     android:textIsSelectable="true"
+                    android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="@+id/textView5"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/textView5" />
@@ -163,8 +163,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="32dp"
                     android:text="@string/bank_name"
-                    android:textSize="16sp"
                     android:textColor="#333333"
+                    android:textSize="16sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/textView5" />
 
@@ -173,9 +173,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/bank_name_placeholder"
-                    android:textSize="16sp"
                     android:textColor="#333333"
                     android:textIsSelectable="true"
+                    android:textSize="16sp"
                     app:layout_constraintBottom_toBottomOf="@+id/textView7"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/textView7" />
@@ -186,8 +186,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="32dp"
                     android:text="@string/beneficiary_name"
-                    android:textSize="16sp"
                     android:textColor="#333333"
+                    android:textSize="16sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/textView7" />
 
@@ -196,8 +196,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/beneficiary_name_placeholder"
-                    android:textSize="16sp"
                     android:textColor="#333333"
+                    android:textSize="16sp"
                     app:layout_constraintBottom_toBottomOf="@+id/textView9"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/textView9" />
@@ -221,12 +221,12 @@
                     android:id="@+id/rave_transfer_status_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
                     android:layout_marginStart="32dp"
                     android:layout_marginLeft="32dp"
                     android:layout_marginTop="32dp"
                     android:layout_marginEnd="32dp"
                     android:layout_marginRight="32dp"
+                    android:gravity="center"
                     android:text="@string/transfer_received_successfully"
                     android:textSize="16sp"
                     android:textStyle="bold"
@@ -234,7 +234,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/textView9"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible" />
 
 
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_barter.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_barter.xml
index 7e2fb755..41abdcf9 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_barter.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_barter.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".barter.BarterFragment">
 
     <ScrollView
@@ -20,7 +19,6 @@
             android:paddingTop="10dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -36,14 +34,11 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-
             <Button
                 android:id="@+id/rave_payButton"
                 style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
                 android:layout_marginBottom="15dp"
                 android:text="@string/pay" />
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_card.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_card.xml
index b1244bf9..d1d4f08d 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_card.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_card.xml
@@ -1,11 +1,10 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:descendantFocusability="beforeDescendants"
     android:focusableInTouchMode="true"
-    android:layout_width="match_parent"
     android:orientation="vertical"
-    android:layout_height="wrap_content"
     tools:context=".card.CardFragment">
 
     <ScrollView
@@ -13,269 +12,254 @@
         android:layout_height="match_parent"
         android:fillViewport="true">
 
-            <LinearLayout
+        <LinearLayout
+            android:id="@+id/rave_topLay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
-                android:padding="20dp"
-                android:layout_height="wrap_content"
-                android:id="@+id/rave_topLay"
-                android:paddingTop="10dp"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/rave_amountEt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/rave_card1"
+                    android:layout_marginBottom="10dp"
+                    android:hint="@string/amount"
+                    android:inputType="numberDecimal"
+                    android:maxLength="10" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    app:boxBackgroundColor="@null"
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/rave_emailTil"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/rave_emailEt"
                     android:layout_width="match_parent"
-                    android:id="@+id/rave_amountTil"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/rave_card1"
+                    android:hint="@string/email"
+                    android:inputType="textEmailAddress" />
 
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:paddingLeft="2dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/amount"
-                        android:id="@+id/rave_amountEt"
-                        android:inputType="numberDecimal"
-                        android:layout_below="@+id/rave_card1"
-                        android:layout_marginBottom="10dp"
-                        />
+            </com.google.android.material.textfield.TextInputLayout>
 
-                </com.google.android.material.textfield.TextInputLayout>
+            <LinearLayout
+                android:id="@+id/rave_new_card_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <com.google.android.material.textfield.TextInputLayout
-                    app:boxBackgroundColor="@null"
+                    android:id="@+id/rave_cardNoTil"
                     android:layout_width="match_parent"
-                    android:id="@+id/rave_emailTil"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp">
 
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:paddingLeft="2dp"
+                    <com.flutterwave.raveandroid.card.CreditCardView
+                        android:id="@+id/rave_cardNoTv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="@string/email"
-                        android:id="@+id/rave_emailEt"
-                        android:inputType="textEmailAddress"
-                        android:layout_below="@+id/rave_card1"
-                        android:layout_marginBottom="10dp"
-                        />
+                        android:layout_gravity="center"
+                        android:hint="@string/card_number"
+                        android:maxLength="19"
+                        android:paddingEnd="10dp" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
+
                 <LinearLayout
-                    android:id="@+id/rave_new_card_layout"
+                    android:id="@+id/rave_cvvExpLay"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_marginBottom="10dp"
+                    android:orientation="horizontal"
+                    android:weightSum="2">
 
                     <com.google.android.material.textfield.TextInputLayout
-                        app:boxBackgroundColor="@null"
-                        android:id="@+id/rave_cardNoTil"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp">
+                        android:id="@+id/rave_cardExpiryTil"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="5dp"
+                        android:layout_marginRight="5dp"
+                        android:layout_weight="1">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/rave_cardExpiryTv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@+id/rave_card1"
+                            android:layout_marginBottom="10dp"
+                            android:hint="@string/expiration"
+                            android:inputType="number"
+                            android:maxLength="5" />
 
-                        <com.flutterwave.raveandroid.card.CreditCardView
-                            android:id="@+id/rave_cardNoTv"
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/rave_cvvTil"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginLeft="5dp"
+                        android:layout_weight="1">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/rave_cvvTv"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:hint="@string/card_number" />
+                            android:layout_below="@+id/rave_card1"
+                            android:layout_marginBottom="10dp"
+                            android:hint="@string/cvc_cvv2"
+                            android:imeOptions="actionDone"
+                            android:inputType="numberPassword"
+                            android:maxLength="4" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
+                </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/rave_cvvExpLay"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            app:boxBackgroundColor="@null"
-                            android:id="@+id/rave_cardExpiryTil"
-                            android:layout_width="0dip"
-                            android:layout_height="match_parent"
-                            android:layout_marginEnd="5dp"
-                            android:layout_marginRight="5dp"
-                            android:layout_weight="1">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:paddingLeft="2dp"
-                                android:id="@+id/rave_cardExpiryTv"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_below="@+id/rave_card1"
-                                android:layout_marginBottom="10dp"
-                                android:hint="@string/expiration"
-                                android:inputType="number"
-                                android:maxLength="5"
-                                android:paddingEnd="50dp"
-                                android:paddingRight="50dp" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            app:boxBackgroundColor="@null"
-                            android:id="@+id/rave_cvvTil"
-                            android:layout_width="0dip"
-                            android:layout_height="match_parent"
-                            android:layout_marginStart="5dp"
-                            android:layout_marginLeft="5dp"
-                            android:layout_weight="1">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:paddingLeft="2dp"
-                                android:id="@+id/rave_cvvTv"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_below="@+id/rave_card1"
-                                android:layout_marginBottom="10dp"
-                                android:hint="@string/cvc_cvv2"
-                                android:imeOptions="actionDone"
-                                android:inputType="numberPassword"
-                                android:maxLength="4" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                    </LinearLayout>
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/rave_saveCardSwitch"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginBottom="20dp"
-                        android:text="@string/save_card"
-                        android:visibility="gone" />
-
-                    <LinearLayout
-                        android:id="@+id/rave_layout_for_saving_card"
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/rave_saveCardSwitch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="2dp"
+                    android:layout_marginBottom="20dp"
+                    android:text="@string/save_card"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    android:id="@+id/rave_layout_for_saving_card"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/save_card_phoneNoTil"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_marginBottom="16dp"
-                        android:visibility="gone">
+                        android:layout_marginBottom="15dp">
 
-                        <com.google.android.material.textfield.TextInputLayout
-                            app:boxBackgroundColor="@null"
-                            android:id="@+id/save_card_phoneNoTil"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:paddingLeft="2dp"
-                                android:id="@+id/save_card_phoneNoTV"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:hint="@string/phone_number"
-                                android:inputType="phone" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            app:boxBackgroundColor="@null"
-                            android:id="@+id/save_card_emailTil"
+                        <com.google.android.material.textfield.TextInputEditText
+
+                            android:id="@+id/save_card_phoneNoTV"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp">
+                            android:layout_gravity="center"
+                            android:hint="@string/phone_number"
+                            android:inputType="phone"
+                            android:maxLength="15" />
 
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:paddingLeft="2dp"
-                                android:id="@+id/save_card_emailTv"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:hint="@string/email" />
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                        </com.google.android.material.textfield.TextInputLayout>
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/save_card_emailTil"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="10dp">
 
-                    </LinearLayout>
+                        <com.google.android.material.textfield.TextInputEditText
 
+                            android:id="@+id/save_card_emailTv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:hint="@string/email" />
 
-                    <Button
-                        android:id="@+id/rave_payButton"
-                        style="?PayButtonStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginBottom="15dp"
-                        android:text="@string/pay" />
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <TextView
-                        android:id="@+id/rave_use_saved_card_tv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:gravity="center_horizontal|center_vertical"
-                        android:padding="16dp"
-                        android:text="@string/use_a_saved_card"
-                        android:textSize="16sp"
-                        android:textStyle="bold" />
                 </LinearLayout>
 
-                <View
+                <Button
+                    android:id="@+id/rave_payButton"
+                    style="?PayButtonStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="#E5E5E5"
-                    android:layout_marginRight="20dp"
+                    android:layout_height="wrap_content"
                     android:layout_marginBottom="15dp"
-                    android:layout_marginLeft="20dp"
-                    />
+                    android:text="@string/pay" />
 
-                <LinearLayout
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/rave_use_saved_card_tv"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="25dp"
                     android:layout_marginBottom="8dp"
-                    android:background="@drawable/black_background_curved"
-                    android:orientation="horizontal"
-                    android:paddingHorizontal="4dp"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp">
-
-                    <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginEnd="4dp"
-                        android:layout_marginRight="4dp"
-                        android:layout_marginBottom="4dp"
-                        android:src="@drawable/flw_icon_coloured" />
-
-                    <TextView
-                        android:id="@+id/secured_by_flutterwave_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:drawablePadding="4dp"
-                        android:letterSpacing="-0.01"
-                        android:text="@string/secured_by_flutterwave"
-                        android:textColor="#F4B918"
-                        android:textSize="10sp"
-                        android:textStyle="bold" />
+                    android:gravity="center_horizontal|center_vertical"
+                    android:padding="16dp"
+                    android:text="@string/use_a_saved_card"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="15dp"
+                android:background="#E5E5E5"
+                android:visibility="gone" />
 
-                </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="25dp"
+                android:layout_marginBottom="8dp"
+                android:background="@drawable/black_background_curved"
+                android:orientation="horizontal"
+                android:paddingHorizontal="4dp"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp">
+
+                <ImageView
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_marginBottom="4dp"
+                    android:src="@drawable/ic_flw_logo" />
 
                 <TextView
-                    android:id="@+id/rave_pcidss_compliant_tv"
+                    android:id="@+id/secured_by_flutterwave_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:drawableStart="@drawable/ic_lock_outline_black_24dp"
-                    android:drawableLeft="@drawable/ic_lock_outline_black_24dp"
-                    android:drawablePadding="5dp"
-                    android:text="@string/pci_dss_compliant"
-                    android:textSize="12sp" />
+                    android:layout_gravity="center_vertical"
+                    android:drawablePadding="4dp"
+                    android:letterSpacing="-0.01"
+                    android:text="@string/secured_by_flutterwave"
+                    android:textColor="#F4B918"
+                    android:textSize="10sp"
+                    android:textStyle="bold" />
 
 
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/rave_pcidss_compliant_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:drawableStart="@drawable/ic_lock"
+                android:drawableLeft="@drawable/ic_lock"
+                android:drawablePadding="5dp"
+                android:gravity="center_vertical"
+                android:text="@string/pci_dss_compliant"
+                android:textSize="10sp" />
+
+
+        </LinearLayout>
+
     </ScrollView>
 
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_francophone.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_francophone.xml
index 50cee6f2..f0d19234 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_francophone.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_francophone.xml
@@ -19,18 +19,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="20dp"
-            android:paddingTop="10dp">
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp">
+                android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
                     android:id="@+id/rave_phoneEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -42,18 +39,17 @@
 
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+
                     android:id="@+id/rave_amountEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/rave_card1"
-                    android:layout_marginBottom="10dp"
                     android:hint="@string/amount"
                     android:inputType="numberDecimal" />
 
@@ -64,8 +60,7 @@
                 style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginTop="10dp"
                 android:layout_marginBottom="15dp"
                 android:text="@string/pay" />
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml
index 6d802ac7..d4afdc2e 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_gh_mobile_money.xml
@@ -19,15 +19,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="20dp"
-            android:paddingTop="10dp">
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                app:boxBackgroundColor="@null">
+                android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/rave_amountEt"
@@ -35,8 +33,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/rave_card1"
                     android:hint="@string/amount"
-                    android:inputType="numberDecimal"
-                    android:paddingLeft="2dp" />
+                    android:inputType="numberDecimal" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -45,8 +42,7 @@
                 android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                app:boxBackgroundColor="@null">
+                android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/rave_phoneEt"
@@ -54,8 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/rave_card1"
                     android:hint="Phone no"
-                    android:inputType="phone"
-                    android:paddingLeft="2dp" />
+                    android:inputType="phone" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -63,8 +58,7 @@
                 android:id="@+id/rave_voucherTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp"
-                app:boxBackgroundColor="@null">
+                android:layout_marginBottom="20dp">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/rave_voucherEt"
@@ -72,16 +66,30 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/rave_card1"
                     android:hint="Voucher"
-                    android:inputType="text"
-                    android:paddingLeft="2dp" />
+                    android:inputType="text" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Spinner
-                android:id="@+id/rave_networkSpinner"
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginBottom="10dp" />
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
+
+                <Spinner
+                    android:id="@+id/rave_networkSpinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/rectangle"
+                    android:dropDownSelector="@drawable/ic_arrow_down" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginEnd="10dp"
+                    android:src="@drawable/ic_arrow_down" />
+            </RelativeLayout>
 
             <TextView
                 android:id="@+id/instructionsTv"
@@ -89,6 +97,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="20dp"
                 android:gravity="left"
+                android:visibility="gone"
                 tools:text="@string/vodafone_msg" />
 
             <Button
@@ -96,12 +105,10 @@
                 style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginTop="15dp"
                 android:layout_marginBottom="15dp"
                 android:text="@string/pay" />
 
-
         </LinearLayout>
 
     </ScrollView>
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_mpesa.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_mpesa.xml
index 4b256351..38e218bc 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_mpesa.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_mpesa.xml
@@ -1,78 +1,70 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:descendantFocusability="beforeDescendants"
     android:focusableInTouchMode="true"
-    android:layout_width="match_parent"
     android:orientation="vertical"
-    android:layout_height="match_parent"
     tools:context="com.flutterwave.raveandroid.mpesa.MpesaFragment">
 
-<ScrollView
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_constraintTop_toTopOf="parent"
-    android:orientation="vertical"
-    android:fillViewport="true">
-
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:padding="20dp"
-        android:layout_height="wrap_content"
-        android:paddingTop="10dp"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:orientation="vertical"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.textfield.TextInputLayout
-            app:boxBackgroundColor="@null"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:id="@+id/rave_amountTil"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:paddingLeft="2dp"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/amount"
-                android:id="@+id/rave_amountEt"
-                android:inputType="numberDecimal"
-                android:layout_below="@+id/rave_card1"
-                android:layout_marginBottom="10dp"
-                />
+                android:layout_height="wrap_content">
 
-        </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputEditText
 
-        <com.google.android.material.textfield.TextInputLayout
-            app:boxBackgroundColor="@null"
-            android:id="@+id/rave_phoneTil"
-            android:layout_width="match_parent"
-            android:layout_marginBottom="20dp"
-            android:layout_height="wrap_content">
+                    android:id="@+id/rave_amountEt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/rave_card1"
+                    android:layout_marginBottom="10dp"
+                    android:hint="@string/amount"
+                    android:inputType="numberDecimal" />
+
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:paddingLeft="2dp"
-                android:id="@+id/rave_phoneEt"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/rave_card1"
-                android:hint="Phone no e.g. 254xxxxxxxxx"
-                android:inputType="phone" />
+                android:layout_marginBottom="20dp">
 
-        </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputEditText
 
+                    android:id="@+id/rave_phoneEt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/rave_card1"
+                    android:hint="Phone no e.g. 254xxxxxxxxx"
+                    android:inputType="phone" />
 
-        <Button
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/pay"
-            style="?PayButtonStyle"
-            android:id="@+id/rave_payButton"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="15dp"
-            android:layout_marginLeft="10dp"
-            />
-    </LinearLayout>
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+            <Button
+                android:id="@+id/rave_payButton"
+                style="?PayButtonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="15dp"
+                android:text="@string/pay" />
+        </LinearLayout>
 
-</ScrollView>
+    </ScrollView>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_rwf_mobile_money.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_rwf_mobile_money.xml
index b16435e2..bb6f7619 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_rwf_mobile_money.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_rwf_mobile_money.xml
@@ -23,14 +23,13 @@
             android:paddingTop="10dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+
                     android:id="@+id/rave_phoneEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -42,14 +41,13 @@
 
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+
                     android:id="@+id/rave_amountEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -64,8 +62,7 @@
                 style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginTop="10dp"
                 android:layout_marginBottom="15dp"
                 android:text="@string/pay" />
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_sa_bank_account.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_sa_bank_account.xml
index 776da5fe..5f970b6a 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_sa_bank_account.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_sa_bank_account.xml
@@ -23,19 +23,18 @@
             android:paddingTop="10dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
-                    android:enabled="false"
+
                     android:id="@+id/rave_amountEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/rave_card1"
                     android:layout_marginBottom="10dp"
+                    android:enabled="false"
                     android:hint="@string/amount"
                     android:inputType="numberDecimal" />
 
@@ -43,7 +42,6 @@
 
 
             <Button
-                android:textAllCaps="false"
                 android:id="@+id/rave_payButton"
                 style="?PayButtonStyle"
                 android:layout_width="match_parent"
@@ -51,7 +49,8 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="15dp"
-                android:text="@string/pay" />
+                android:text="@string/pay"
+                android:textAllCaps="false" />
 
         </LinearLayout>
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml
index eca96e02..58beaec6 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_ug_mobile_money.xml
@@ -1,56 +1,50 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:descendantFocusability="beforeDescendants"
     android:focusableInTouchMode="true"
-    android:layout_width="match_parent"
     android:orientation="vertical"
-    android:layout_height="match_parent"
     tools:context="com.flutterwave.raveandroid.ugmobilemoney.UgMobileMoneyFragment">
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:fillViewport="true"
         android:orientation="vertical"
-        android:fillViewport="true">
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:padding="20dp"
             android:layout_height="wrap_content"
-            android:paddingTop="10dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
-                android:layout_width="match_parent"
                 android:id="@+id/rave_amountTil"
-                android:layout_marginBottom="10dp"
-                android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+                    android:id="@+id/rave_amountEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/amount"
-                    android:id="@+id/rave_amountEt"
-                    android:inputType="numberDecimal"
                     android:layout_below="@+id/rave_card1"
-                    />
+                    android:hint="@string/amount"
+                    android:inputType="numberDecimal" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
-                android:layout_marginBottom="10dp"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+
                     android:id="@+id/rave_phoneEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -62,15 +56,13 @@
 
 
             <Button
+                android:id="@+id/rave_payButton"
+                style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/pay"
-                style="?PayButtonStyle"
-                android:id="@+id/rave_payButton"
-                android:layout_marginRight="10dp"
+                android:layout_marginTop="10dp"
                 android:layout_marginBottom="15dp"
-                android:layout_marginLeft="10dp"
-                />
+                android:text="@string/pay" />
         </LinearLayout>
 
     </ScrollView>
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_uk.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_uk.xml
index ef89267d..8a6b0509 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_uk.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_uk.xml
@@ -19,17 +19,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="20dp"
-            android:paddingTop="10dp">
+            android:padding="16dp">
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+
                     android:id="@+id/rave_amountEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -46,8 +44,7 @@
                 style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginTop="10dp"
                 android:layout_marginBottom="15dp"
                 android:text="@string/pay" />
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_ussd.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_ussd.xml
index e5f90b7a..5f052dfe 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_ussd.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_ussd.xml
@@ -1,203 +1,206 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	android:padding="32dp"
-	tools:context=".ussd.UssdFragment">
-
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:id="@+id/rave_initiate_payment_layout"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		tools:visibility="gone">
-
-
-		<Button
-			android:id="@+id/pay_button"
-			style="?PayButtonStyle"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="64dp"
-			android:text="@string/pay"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/banks_spinner" />
-
-		<com.google.android.material.textfield.TextInputLayout
-            app:boxBackgroundColor="@null"
-			android:id="@+id/rave_amountTil"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="32dp"
-			android:visibility="gone"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent">
-
-			<com.google.android.material.textfield.TextInputEditText
-				android:paddingLeft="2dp"
-				android:id="@+id/rave_amountEt"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@+id/rave_card1"
-				android:layout_marginBottom="10dp"
-				android:hint="@string/amount"
-				android:inputType="numberDecimal" />
-
-		</com.google.android.material.textfield.TextInputLayout>
-
-		<androidx.appcompat.widget.AppCompatSpinner
-			android:id="@+id/banks_spinner"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="32dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/rave_amountTil"
-			tools:layout_height="20dp" />
-
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:id="@+id/rave_validate_payment_layout"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:visibility="gone"
-		tools:visibility="visible">
-
-
-		<Button
-			android:id="@+id/verify_ussd_payment_button"
-			style="?PayButtonStyle"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="32dp"
-			android:text="@string/verify_ussd_payment_button_text"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/payment_status_Tv" />
-
-		<LinearLayout
-			android:id="@+id/reference_code_layout"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="32dp"
-			android:orientation="vertical"
-			android:visibility="gone"
-			app:layout_constraintTop_toBottomOf="@id/ussd_code_tv"
-			tools:visibility="visible">
-			<View
-				android:id="@+id/divider1"
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="#DCD4C9" />
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:padding="12dp">
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="start"
-					android:layout_marginStart="8dp"
-					android:layout_marginLeft="8dp"
-					android:text="@string/reference_code"
-					android:textSize="20sp" />
-				<TextView
-					android:id="@+id/reference_code_tv"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_marginEnd="8dp"
-					android:layout_marginRight="8dp"
-					android:layout_weight="1"
-					android:gravity="end"
-					android:text="@string/reference_code_placeholder"
-					android:textSize="20sp" />
-				<ImageView
-					android:id="@+id/copy_reference_code_view"
-					android:layout_width="18dp"
-					android:layout_height="18dp"
-					android:layout_gravity="center_vertical"
-					android:contentDescription="Copy reference code"
-					android:src="@drawable/ic_content_copy_black_24dp" />
-			</LinearLayout>
-
-
-			<View
-				android:id="@+id/divider2"
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:background="@color/sisal"
-				app:layout_constraintTop_toBottomOf="@id/reference_code_layout" />
-		</LinearLayout>
-
-
-		<TextView
-			android:id="@+id/textView3"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="32dp"
-			android:layout_marginEnd="16dp"
-			android:text="@string/ussd_instructions"
-			android:textColor="@color/black"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
-
-		<TextView
-			android:id="@+id/copy_reference_code_tv"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="32dp"
-			android:text="@string/click_here_to_copy_the_ussd_code"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/reference_code_layout" />
-
-		<TextView
-			android:id="@+id/payment_status_Tv"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="32dp"
-			android:visibility="invisible"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/copy_reference_code_tv" />
-
-
-		<TextView
-			android:id="@+id/ussd_code_tv"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="48dp"
-			android:text="@string/ussd_code_placeholder"
-			android:textSize="36sp"
-			android:textStyle="bold"
-
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textView3" />
-
-		<TextView
-			android:id="@+id/choose_another_bank_tv"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="32dp"
-			android:layout_marginBottom="32dp"
-			android:text="@string/choose_another_bank"
-			android:textStyle="bold"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/verify_ussd_payment_button"
-			app:layout_constraintVertical_bias="1.0" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:context=".ussd.UssdFragment">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/rave_initiate_payment_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:visibility="gone">
+
+        <Button
+            android:id="@+id/pay_button"
+            style="?PayButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="64dp"
+            android:text="@string/pay"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/banks_spinner" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/rave_amountTil"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:visibility="gone"
+
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+
+                android:id="@+id/rave_amountEt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/rave_card1"
+                android:layout_marginBottom="10dp"
+                android:hint="@string/amount"
+                android:inputType="numberDecimal" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/banks_spinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rave_amountTil"
+            tools:layout_height="20dp" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/rave_validate_payment_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+
+        <Button
+            android:id="@+id/verify_ussd_payment_button"
+            style="?PayButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/verify_ussd_payment_button_text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/payment_status_Tv" />
+
+        <LinearLayout
+            android:id="@+id/reference_code_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:orientation="vertical"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/ussd_code_tv"
+            tools:visibility="visible">
+
+            <View
+                android:id="@+id/divider1"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#DCD4C9" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="12dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:text="@string/reference_code"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:id="@+id/reference_code_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:text="@string/reference_code_placeholder"
+                    android:textSize="20sp" />
+
+                <ImageView
+                    android:id="@+id/copy_reference_code_view"
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:layout_gravity="center_vertical"
+                    android:contentDescription="Copy reference code"
+                    android:src="@drawable/ic_content_copy_black_24dp" />
+            </LinearLayout>
+
+
+            <View
+                android:id="@+id/divider2"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/sisal"
+                app:layout_constraintTop_toBottomOf="@id/reference_code_layout" />
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/ussd_instructions"
+            android:textColor="@color/black"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/copy_reference_code_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/click_here_to_copy_the_ussd_code"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/reference_code_layout" />
+
+        <TextView
+            android:id="@+id/payment_status_Tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:visibility="invisible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/copy_reference_code_tv" />
+
+
+        <TextView
+            android:id="@+id/ussd_code_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="48dp"
+            android:text="@string/ussd_code_placeholder"
+            android:textSize="36sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView3" />
+
+        <TextView
+            android:id="@+id/choose_another_bank_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginBottom="32dp"
+            android:text="@string/choose_another_bank"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/verify_ussd_payment_button"
+            app:layout_constraintVertical_bias="1.0" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/rave_android/src/main/res/layout/rave_sdk_fragment_zm_mobile_money.xml b/rave_android/src/main/res/layout/rave_sdk_fragment_zm_mobile_money.xml
index dabea5f2..72caeaed 100644
--- a/rave_android/src/main/res/layout/rave_sdk_fragment_zm_mobile_money.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_fragment_zm_mobile_money.xml
@@ -19,33 +19,46 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="20dp"
-            android:paddingTop="10dp">
+            android:padding="10dp">
 
-            <Spinner
-                android:id="@+id/rave_networkSpinner"
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginBottom="10dp" />
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp">
 
+                <Spinner
+                    android:id="@+id/rave_networkSpinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:background="@drawable/rectangle"
+                    android:dropDownSelector="@drawable/ic_arrow_down" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginEnd="10dp"
+                    android:src="@drawable/ic_arrow_down" />
+            </RelativeLayout>
 
             <TextView
                 android:id="@+id/instructionsTv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp"
+                android:layout_marginBottom="10dp"
                 android:gravity="left"
+                android:visibility="gone"
                 tools:text="@string/vodafone_msg" />
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+
                     android:id="@+id/rave_phoneEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -56,17 +69,16 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                app:boxBackgroundColor="@null"
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:paddingLeft="2dp"
+
+                    android:id="@+id/rave_amountEt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/rave_amountEt"
                     android:layout_below="@+id/rave_card1"
                     android:hint="@string/amount"
                     android:inputType="numberDecimal" />
@@ -78,8 +90,6 @@
                 style="?PayButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
                 android:layout_marginBottom="15dp"
                 android:text="@string/pay" />
         </LinearLayout>
diff --git a/rave_android/src/main/res/layout/rave_sdk_payment_fragment_container_layout.xml b/rave_android/src/main/res/layout/rave_sdk_payment_fragment_container_layout.xml
index 20e3f312..776bd03b 100644
--- a/rave_android/src/main/res/layout/rave_sdk_payment_fragment_container_layout.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_payment_fragment_container_layout.xml
@@ -11,11 +11,11 @@
         android:id="@+id/payment_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/choose_another_payment_method_tv"
-        app:layout_constraintVertical_bias="0.0"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
 
     <TextView
         android:id="@+id/choose_another_payment_method_tv"
@@ -26,25 +26,25 @@
         android:layout_marginBottom="24dp"
         android:text="@string/choose_another_payment_method"
         android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@id/payment_fragment_container"
         app:layout_constraintBottom_toTopOf="@id/stagingModeBannerLay"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/payment_fragment_container" />
 
     <RelativeLayout
         android:id="@+id/stagingModeBannerLay"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:visibility="gone"
-        tools:visibility="visible"
-        tools:layout_editor_absoluteY="547dp">
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:layout_editor_absoluteY="547dp"
+        tools:visibility="visible">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:background="@android:color/holo_red_dark"
+            android:background="@color/colorAccent"
             android:gravity="center"
             android:text="@string/you_are_currently_on_staging_mode"
             android:textColor="@android:color/white" />
diff --git a/rave_android/src/main/res/layout/rave_sdk_payment_title_layout.xml b/rave_android/src/main/res/layout/rave_sdk_payment_title_layout.xml
index df72ee51..e7a581c2 100644
--- a/rave_android/src/main/res/layout/rave_sdk_payment_title_layout.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_payment_title_layout.xml
@@ -11,11 +11,13 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="17dp"
         android:layout_marginTop="25dp"
-        android:drawableLeft="@drawable/padlock"
+        android:drawableLeft="@drawable/ic_lock"
         android:drawablePadding="10dp"
+        android:drawableTint="@color/blackGrey"
+        android:gravity="center_vertical"
         android:letterSpacing="-0.01"
         android:text="SECURED BY FLUTTERWAVE"
-        android:textColor="#4a4a4a"
+        android:textColor="@color/black"
         android:textSize="10sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -26,13 +28,13 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="17dp"
         android:text="@string/how_would_you_like_to_pay"
-        android:textColor="#12122c"
+        android:textColor="@color/black"
         android:textSize="36sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintTop_toBottomOf="@+id/secured_by_flutterwave_tv"
         app:layout_constraintVertical_bias="0.32" />
 
@@ -43,11 +45,11 @@
         android:layout_marginTop="24dp"
         android:layout_marginBottom="64dp"
         android:background="@color/colorAccent"
-        app:layout_constraintTop_toBottomOf="@id/textView"
-        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintStart_toStartOf="@+id/textView" />
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/textView"
+        app:layout_constraintTop_toBottomOf="@id/textView"
+        app:layout_constraintVertical_bias="0.0" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/rave_android/src/main/res/layout/rave_sdk_payment_type_tile_layout.xml b/rave_android/src/main/res/layout/rave_sdk_payment_type_tile_layout.xml
index dd344aaa..dfe23d68 100644
--- a/rave_android/src/main/res/layout/rave_sdk_payment_type_tile_layout.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_payment_type_tile_layout.xml
@@ -2,55 +2,57 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    app:cardElevation="10dp"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:cardElevation="4dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/rave_cl"
+        style="?PaymentTileStyle"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        style="?PaymentTileStyle">
+        android:layout_height="match_parent">
 
         <TextView
+            android:id="@+id/rave_payment_type_title_textView"
+            style="?PaymentTileTextStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="22dp"
-            android:layout_marginLeft="22dp"
-            android:id="@+id/rave_payment_type_title_textView"
-            android:ellipsize="end"
-            android:letterSpacing="-0.01"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginTop="8dp"
-            style="?PaymentTileTextStyle"
             android:layout_marginBottom="8dp"
+            android:ellipsize="end"
+            android:letterSpacing="-0.01"
             android:text="Pay with your Debit Cards"
             android:textSize="18sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/arrowIv2"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintLeft_toLeftOf="parent" />
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/arrowIv2"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
         <ImageView
             android:id="@+id/arrowIv2"
-            android:layout_width="13dp"
-            android:layout_height="6dp"
-            app:layout_constraintTop_toTopOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="22dp"
-            android:src="@drawable/collapsed"
+            android:src="@drawable/ic_arrow_up"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <View
             android:id="@+id/divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
             style="?PaymentTileDividerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:background="@color/divider_color"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/rave_android/src/main/res/layout/rave_sdk_pick_saved_card_layout.xml b/rave_android/src/main/res/layout/rave_sdk_pick_saved_card_layout.xml
index b94fc32d..a8ab3b06 100644
--- a/rave_android/src/main/res/layout/rave_sdk_pick_saved_card_layout.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_pick_saved_card_layout.xml
@@ -2,63 +2,21 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="24dp">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/rave_payment_type_title_textView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center_horizontal|center_vertical"
-            android:text="@string/please_select_a_card"
-            android:textColor="#4a4a4a"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <View
-            android:id="@+id/divider1"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginRight="10dp"
-            android:background="#E5E5E5" />
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rave_recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            tools:listitem="@layout/rave_sdk_card_preview_item"
-            tools:layout_editor_absoluteX="24dp" />
-
-
-        <TextView
-            android:id="@+id/rave_use_new_card_tv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal|center_vertical"
-            android:padding="16dp"
-            android:text="@string/use_a_new_card"
-            android:textColor="#0000EE"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-
-        <View
-            android:id="@+id/divider2"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="15dp"
-            android:background="#E5E5E5" />
+            android:layout_marginTop="10dp"
+            tools:itemCount="5"
+            tools:layout_editor_absoluteX="24dp"
+            tools:listitem="@layout/rave_sdk_card_preview_item" />
 
         <LinearLayout
             android:id="@+id/secured_by_flutterwave_layout"
@@ -80,7 +38,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginRight="4dp"
                 android:layout_marginBottom="4dp"
-                android:src="@drawable/flw_icon_coloured" />
+                android:src="@drawable/ic_flw_logo" />
 
             <TextView
                 android:id="@+id/secured_by_flutterwave_tv"
@@ -102,8 +60,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:drawableStart="@drawable/ic_lock_outline_black_24dp"
-            android:drawableLeft="@drawable/ic_lock_outline_black_24dp"
+            android:drawableStart="@drawable/ic_lock"
+            android:drawableLeft="@drawable/ic_lock"
             android:drawablePadding="5dp"
             android:text="@string/pci_dss_compliant"
             android:textSize="12sp" />
diff --git a/rave_android/src/main/res/layout/rave_sdk_recycler_view_item.xml b/rave_android/src/main/res/layout/rave_sdk_recycler_view_item.xml
index c820a765..ae63da7f 100644
--- a/rave_android/src/main/res/layout/rave_sdk_recycler_view_item.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_recycler_view_item.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="horizontal"
-              android:padding="8dp"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content">
-  <ImageView
-      android:id="@+id/imageView1"
-      android:layout_width="50dp"
-      android:layout_height="50dp"
-      tools:src="@tools:sample/avatars"/>
-  <TextView
-      android:id="@+id/textView1"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:padding="5dp"
-      tools:text="@tools:sample/lorem" />
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="8dp">
+
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="5dp"
+        tools:text="@tools:sample/lorem" />
 </LinearLayout>
\ No newline at end of file
diff --git a/rave_android/src/main/res/layout/rave_sdk_select_bank_list_item.xml b/rave_android/src/main/res/layout/rave_sdk_select_bank_list_item.xml
index 48c0a6f8..94980e78 100644
--- a/rave_android/src/main/res/layout/rave_sdk_select_bank_list_item.xml
+++ b/rave_android/src/main/res/layout/rave_sdk_select_bank_list_item.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-
-        <RelativeLayout
-            android:orientation="vertical"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/rave_pay_activity_root"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:minHeight="50dp"
+        android:orientation="vertical"
+        android:paddingLeft="20dp"
+        android:paddingTop="10dp"
+        android:paddingRight="20dp">
+
+        <TextView
+            android:id="@+id/bankNameTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:letterSpacing="0.04"
+            android:textAllCaps="true"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <View
             android:layout_width="match_parent"
-            android:minHeight="50dp"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
-            android:paddingTop="10dp"
-            android:id="@+id/rave_pay_activity_root"
-            android:layout_height="50dp">
-
-            <TextView
-                android:id="@+id/bankNameTv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:letterSpacing="0.04"
-                android:textColor="#4a4a4a"
-                android:textSize="16sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="#4a4a4a"
-                android:layout_alignParentBottom="true"
-                />
+            android:layout_height="0.5dp"
+            android:layout_alignParentBottom="true"
+            android:background="@color/black" />
 
 
-        </RelativeLayout>
+    </RelativeLayout>
 
 </LinearLayout>
 
diff --git a/rave_android/src/main/res/values-night/colors.xml b/rave_android/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..3ae97704
--- /dev/null
+++ b/rave_android/src/main/res/values-night/colors.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#212e67</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#c16c00</color>
+    <color name="otpColorTheme">#dd7a32</color>
+    <color name="pinColorTheme">#dd7a32</color>
+    <color name="tabIndicatorColor">@color/colorPrimary</color>
+    <color name="paymentTileBackground">#fbeed8</color>
+    <color name="white">#000000</color>
+    <color name="background">#303030</color>
+    <color name="yellow">#000000</color>
+    <color name="black">#ffffff</color>
+    <color name="sisal">#cccccc</color>
+    <color name="divider_color">#DCD4C9</color>
+    <color name="blackGrey">#F6F6F6</color>
+</resources>
\ No newline at end of file
diff --git a/rave_android/src/main/res/values/colors.xml b/rave_android/src/main/res/values/colors.xml
index e524c278..fe3ab5bc 100644
--- a/rave_android/src/main/res/values/colors.xml
+++ b/rave_android/src/main/res/values/colors.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <color name="colorPrimary">#212e67</color>
     <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorAccent">#dd7a32</color>
     <color name="otpColorTheme">#dd7a32</color>
     <color name="pinColorTheme">#dd7a32</color>
     <color name="tabIndicatorColor">@color/colorPrimary</color>
     <color name="paymentTileBackground">#fbeed8</color>
-    <color name="white">#fff</color>
-    <color name="black">#000</color>
-	<color name="sisal">#DCD4C9</color>
+    <color name="white">#ffffff</color>
+    <color name="background">#ffffff</color>
+    <color name="black">#000000</color>
+    <color name="sisal">#DCD4C9</color>
+    <color name="yellow">#F4B918</color>
     <color name="divider_color">#DCD4C9</color>
+    <color name="blackGrey">#999999</color>
+    <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">@color/black</color>
+
 </resources>
diff --git a/rave_android/src/main/res/values/dimens.xml b/rave_android/src/main/res/values/dimens.xml
index f4f43052..fa457731 100644
--- a/rave_android/src/main/res/values/dimens.xml
+++ b/rave_android/src/main/res/values/dimens.xml
@@ -1,4 +1,9 @@
 <resources>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="attribution_text_size">10sp</dimen>
+    <dimen name="mtrl_textinput_box_stroke_width_default">0.5dp</dimen>
+    <dimen name="boxCollapsedPaddingTop">1dp</dimen>
+    <dimen name="mtrl_textinput_box_padding_start">10dp</dimen>
+    <dimen name="mtrl_textinput_box_padding_end">10dp</dimen>
+    <dimen name="mtrl_textinput_box_stroke_width_focused">1dp</dimen>
 </resources>
diff --git a/rave_android/src/main/res/values/strings.xml b/rave_android/src/main/res/values/strings.xml
index a41b4eef..31d09c34 100644
--- a/rave_android/src/main/res/values/strings.xml
+++ b/rave_android/src/main/res/values/strings.xml
@@ -20,12 +20,12 @@
     <string name="save_card">Save card</string>
     <string name="otp">OTP</string>
     <string name="enter_your_one_ntime_password_otp">Enter your one  time password (OTP)</string>
-    <string name="card_number">Card Number</string>
+    <string name="card_number">Card number</string>
     <string name="powered_by">by Flutterwave</string>
     <string name="please_enter_your_card_pin_nto_continue_your_transaction">Please enter your card pin  to continue your transaction.</string>
     <string name="otp_icon">otp icon</string>
-    <string name="cvc_cvv2">CVC/CVV2</string>
-    <string name="expiration">Valid Till (MM/YY)</string>
+    <string name="cvc_cvv2">Cvc/Cvv2</string>
+    <string name="expiration">Expiry(mm/yy)</string>
     <string name="email">Email</string>
     <string name="enter_your_billing_address_details">Enter your billing address details</string>
     <string name="billing_zip_code">Zip code e.g. 928302</string>
diff --git a/rave_android/src/main/res/values/styles.xml b/rave_android/src/main/res/values/styles.xml
index a2c338c9..4ed2eccf 100644
--- a/rave_android/src/main/res/values/styles.xml
+++ b/rave_android/src/main/res/values/styles.xml
@@ -1,11 +1,28 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppThemes" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>e
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="textInputStyle">@style/TextInputLayout</item>
+    </style>
+
+    <style name="TextInputLayout" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        <item name="boxBackgroundMode">outline</item>
+        <item name="background">@drawable/rectangle</item>
+        <item name="android:strokeColor">@color/white</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:paddingTop">3dp</item>
+        <item name="android:paddingStart">2dp</item>
+        <item name="android:paddingBottom">3dp</item>
+        <item name="android:minHeight">35dp</item>
+        <item name="strokeColor">@color/black</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+        <item name="boxStrokeColor">@color/black</item>
+        <item name="android:gravity">center_vertical</item>
     </style>
 
     <style name="tabLayoutStyle" parent="Widget.Design.TabLayout">
@@ -79,7 +96,6 @@
     </style>
 
 
-
     <style name="otpHeaderStyle2">
         <item name="android:background">#5d4037</item>
     </style>
diff --git a/rave_cache/build.gradle b/rave_cache/build.gradle
index a2916076..24114e05 100644
--- a/rave_cache/build.gradle
+++ b/rave_cache/build.gradle
@@ -4,7 +4,6 @@ group = 'com.github.flutterwave'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
 
     defaultConfig {
         minSdkVersion 15
diff --git a/rave_logger/build.gradle b/rave_logger/build.gradle
index 1a44c190..75abb08a 100644
--- a/rave_logger/build.gradle
+++ b/rave_logger/build.gradle
@@ -4,7 +4,6 @@ group = 'com.github.flutterwave'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
 
     defaultConfig {
         minSdkVersion 15
diff --git a/rave_presentation/build.gradle b/rave_presentation/build.gradle
index e5dbf5ee..bb22b31c 100644
--- a/rave_presentation/build.gradle
+++ b/rave_presentation/build.gradle
@@ -3,12 +3,11 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.flutterwave'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
diff --git a/rave_remote/build.gradle b/rave_remote/build.gradle
index b533da91..9ed1dd01 100644
--- a/rave_remote/build.gradle
+++ b/rave_remote/build.gradle
@@ -3,12 +3,11 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.flutterwave'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
diff --git a/rave_utils/build.gradle b/rave_utils/build.gradle
index 98dbfe71..9872f8f9 100644
--- a/rave_utils/build.gradle
+++ b/rave_utils/build.gradle
@@ -4,7 +4,6 @@ group = 'com.github.flutterwave'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.3"
 
     defaultConfig {
         minSdkVersion 15
diff --git a/rave_utils/src/main/res/drawable-hdpi/back_grey.xml b/rave_utils/src/main/res/drawable-hdpi/back_grey.xml
new file mode 100644
index 00000000..7334520c
--- /dev/null
+++ b/rave_utils/src/main/res/drawable-hdpi/back_grey.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:fillColor="#999999"
+      android:pathData="M16,7H3.83L9.42,1.41L8,0L0,8L8,16L9.41,14.59L3.83,9H16V7Z" />
+</vector>
diff --git a/rave_utils/src/main/res/drawable-hdpi/ic_lock.xml b/rave_utils/src/main/res/drawable-hdpi/ic_lock.xml
new file mode 100644
index 00000000..b5650bca
--- /dev/null
+++ b/rave_utils/src/main/res/drawable-hdpi/ic_lock.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#999"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>
diff --git a/rave_utils/src/main/res/drawable-night/back_grey.xml b/rave_utils/src/main/res/drawable-night/back_grey.xml
new file mode 100644
index 00000000..50b1b6c0
--- /dev/null
+++ b/rave_utils/src/main/res/drawable-night/back_grey.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16,7H3.83L9.42,1.41L8,0L0,8L8,16L9.41,14.59L3.83,9H16V7Z" />
+</vector>
diff --git a/rave_utils/src/main/res/layout/rave_sdk_activity_futher_verification.xml b/rave_utils/src/main/res/layout/rave_sdk_activity_futher_verification.xml
index 962070d0..f1094312 100644
--- a/rave_utils/src/main/res/layout/rave_sdk_activity_futher_verification.xml
+++ b/rave_utils/src/main/res/layout/rave_sdk_activity_futher_verification.xml
@@ -1,10 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/frame_container"
-    android:orientation="vertical"
-    tools:context="com.flutterwave.raveutils.verification.VerificationActivity">
+    android:layout_height="match_parent">
 
-</FrameLayout>
\ No newline at end of file
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@android:color/transparent"
+        android:gravity="center_vertical"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="@drawable/back_grey"
+        app:subtitleTextColor="@color/black">
+
+        <TextView
+            android:id="@+id/toolbar_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="Saved Cards"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/frame_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_margin="16dp"
+        android:layout_marginTop="10dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml b/rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml
index 00e4da5f..19fb34b2 100644
--- a/rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml
+++ b/rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml
@@ -2,7 +2,6 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:scrollbars="vertical"
     android:fillViewport="true"
     android:layout_height="match_parent">
@@ -34,7 +33,7 @@
         android:text="@string/enter_your_billing_address_details"/>
 
     <com.google.android.material.textfield.TextInputLayout
-        app:boxBackgroundColor="@null"
+
         android:layout_width="match_parent"
         android:id="@+id/rave_billAddressTil"
         android:layout_marginBottom="5dp"
@@ -56,7 +55,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        app:boxBackgroundColor="@null"
+
         android:layout_width="match_parent"
         android:id="@+id/rave_billCityTil"
         android:layout_marginBottom="5dp"
@@ -65,7 +64,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:paddingLeft="2dp"
+
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="1"
@@ -79,7 +78,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        app:boxBackgroundColor="@null"
+
         android:layout_width="match_parent"
         android:id="@+id/rave_billStateTil"
         android:layout_marginBottom="5dp"
@@ -88,7 +87,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:paddingLeft="2dp"
+
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="1"
@@ -102,7 +101,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        app:boxBackgroundColor="@null"
+
         android:layout_width="match_parent"
         android:id="@+id/rave_zipTil"
         android:layout_marginBottom="5dp"
@@ -111,7 +110,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:paddingLeft="2dp"
+
             android:layout_width="match_parent"
             android:imeOptions="actionNext"
             android:layout_height="wrap_content"
@@ -125,7 +124,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        app:boxBackgroundColor="@null"
+
         android:layout_width="match_parent"
         android:id="@+id/rave_countryTil"
         android:layout_marginBottom="10dp"
@@ -134,7 +133,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:paddingLeft="2dp"
+
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="Country e.g. US"
diff --git a/rave_utils/src/main/res/layout/rave_sdk_otp_layout.xml b/rave_utils/src/main/res/layout/rave_sdk_otp_layout.xml
index a8deb6f0..0a8f37a1 100644
--- a/rave_utils/src/main/res/layout/rave_sdk_otp_layout.xml
+++ b/rave_utils/src/main/res/layout/rave_sdk_otp_layout.xml
@@ -40,7 +40,7 @@
         />
 
     <com.google.android.material.textfield.TextInputLayout
-        app:boxBackgroundColor="@null"
+
         android:layout_width="match_parent"
         android:id="@+id/otpTil"
         android:layout_marginBottom="20dp"
@@ -49,16 +49,15 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:paddingLeft="2dp"
+
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_lock_outline_black_24dp"
-            android:drawableStart="@drawable/ic_lock_outline_black_24dp"
+            android:id="@+id/otpEv"
+            android:drawableStart="@drawable/ic_lock"
             android:hint="@string/otp"
             android:inputType="number"
             android:drawablePadding="10dp"
-            android:id="@+id/otpEv"
-            />
+            android:drawableLeft="@drawable/ic_lock" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/rave_utils/src/main/res/layout/rave_sdk_pin_layout.xml b/rave_utils/src/main/res/layout/rave_sdk_pin_layout.xml
index 46ba3b44..37b012a8 100644
--- a/rave_utils/src/main/res/layout/rave_sdk_pin_layout.xml
+++ b/rave_utils/src/main/res/layout/rave_sdk_pin_layout.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:gravity="center"
@@ -26,7 +25,7 @@
         android:text="@string/please_enter_your_card_pin_nto_continue_your_transaction"/>
 
     <com.google.android.material.textfield.TextInputLayout
-        app:boxBackgroundColor="@null"
+
         android:layout_width="match_parent"
         android:id="@+id/rave_pinTil"
         android:layout_marginBottom="20dp"
@@ -35,17 +34,16 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:paddingLeft="2dp"
+
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/pin"
             android:inputType="numberPassword"
-            android:drawableLeft="@drawable/ic_lock_outline_black_24dp"
-            android:drawableStart="@drawable/ic_lock_outline_black_24dp"
+            android:id="@+id/rave_pinEv"
+            android:drawableStart="@drawable/ic_lock"
             android:drawablePadding="7dp"
             android:maxLength="4"
-            android:id="@+id/rave_pinEv"
-            />
+            android:drawableLeft="@drawable/ic_lock" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/rave_utils/src/main/res/values-night/colors.xml b/rave_utils/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..645ce168
--- /dev/null
+++ b/rave_utils/src/main/res/values-night/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#212e67</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="otpColorTheme">#dd7a32</color>
+    <color name="pinColorTheme">#dd7a32</color>
+    <color name="black">#cccccc</color>
+    <color name="tabIndicatorColor">@color/colorPrimary</color>
+</resources>
\ No newline at end of file
diff --git a/rave_utils/src/main/res/values/colors.xml b/rave_utils/src/main/res/values/colors.xml
index 7d9342de..f4904f00 100644
--- a/rave_utils/src/main/res/values/colors.xml
+++ b/rave_utils/src/main/res/values/colors.xml
@@ -5,5 +5,6 @@
     <color name="colorAccent">#FF4081</color>
     <color name="otpColorTheme">#dd7a32</color>
     <color name="pinColorTheme">#dd7a32</color>
+    <color name="black">#999999</color>
     <color name="tabIndicatorColor">@color/colorPrimary</color>
 </resources>
\ No newline at end of file