diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
index 3d41b6bf..b19f923e 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
@@ -15,8 +15,16 @@ import java.io.File;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.concurrent.TimeUnit;
 
 import io.fabric.sdk.android.Fabric;
+import io.reactivex.Observable;
+import io.reactivex.Observer;
+import io.reactivex.Scheduler;
+import io.reactivex.SingleObserver;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_COUNTRY_CODE;
 import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_LOCALE;
@@ -39,24 +47,53 @@ public class GmeApplication extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        if (!BuildConfig.DEBUG) {
-            Fabric.with(this, new Crashlytics());
-        } else
-            {
-            DateFormat df = new SimpleDateFormat("d_MMM");
-            String date = df.format(Calendar.getInstance().getTime());
-            File path = getExternalFilesDir(null);
-            logginFile = new File(path, "API Log " + date + ".txt");
-        }
 
+        Observable.fromCallable(() -> {
+            if (!BuildConfig.DEBUG) {
+                Fabric.with(this, new Crashlytics());
+            } else {
+                DateFormat df = new SimpleDateFormat("d_MMM");
+                String date = df.format(Calendar.getInstance().getTime());
+                File path = getExternalFilesDir(null);
+                logginFile = new File(path, "API Log " + date + ".txt");
+            }
+
+
+            if (appRelatedMetaData == null)
+                appRelatedMetaData = new AppRelatedMetaData(this);
+
+            if (stringExtractor == null)
+                stringExtractor = new StringExtractor(getResources());
+
+            gmeSharedPreferences = this.getSharedPreferences(getString(R.string.gme_sharedpreferences_key), Context.MODE_PRIVATE);
+
+            return true;
+        })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<Boolean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
 
-        if (appRelatedMetaData == null)
-            appRelatedMetaData = new AppRelatedMetaData(this);
+                    @Override
+                    public void onNext(Boolean aBoolean) {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
 
-        if (stringExtractor == null)
-            stringExtractor = new StringExtractor(getResources());
 
-        gmeSharedPreferences = this.getSharedPreferences(getString(R.string.gme_sharedpreferences_key), Context.MODE_PRIVATE);
     }
 
     @Override
