diff --git a/app/src/main/res/drawable/cursor_drawable.xml b/app/src/main/res/drawable/cursor_drawable.xml
new file mode 100644
index 0000000..d78b847
--- /dev/null
+++ b/app/src/main/res/drawable/cursor_drawable.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/color_primary"
+        />
+
+    <size android:width="2dp"
+        />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_age_select.xml b/app/src/main/res/layout/fragment_age_select.xml
index 7a34c38..f5db6c1 100644
--- a/app/src/main/res/layout/fragment_age_select.xml
+++ b/app/src/main/res/layout/fragment_age_select.xml
@@ -9,9 +9,9 @@
 
     <ImageView
         android:id="@+id/back_btn"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:contentDescription="@string/image"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
+        android:contentDescription="@string/back_btn"
         android:src="@drawable/ic_arrow_back"
         app:layout_constraintBottom_toBottomOf="@+id/logo"
         app:layout_constraintEnd_toStartOf="@+id/logo"
@@ -50,7 +50,7 @@
 
         android:textColor="@color/color_primary"
 
-        android:textSize="18sp"
+        android:textSize="@dimen/_16ssp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/logo" />
@@ -67,7 +67,7 @@
 
         android:textColor="@color/color_primary"
 
-        android:textSize="16sp"
+        android:textSize="@dimen/_13ssp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView" />
@@ -83,8 +83,8 @@
         app:layout_constraintTop_toBottomOf="@+id/textView2">
 
         <ImageView
-            android:layout_width="120dp"
-            android:layout_height="120dp"
+            android:layout_width="@dimen/_100sdp"
+            android:layout_height="@dimen/_100sdp"
             android:src="@drawable/age_bg"
             android:contentDescription="@string/image"/>
 
@@ -165,7 +165,7 @@
 
                         android:text="@string/i_am"
                         android:textColor="@color/white"
-                        android:textSize="18sp"
+                        android:textSize="@dimen/_12ssp"
                         android:fontFamily="@font/exo_2_bold"
 
                         />
@@ -176,7 +176,7 @@
 
                         android:text="@string/under"
                         android:textColor="@color/white"
-                        android:textSize="20sp"
+                        android:textSize="@dimen/_16ssp"
                         android:fontFamily="@font/exo_2_extrabold"
 
                         />
@@ -191,6 +191,7 @@
                     android:textColor="@color/color_primary"
                     android:fontFamily="@font/exo_2"
                     android:textAlignment="center"
+                    android:textSize="@dimen/_12ssp"
 
                     android:layout_marginHorizontal="15dp"
                     android:layout_marginTop="15dp"
@@ -229,7 +230,7 @@
 
                         android:text="@string/i_am"
                         android:textColor="@color/white"
-                        android:textSize="18sp"
+                        android:textSize="@dimen/_12ssp"
                         android:fontFamily="@font/exo_2_bold"
 
                         />
@@ -240,7 +241,7 @@
 
                         android:text="@string/above"
                         android:textColor="@color/white"
-                        android:textSize="20sp"
+                        android:textSize="@dimen/_16ssp"
                         android:fontFamily="@font/exo_2_extrabold"
 
                         />
@@ -255,6 +256,7 @@
                     android:textColor="@color/color_primary"
                     android:fontFamily="@font/exo_2"
                     android:textAlignment="center"
+                    android:textSize="@dimen/_12ssp"
 
                     android:layout_marginHorizontal="10dp"
                     android:layout_marginTop="15dp"
diff --git a/app/src/main/res/layout/fragment_get_code.xml b/app/src/main/res/layout/fragment_get_code.xml
index a083dcb..62b067e 100644
--- a/app/src/main/res/layout/fragment_get_code.xml
+++ b/app/src/main/res/layout/fragment_get_code.xml
@@ -9,9 +9,9 @@
 
     <ImageView
         android:id="@+id/back_btn"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:contentDescription="@string/image"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
+        android:contentDescription="@string/back_btn"
         android:src="@drawable/ic_arrow_back"
         app:layout_constraintBottom_toBottomOf="@+id/logo"
         app:layout_constraintEnd_toStartOf="@+id/logo"
@@ -47,7 +47,7 @@
         android:fontFamily="@font/exo_2"
         android:textColor="@color/color_primary"
         android:textAlignment="center"
