diff --git a/app/src/main/res/layout/base_kbs_pin_fragment.xml b/app/src/main/res/layout/base_kbs_pin_fragment.xml
index fde1c682c8..8bd397b795 100644
--- a/app/src/main/res/layout/base_kbs_pin_fragment.xml
+++ b/app/src/main/res/layout/base_kbs_pin_fragment.xml
@@ -16,8 +16,8 @@
             android:id="@+id/kbs_pin_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toStartOf="parent" />
+            app:layout_constraintEnd_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/edit_kbs_pin_title"
@@ -56,6 +56,8 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:minWidth="210dp"
+            app:errorEnabled="false"
+            app:hintEnabled="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/edit_kbs_pin_description">
@@ -67,7 +69,10 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:imeOptions="actionDone"
-                android:inputType="numberPassword" />
+                android:inputType="numberPassword"
+                android:textColor="@color/signal_colorOnSurface"
+                android:textCursorDrawable="@color/signal_colorOnSurface"
+                tools:text="1234567890" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.airbnb.lottie.LottieAnimationView