diff --git a/vector/src/main/res/layout/fragment_ftue_auth_splash.xml b/vector/src/main/res/layout/fragment_ftue_auth_splash.xml
index 39c0ad3007..803ad700db 100644
--- a/vector/src/main/res/layout/fragment_ftue_auth_splash.xml
+++ b/vector/src/main/res/layout/fragment_ftue_auth_splash.xml
@@ -190,7 +190,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/loginSplashSpace4" />
 
-    <TextView
+    <Button
         android:id="@+id/loginSplashAlreadyHaveAccount"
         style="@style/Widget.Vector.Button.Text.Login"
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml b/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml
index 1f2968a428..89d059dab9 100644
--- a/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml
+++ b/vector/src/main/res/layout/fragment_ftue_auth_use_case.xml
@@ -127,8 +127,8 @@
         android:id="@+id/useCaseSkip"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:clickable="true"
+        android:gravity="center"
         app:layout_constraintBottom_toTopOf="@id/contentFooterSpacing"
         app:layout_constraintEnd_toEndOf="@id/useCaseGutterEnd"
         app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"
@@ -152,7 +152,7 @@
         app:layout_constraintStart_toStartOf="@id/useCaseGutterStart"
         app:layout_constraintTop_toBottomOf="@id/contentFooterSpacing" />
 
-    <TextView
+    <Button
         android:id="@+id/useCaseConnectToServer"
         style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml b/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml
index 6791a09130..facef377d4 100644
--- a/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml
+++ b/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml
@@ -69,7 +69,7 @@
         app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart"
         app:layout_constraintTop_toBottomOf="@id/loginSplashButtonsSpace" />
 
-    <TextView
+    <Button
         android:id="@+id/loginSplashAlreadyHaveAccount"
         style="@style/Widget.Vector.Button.Text.Login"
         android:layout_width="0dp"