-        android:textSize="24sp"
+        android:textSize="@dimen/_20ssp"
 
         android:layout_marginHorizontal="25dp"
         android:layout_marginTop="50dp"
@@ -66,7 +66,7 @@
         android:text="@string/please_enter_the_otp"
         android:fontFamily="@font/exo_2_bold"
         android:textColor="@color/color_primary"
-        android:textSize="18sp"
+        android:textSize="@dimen/_14ssp"
         android:textAlignment="center"
 
         app:layout_constraintStart_toStartOf="parent"
@@ -105,6 +105,7 @@
             android:fontFamily="@font/exo_2_bold"
             android:textAlignment="center"
             android:gravity="center"
+            android:textSize="@dimen/_14ssp"
 
             android:textColorHint="@android:color/darker_gray"
 
@@ -134,6 +135,7 @@
             android:fontFamily="@font/exo_2_bold"
             android:textAlignment="center"
             android:gravity="center"
+            android:textSize="@dimen/_14ssp"
 
             android:textColorHint="@android:color/darker_gray"
 
@@ -163,6 +165,7 @@
             android:fontFamily="@font/exo_2_bold"
             android:textAlignment="center"
             android:gravity="center"
+            android:textSize="@dimen/_14ssp"
 
             android:textColorHint="@android:color/darker_gray"
 
@@ -191,6 +194,7 @@
             android:fontFamily="@font/exo_2_bold"
             android:textAlignment="center"
             android:gravity="center"
+            android:textSize="@dimen/_14ssp"
 
             android:textColorHint="@android:color/darker_gray"
 
@@ -215,7 +219,7 @@
         android:text="@string/don_t_forget_to_check_your_junk_spam_folder"
         android:fontFamily="@font/exo_2_medium"
         android:textColor="@color/color_primary"
-        android:textSize="16sp"
+        android:textSize="@dimen/_14ssp"
         android:textAlignment="center"
 
         app:layout_constraintStart_toStartOf="parent"
@@ -235,11 +239,12 @@
         android:text="@string/next"
         android:textColor="@color/white"
         android:fontFamily="@font/exo_2_bold"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/grad_btn_bg_4"
 
         android:layout_marginHorizontal="15dp"
-        android:layout_marginBottom="45dp"
+        android:layout_marginBottom="@dimen/_25sdp"
 
         app:layout_constraintBottom_toBottomOf="parent"
 
diff --git a/app/src/main/res/layout/fragment_get_email.xml b/app/src/main/res/layout/fragment_get_email.xml
index 25a0d03..8ac52df 100644
--- a/app/src/main/res/layout/fragment_get_email.xml
+++ b/app/src/main/res/layout/fragment_get_email.xml
@@ -9,9 +9,9 @@
 
     <ImageView
         android:id="@+id/back_btn"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:contentDescription="@string/image"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
+        android:contentDescription="@string/back_btn"
         android:src="@drawable/ic_arrow_back"
         app:layout_constraintBottom_toBottomOf="@+id/logo"
         app:layout_constraintEnd_toStartOf="@+id/logo"
@@ -45,7 +45,7 @@
 
         android:text="@string/let_s_start_here"
         android:fontFamily="@font/exo_2_medium"
-        android:textSize="22sp"
+        android:textSize="@dimen/_18ssp"
         android:textColor="@color/color_primary"
         android:textAlignment="center"
 
@@ -64,7 +64,7 @@
 
         android:text="@string/can_we_have_your_email"
         android:fontFamily="@font/exo_2_bold"
-        android:textSize="16sp"
+        android:textSize="@dimen/_14ssp"
         android:textColor="@color/color_primary"
         android:textAlignment="center"
 
@@ -72,7 +72,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title"
 
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="@dimen/_50sdp"
         android:layout_marginHorizontal="15dp"
 
         />
@@ -89,6 +89,7 @@
         android:textColorHint="@android:color/darker_gray"
         android:autofillHints="emailAddress"
         android:inputType="textEmailAddress"
+        android:textSize="@dimen/_13ssp"
 
         android:background="@drawable/round_25_shadow"
 
@@ -114,7 +115,7 @@
         android:text="@string/we_will_send_a_verification_code_to_their_email"
         android:fontFamily="@font/exo_2_medium"
         android:textColor="@color/color_primary"