@@ -166,21 +203,20 @@ public class GmeApplication extends MultiDexApplication {
     public class StringExtractor {
 
         Resources resources;
-        public void updateResources(Resources resources)
-        {
-            this.resources=resources;
+
+        public void updateResources(Resources resources) {
+            this.resources = resources;
         }
+
         private StringExtractor(Resources resources) {
             this.resources = resources;
         }
 
-        public Resources getResources()
-        {
+        public Resources getResources() {
             return this.resources;
         }
 
-        public String getStringFromStringId(@StringRes int stringResourceID)
-        {
+        public String getStringFromStringId(@StringRes int stringResourceID) {
 
             try {
                 if (resources == null)
@@ -193,11 +229,10 @@ public class GmeApplication extends MultiDexApplication {
 
     }
 
-    public static String getPreferredCountryCode()
-    {
-        if(gmeSharedPreferences==null)
+    public static String getPreferredCountryCode() {
+        if (gmeSharedPreferences == null)
             return "en";
-        return gmeSharedPreferences.getString(USER_PREFERRED_COUNTRY_CODE,"en");
+        return gmeSharedPreferences.getString(USER_PREFERRED_COUNTRY_CODE, "en");
 
     }
 
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
index b5d99aa6..6a0837af 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
@@ -127,6 +127,8 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S
             presenter.updateSelectedAmount(getIntent().getStringExtra(SELECTED_AMT_FOR_OTP_BUNDLE_KEY));
             presenter.updateSelectedKftcId(getIntent().getStringExtra(SELECTED_KFTC_ID_FOR_OTP_BUNDLE_KEY));
         }
+        else
+            resendRequest.setVisibility(View.GONE);
     }
 
     private void init() {
diff --git a/app/src/main/res/drawable/ic_rounded_password_prompt.xml b/app/src/main/res/drawable/ic_rounded_password_prompt.xml
index ebb2e103..7481d1d1 100644
--- a/app/src/main/res/drawable/ic_rounded_password_prompt.xml
+++ b/app/src/main/res/drawable/ic_rounded_password_prompt.xml
@@ -2,6 +2,6 @@
 <inset
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:drawable="@drawable/ic_rounded_password_prompt_bg"
-    android:insetTop="56dp"
+    android:insetTop="@dimen/_38sdp"
     >
 </inset>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_transaction_history_v2.xml b/app/src/main/res/layout/activity_transaction_history_v2.xml
index 58b2cf8e..48137240 100644
--- a/app/src/main/res/layout/activity_transaction_history_v2.xml
+++ b/app/src/main/res/layout/activity_transaction_history_v2.xml
@@ -35,7 +35,7 @@
                     android:background="@color/send_money_bg_grey"
                     android:focusableInTouchMode="true"
                     android:orientation="horizontal"
-                    android:padding="18dp">
+                    android:padding="@dimen/_16sdp">
 
                     <ImageView
                         android:layout_width="wrap_content"
@@ -48,8 +48,8 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginStart="15dp"
+                        android:layout_marginLeft="@dimen/_11sdp"
+                        android:layout_marginStart="@dimen/_11sdp"
                         android:layout_weight="1"
                         android:background="@null"
                         android:gravity="center_vertical"
@@ -59,7 +59,7 @@
                         android:inputType="text"
                         android:maxLength="20"
                         android:textColor="@android:color/black"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp"/>
 
                     <ImageView
                         android:id="@+id/iv_calendar"
@@ -115,48 +115,48 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:orientation="horizontal"
-                    android:paddingBottom="4dp"
-                    android:paddingTop="4dp"
+                    android:paddingBottom="@dimen/_3sdp"
+                    android:paddingTop="@dimen/_3sdp"
                     android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tv_from_date"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="@dimen/_6sdp"
+                        android:layout_marginLeft="@dimen/_6sdp"
+                        android:layout_marginRight="@dimen/_6sdp"
+                        android:layout_marginStart="@dimen/_6sdp"
                         android:gravity="center"
-                        android:padding="3dp"
+                        android:padding="@dimen/_2sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="11sp" />
+                        android:textSize="@dimen/_11ssp" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="@dimen/_6sdp"
+                        android:layout_marginLeft="@dimen/_6sdp"
+                        android:layout_marginRight="@dimen/_6sdp"
+                        android:layout_marginStart="@dimen/_6sdp"
                         android:gravity="center"
-                        android:padding="3dp"
+                        android:padding="@dimen/_2sdp"
                         android:text="-"
                         android:textColor="@color/darkgray"
-                        android:textSize="11sp" />
+                        android:textSize="@dimen/_11ssp" />
 
                     <TextView
                         android:id="@+id/tv_to_date"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="@dimen/_6sdp"
+                        android:layout_marginLeft="@dimen/_6sdp"
+                        android:layout_marginRight="@dimen/_6sdp"
+                        android:layout_marginStart="@dimen/_6sdp"
                         android:gravity="center"
-                        android:padding="3dp"
+                        android:padding="@dimen/_2sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="11sp" />
+                        android:textSize="@dimen/_11ssp" />
 
 
 
diff --git a/app/src/main/res/layout/activity_transaction_listing_v2.xml b/app/src/main/res/layout/activity_transaction_listing_v2.xml
index b3879f84..de8969ba 100644
--- a/app/src/main/res/layout/activity_transaction_listing_v2.xml
+++ b/app/src/main/res/layout/activity_transaction_listing_v2.xml
@@ -71,8 +71,8 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginStart="15dp"
+                        android:layout_marginLeft="@dimen/_11sdp"
+                        android:layout_marginStart="@dimen/_11sdp"
                         android:layout_weight="1"
                         android:background="@null"
                         android:gravity="center_vertical"
@@ -82,7 +82,7 @@
                         android:inputType="text"
                         android:maxLength="20"
                         android:textColor="@android:color/black"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/_10ssp" />
 
                     <ImageView
                         android:id="@+id/iv_calendar"
@@ -93,8 +93,8 @@
 
                 </LinearLayout>
                 <View
-                    android:layout_marginStart="18dp"
-                    android:layout_marginEnd="18dp"
+                    android:layout_marginStart="@dimen/_12sdp"
+                    android:layout_marginEnd="@dimen/_12sdp"
                     android:id="@+id/searchbarDivider"
                     android:visibility="gone"
                     android:layout_width="match_parent"
@@ -106,48 +106,48 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:orientation="horizontal"
-                    android:paddingBottom="4dp"
-                    android:paddingTop="4dp"
+                    android:paddingBottom="@dimen/_3sdp"
+                    android:paddingTop="@dimen/_3sdp"
                     android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tv_from_date"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="@dimen/_6sdp"
+                        android:layout_marginLeft="@dimen/_6sdp"
+                        android:layout_marginRight="@dimen/_6sdp"
+                        android:layout_marginStart="@dimen/_6sdp"
                         android:gravity="center"
-                        android:padding="3dp"
+                        android:padding="@dimen/_2sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="11sp" />
+                        android:textSize="@dimen/_11ssp" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="@dimen/_6sdp"
+                        android:layout_marginLeft="@dimen/_6sdp"
+                        android:layout_marginRight="@dimen/_6sdp"
+                        android:layout_marginStart="@dimen/_6sdp"
                         android:gravity="center"
-                        android:padding="3dp"
+                        android:padding="@dimen/_2sdp"
                         android:text="-"
                         android:textColor="@color/darkgray"
-                        android:textSize="11sp" />
+                        android:textSize="@dimen/_11ssp" />
 
                     <TextView
                         android:id="@+id/tv_to_date"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="@dimen/_6sdp"
+                        android:layout_marginLeft="@dimen/_6sdp"
+                        android:layout_marginRight="@dimen/_6sdp"
+                        android:layout_marginStart="@dimen/_6sdp"
                         android:gravity="center"
-                        android:padding="3dp"
+                        android:padding="@dimen/_2sdp"
                         android:textColor="@color/darkgray"
-                        android:textSize="11sp" />
+                        android:textSize="@dimen/_11ssp" />
 
 
 
@@ -180,7 +180,7 @@
             </android.support.v7.widget.RecyclerView>
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
-                android:paddingTop="50dp"
+                android:paddingTop="@dimen/_34sdp"
                 android:id="@+id/noTransactionFoundTextView"
                 android:visibility="invisible"
                 android:layout_width="match_parent"
@@ -194,7 +194,7 @@
                 android:imeOptions="actionDone"
                 android:inputType="text"
                 android:textColor="@android:color/black"
-                android:textSize="14sp"
+                android:textSize="@dimen/_11ssp"
                 />
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/activity_transaction_password_prompt.xml b/app/src/main/res/layout/activity_transaction_password_prompt.xml
index abcdec2c..3b4591f0 100644
--- a/app/src/main/res/layout/activity_transaction_password_prompt.xml
+++ b/app/src/main/res/layout/activity_transaction_password_prompt.xml
@@ -14,21 +14,21 @@
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="5dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginBottom="@dimen/_15sdp"
+        android:layout_marginTop="@dimen/_15sdp"
         android:gravity="center"
         android:text="@string/enter_login_password_text"
         android:textColor="@color/black"
-        android:textSize="20sp" />
+        android:textSize="@dimen/_15ssp" />
 
 
     <ImageView
         android:id="@+id/passwordPromptImageView"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:minHeight="48dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/_8sdp"
+        android:layout_marginBottom="@dimen/_8sdp"
+        android:layout_width="@dimen/_50sdp"
+        android:layout_height="@dimen/_50sdp"
+        android:scaleType="centerCrop"
         android:layout_gravity="center"
         />
 
@@ -37,14 +37,14 @@
         android:layout_width="match_parent"
         android:visibility="gone"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="20dp"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
+        android:layout_marginTop="@dimen/_8sdp"
+        android:layout_marginBottom="@dimen/_16sdp"
+        android:layout_marginStart="@dimen/_12sdp"
+        android:layout_marginEnd="@dimen/_12sdp"
         android:gravity="center"
         android:text="@string/fingerprint_user_text"
         android:textColor="@color/darkgray"
-        android:textSize="14sp" />
+        android:textSize="@dimen/_11sdp" />
 
 
     <com.gmeremit.online.gmeremittance_native.utils.security.securitykeypad.SecurityKeyboardView
@@ -53,31 +53,31 @@
         app:centerGravityInput="false"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginEnd="5dp"
-        android:layout_marginStart="5dp" />
+        android:layout_marginEnd="@dimen/_4sdp"
+        android:layout_marginStart="@dimen/_4sdp" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeErrorTextView
         android:id="@+id/passwordErrorTxt"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="13dp"
-        android:layout_marginRight="13dp"
-        android:paddingBottom="2dp"
-        android:paddingTop="2dp" />
+        android:layout_marginLeft="@dimen/_11sdp"
+        android:layout_marginRight="@dimen/_11sdp"
+        android:paddingBottom="@dimen/_1sdp"
+        android:paddingTop="@dimen/_1sdp" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/resend_request"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="8dp"
-        android:padding="10dp"
+        android:layout_marginStart="@dimen/_6sdp"
+        android:layout_marginTop="@dimen/_8sdp"
+        android:layout_marginEnd="@dimen/_8sdp"
+        android:padding="@dimen/_8sdp"
         android:gravity="center"
         android:text="@string/resend_request_text"
         android:textColor="@color/colorPrimary"
-        android:textSize="14sp"
+        android:textSize="@dimen/_11ssp"
         android:visibility="invisible" />
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_wallet_statement_v2.xml b/app/src/main/res/layout/activity_wallet_statement_v2.xml
index 54d181f3..834ff81b 100644
--- a/app/src/main/res/layout/activity_wallet_statement_v2.xml
+++ b/app/src/main/res/layout/activity_wallet_statement_v2.xml
@@ -47,48 +47,48 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:orientation="horizontal"
-        android:paddingBottom="4dp"
-        android:paddingTop="4dp"
+        android:paddingBottom="@dimen/_3sdp"
+        android:paddingTop="@dimen/_3sdp"
         android:visibility="gone">
 
         <TextView
             android:id="@+id/tv_from_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
             android:gravity="center"
-            android:padding="3dp"
+            android:padding="@dimen/_2sdp"
             android:textColor="@color/darkgray"
-            android:textSize="11sp" />
+            android:textSize="@dimen/_11ssp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
             android:gravity="center"
-            android:padding="3dp"
+            android:padding="@dimen/_2sdp"
             android:text="-"
             android:textColor="@color/darkgray"
-            android:textSize="11sp" />
+            android:textSize="@dimen/_11ssp" />
 
         <TextView
             android:id="@+id/tv_to_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
             android:gravity="center"
-            android:padding="3dp"
+            android:padding="@dimen/_2sdp"
             android:textColor="@color/darkgray"
-            android:textSize="11sp" />
+            android:textSize="@dimen/_11ssp" />
 
 
 
@@ -109,7 +109,7 @@
             </android.support.v7.widget.RecyclerView>
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
-                android:paddingTop="50dp"
+                android:paddingTop="@dimen/_45sdp"
                 android:id="@+id/noTransactionFoundTextView"
                 android:visibility="invisible"
                 android:layout_width="match_parent"
@@ -123,7 +123,7 @@
                 android:imeOptions="actionDone"
                 android:inputType="text"
                 android:textColor="@android:color/black"
-                android:textSize="14sp"
+                android:textSize="@dimen/_12ssp"
                 />
         </FrameLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_splash_avd_viewpager.xml b/app/src/main/res/layout/fragment_splash_avd_viewpager.xml
index cd5bf378..67dd6298 100644
--- a/app/src/main/res/layout/fragment_splash_avd_viewpager.xml
+++ b/app/src/main/res/layout/fragment_splash_avd_viewpager.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.120000005">
+        app:layout_constraintVertical_bias="0.100000024">
 
         <ImageView
             android:id="@+id/avdMobileImage"
diff --git a/app/src/main/res/layout/fragment_verification_resend_money_v2.xml b/app/src/main/res/layout/fragment_verification_resend_money_v2.xml
index ff15118f..7c67c9c1 100644
--- a/app/src/main/res/layout/fragment_verification_resend_money_v2.xml
+++ b/app/src/main/res/layout/fragment_verification_resend_money_v2.xml
@@ -25,39 +25,39 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="10dp">
+            android:padding="@dimen/_8sdp">
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:text="@string/reciever_details_text"
                 android:textColor="@color/colorPrimary"
-                android:textSize="17sp" />
+                android:textSize="@dimen/_14ssp" />
             <LinearLayout
 
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/full_name_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/full_name_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_firstName"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="Preyea R. Regmi"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_firstName"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="Preyea R. Regmi"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
@@ -65,25 +65,25 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/address_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/address_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_address"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="Jorpati"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_address"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="Jorpati"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
@@ -91,25 +91,25 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/country_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/country_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_country"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="Nepal"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_country"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="Nepal"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
@@ -117,24 +117,24 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/mobile_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/mobile_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_mobile"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_mobile"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
 
@@ -143,42 +143,42 @@
 
 
         <LinearLayout
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="@dimen/_8sdp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="10dp">
+            android:padding="@dimen/_8sdp">
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:text="@string/transaction_detail_text"
                 android:textColor="@color/colorPrimary"
-                android:textSize="17sp" />
+                android:textSize="@dimen/_14ssp" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/payout_country_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/payout_country_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_pcountry"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="Nepal"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_pcountry"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="Nepal"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
@@ -186,26 +186,26 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/payout_mode_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/payout_mode_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_pmode"
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_pmode"
 
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="CASH Payment"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                app:txtfontName="@string/semibold" />
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="CASH Payment"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
@@ -213,26 +213,26 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/paying_amount_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/paying_amount_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_pamount"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="50,000.00 KRW"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                android:textStyle="bold"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_pamount"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="50,000.00 KRW"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    android:textStyle="bold"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
@@ -240,26 +240,26 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/exchange_rate_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/exchange_rate_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_exrate"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="0.00977"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                android:textStyle="bold"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_exrate"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="0.00977"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    android:textStyle="bold"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
@@ -267,57 +267,57 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="10dp"
-                android:text="@string/service_charge_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="@dimen/_8sdp"
+                    android:text="@string/service_charge_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_servicechargeAmount"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="5000 KRW"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                android:textStyle="bold"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_servicechargeAmount"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="5000 KRW"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    android:textStyle="bold"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/pAgentContainerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
 
                 android:orientation="horizontal">
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="top"
-                android:text="@string/payout_agent_text"
-                android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="top"
+                    android:text="@string/payout_agent_text"
+                    android:textColor="@color/dark_gray"
+                    android:textSize="@dimen/_11ssp" />
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/txt_pagent"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="[Any Where] lasjdkflasjdfklkasdhfksjdfhl"
-                android:textColor="@color/black"
-                android:textSize="13sp"
-                android:textStyle="bold"
-                android:singleLine="false"
-                android:inputType="textMultiLine"
-                app:txtfontName="@string/semibold" />
+                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                    android:id="@+id/txt_pagent"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="[Any Where] lasjdkflasjdfklkasdhfksjdfhl"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_11ssp"
+                    android:textStyle="bold"
+                    android:singleLine="false"
+                    android:inputType="textMultiLine"
+                    app:txtfontName="@string/semibold" />
             </LinearLayout>
 
             <LinearLayout
@@ -331,10 +331,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:paddingTop="10dp"
+                    android:paddingTop="@dimen/_8sdp"
                     android:text="Bank A/C No: "
                     android:textColor="@color/dark_gray"
-                    android:textSize="13sp" />
+                    android:textSize="@dimen/_11ssp" />
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                     android:id="@+id/txt_bankAcNo"
@@ -344,7 +344,7 @@
                     android:gravity="center_vertical"
 
                     android:textColor="@color/black"
-                    android:textSize="13sp"
+                    android:textSize="@dimen/_11ssp"
                     android:textStyle="bold"
                     app:txtfontName="@string/semibold" />
             </LinearLayout>
@@ -354,7 +354,7 @@
 
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="@dimen/_8sdp"
             android:layout_width="match_parent"
             android:singleLine="false"
             android:gravity="center"
@@ -362,9 +362,9 @@
             android:layout_height="wrap_content"
             android:text="@string/i_have_read_to_text"
             android:textColor="@color/dark_gray"
-            android:textSize="13sp" />
+            android:textSize="@dimen/_11ssp" />
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:layout_marginBottom="20dp"
+            android:layout_marginBottom="@dimen/_16sdp"
             android:id="@+id/txt_user_aggreement"
             android:paddingTop="3dp"
             android:paddingBottom="3dp"
@@ -373,7 +373,7 @@
             android:gravity="center"
             android:text="@string/gme_user_aggreement_text"
             android:textColor="@color/colorPrimary"
-            android:textSize="13sp" />
+            android:textSize="@dimen/_11ssp" />
 
 
 
diff --git a/app/src/main/res/layout/fragment_verification_send_money_v2.xml b/app/src/main/res/layout/fragment_verification_send_money_v2.xml
index ff15118f..349a0daf 100644
--- a/app/src/main/res/layout/fragment_verification_send_money_v2.xml
+++ b/app/src/main/res/layout/fragment_verification_send_money_v2.xml
@@ -25,14 +25,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="10dp">
+            android:padding="@dimen/_8sdp">
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:text="@string/reciever_details_text"
                 android:textColor="@color/colorPrimary"
-                android:textSize="17sp" />
+                android:textSize="@dimen/_14ssp" />
             <LinearLayout
 
                 android:layout_width="match_parent"
@@ -43,10 +43,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/full_name_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_firstName"
@@ -56,7 +56,7 @@
                 android:gravity="center_vertical"
                 android:text="Preyea R. Regmi"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
 
@@ -69,10 +69,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/address_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_address"
@@ -82,7 +82,7 @@
                 android:gravity="center_vertical"
                 android:text="Jorpati"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
 
@@ -95,10 +95,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/country_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_country"
@@ -108,7 +108,7 @@
                 android:gravity="center_vertical"
                 android:text="Nepal"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
 
@@ -121,10 +121,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/mobile_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_mobile"
@@ -133,7 +133,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
 
@@ -143,18 +143,18 @@
 
 
         <LinearLayout
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="@dimen/_8sdp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="10dp">
+            android:padding="@dimen/_8sdp">
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:text="@string/transaction_detail_text"
                 android:textColor="@color/colorPrimary"
-                android:textSize="17sp" />
+                android:textSize="@dimen/_14ssp" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -164,10 +164,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/payout_country_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_pcountry"
@@ -177,7 +177,7 @@
                 android:gravity="center_vertical"
                 android:text="Nepal"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
 
@@ -190,10 +190,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/payout_mode_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_pmode"
@@ -204,7 +204,7 @@
                 android:gravity="center_vertical"
                 android:text="CASH Payment"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
 
@@ -217,10 +217,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/paying_amount_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_pamount"
@@ -230,7 +230,7 @@
                 android:gravity="center_vertical"
                 android:text="50,000.00 KRW"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 android:textStyle="bold"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
@@ -244,10 +244,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/exchange_rate_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_exrate"
@@ -257,7 +257,7 @@
                 android:gravity="center_vertical"
                 android:text="0.00977"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 android:textStyle="bold"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
@@ -271,10 +271,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
                 android:text="@string/service_charge_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_servicechargeAmount"
@@ -284,7 +284,7 @@
                 android:gravity="center_vertical"
                 android:text="5000 KRW"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 android:textStyle="bold"
                 app:txtfontName="@string/semibold" />
             </LinearLayout>
@@ -293,7 +293,7 @@
                 android:id="@+id/pAgentContainerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/_8sdp"
 
                 android:orientation="horizontal">
 
@@ -303,7 +303,7 @@
                 android:gravity="top"
                 android:text="@string/payout_agent_text"
                 android:textColor="@color/dark_gray"
-                android:textSize="13sp" />
+                android:textSize="@dimen/_11ssp" />
 
             <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                 android:id="@+id/txt_pagent"
@@ -313,7 +313,7 @@
                 android:gravity="center_vertical"
                 android:text="[Any Where] lasjdkflasjdfklkasdhfksjdfhl"
                 android:textColor="@color/black"
-                android:textSize="13sp"
+                android:textSize="@dimen/_11ssp"
                 android:textStyle="bold"
                 android:singleLine="false"
                 android:inputType="textMultiLine"
@@ -331,10 +331,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:paddingTop="10dp"
+                    android:paddingTop="@dimen/_8sdp"
                     android:text="Bank A/C No: "
                     android:textColor="@color/dark_gray"
-                    android:textSize="13sp" />
+                    android:textSize="@dimen/_11ssp" />
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                     android:id="@+id/txt_bankAcNo"
@@ -344,7 +344,7 @@
                     android:gravity="center_vertical"
 
                     android:textColor="@color/black"
-                    android:textSize="13sp"
+                    android:textSize="@dimen/_11ssp"
                     android:textStyle="bold"
                     app:txtfontName="@string/semibold" />
             </LinearLayout>
@@ -354,7 +354,7 @@
 
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="@dimen/_8sdp"
             android:layout_width="match_parent"
             android:singleLine="false"
             android:gravity="center"
@@ -362,9 +362,9 @@
             android:layout_height="wrap_content"
             android:text="@string/i_have_read_to_text"
             android:textColor="@color/dark_gray"
-            android:textSize="13sp" />
+            android:textSize="@dimen/_11ssp" />
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:layout_marginBottom="20dp"
+            android:layout_marginBottom="@dimen/_16sdp"
             android:id="@+id/txt_user_aggreement"
             android:paddingTop="3dp"
             android:paddingBottom="3dp"
@@ -373,7 +373,7 @@
             android:gravity="center"
             android:text="@string/gme_user_aggreement_text"
             android:textColor="@color/colorPrimary"
-            android:textSize="13sp" />
+            android:textSize="@dimen/_11ssp" />
 
 
 
diff --git a/app/src/main/res/layout/transaction_history_viewholder_v3.xml b/app/src/main/res/layout/transaction_history_viewholder_v3.xml
index 468f41aa..3dd0379b 100644
--- a/app/src/main/res/layout/transaction_history_viewholder_v3.xml
+++ b/app/src/main/res/layout/transaction_history_viewholder_v3.xml
@@ -3,15 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
+    android:layout_marginLeft="@dimen/_8sdp"
+    android:layout_marginRight="@dimen/_8sdp"
     android:background="@drawable/ic_rounded_background_brightgray"
-    android:padding="6dp"
-    android:layout_marginTop="5dp"
-    android:layout_marginBottom="5dp"
+    android:padding="@dimen/_5sdp"
+    android:layout_marginTop="@dimen/_4sdp"
+    android:layout_marginBottom="@dimen/_4sdp"
     android:layout_height="wrap_content">
     <LinearLayout
-        android:padding="5dp"
+        android:padding="@dimen/_4sdp"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -20,50 +20,50 @@
             android:layout_width="0dp"
             android:layout_weight=".5"
             android:layout_height="match_parent"
+            android:gravity="start"
+            android:text="19/11/2019"
             app:txtfontName="@string/regular"
-            android:gravity="left"
-            android:text=""
             android:textColor="@color/darkgray"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp" />
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_gme_control_no"
             android:layout_width="0dp"
             android:layout_weight=".5"
             android:layout_height="match_parent"
-            android:gravity="right"
-            android:text=""
+            android:gravity="end"
             app:txtfontName="@string/regular"
+            android:text="123342312312543323"
             android:textColor="@color/darkgray"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp" />
     </LinearLayout>
     <LinearLayout
-        android:padding="5dp"
+        android:padding="@dimen/_4sdp"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_user_id"
-            android:layout_width="0dp"
             app:txtfontName="@string/bold"
+            android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:gravity="left"
-            android:text=""
+            android:gravity="start"
+            android:text="Preyea Ranjan Regmi"
             android:textColor="@color/darkgray"
-            android:textSize="17sp" />
+            android:textSize="@dimen/_13ssp" />
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_amount"
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:gravity="right"
+            android:gravity="end"
             app:txtfontName="@string/semibold"
-            android:text=""
+            android:text="5,00000 NPR"
             android:textColor="@color/colorPrimary"
-            android:textSize="17sp" />
+            android:textSize="@dimen/_13ssp" />
     </LinearLayout>
     <LinearLayout
-        android:padding="5dp"
+        android:padding="@dimen/_4sdp"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -72,21 +72,31 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:gravity="left"
-            android:text=""
+            android:gravity="start"
+            android:text="BANK DEPOSIT"
+            app:txtfontName="@string/semibold"
             android:textColor="@color/darkgray"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp" />
 
-        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        <TextView
             android:id="@+id/tv_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Unpaid"
-            app:txtfontName="@string/semibold"
             android:textColor="@color/white"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp"/>
     </LinearLayout>
 
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:padding="@dimen/_4sdp"
+        app:txtfontName="@string/regular"
+        android:id="@+id/tv_bank_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="start"
+        android:text="GLOBAL IME BANK"
+        android:textColor="@color/darkgray"
+        android:textSize="@dimen/_10ssp" />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/transaction_listing_viewholder.xml b/app/src/main/res/layout/transaction_listing_viewholder.xml
index 13de5a85..3dd0379b 100644
--- a/app/src/main/res/layout/transaction_listing_viewholder.xml
+++ b/app/src/main/res/layout/transaction_listing_viewholder.xml
@@ -3,15 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
+    android:layout_marginLeft="@dimen/_8sdp"
+    android:layout_marginRight="@dimen/_8sdp"
     android:background="@drawable/ic_rounded_background_brightgray"
-    android:padding="6dp"
-    android:layout_marginTop="5dp"
-    android:layout_marginBottom="5dp"
+    android:padding="@dimen/_5sdp"
+    android:layout_marginTop="@dimen/_4sdp"
+    android:layout_marginBottom="@dimen/_4sdp"
     android:layout_height="wrap_content">
     <LinearLayout
-        android:padding="5dp"
+        android:padding="@dimen/_4sdp"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -24,7 +24,7 @@
             android:text="19/11/2019"
             app:txtfontName="@string/regular"
             android:textColor="@color/darkgray"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp" />
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_gme_control_no"
             android:layout_width="0dp"
@@ -34,10 +34,10 @@
             app:txtfontName="@string/regular"
             android:text="123342312312543323"
             android:textColor="@color/darkgray"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp" />
     </LinearLayout>
     <LinearLayout
-        android:padding="5dp"
+        android:padding="@dimen/_4sdp"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -50,7 +50,7 @@
             android:gravity="start"
             android:text="Preyea Ranjan Regmi"
             android:textColor="@color/darkgray"
-            android:textSize="17sp" />
+            android:textSize="@dimen/_13ssp" />
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_amount"
             android:layout_width="0dp"
@@ -60,10 +60,10 @@
             app:txtfontName="@string/semibold"
             android:text="5,00000 NPR"
             android:textColor="@color/colorPrimary"
-            android:textSize="17sp" />
+            android:textSize="@dimen/_13ssp" />
     </LinearLayout>
     <LinearLayout
-        android:padding="5dp"
+        android:padding="@dimen/_4sdp"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -76,7 +76,7 @@
             android:text="BANK DEPOSIT"
             app:txtfontName="@string/semibold"
             android:textColor="@color/darkgray"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp" />
 
         <TextView
             android:id="@+id/tv_status"
@@ -84,11 +84,11 @@
             android:layout_height="wrap_content"
             android:text="Unpaid"
             android:textColor="@color/white"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp"/>
     </LinearLayout>
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:padding="5dp"
+        android:padding="@dimen/_4sdp"
         app:txtfontName="@string/regular"
         android:id="@+id/tv_bank_name"
         android:layout_width="match_parent"
@@ -96,7 +96,7 @@
         android:gravity="start"
         android:text="GLOBAL IME BANK"
         android:textColor="@color/darkgray"
-        android:textSize="12sp" />
+        android:textSize="@dimen/_10ssp" />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/wallet_statement_viewholder_v2.xml b/app/src/main/res/layout/wallet_statement_viewholder_v2.xml
index b9394961..6c1eeb0d 100644
--- a/app/src/main/res/layout/wallet_statement_viewholder_v2.xml
+++ b/app/src/main/res/layout/wallet_statement_viewholder_v2.xml
@@ -3,19 +3,19 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_marginBottom="5dp"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
-    android:layout_marginTop="5dp"
+    android:layout_marginBottom="@dimen/_4sdp"
+    android:layout_marginLeft="@dimen/_8sdp"
+    android:layout_marginRight="@dimen/_8sdp"
+    android:layout_marginTop="@dimen/_4sdp"
     android:background="@drawable/ic_rounded_background_brightgray"
     android:orientation="vertical"
-    android:padding="6dp">
+    android:padding="@dimen/_4sdp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="5dp">
+        android:padding="@dimen/_4sdp">
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_date"
@@ -26,7 +26,7 @@
             android:gravity="left"
             android:text="dd/mm/yyyy"
             android:textColor="@color/darkgray"
-            android:textSize="12sp" />
+            android:textSize="@dimen/_10ssp"/>
 
     </LinearLayout>
 
@@ -34,7 +34,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="5dp">
+        android:padding="@dimen/_4sdp">
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_particular"
@@ -47,7 +47,7 @@
             android:singleLine="false"
             android:maxLines="3"
             android:textColor="@color/darkgray"
-            android:textSize="17sp" />
+            android:textSize="@dimen/_13ssp"/>
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_wallet_status"
@@ -55,21 +55,21 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             app:txtfontName="@string/regular"
-            android:layout_marginLeft="8dp"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:paddingTop="@dimen/_3sdp"
+            android:paddingBottom="@dimen/_3sdp"
+            android:layout_marginStart="@dimen/_6sdp"
             android:gravity="center"
 
             android:textColor="@color/white"
-            android:textSize="16sp" />
+            android:textSize="@dimen/_12ssp" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="5dp">
+        android:padding="@dimen/_4sdp">
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:layout_width="0dp"
@@ -79,7 +79,7 @@
             app:txtfontName="@string/regular"
             android:text="Closing Balance"
             android:textColor="@color/darkgray"
-            android:textSize="17sp" />
+            android:textSize="@dimen/_13sdp" />
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
             android:id="@+id/tv_amount"
@@ -87,10 +87,10 @@
             android:layout_height="wrap_content"
             android:gravity="right"
             app:txtfontName="@string/regular"
-            android:padding="5dp"
+            android:padding="@dimen/_4sdp"
             android:text="---"
             android:textColor="@color/colorPrimary"
-            android:textSize="17sp" />
+            android:textSize="@dimen/_13sdp" />
     </LinearLayout>