-        android:textSize="16sp"
+        android:textSize="@dimen/_14ssp"
         android:textAlignment="center"
 
         app:layout_constraintStart_toStartOf="parent"
@@ -134,11 +135,12 @@
         android:text="@string/next"
         android:textColor="@color/white"
         android:fontFamily="@font/exo_2_bold"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/grad_btn_bg_4"
 
         android:layout_marginHorizontal="15dp"
-        android:layout_marginBottom="45dp"
+        android:layout_marginBottom="@dimen/_25sdp"
 
         app:layout_constraintBottom_toBottomOf="parent"
 
diff --git a/app/src/main/res/layout/fragment_get_more_info.xml b/app/src/main/res/layout/fragment_get_more_info.xml
index e11e76b..fc80ba8 100644
--- a/app/src/main/res/layout/fragment_get_more_info.xml
+++ b/app/src/main/res/layout/fragment_get_more_info.xml
@@ -22,12 +22,12 @@
 
             <ImageView
                 android:id="@+id/back_btn"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:contentDescription="@string/image"
+                android:layout_width="@dimen/_25sdp"
+                android:layout_height="@dimen/_25sdp"
+                android:contentDescription="@string/back_btn"
                 android:layout_gravity="start"
-                android:layout_marginStart="30dp"
-                android:layout_marginTop="25dp"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="30dp"
                 android:layout_marginBottom="10dp"
                 android:src="@drawable/ic_arrow_back"
                 app:tint="@color/color_primary" />
@@ -36,11 +36,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
 
-                android:text="@string/nice_to_meet_you"
                 android:fontFamily="@font/exo_2"
-                android:textColor="@color/color_primary"
-                android:textSize="18sp"
+                android:text="@string/nice_to_meet_you"
                 android:textAlignment="center"
+                android:textColor="@color/color_primary"
+                android:textSize="@dimen/_16ssp"
 
                 />
 
@@ -52,7 +52,7 @@
                 tools:text="Aditya"
                 android:fontFamily="@font/exo_2_extrabold"
                 android:textColor="@color/color_primary"
-                android:textSize="24sp"
+                android:textSize="@dimen/_18ssp"
                 android:textAlignment="center"
 
                 />
@@ -64,7 +64,7 @@
                 android:text="@string/can_we_know_a_bit_more_about_you"
                 android:fontFamily="@font/exo_2"
                 android:textColor="@color/color_primary"
-                android:textSize="18sp"
+                android:textSize="@dimen/_16ssp"
                 android:textAlignment="center"
 
                 android:layout_marginTop="15dp"
@@ -77,7 +77,7 @@
                 android:text="@string/your_gender"
                 android:fontFamily="@font/exo_2_bold"
                 android:textColor="@color/color_primary"
-                android:textSize="16sp"
+                android:textSize="@dimen/_12ssp"
                 android:textAlignment="center"
 
                 android:layout_marginTop="15dp"
@@ -185,7 +185,7 @@
                 android:text="@string/when_is_your_birthday"
                 android:fontFamily="@font/exo_2_bold"
                 android:textColor="@color/color_primary"
-                android:textSize="16sp"
+                android:textSize="@dimen/_12ssp"
                 android:textAlignment="center"
 
                 android:layout_marginTop="15dp"
@@ -215,7 +215,7 @@
                     android:text="@string/what_are_your_interests"
                     android:fontFamily="@font/exo_2_bold"
                     android:textColor="@color/color_primary"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/_12ssp"
                     android:textAlignment="center"
                     />
 
@@ -261,7 +261,7 @@
         android:background="@drawable/grad_btn_bg_4"
 
         android:layout_marginHorizontal="15dp"
-        android:layout_marginBottom="25dp"
+        android:layout_marginBottom="@dimen/_20sdp"
 
         android:layout_alignParentBottom="true"
 
diff --git a/app/src/main/res/layout/fragment_language.xml b/app/src/main/res/layout/fragment_language.xml
index c13c3e6..8e27ead 100644
--- a/app/src/main/res/layout/fragment_language.xml
+++ b/app/src/main/res/layout/fragment_language.xml
@@ -44,7 +44,7 @@
             android:textAllCaps="true"
             android:fontFamily="@font/exo_2_bold"
             android:textAlignment="center"
-            android:textSize="18sp" />
+            android:textSize="@dimen/_12ssp" />
 
         <Button
             android:id="@+id/hindi"
@@ -59,7 +59,7 @@
             android:textAllCaps="true"
             android:fontFamily="@font/exo_2_bold"
             android:textAlignment="center"
-            android:textSize="18sp"
+            android:textSize="@dimen/_12ssp"
 
             android:layout_marginStart="25dp" />
 
diff --git a/app/src/main/res/layout/fragment_new_password.xml b/app/src/main/res/layout/fragment_new_password.xml
index 6d8c16b..1723839 100644
--- a/app/src/main/res/layout/fragment_new_password.xml
+++ b/app/src/main/res/layout/fragment_new_password.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/back_btn"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
         android:contentDescription="@string/image"
         android:src="@drawable/ic_arrow_back"
         app:layout_constraintBottom_toBottomOf="@+id/logo"
@@ -45,7 +45,7 @@
 
         android:text="@string/great_select_new_password"
         android:fontFamily="@font/exo_2_medium"
-        android:textSize="22sp"
+        android:textSize="@dimen/_18ssp"
         android:textColor="@color/color_primary"
         android:textAlignment="center"
 
@@ -73,7 +73,7 @@
 
             android:text="@string/create_your_password"
             android:fontFamily="@font/exo_2_bold"
-            android:textSize="16sp"
+            android:textSize="@dimen/_12ssp"
             android:textColor="@color/color_primary"
             android:textAlignment="center"
 
@@ -118,6 +118,7 @@
 
                     android:textColor="@color/black"
                     android:textColorHint="@android:color/darker_gray"
+                    android:textSize="@dimen/_13ssp"
 
                     />
 
@@ -131,7 +132,7 @@
 
             android:text="@string/create_your_password"
             android:fontFamily="@font/exo_2_bold"
-            android:textSize="16sp"
+            android:textSize="@dimen/_12ssp"
             android:textColor="@color/color_primary"
             android:textAlignment="center"
 
@@ -173,6 +174,7 @@
                     android:textColorHint="@android:color/darker_gray"
                     android:singleLine="true"
                     android:inputType="textPassword"
+                    android:textSize="@dimen/_13ssp"
 
                     android:background="@drawable/round_25_shadow"
 
@@ -195,11 +197,12 @@
         android:text="@string/reset_password"
         android:textColor="@color/white"
         android:fontFamily="@font/exo_2_bold"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/grad_btn_bg_4"
 
         android:layout_marginHorizontal="15dp"
-        android:layout_marginBottom="45dp"
+        android:layout_marginBottom="@dimen/_25sdp"
 
         app:layout_constraintBottom_toBottomOf="parent"
 
diff --git a/app/src/main/res/layout/fragment_onboard.xml b/app/src/main/res/layout/fragment_onboard.xml
index beacb02..10a1e32 100644
--- a/app/src/main/res/layout/fragment_onboard.xml
+++ b/app/src/main/res/layout/fragment_onboard.xml
@@ -18,8 +18,9 @@
 
     <ImageView
         android:id="@+id/back_btn"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
+        android:contentDescription="@string/back_btn"
         android:src="@drawable/ic_arrow_back"
         app:layout_constraintBottom_toBottomOf="@+id/logo"
         app:layout_constraintEnd_toStartOf="@+id/logo"
@@ -84,7 +85,7 @@
         android:text="@string/create_your_account"
         android:fontFamily="@font/exo_2_bold"
         android:textColor="@color/white"
-        android:textSize="18sp"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/gradient_btn_bg"
 
@@ -103,7 +104,7 @@
         android:text="@string/login"
         android:fontFamily="@font/exo_2_bold"
         android:textColor="@color/white"
-        android:textSize="18sp"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/gradient_btn_bg_2"
 
@@ -123,7 +124,7 @@
         android:textAllCaps="false"
         android:fontFamily="@font/exo_2_bold"
         android:textColor="@color/white"
-        android:textSize="18sp"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/gradient_btn_bg_3"
 
diff --git a/app/src/main/res/layout/fragment_select_avatar.xml b/app/src/main/res/layout/fragment_select_avatar.xml
index e9333e4..a778add 100644
--- a/app/src/main/res/layout/fragment_select_avatar.xml
+++ b/app/src/main/res/layout/fragment_select_avatar.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/back_btn"
-        android:layout_width="25dp"
-        android:layout_height="25dp"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
         android:contentDescription="@string/image"
         android:src="@drawable/ic_arrow_back"
         app:layout_constraintBottom_toBottomOf="@+id/title"
@@ -31,7 +31,7 @@
         android:text="@string/select_your_avatar"
         android:fontFamily="@font/exo_2"
         android:textColor="@color/color_primary"
-        android:textSize="22sp"
+        android:textSize="@dimen/_18ssp"
         android:textAlignment="center"
 
         android:visibility="visible"
@@ -63,11 +63,12 @@
         android:text="@string/next"
         android:textColor="@color/white"
         android:fontFamily="@font/exo_2_bold"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/grad_btn_bg_4"
 
         android:layout_marginHorizontal="15dp"
-        android:layout_marginBottom="45dp"
+        android:layout_marginBottom="@dimen/_25sdp"
 
         app:layout_constraintBottom_toBottomOf="parent"
 
diff --git a/app/src/main/res/layout/fragment_sign_in.xml b/app/src/main/res/layout/fragment_sign_in.xml
index 678a037..e1f0f62 100644
--- a/app/src/main/res/layout/fragment_sign_in.xml
+++ b/app/src/main/res/layout/fragment_sign_in.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/back_btn"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
         android:contentDescription="@string/image"
         android:src="@drawable/ic_arrow_back"
         app:layout_constraintBottom_toBottomOf="@+id/logo"
@@ -57,7 +57,7 @@
             android:text="@string/login_to_woka"
             android:textAlignment="center"
             android:textColor="@color/color_primary"
-            android:textSize="24sp" />
+            android:textSize="@dimen/_20sdp" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -69,7 +69,7 @@
             android:textAlignment="center"
             android:textColor="@color/color_primary"
 
-            android:textSize="18sp" />
+            android:textSize="@dimen/_12sdp" />
 
         <EditText
             android:id="@+id/username"
@@ -96,6 +96,7 @@
 
             android:textColor="@color/black"
             android:textColorHint="@android:color/darker_gray"
+            android:textSize="@dimen/_13sdp"
 
             />
 
@@ -109,7 +110,7 @@
             android:textAlignment="center"
             android:textColor="@color/color_primary"
 
-            android:textSize="18sp" />
+            android:textSize="@dimen/_12sdp" />
 
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
@@ -140,7 +141,7 @@
                     android:background="@drawable/round_25_shadow"
                     android:fontFamily="@font/exo_2"
 
-                    android:hint="@string/enter_a_new_password"
+                    android:hint="@string/enter_your_password"
                     android:paddingHorizontal="20dp"
                     android:paddingVertical="15dp"
 
@@ -149,6 +150,7 @@
                     android:textColor="@color/black"
                     android:textColorHint="@android:color/darker_gray"
                     android:inputType="textPassword"
+                    android:textSize="@dimen/_13sdp"
 
                     />
 
@@ -167,7 +169,7 @@
             android:textAlignment="center"
             android:textColor="@color/color_primary"
 
-            android:textSize="18sp"
+            android:textSize="@dimen/_14sdp"
 
             />
 
@@ -185,6 +187,7 @@
             android:fontFamily="@font/exo_2_bold"
             android:text="@string/login"
             android:textColor="@color/white"
+            android:textSize="@dimen/_14ssp"
 
             />
 
@@ -199,7 +202,7 @@
         android:text="@string/continue_as_guest"
         android:textAlignment="center"
         android:textColor="@color/color_primary"
-        android:textSize="18sp"
+        android:textSize="@dimen/_14ssp"
 
         app:layout_constraintStart_toStartOf="@id/create_account"
         app:layout_constraintEnd_toEndOf="@id/create_account"
@@ -217,6 +220,7 @@
         android:text="@string/create_your_account"
         android:textColor="@color/white"
         android:fontFamily="@font/exo_2_bold"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/gradient_btn_bg"
 
diff --git a/app/src/main/res/layout/fragment_sign_up.xml b/app/src/main/res/layout/fragment_sign_up.xml
index 3243876..e865585 100644
--- a/app/src/main/res/layout/fragment_sign_up.xml
+++ b/app/src/main/res/layout/fragment_sign_up.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/back_btn"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="@dimen/_25sdp"
+        android:layout_height="@dimen/_25sdp"
         android:contentDescription="@string/image"
         android:src="@drawable/ic_arrow_back"
         app:layout_constraintBottom_toBottomOf="@+id/logo"
@@ -64,7 +64,7 @@
                 android:fontFamily="@font/exo_2"
                 android:textColor="@color/color_primary"
                 android:textAlignment="center"
-                android:textSize="24sp"
+                android:textSize="@dimen/_18ssp"
 
                 android:layout_marginHorizontal="25dp"
                 android:layout_marginTop="25dp"
@@ -78,7 +78,7 @@
                 android:text="@string/select_username"
                 android:fontFamily="@font/exo_2_bold"
                 android:textColor="@color/color_primary"
-                android:textSize="16sp"
+                android:textSize="@dimen/_12ssp"
 
                 android:layout_marginTop="30dp"
 
@@ -91,6 +91,7 @@
 
                 android:textColor="@color/black"
                 android:fontFamily="@font/exo_2"
+                android:textSize="@dimen/_13ssp"
 
                 android:hint="@string/enter_a_username"
                 android:textColorHint="@android:color/darker_gray"
@@ -119,7 +120,7 @@
                 android:text="@string/what_s_your_name"
                 android:fontFamily="@font/exo_2_bold"
                 android:textColor="@color/color_primary"
-                android:textSize="16sp"
+                android:textSize="@dimen/_12ssp"
 
                 android:layout_marginTop="15dp"
 
@@ -139,6 +140,7 @@
                 android:autofillHints="name"
                 android:inputType="textCapWords"
                 android:singleLine="true"
+                android:textSize="@dimen/_13ssp"
 
                 android:background="@drawable/round_25_shadow"
 
@@ -160,7 +162,7 @@
                 android:text="@string/create_your_password"
                 android:fontFamily="@font/exo_2_bold"
                 android:textColor="@color/color_primary"
-                android:textSize="16sp"
+                android:textSize="@dimen/_12ssp"
 
                 android:layout_marginTop="15dp"
 
@@ -200,6 +202,7 @@
                         android:textColorHint="@android:color/darker_gray"
                         android:singleLine="true"
                         android:inputType="textPassword"
+                        android:textSize="@dimen/_13ssp"
 
                         android:background="@drawable/round_25_shadow"
 
@@ -237,11 +240,12 @@
         android:text="@string/next"
         android:textColor="@color/white"
         android:fontFamily="@font/exo_2_bold"
+        android:textSize="@dimen/_14ssp"
 
         android:background="@drawable/grad_btn_bg_4"
 
         android:layout_marginHorizontal="15dp"
-        android:layout_marginBottom="45dp"
+        android:layout_marginBottom="@dimen/_25sdp"
 
         app:layout_constraintBottom_toBottomOf="parent"
 
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 2169fc1..194ace5 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -64,4 +64,5 @@
     <string name="enter_a_new_password_">नया पासवर्ड दर्ज करें</string>
     <string name="confirm_your_password">नया पासवर्ड पुन: दर्ज करें</string>
     <string name="reset_password">पासवर्ड रीसेट</string>
+    <string name="enter_your_password">अपना पासवर्ड दर्ज करें</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 6762431..1e4ea4a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,5 +3,6 @@
     <style name="Base.Theme.Woka" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your dark theme here. -->
          <item name="colorPrimary">@color/color_primary</item>
+        <item name="android:textCursorDrawable">@drawable/cursor_drawable</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e9eee8..86624c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,4 +66,6 @@
     <string name="enter_a_new_password_">Enter a new password</string>
     <string name="confirm_your_password">Re-enter your password</string>
     <string name="reset_password">RESET PASSWORD</string>
+    <string name="back_btn" translatable="false">back_btn</string>
+    <string name="enter_your_password">Enter your password</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 346b141..582595a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,6 +3,7 @@
     <style name="Base.Theme.Woka" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your light theme here. -->
          <item name="colorPrimary">@color/color_primary</item>
+        <item name="android:textCursorDrawable">@drawable/cursor_drawable</item>
     </style>
 
     <style name="Theme.App.Starting" parent="Theme.SplashScreen">